Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

1 files changed, 11 insertions, 13 deletions

diff --git a/tmux.1 b/tmux.1
index 05dfac61..5132a189 100644
--- a/tmux.1
+++ b/tmux.1
@@ -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
@@ -126,7 +122,7 @@ Specify an alternative configuration file.
 By default,
 .Nm
 loads the system configuration file from
-.Pa /etc/tmux.conf ,
+.Pa @SYSCONFDIR@/tmux.conf ,
 if present, then looks for a user configuration file at
 .Pa ~/.tmux.conf .
 .Pp
@@ -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
@@ -3542,7 +3540,7 @@ Lock each client individually by running the command specified by the
 .Ic lock-command
 option.
 .It Xo Ic run-shell
-.Fl b
+.Op Fl b
 .Op Fl t Ar target-pane
 .Ar shell-command
 .Xc
@@ -3707,12 +3705,12 @@ was renamed to
 .Ar name .
 .El
 .Sh FILES
-.Bl -tag -width "/etc/tmux.confXXX" -compact
+.Bl -tag -width "@SYSCONFDIR@/tmux.confXXX" -compact
 .It Pa ~/.tmux.conf
 Default
 .Nm
 configuration file.
-.It Pa /etc/tmux.conf
+.It Pa @SYSCONFDIR@/tmux.conf
 System-wide configuration file.
 .El
 .Sh EXAMPLES