Merge branch 'next' into testcases

Conflicts: docs/userguide
2009-08-21 11:45:59 +02:00
parent 5b6bcb48f0 74a6c7532d
commit 4da54f1279
17 changed files with 173 additions and 130 deletions
--- a/docs/userguide
+++ b/docs/userguide
@ -505,7 +505,7 @@ or you can specify the position of the client if you always use the same layout.
 *Examples*:
 --------------------------------------
 # Get me to the next open VIM instance
-bind Mod1+38 jump "urxvt/VIM"
+bindsym Mod1+a jump "urxvt/VIM"
 --------------------------------------

 === Traveling the focus stack