Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-10-14 20:01:13 +01:00
commit 33fbf82ac0

21
tmux.1
View File

@ -1251,7 +1251,7 @@ By default, it uses the format
but a different format may be specified with but a different format may be specified with
.Fl F . .Fl F .
.It Xo Ic capture-pane .It Xo Ic capture-pane
.Op Fl aepPq .Op Fl aepPqCJ
.Op Fl b Ar buffer-name .Op Fl b Ar buffer-name
.Op Fl E Ar end-line .Op Fl E Ar end-line
.Op Fl S Ar start-line .Op Fl S Ar start-line
@ -1391,19 +1391,16 @@ can be used and will be replaced with the session name and window index.
When a window is chosen from the list, the session command is run before the When a window is chosen from the list, the session command is run before the
window command. window command.
.Pp .Pp
If
.Fl S .Fl S
is given will display the specified format instead of the default session uses
format. .Ar format
If instead of the default session
format and
.Fl W .Fl W
is given will display the specified format instead of the default window instead of the default window format.
format. For the meaning of
For the meaning of the .Ar format ,
.Fl s see the
and
.Fl w
options, see the
.Sx FORMATS .Sx FORMATS
section. section.
.Pp .Pp