dap commit: Multiple batteries: remove duplicate 'dischargingTime' description,

changeset:   553:389c12d1c49c
user:        Anssi Kostiainen <anssi.kostiainen@intel.com>
date:        Wed Jul 02 09:14:43 2014 +0300
files:       battery/Overview.src.html
description:
Multiple batteries: remove duplicate 'dischargingTime' description,
reword 'chargingTime', reorder the attributes to match the IDL.


diff -r 10ea45927fa6 -r 389c12d1c49c battery/Overview.src.html
--- a/battery/Overview.src.html	Tue Jul 01 12:15:19 2014 +0300
+++ b/battery/Overview.src.html	Wed Jul 02 09:14:43 2014 +0300
@@ -291,20 +291,9 @@
           Otherwise, it MUST be set to false.
         </p>
         <p>
-          The <code>level</code> attribute can be set to the average of the
-          levels of batteries of same capacity, or the weighted average of the
-          battery level attributes for batteries of different capacities.
-        </p>
-        <p>
-          Depending on whether multiple batteries charge in parallel or
-          serially, the <code>chargingTime</code> attribute can be set to the
-          maximum or sum of the individual battery charging time, respectively.
-        </p>
-        <p>
-          The <code>dischargingTime</code> attribute can be set to the sum or
-          weighted average  of the individual battery
-          <code>dischargingTime</code>, depending on whether they discharge
-          serially or in parallel respectively.
+          The <code>chargingTime</code> attribute can be set to the maximum
+          charging time of the individual batteries if charging in parallel,
+          and to the sum of the individual charging times if charging serially.
         </p>
         <p>
           The <code>dischargingTime</code> attribute can be set to the maximum
@@ -312,6 +301,11 @@
           parallel, and to the sum of the individual batteries if discharging
           serially.
         </p>
+        <p>
+          The <code>level</code> attribute can be set to the average of the
+          levels of batteries of same capacity, or the weighted average of the
+          battery level attributes for batteries of different capacities.
+        </p>
       </section>
       <section>
         <h2>Event handlers</h2>

Received on Wednesday, 2 July 2014 06:45:21 UTC