Merge server-info into show-messages and remove some not useful output.

1 files changed, 12 insertions, 6 deletions

diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index ba3f6ab80ff..5fd445c1a53 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.376 2013/11/24 11:29:09 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.377 2014/01/22 14:43:42 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 24 2013 $
+.Dd $Mdocdate: January 22 2014 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -770,15 +770,24 @@ 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 t Ar target-client
 .Xc
 .D1 (alias: Ic showmsgs )
+Show client messages or server information.
 Any messages displayed on the status line are saved in a per-client message
 log, up to a maximum of the limit set by the
 .Ar message-limit
 session option for the session attached to that client.
-This command displays the log for
+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.
 .It Ic source-file Ar path
 .D1 (alias: Ic source )
 Execute commands from
@@ -3566,9 +3575,6 @@ specified by
 .Fl t
 or the current pane if omitted).
 If the command doesn't return success, the exit status is also displayed.
-.It Ic server-info
-.D1 (alias: Ic info )
-Show server information and terminal details.
 .It Xo Ic wait-for
 .Op Fl L | S | U
 .Ar channel