update docs/userguide

diff --git a/_docs/userguide b/_docs/userguide
index 50c8b2617d893d03c9e803a3771ddb35c6572e63..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*:
@@ -834,6 +834,11 @@ You can also switch to the next and previous workspace with the commands
 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

diff --git a/docs/4.0/userguide.html b/docs/4.0/userguide.html
index 5fc25ec04b14fca78b954824d9126855ebc0cbf5..6698106e108763d8bef882a91b83e97fed816a78 100644 (file)
--- a/docs/4.0/userguide.html
+++ b/docs/4.0/userguide.html
@@ -487,7 +487,7 @@ start.</p></div>
 <div class="paragraph"><p><strong>Syntax</strong>:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>new_window &lt;normal|1pixel|borderless&gt;</tt></pre>\r
+<pre><tt>new_window &lt;normal|1pixel|none&gt;</tt></pre>\r
 </div></div>\r
 <div class="paragraph"><p><strong>Example</strong>:</p></div>\r
 <div class="listingblock">\r
@@ -983,6 +983,10 @@ number or name of the workspace. To move containers to specific workspaces, use
 <tt>workspace next</tt> and <tt>workspace prev</tt>, which is handy, for example, if you have\r
 workspace 1, 3, 4 and 9 and you want to cycle through them with a single key\r
 combination.</p></div>\r
+<div class="paragraph"><p>To move a container to another xrandr output such as <tt>LVDS1</tt> or <tt>VGA1</tt>, you can\r
+use the <tt>move output</tt> command followed by the name of the target output. You\r
+may also use <tt>left</tt>, <tt>right</tt>, <tt>up</tt>, <tt>down</tt> instead of the xrandr output name to\r
+move to the the next output in the specified direction.</p></div>\r
 <div class="paragraph"><p><strong>Examples</strong>:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r

diff --git a/docs/userguide.html b/docs/userguide.html
index 5fc25ec04b14fca78b954824d9126855ebc0cbf5..6698106e108763d8bef882a91b83e97fed816a78 100644 (file)
--- a/docs/userguide.html
+++ b/docs/userguide.html
@@ -487,7 +487,7 @@ start.</p></div>
 <div class="paragraph"><p><strong>Syntax</strong>:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>new_window &lt;normal|1pixel|borderless&gt;</tt></pre>\r
+<pre><tt>new_window &lt;normal|1pixel|none&gt;</tt></pre>\r
 </div></div>\r
 <div class="paragraph"><p><strong>Example</strong>:</p></div>\r
 <div class="listingblock">\r
@@ -983,6 +983,10 @@ number or name of the workspace. To move containers to specific workspaces, use
 <tt>workspace next</tt> and <tt>workspace prev</tt>, which is handy, for example, if you have\r
 workspace 1, 3, 4 and 9 and you want to cycle through them with a single key\r
 combination.</p></div>\r
+<div class="paragraph"><p>To move a container to another xrandr output such as <tt>LVDS1</tt> or <tt>VGA1</tt>, you can\r
+use the <tt>move output</tt> command followed by the name of the target output. You\r
+may also use <tt>left</tt>, <tt>right</tt>, <tt>up</tt>, <tt>down</tt> instead of the xrandr output name to\r
+move to the the next output in the specified direction.</p></div>\r
 <div class="paragraph"><p><strong>Examples</strong>:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r