aboutsummaryrefslogtreecommitdiff
path: root/tmux.1
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-10-27 23:27:26 +0000
committerThomas Adam <thomas@xteddy.org>2015-10-27 23:27:26 +0000
commitda1f6fc2c8477c99e986061bcdd7c3e854a60076 (patch)
treef5934e2f96c43f80bad7e3a219230d6337c9d208 /tmux.1
parent147b5ae5145dc29e9bf4d0ebbc635939b6fdc60b (diff)
parent44657bf932b068aff5ce1019a4e8a2e7b00b5321 (diff)
downloadrtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.tar.gz
rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.tar.bz2
rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.zip
Merge branch 'obsd-master'
Conflicts: Makefile client.c server-client.c server.c tmux.c tmux.h
Diffstat (limited to 'tmux.1')
-rw-r--r--tmux.17
1 files changed, 3 insertions, 4 deletions
diff --git a/tmux.1 b/tmux.1
index fa9d2b55..3361ec31 100644
--- a/tmux.1
+++ b/tmux.1
@@ -143,11 +143,10 @@ session created, and continues to process the rest of the configuration file.
.It Fl L Ar socket-name
.Nm
stores the server socket in a directory under
-.Ev TMUX_TMPDIR ,
-.Ev TMPDIR
-if it is unset, or
+.Ev TMUX_TMPDIR
+or
.Pa /tmp
-if both are unset.
+if it is unset.
The default socket is named
.Em default .
This option allows a different socket name to be specified, allowing several