Merge branch 'master' into next

[i3/i3] / docs / userguide

diff --git a/docs/userguide b/docs/userguide
index 58dcf9acaffb0392622f259e5344bcb2e5ecf3ac..4eadccb1d3dfb4eb6653a4864f378ab58a1ea5f2 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -324,7 +324,7 @@ font pango:[family list] [style options] [size]
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 font pango:DejaVu Sans Mono 10
 font pango:DejaVu Sans Mono, Terminus Bold Semi-Condensed 11
-font pango:Terminus 11x
+font pango:Terminus 11px
 --------------------------------------------------------------
 
 [[keybindings]]
@@ -1565,7 +1565,7 @@ If you want to resize containers/windows using your keyboard, you can use the
 
 *Syntax*:
 ---------------------------------------------------------
-resize <grow|shrink> <direction> [<px> px] [or <ppt> ppt]
+resize <grow|shrink> <direction> [<px> px [or <ppt> ppt]]
 ---------------------------------------------------------
 
 Direction can either be one of +up+, +down+, +left+ or +right+. Or you can be