Merge branch 'master' into next

[i3/i3] / i3.config.keycodes

diff --git a/i3.config.keycodes b/i3.config.keycodes
index 162660d3342e83ea7b33b5effa9e4ebb7b9bf1c9..21229208ff43801f0487e3162efb8d5ec17a1071 100644 (file)
--- a/i3.config.keycodes
+++ b/i3.config.keycodes
@@ -16,8 +16,8 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 # The font above is very space-efficient, that is, it looks good, sharp and
 # clear in small sizes. However, if you need a lot of unicode glyphs or
 # right-to-left text rendering, you should instead use pango for rendering and
-# chose an xft font, such as:
-# font xft:DejaVu Sans Mono 10
+# chose a FreeType font, such as:
+# font pango:DejaVu Sans Mono 10
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -79,7 +79,7 @@ bindcode $mod+65 focus mode_toggle
 bindcode $mod+38 focus parent
 
 # focus the child container
-#bindcode $mod+d focus child
+#bindsym $mod+d focus child
 
 # switch to workspace
 bindcode $mod+10 workspace 1