Merge branch 'obsd-master'

Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h
This commit is contained in:
Thomas Adam
2015-10-27 23:27:26 +00:00
43 changed files with 872 additions and 824 deletions

7
tmux.1
View File

@ -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