From 4ec61bef461aba6d5849bce971a241850b8d7ef6 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Nov 2015 20:40:51 +0000
Subject: Fix usage of detach-client.

---
 tmux.1 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 3fd383d6..455de33b 100644
--- a/tmux.1
+++ b/tmux.1
@@ -714,8 +714,7 @@ is used,
 .Ic update-environment
 option will not be applied.
 .It Xo Ic detach-client
-.Op Fl P
-.Op Fl a
+.Op Fl aP
 .Op Fl s Ar target-session
 .Op Fl t Ar target-client
 .Xc
-- 
cgit 


From 1e2df2d46496fc025330c25fa08e83d14e62d11b Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Nov 2015 21:52:06 +0000
Subject: Remove the -I part of show-messages which isn't really that useful;
 the server start time can now be accessed with a new start_time format (use:
 tmux display -p '#{t:start_time}')

---
 tmux.1 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 455de33b..cba38264 100644
--- a/tmux.1
+++ b/tmux.1
@@ -740,7 +740,7 @@ Kill the
 .Nm
 server and clients and destroy all sessions.
 .It Xo Ic kill-session
-.Op Fl a
+.Op Fl aC
 .Op Fl t Ar target-session
 .Xc
 Destroy the given session, closing any windows linked to it and no other
@@ -748,6 +748,10 @@ sessions, and detaching all clients attached to it.
 If
 .Fl a
 is given, all sessions but the specified one is killed.
+The
+.Fl C
+clears alerts (bell, activity, or silence) in all windows linked to the
+session.
 .It Xo Ic list-clients
 .Op Fl F Ar format
 .Op Fl t Ar target-session
@@ -887,7 +891,7 @@ is specified, only update the client's status bar.
 Rename the session to
 .Ar new-name .
 .It Xo Ic show-messages
-.Op Fl IJT
+.Op Fl JT
 .Op Fl t Ar target-client
 .Xc
 .D1 (alias: Ic showmsgs )
@@ -900,11 +904,10 @@ With
 .Fl t ,
 display the log for
 .Ar target-client .
-.Fl I ,
 .Fl J
 and
 .Fl T
-show debugging information about the running server, jobs and terminals.
+show debugging information about jobs and terminals.
 .It Ic source-file Ar path
 .D1 (alias: Ic source )
 Execute commands from
@@ -3410,6 +3413,7 @@ The following variables are available, where appropriate:
 .It Li "session_name" Ta "#S" Ta "Name of session"
 .It Li "session_width" Ta "" Ta "Width of session"
 .It Li "session_windows" Ta "" Ta "Number of windows in session"
+.It Li "start_time" Ta "" Ta "Server start time"
 .It Li "window_activity" Ta "" Ta "Integer time of window last activity"
 .It Li "window_active" Ta "" Ta "1 if window active"
 .It Li "window_bell_flag" Ta "" Ta "1 if window has bell"
-- 
cgit 


From c18fbefe93dfbc7525b27e0129f8a0e8e9b70117 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Nov 2015 22:27:59 +0000
Subject: Document socket_path format.

---
 tmux.1 | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index cba38264..8fa6ad55 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3413,6 +3413,7 @@ The following variables are available, where appropriate:
 .It Li "session_name" Ta "#S" Ta "Name of session"
 .It Li "session_width" Ta "" Ta "Width of session"
 .It Li "session_windows" Ta "" Ta "Number of windows in session"
+.It Li "socket_path" Ta "" "Server socket path"
 .It Li "start_time" Ta "" Ta "Server start time"
 .It Li "window_activity" Ta "" Ta "Integer time of window last activity"
 .It Li "window_active" Ta "" Ta "1 if window active"
-- 
cgit 


From 62d3af17f9e6aec244ab1d91c1c46fdbbf6f8a86 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Nov 2015 23:46:15 +0000
Subject: Make environ_set va_args and use it to tidy up some calls. Also add a
 missing word in manpage (from jmc).

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

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 8fa6ad55..454af1d2 100644
--- a/tmux.1
+++ b/tmux.1
@@ -750,7 +750,7 @@ If
 is given, all sessions but the specified one is killed.
 The
 .Fl C
-clears alerts (bell, activity, or silence) in all windows linked to the
+flag clears alerts (bell, activity, or silence) in all windows linked to the
 session.
 .It Xo Ic list-clients
 .Op Fl F Ar format
-- 
cgit