===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -r1.553 -r1.554
--- src/usr.bin/tmux/tmux.1	2017/05/29 15:43:48	1.553
+++ src/usr.bin/tmux/tmux.1	2017/05/29 18:06:34	1.554
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.553 2017/05/29 15:43:48 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.554 2017/05/29 18:06:34 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
 .\"
@@ -3430,7 +3430,7 @@
 .Ql no
 if not.
 .Pp
-Simple comparisons may be expressed by prefixing two comma-separated
+Comparisons may be expressed by prefixing two comma-separated
 alternatives by
 .Ql ==
 or
@@ -3443,14 +3443,26 @@
 if running on
 .Ql myhost ,
 otherwise by
-.Ql 0.
+.Ql 0 .
 An
 .Ql m
-specifies a
+specifies an
 .Xr fnmatch 3
-comparison - the first argument is the pattern and the second the string to
-compare. For example,
+comparison where the first argument is the pattern and the second the string to
+compare, for example
 .Ql #{m:*foo*,#{host}} .
+.Ql ||
+and
+.Ql &&
+evaluate to true if either or both of two comma-separated alternatives are
+true, for example
+.Ql #{||,#{pane_in_mode},#{alternate_on}} .
+A
+.Ql C
+performs a search for an
+.Xr fnmatch 3
+pattern in the pane content and evaluates to zero if not found, or a line
+number if found.
 .Pp
 A limit may be placed on the length of the resultant string by prefixing it
 by an