diff options
| author | pst <pst@FreeBSD.org> | 1997-11-27 19:52:45 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1997-11-27 19:52:45 +0000 |
| commit | edc7af1d41032004b3a4af59de18c4d7b46d8258 (patch) | |
| tree | d28ad0df933472398965c6b7b10480b131520609 /contrib/tcl/doc | |
| parent | 10ddeda1f7695845a8cf461ed2472f333c7a83c0 (diff) | |
| download | FreeBSD-src-edc7af1d41032004b3a4af59de18c4d7b46d8258.zip FreeBSD-src-edc7af1d41032004b3a4af59de18c4d7b46d8258.tar.gz | |
Resolve merge conflicts.
Diffstat (limited to 'contrib/tcl/doc')
| -rw-r--r-- | contrib/tcl/doc/expr.n | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/tcl/doc/expr.n b/contrib/tcl/doc/expr.n index f4532cc..f0969ce 100644 --- a/contrib/tcl/doc/expr.n +++ b/contrib/tcl/doc/expr.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) expr.n 1.27 97/08/12 11:31:30 +'\" SCCS: @(#) expr.n 1.28 97/09/18 18:21:30 '\" .so man.macros .TH expr n 8.0 Tcl "Tcl Built-In Commands" @@ -144,12 +144,13 @@ Bit-wise exclusive OR. Valid for integer operands only. Bit-wise OR. Valid for integer operands only. .TP 20 \fB&&\fR -Logical AND. Produces a 1 result if both operands are non-zero, 0 otherwise. -Valid for numeric operands only (integers or floating-point). +Logical AND. Produces a 1 result if both operands are non-zero, +0 otherwise. +Valid for boolean and numeric (integers or floating-point) operands only. .TP 20 \fB||\fR Logical OR. Produces a 0 result if both operands are zero, 1 otherwise. -Valid for numeric operands only (integers or floating-point). +Valid for boolean and numeric (integers or floating-point) operands only. .TP 20 \fIx\fB?\fIy\fB:\fIz\fR If-then-else, as in C. If \fIx\fR |
