Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-27 15:28:34 +02:00
commit 057e0e9794
1 changed files with 1 additions and 1 deletions

View File

@ -78,7 +78,7 @@ tabbed::
The same principle as +stacking+, but the list of windows at the top is only The same principle as +stacking+, but the list of windows at the top is only
a single line which is vertically split. a single line which is vertically split.
To switch modes, press +mod+e+ for default, +mod+h+ for stacking and To switch modes, press +mod+e+ for default, +mod+s+ for stacking and
+mod+w+ for tabbed. +mod+w+ for tabbed.
image:modes.png[Container modes] image:modes.png[Container modes]