From 6b705cb2c9447fdaaca3f14a5ba3df7581e3eda3 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 29 Aug 2011 15:18:14 +0200
Subject: [PATCH] update docs/userguide

---
 _docs/userguide         | 7 ++++++-
 docs/4.0/userguide.html | 6 +++++-
 docs/userguide.html     | 6 +++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/_docs/userguide b/_docs/userguide
index 50c8b26..854acbb 100644
--- 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 5fc25ec..6698106 100644
--- 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>
 <div class="listingblock">
 <div class="content">
-<pre><tt>new_window &lt;normal|1pixel|borderless&gt;</tt></pre>
+<pre><tt>new_window &lt;normal|1pixel|none&gt;</tt></pre>
 </div></div>
 <div class="paragraph"><p><strong>Example</strong>:</p></div>
 <div class="listingblock">
@@ -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
 workspace 1, 3, 4 and 9 and you want to cycle through them with a single key
 combination.</p></div>
+<div class="paragraph"><p>To move a container to another xrandr output such as <tt>LVDS1</tt> or <tt>VGA1</tt>, you can
+use the <tt>move output</tt> command followed by the name of the target output. You
+may also use <tt>left</tt>, <tt>right</tt>, <tt>up</tt>, <tt>down</tt> instead of the xrandr output name to
+move to the the next output in the specified direction.</p></div>
 <div class="paragraph"><p><strong>Examples</strong>:</p></div>
 <div class="listingblock">
 <div class="content">
diff --git a/docs/userguide.html b/docs/userguide.html
index 5fc25ec..6698106 100644
--- a/docs/userguide.html
+++ b/docs/userguide.html
@@ -487,7 +487,7 @@ start.</p></div>
 <div class="paragraph"><p><strong>Syntax</strong>:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>new_window &lt;normal|1pixel|borderless&gt;</tt></pre>
+<pre><tt>new_window &lt;normal|1pixel|none&gt;</tt></pre>
 </div></div>
 <div class="paragraph"><p><strong>Example</strong>:</p></div>
 <div class="listingblock">
@@ -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
 workspace 1, 3, 4 and 9 and you want to cycle through them with a single key
 combination.</p></div>
+<div class="paragraph"><p>To move a container to another xrandr output such as <tt>LVDS1</tt> or <tt>VGA1</tt>, you can
+use the <tt>move output</tt> command followed by the name of the target output. You
+may also use <tt>left</tt>, <tt>right</tt>, <tt>up</tt>, <tt>down</tt> instead of the xrandr output name to
+move to the the next output in the specified direction.</p></div>
 <div class="paragraph"><p><strong>Examples</strong>:</p></div>
 <div class="listingblock">
 <div class="content">
-- 
2.39.5