summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2004-09-18 17:37:13 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2004-09-18 17:37:13 (GMT)
commit1ad855e68849daccd5c7439bc910d5c694af4227 (patch)
tree988d5817ba14f96392d0e3d815b66dc9dcf73cd5
parentf9715cfd19078a6422fe87f43cb9b93b900a9fe7 (diff)
downloadtcl-1ad855e68849daccd5c7439bc910d5c694af4227.zip
tcl-1ad855e68849daccd5c7439bc910d5c694af4227.tar.gz
tcl-1ad855e68849daccd5c7439bc910d5c694af4227.tar.bz2
Fix "operand"/"operator" confusion
-rw-r--r--doc/expr.n11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/expr.n b/doc/expr.n
index 31c146a..e4dbfbc 100644
--- a/doc/expr.n
+++ b/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.
'\"
-'\" RCS: @(#) $Id: expr.n,v 1.14 2004/09/06 09:44:56 dkf Exp $
+'\" RCS: @(#) $Id: expr.n,v 1.15 2004/09/18 17:37:13 dkf Exp $
'\"
.so man.macros
.TH expr n 8.5 Tcl "Tcl Built-In Commands"
@@ -110,18 +110,17 @@ The valid operators are listed below, grouped in decreasing order
of precedence:
.TP 20
\fB\-\0\0+\0\0~\0\0!\fR
-Unary minus, unary plus, bit-wise NOT, logical NOT. None of these operands
+Unary minus, unary plus, bit-wise NOT, logical NOT. None of these operators
may be applied to string operands, and bit-wise NOT may be
applied only to integers.
.TP 20
\fB**\fR
.VS 8.5
-Exponentiation. None of these operands may be applied to string
-operands.
+Exponentiation. Valid for any numeric operands.
.VE 8.5
.TP 20
\fB*\0\0/\0\0%\fR
-Multiply, divide, remainder. None of these operands may be
+Multiply, divide, remainder. None of these operators may be
applied to string operands, and remainder may be applied only
to integers.
The remainder will always have the same sign as the divisor and
@@ -170,7 +169,7 @@ Valid for boolean and numeric (integers or floating-point) operands only.
If-then-else, as in C. If \fIx\fR
evaluates to non-zero, then the result is the value of \fIy\fR.
Otherwise the result is the value of \fIz\fR.
-The \fIx\fR operand must have a numeric value.
+The \fIx\fR operand must have a boolean or numeric value.
.LP
See the C manual for more details on the results
produced by each operator.