aboutsummaryrefslogtreecommitdiff
path: root/tmux.1
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-08-28 14:01:11 +0100
committerThomas Adam <thomas@xteddy.org>2015-08-28 14:01:11 +0100
commit84eabb2658f9ad1bec81344aa425f66a903c931d (patch)
tree98c743d4888d1414884ec418d1eaf354c9a07213 /tmux.1
parent31c027a37a18d11acdc5a1bc96c871dd0139744d (diff)
parent675def039652e69d8fd5f229eff2128116e1d328 (diff)
downloadrtmux-84eabb2658f9ad1bec81344aa425f66a903c931d.tar.gz
rtmux-84eabb2658f9ad1bec81344aa425f66a903c931d.tar.bz2
rtmux-84eabb2658f9ad1bec81344aa425f66a903c931d.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.1')
-rw-r--r--tmux.117
1 files changed, 1 insertions, 16 deletions
diff --git a/tmux.1 b/tmux.1
index 2001a2f1..681c9367 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2565,9 +2565,7 @@ Lock the session (like the
.Ic lock-session
command) after
.Ar number
-seconds of inactivity, or the entire server (all sessions) if the
-.Ic lock-server
-option is set.
+seconds of inactivity.
The default is not to lock (set to 0).
.It Ic lock-command Ar shell-command
Command to run when locking each client.
@@ -2575,19 +2573,6 @@ The default is to run
.Xr lock 1
with
.Fl np .
-.It Xo Ic lock-server
-.Op Ic on | off
-.Xc
-If this option is
-.Ic on
-(the default),
-instead of each session locking individually as each has been
-idle for
-.Ic lock-after-time ,
-the entire server will lock after
-.Em all
-sessions would have locked.
-This has no effect as a session option; it must be set as a global option.
.It Ic message-command-style Ar style
Set status line message command style, where
.Ar style