Merge branch 'master' into next

diff --git a/docs/userguide b/docs/userguide
index 52571bd4b6745cb36ca2007198bb0ee0ea3ae784..4eadccb1d3dfb4eb6653a4864f378ab58a1ea5f2 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -1565,7 +1565,7 @@ If you want to resize containers/windows using your keyboard, you can use the
 
 *Syntax*:
 ---------------------------------------------------------
-resize <grow|shrink> <direction> [<px> px] [or <ppt> ppt]
+resize <grow|shrink> <direction> [<px> px [or <ppt> ppt]]
 ---------------------------------------------------------
 
 Direction can either be one of +up+, +down+, +left+ or +right+. Or you can be