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

This commit is contained in:
Nicholas Marriott 2014-02-22 17:36:17 +00:00
commit 2a412fad04

10
tmux.1
View File

@ -61,7 +61,7 @@ A window occupies the entire screen
and may be split into rectangular panes, and may be split into rectangular panes,
each of which is a separate pseudo terminal each of which is a separate pseudo terminal
(the (the
.Xr pty 4 .Xr pty 7
manual page documents the technical details of pseudo terminals). manual page documents the technical details of pseudo terminals).
Any number of Any number of
.Nm .Nm
@ -359,7 +359,7 @@ or
These specify the client, session, window or pane which a command should affect. These specify the client, session, window or pane which a command should affect.
.Ar target-client .Ar target-client
is the name of the is the name of the
.Xr pty 4 .Xr pty 7
file to which the client is connected, for example either of file to which the client is connected, for example either of
.Pa /dev/ttyp1 .Pa /dev/ttyp1
or or
@ -710,7 +710,7 @@ and
specify the size of the initial window (80 by 24 if not given). specify the size of the initial window (80 by 24 if not given).
.Pp .Pp
If run from a terminal, any If run from a terminal, any
.Xr termios 4 .Xr termios 3
special characters are saved and used for new windows in the new session. special characters are saved and used for new windows in the new session.
.Pp .Pp
The The
@ -1144,7 +1144,7 @@ interactively from a list.
After a client is chosen, After a client is chosen,
.Ql %% .Ql %%
is replaced by the client is replaced by the client
.Xr pty 4 .Xr pty 7
path in path in
.Ar template .Ar template
and the result executed as a command. and the result executed as a command.
@ -3852,6 +3852,6 @@ bind-key / command-prompt "split-window 'exec man %%'"
bind-key S command-prompt "new-window -n %1 'ssh %1'" bind-key S command-prompt "new-window -n %1 'ssh %1'"
.Ed .Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr pty 4 .Xr pty 7
.Sh AUTHORS .Sh AUTHORS
.An Nicholas Marriott Aq Mt nicm@users.sourceforge.net .An Nicholas Marriott Aq Mt nicm@users.sourceforge.net