update changelog and manpage for 2.6

CHANGELOG

@@ -1,3 +1,15 @@
+2012-10-03 i3status 2.6
+
+ • Error handling: Properly output JSON errors in the battery module
+ • Colorize battery output if remaining time/percentage below threshold
+ • Colorize volume in red if muted
+ • Include a Perl and Python example wrapper script for i3status’s JSON output
+ • Avoid division by zero when calculating CPU usage
+ • Add consumption to battery info
+ • Use correct units for battery calculations
+ • Add percentage values for disk info
+ • Save the DNS lookup for k.root-servers.net in the ipv6 module
+
 2012-05-11 i3status 2.5.1
 
  • Handle %d with non-default CPU temperature path

man/asciidoc.conf

@@ -7,7 +7,7 @@ template::[header-declarations]
 <refentrytitle>{mantitle}</refentrytitle>
 <manvolnum>{manvolnum}</manvolnum>
 <refmiscinfo class="source">i3status</refmiscinfo>
-<refmiscinfo class="version">v2.5</refmiscinfo>
+<refmiscinfo class="version">v2.6</refmiscinfo>
 <refmiscinfo class="manual">i3 Manual</refmiscinfo>
 </refmeta>
 <refnamediv>

man/i3status.man

@@ -1,7 +1,7 @@
 i3status(1)
 ===========
-Michael Stapelberg <michael+i3@stapelberg.de>
-v2.5, May 2012
+Michael Stapelberg <michael@i3wm.org>
+v2.6, October 2012
 
 == NAME
 
@@ -365,6 +365,10 @@ done
 
 Put that in some script, say +.bin/my_i3status.sh+ and execute that instead of i3status.
 
+Note that if you want to use the JSON output format (with colors in i3bar), you
+need to use a slightly more complex wrapper script. There are examples in the
+contrib/ folder, see http://code.i3wm.org/i3status/tree/contrib
+
 == SEE ALSO
 
 +strftime(3)+, +date(1)+, +glob(3)+, +dzen2(1)+, +xmobar(1)+