diff options
author | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
commit | b58bca9a72009101da373a3b7463fd866ecac58c (patch) | |
tree | e8f9b4b720b4c05f67fd47505b5170c4fd33dcb0 /tmux.1 | |
parent | e312db140868754358d40ec17595327a8fbbf180 (diff) | |
parent | 27dcf470dc4aa5901ac7f01b3a9f971e02f2229e (diff) | |
download | rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.gz rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.bz2 rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.zip |
Merge branch 'obsd-master'
Conflicts:
tmux.c
Diffstat (limited to 'tmux.1')
-rw-r--r-- | tmux.1 | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -98,10 +98,6 @@ The options are as follows: Force .Nm to assume the terminal supports 256 colours. -.It Fl 8 -Like -.Fl 2 , -but indicates that the terminal supports 88 colours. .It Fl C Start in control mode. Given twice @@ -145,11 +141,12 @@ 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 -.Pa /tmp -(or +.Ev TMUX_TMPDIR , .Ev TMPDIR -if set); -the default socket is named +if it is unset, or +.Pa /tmp +if both are unset. +The default socket is named .Em default . This option allows a different socket name to be specified, allowing several independent @@ -2652,7 +2649,7 @@ The default is .Ql \ -_@ . .El .It Xo Ic set-window-option -.Op Fl agqu +.Op Fl agoqu .Op Fl t Ar target-window .Ar option Ar value .Xc @@ -2661,6 +2658,7 @@ Set a window option. The .Fl a , .Fl g , +.Fl o , .Fl q and .Fl u |