summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-10-09 14:25:40 +0000
committerTiago Cunha <tcunha@gmx.com>2010-10-09 14:25:40 +0000
commit6139fac10dab60bf29436b8ea0a346ba358fe762 (patch)
tree9b373f14100d6263723be20b644b71962eac2f7b
parentd0d98d4ec0feb91b9592a212618d5c5b5975ed85 (diff)
Sync OpenBSD patchset 764:
detach-on-destroy is a session option, not server.
-rw-r--r--tmux.114
1 files changed, 7 insertions, 7 deletions
diff --git a/tmux.1 b/tmux.1
index 2e7570b4..498a01f0 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.265 2010-09-10 13:36:17 tcunha Exp $
+.\" $Id: tmux.1,v 1.266 2010-10-09 14:25:40 tcunha Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 8 2010 $
+.Dd $Mdocdate: September 25 2010 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -1581,11 +1581,6 @@ Available window options are listed under
.Pp
Available server options are:
.Bl -tag -width Ds
-.It Ic detach-on-destroy
-If on (the default), the client is detached when the session it is attached to
-is destroyed.
-If off, the client is switched to the most recently active of the remaining
-sessions.
.It Ic escape-time
Set the time in milliseconds for which
.Nm
@@ -1664,6 +1659,11 @@ to work correctly, this
be set to
.Ql screen
or a derivative of it.
+.It Ic detach-on-destroy
+If on (the default), the client is detached when the session it is attached to
+is destroyed.
+If off, the client is switched to the most recently active of the remaining
+sessions.
.It Ic display-panes-active-colour Ar colour
Set the colour used by the
.Ic display-panes