Merge branch 'master' into next

2011-08-27 15:28:34 +02:00 · 2011-08-27 15:28:34 +02:00 · 057e0e9794
parent 8114ecda47 47ae4d4f66
commit 057e0e9794
1 changed files with 1 additions and 1 deletions
--- a/docs/userguide
+++ b/docs/userguide
@ -78,7 +78,7 @@ tabbed::
 The same principle as +stacking+, but the list of windows at the top is only
 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.

 image:modes.png[Container modes]