Merge branch 'master' into next

diff --combined docs/userguide
index 9aaaa1d049b34347d9a53c29dec000bdcb396b07,772fd4b8bda1c3f1316de51b3fba45283dca99e3..854acbbc7a98b7a687778d988b4238ef213f6f47
--- 1/docs/userguide
--- 2/docs/userguide
+++ b/docs/userguide
@@@ -415,7 -415,7 +415,7 @@@ This option determines which border sty
  
  *Syntax*:
  ---------------------------------------------
- new_window <normal|1pixel|borderless>
+ new_window <normal|1pixel|none>
  ---------------------------------------------
  
  *Example*:
@@@ -834,11 -834,6 +834,11 @@@ You can also switch to the next and pre
  workspace 1, 3, 4 and 9 and you want to cycle through them with a single key
  combination.
  
 +To move a container to another xrandr output such as +LVDS1+ or +VGA1+, you can
 +use the +move output+ command followed by the name of the target output. You
 +may also use +left+, +right+, +up+, +down+ instead of the xrandr output name to
 +move to the the next output in the specified direction.
 +
  *Examples*:
  -------------------------
  bindsym mod+1 workspace 1