From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 3 Oct 2011 18:31:12 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~124
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=201268d9b2014fcd91a3258dddf43d2e8235016e;hp=963c8cfb2087329baab7c4b3bf947f8b57b7b3fb

Merge branch 'master' into next
---

diff --git a/i3bar/doc/i3bar.man b/i3bar/doc/i3bar.man
index 5faa16c3..d28f6249 100644
--- a/i3bar/doc/i3bar.man
+++ b/i3bar/doc/i3bar.man
@@ -29,7 +29,7 @@ Put i3bar in dockmode. This will reserve some space for it, so it does not overl
 You can specify either *bottom* (default) or *top* as 'pos'.
 
 *-f, --font* 'font'::
-Specifies a 'X-core-font' to use. You can choose one with *xfontsel*(1). Defaults to '-misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1'.
+Specifies a 'X-core-font' to use. You can choose one with *xfontsel*(1). Defaults to '+++-misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1+++'.
 
 *-V, --verbose*::
 Be (very) verbose with the debug-output. If not set, only errors are reported to 'stderr'