From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 20 Apr 2018 15:55:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'mariner/fishdescriptor'
X-Git-Tag: archive/debian/6.0.0~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=7387948ac5bb282f6386da0c152dc4ad51e67ca9;hp=06e9fbce65f66a3289257d8013aa92ce0ba37296

Merge remote-tracking branch 'mariner/fishdescriptor'
---

diff --git a/cprogs/xbatmon-simple.c b/cprogs/xbatmon-simple.c
index 5d64ff4..8fe9b06 100644
--- a/cprogs/xbatmon-simple.c
+++ b/cprogs/xbatmon-simple.c
@@ -1,16 +1,21 @@
 /*
+ * The display is a lin-log chart of the charge over time.
+ * Time is on a log scale.
+ * The top pixel line is 60s from now.
+ * The bottom of the window is 1h from now.
+ *
  * display outputs, per line:
  *
  *   Remaining:	 | Empty:	| Degraded:
  *     blue	 |  black	|  dimgrey	discharging
  *     green	 |  black	|  dimgrey	charging
  *     cyan	 |  black	|  dimgrey	charged
- *     grey	 |  black	|  dimgrey	charging&discharching!
+ *     grey	 |  black	|  dimgrey	charging&discharging!
  *     lightgrey |  black	|  dimgrey	none of the above
  *     blue	 |  red  	|  dimgrey	discharging - low!
  *     green	 |  red  	|  dimgrey	charging - low
  *     cyan	 |  red  	|  dimgrey	charged - low [1]
- *     grey	 |  red  	|  dimgrey	charging&discharching, low [1]
+ *     grey	 |  red  	|  dimgrey	charging&discharging, low [1]
  *       ...  darkgreen  ...			no batteries present
  *       ...  yellow  ...			error
  *
diff --git a/debian/changelog b/debian/changelog
index 265c157..1bf6008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-utils (5.0.3~iwj) unstable; urgency=medium
+
+  xbatmon-simple:
+  * Minor improvements to the .txt doc.
+
+ --
+
 chiark-utils (5.0.3~citrix3) unstable; urgency=medium
 
   fishdescriptor: