news and readme updates

2 files changed, 17 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index f008eda..df0bc07 100644
--- a/NEWS
+++ b/NEWS
@@ -11,11 +11,15 @@ _New features_
   - New keyboard layout monitor (Kbd).  Yes, by Martin.
   - Rewrite of the event handling ([issue 53], [issue 57]), also by Martin.
   - Cpu monitor now also reports `iowait` field ([issue 55]).
+  - Battery monitor: the full charge file is now settable in the
+    monitor arguments (olpc systems use charge_full_design; see [issue 62]).
 
 _Bug fixes_
 
+  - [issue 45]: Fix for crashes with AC status changes in battery monitor.
   - [issue 48]: The <quality> field of Wireless behaves like a percentage.
-  - [issue 50]: `MPD` monitor now works with libmpd 0.6.
+  - [issue 50]/[issue 61]: `MPD` monitor now works with libmpd 0.6.
+  - [issue 60]: Fixes for crashes on power resume for battery monitor.
   - Template sections without fields are now correctly displayed.
   - Catch errors when reading battery status (Ben Boeckel).
   - Compilation issues with ghc 7.x (Sergei Trofimovich).
@@ -25,11 +29,15 @@ _Bug fixes_
     (Martin).
   - Fixed compilation in OpenBSD (Ivo van der Sangen).
 
+[issue 45]: http://code.google.com/p/xmobar/issues/detail?id=45
 [issue 48]: http://code.google.com/p/xmobar/issues/detail?id=48
 [issue 50]: http://code.google.com/p/xmobar/issues/detail?id=50
 [issue 53]: http://code.google.com/p/xmobar/issues/detail?id=53
 [issue 55]: http://code.google.com/p/xmobar/issues/detail?id=55
 [issue 57]: http://code.google.com/p/xmobar/issues/detail?id=57
+[issue 60]: http://code.google.com/p/xmobar/issues/detail?id=60
+[issue 61]: http://code.google.com/p/xmobar/issues/detail?id=61
+[issue 62]: http://code.google.com/p/xmobar/issues/detail?id=62
 
 ## Version 0.13 (March 28, 2011)
 
diff --git a/README b/README
index 69d5a3c..412f0d3 100644
--- a/README
+++ b/README
@@ -319,13 +319,8 @@ swap monitor plugin, with default options, every second.
 The only internal available command is `Com` (see below Executing
 External Commands). All other commands are provided by plugins. xmobar
 comes with some plugins, providing a set of system monitors, a
-standard input reader, an Unix named pipe reader, and a configurable
-date plugin. These plugins install the following internal commands:
-`Weather`, `Network`, `Wireless` (optional), `Memory`, `Swap`, `Cpu`,
-`MultiCpu`, `Battery`, `TopProc`, `TopMem`, `DiskU`, `DiskIO`,
-`Thermal`, `ThermalZone`, `CpuFreq`, `CoreTemp`, `Volume` (optional),
-`MPD` (optional), `Mail` (optional), `MBox` (optional), `Date`,
-`Uptime`, `StdinReader`, `CommandReader`, and `PipeReader`.
+standard input reader, an Unix named pipe reader, a configurable date
+plugin, and much more: we list all available plugins below.
 
 To remove them see below Installing/Removing a Plugin
 
@@ -447,6 +442,10 @@ Monitors have default aliases.
     - `-p`: color to display positive power (battery charging)
     - `-f`: file in `/sys/class/power_supply` with AC info (default:
       "AC/online")
+    - `-c`: file in `/sys/class/power/<BAT>/` with full charge
+    information (default: "charge_full"; for instance, olpc systems
+    use "charge_full_design")
+
 - Variables that can be used with the `-t`/`--template` argument:
 	    `left`, `leftbar`, `timeleft`, `watts`, `acstatus`
 - Default template: `Batt: <watts>, <left>% / <timeleft>`
@@ -458,7 +457,8 @@ Monitors have default aliases.
                        "-L", "10", "-H", "80", "-p", "3",
                        "--", "-O", "<fc=green>On</fc> - ", "-o", "",
                        "-L", "-15", "-H", "-5",
-                       "-l", "red", "-m", "blue", "-h", "green"]
+                       "-l", "red", "-m", "blue", "-h", "green",
+                       "-c", "charge_full_design"]
                       600
   In the above example, the thresholds before the "--" separator
   refer to the `<left>` field, while those after the separator affect