Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-06-20 09:02:26 +01:00
7 changed files with 88 additions and 52 deletions

5
tmux.1
View File

@ -3685,7 +3685,7 @@ function key sequences; these have a number included to indicate modifiers such
as Shift, Alt or Ctrl.
.El
.It Xo Ic show-options
.Op Fl gHqsvw
.Op Fl AgHqsvw
.Op Fl t Ar target-session | Ar target-window
.Op Ar option
.Xc
@ -3719,6 +3719,9 @@ is set, no error will be returned if
is unset.
.Fl H
includes hooks (omitted by default).
.Fl A
includes options inherited from a parent set of options, such options are
marked with an asterisk.
.It Xo Ic show-window-options
.Op Fl gv
.Op Fl t Ar target-window