From 69cd4fe0038a46931f7019e96ceec433cb146649 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg
Date: Wed, 3 Oct 2012 13:42:01 +0200
Subject: update changelog and manpage for 2.6

---
 man/asciidoc.conf | 2 +-
 man/i3status.man  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'man')

diff --git a/man/asciidoc.conf b/man/asciidoc.conf
index ae335bd..afb36bd 100644
--- a/man/asciidoc.conf
+++ b/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>
diff --git a/man/i3status.man b/man/i3status.man
index 35cdb73..9a19ec9 100644
--- a/man/i3status.man
+++ b/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)+
-- 
cgit v1.2.3