dap commit: merge

changeset:   523:428149f72f4a
tag:         tip
parent:      522:77dbe211ed07
parent:      519:68ced792f69f
user:        Mounir Lamouri <mounir@lamouri.fr>
date:        Fri Jun 06 12:35:07 2014 +0100
description:
merge


diff -r 77dbe211ed07 -r 428149f72f4a light/Overview.html
--- a/light/Overview.html	Fri Jun 06 12:34:01 2014 +0100
+++ b/light/Overview.html	Fri Jun 06 12:35:07 2014 +0100
@@ -397,7 +397,7 @@
   </p>
   <h1 class="title p-name" id="title" property="dcterms:title">Ambient Light Events</h1>
   
-  <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-06-06T06:36:13.000Z" id="w3c-editor-s-draft-06-june-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-06-06">06 June 2014</time></h2>
+  <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-06-06T08:29:24.000Z" id="w3c-editor-s-draft-06-june-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-06-06">06 June 2014</time></h2>
   <dl>
     
       <dt>This version:</dt>
@@ -488,6 +488,26 @@
         </p>
         
       <p>
+        The following changes have been made
+        since the
+        <a href="http://www.w3.org/TR/2013/CR-ambient-light-20131001/">
+        <abbr title="World Wide Web Consortium">W3C</abbr>
+        Candidate Recommendation 01 October 2013</a>:
+      </p>
+      <ul>
+        <li>
+          Remove the 
+          <a href="http://www.w3.org/TR/2013/CR-ambient-light-20131001/#lightlevelevent-interface">
+          <code>LightLevelEvent</code></a> interface to align with
+          implementations.
+        </li>
+        <li>
+          Update the <a href="#security-and-privacy-considerations">
+          Security and privacy considerations</a> and
+          <a href="#introduction">Introduction</a> sections accordingly.
+        </li>
+      </ul>
+      <p>
         The functionality described in this specification was initially
         specified as part of the
         <a href="http://dvcs.w3.org/hg/dap/raw-file/default/sensor-api/Overview.html">
diff -r 77dbe211ed07 -r 428149f72f4a light/Overview.src.html
--- a/light/Overview.src.html	Fri Jun 06 12:34:01 2014 +0100
+++ b/light/Overview.src.html	Fri Jun 06 12:35:07 2014 +0100
@@ -56,6 +56,26 @@
     
     <section id="sotd">
       <p>
+        The following changes have been made
+        since the
+        <a href="http://www.w3.org/TR/2013/CR-ambient-light-20131001/">
+        <abbr title="World Wide Web Consortium">W3C</abbr>
+        Candidate Recommendation 01 October 2013</a>:
+      </p>
+      <ul>
+        <li>
+          Remove the 
+          <a href="http://www.w3.org/TR/2013/CR-ambient-light-20131001/#lightlevelevent-interface">
+          <code>LightLevelEvent</code></a> interface to align with
+          implementations.
+        </li>
+        <li>
+          Update the <a href="#security-and-privacy-considerations">
+          Security and privacy considerations</a> and
+          <a href="#introduction">Introduction</a> sections accordingly.
+        </li>
+      </ul>
+      <p>
         The functionality described in this specification was initially
         specified as part of the
         <a href="http://dvcs.w3.org/hg/dap/raw-file/default/sensor-api/Overview.html">

Received on Friday, 6 June 2014 11:35:20 UTC