Merge branch 'master' into next

2011-08-09 09:47:10 +02:00
parent 639a4baf7b 042b10e068
commit f8d834c62d
3 changed files with 11 additions and 6 deletions
--- a/docs/userguide
+++ b/docs/userguide
@ -789,11 +789,11 @@ mode "resize" {
        bindsym j resize shrink left
        bindsym Shift+j resize grow left

-        bindsym k resize grow bottom
-        bindsym Shift+k resize shrink bottom
+        bindsym k resize grow down
+        bindsym Shift+k resize shrink down

-        bindsym l resize shrink top
-        bindsym Shift+l resize grow top
+        bindsym l resize shrink up
+        bindsym Shift+l resize grow up

        bindsym semicolon resize grow right
        bindsym Shift+semicolon resize shrink right