aboutsummaryrefslogtreecommitdiff
path: root/tmux.1
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2011-10-31 13:55:10 +0000
committerTiago Cunha <tcunha@gmx.com>2011-10-31 13:55:10 +0000
commit3f5ec24b5a70421f74c42344cc13af0562d4af4e (patch)
tree4a431f0e4eb76a468e086b81dbc15deca44ac691 /tmux.1
parentd8d9c2af98487b1d64983e44ca592cd40b945bbe (diff)
downloadrtmux-3f5ec24b5a70421f74c42344cc13af0562d4af4e.tar.gz
rtmux-3f5ec24b5a70421f74c42344cc13af0562d4af4e.tar.bz2
rtmux-3f5ec24b5a70421f74c42344cc13af0562d4af4e.zip
Sync OpenBSD patchset 972:
Didn't really think the else behaviour through - requiring argv to contain "else" is silly so just omit that, also some manpage tweaks. From Tiago Cunha.
Diffstat (limited to 'tmux.1')
-rw-r--r--tmux.110
1 files changed, 6 insertions, 4 deletions
diff --git a/tmux.1 b/tmux.1
index b58f4f8d..308a8487 100644
--- a/tmux.1
+++ b/tmux.1
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: October 23 2011 $
+.Dd $Mdocdate: October 27 2011 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -2975,13 +2975,15 @@ Miscellaneous commands are as follows:
.Bl -tag -width Ds
.It Ic clock-mode Op Fl t Ar target-pane
Display a large clock.
-.It Ic if-shell Ar shell-command command
+.It Ic if-shell Ar shell-command command Op Ar command
.D1 (alias: Ic if )
-Execute
+Execute the first
.Ar command
if
.Ar shell-command
-returns success.
+returns success or the second
+.Ar command
+otherwise.
.It Ic lock-server
.D1 (alias: Ic lock )
Lock each client individually by running the command specified by the