Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-06-17 20:01:12 +01:00
6 changed files with 75 additions and 40 deletions

8
tmux.1
View File

@ -1548,7 +1548,7 @@ If no
.Ar target-session
is specified, select the last window of the current session.
.It Xo Ic link-window
.Op Fl dk
.Op Fl adk
.Op Fl s Ar src-window
.Op Fl t Ar dst-window
.Xc
@ -1562,6 +1562,10 @@ If
is specified and no such window exists, the
.Ar src-window
is linked there.
With
.Fl a ,
the window is moved to the next index up (following windows
are moved if necessary).
If
.Fl k
is given and
@ -1627,7 +1631,7 @@ and
.Ar dst-pane
may belong to the same window.
.It Xo Ic move-window
.Op Fl rdk
.Op Fl ardk
.Op Fl s Ar src-window
.Op Fl t Ar dst-window
.Xc