Merge branch 'obsd-master'

1 files changed, 32 insertions, 15 deletions

diff --git a/tmux.1 b/tmux.1
index 124ae2ef..55fa89c4 100644
--- a/tmux.1
+++ b/tmux.1
@@ -629,13 +629,13 @@ refers to a
 .Nm
 command, passed with the command and arguments separately, for example:
 .Bd -literal -offset indent
-bind-key F1 set-window-option synchronize-panes on
+bind-key F1 set-option status off
 .Ed
 .Pp
 Or if using
 .Xr sh 1 :
 .Bd -literal -offset indent
-$ tmux bind-key F1 set-window-option synchronize-panes on
+$ tmux bind-key F1 set-option status off
 .Ed
 .Pp
 Multiple commands may be specified together as part of a
@@ -1983,7 +1983,7 @@ and unzoomed (its normal position in the layout).
 begins mouse resizing (only valid if bound to a mouse key binding, see
 .Sx MOUSE SUPPORT ) .
 .It Xo Ic resize-window
-.Op Fl aADLUR
+.Op Fl aADLRU
 .Op Fl t Ar target-window
 .Op Fl x Ar width
 .Op Fl y Ar height
@@ -1998,24 +1998,22 @@ with
 .Fl L
 or
 .Fl R ,
+or
 to an absolute size
 with
 .Fl x
 or
-.Fl y ,
-or to the size of the smallest or largest session (with
-.Fl a
-or
-.Fl A ) .
+.Fl y .
 The
 .Ar adjustment
 is given in lines or cells (the default is 1).
-.Pp
-This command automatically sets the
+.Fl A
+sets the size of the largest session containing the window;
+.Fl a
+the size of the smallest.
+This command will automatically set
 .Ic window-size
-option to
-.Ar manual
-for the window.
+to manual in the window options.
 .It Xo Ic respawn-pane
 .Op Fl c Ar start-directory
 .Op Fl k
@@ -2785,6 +2783,10 @@ or
 This option should be configured when
 .Nm
 is used as a login shell.
+.It Ic default-size Ar XxY
+Set the default size of windows when the size is not set or the
+.Ic window-size
+option is manual.
 .It Xo Ic destroy-unattached
 .Op Ic on | off
 .Xc
@@ -3397,6 +3399,21 @@ see the
 .Sx STYLES
 section.
 .Pp
+.It Xo Ic window-size
+.Op Ic smallest | largest | manual
+.Xc
+Tell
+.Nm
+how to automatically size windows either the size of the smallest session
+containing the window, the size of the largest, or manual size.
+See also the
+.Ic resize-window
+command and the
+.Ic default-size
+and
+.Ic aggressive-resize
+options.
+.Pp
 .It Xo Ic wrap-search
 .Op Ic on | off
 .Xc
@@ -3963,7 +3980,7 @@ and
 A style may be the single term
 .Ql default
 to specify the default style (which may inherit from another option) or a space
-separated list of the following:
+or comma separated list of the following:
 .Bl -tag -width Ds
 .It Ic fg=colour
 Set the foreground colour.
@@ -4064,7 +4081,7 @@ is a window index.
 .Pp
 Examples are:
 .Bd -literal -offset indent
-fg=yellow,bold,underscore,blink
+fg=yellow bold underscore blink
 bg=black,fg=default,noreverse
 .Ed
 .Sh NAMES AND TITLES