Merge branch 'master' into next

[i3/i3] / docs / userguide

diff --git a/docs/userguide b/docs/userguide
index 9aaaa1d049b34347d9a53c29dec000bdcb396b07..854acbbc7a98b7a687778d988b4238ef213f6f47 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -415,7 +415,7 @@ This option determines which border style new windows will have.
 
 *Syntax*:
 ---------------------------------------------
-new_window <normal|1pixel|borderless>
+new_window <normal|1pixel|none>
 ---------------------------------------------
 
 *Example*: