Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-05-10 16:01:10 +01:00
3 changed files with 54 additions and 30 deletions

7
tmux.1
View File

@ -2335,7 +2335,7 @@ abc123
Commands which set options are as follows:
.Bl -tag -width Ds
.It Xo Ic set-option
.Op Fl agoqsuw
.Op Fl aFgoqsuw
.Op Fl t Ar target-session | Ar target-window
.Ar option Ar value
.Xc
@ -2351,6 +2351,8 @@ otherwise a session option.
If
.Fl g
is given, the global session or window option is set.
.Fl F
expands formats in the option value.
The
.Fl u
flag unsets an option, so a session inherits the option from the global
@ -2901,7 +2903,7 @@ The default is
.Ql \ -_@ .
.El
.It Xo Ic set-window-option
.Op Fl agoqu
.Op Fl aFgoqu
.Op Fl t Ar target-window
.Ar option Ar value
.Xc
@ -2909,6 +2911,7 @@ The default is
Set a window option.
The
.Fl a ,
.Fl F ,
.Fl g ,
.Fl o ,
.Fl q