Merge branch 'master' into floating_panes

tmux.1

@@ -2297,11 +2297,22 @@ Toggle rectangle selection mode.
 .Xc
 Cycles the current line between centre, top, and bottom.
 .It Xo
-.Ic refresh\-from\-pane
+.Ic refresh\-on
+.Xc
+Turn on automatic refresh of the content from the pane, so that new output
+appears while in copy mode.
+Automatic refresh is off by default; it will scroll only while the cursor is at
+the bottom and is paused while a selection is in progress.
+.It Xo
+.Ic refresh\-off
+.Xc
+Turn off automatic refresh of the content from the pane.
+.It Xo
+.Ic refresh\-toggle
 (vi: r)
 (emacs: r)
 .Xc
-Refresh the content from the pane.
+Toggle automatic refresh of the content from the pane.
 .It Xo
 .Ic scroll\-bottom
 .Xc
@@ -3457,7 +3468,7 @@ but a different format may be specified with
 .Fl F .
 .Tg newp
 .It Xo Ic new\-pane
-.Op Fl bBdefhIkPvZ
+.Op Fl bdefhIkPvWZ
 .Op Fl c Ar start\-directory
 .Op Fl e Ar environment
 .Op Fl F Ar format
@@ -3533,13 +3544,13 @@ but also sets the
 option for this pane to
 .Ar message .
 .Pp
-.Fl B
-blocks until
+.Fl W
+Waits until
 .Ar shell\-command
 exits, then returns its exit status.
 For example:
 .Bd -literal -offset indent
-$ tmux new-pane -B 'vi afile'
+$ tmux new-pane -W 'vi afile'
 $ echo $?
 0
 .Ed