Merge branch 'fix-borderless'

diff --git a/docs/userguide b/docs/userguide
index 50c8b2617d893d03c9e803a3771ddb35c6572e63..772fd4b8bda1c3f1316de51b3fba45283dca99e3 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*: