Merge branch 'master' into next

[i3/i3] / docs / userguide

diff --git a/docs/userguide b/docs/userguide
index be3a0b1d01e61eccd67265155e1a0097293d0845..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]]
@@ -1612,7 +1612,7 @@ bindsym $mod+r mode "resize"
 Often when in a multi-monitor environment, you want to quickly jump to a
 specific window. For example, while working on workspace 3 you may want to
 jump to your mail client to email your boss that you’ve achieved some
-important goal. Instead of figuring out how to navigate to your mailclient,
+important goal. Instead of figuring out how to navigate to your mail client,
 it would be more convenient to have a shortcut. You can use the +focus+ command
 with criteria for that.