From 7f636587098593c6c0efd3feaecb970aa7170116 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Wed, 27 Mar 2013 11:24:18 +0000
Subject: Add TMUX_TMPDIR variable to put the socket directory outside TMPDIR.
 From Ben Boeckel.

---
 tmux.1 | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 0dc68bfe..9b1488fc 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
@@ -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
-- 
cgit 


From 20f0d917beb0f774af2628ed7efe2a33cf59f42a Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Wed, 10 Apr 2013 12:07:18 +0000
Subject: Missed -o from set-window-option, from Ben Boeckel.

---
 tmux.1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 9b1488fc..b38b43bb 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2645,7 +2645,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
@@ -2654,6 +2654,7 @@ Set a window option.
 The
 .Fl a ,
 .Fl g ,
+.Fl o ,
 .Fl q
 and
 .Fl u
-- 
cgit