From: Fred Drake <fdrake@acm.org>
Date: Fri, 8 Mar 2002 00:54:43 +0000 (+0000)
Subject: "Shortcut" should be "short-circuit".
X-Git-Tag: v2.3c1~6563
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cb64f9e4650c101179134850f414435abab95ee;p=python

"Shortcut" should be "short-circuit".
This closes SF bug #526277.
---

diff --git a/Doc/tut/tut.tex b/Doc/tut/tut.tex
index 27f33c984f..d7d363c105 100644
--- a/Doc/tut/tut.tex
+++ b/Doc/tut/tut.tex
@@ -2039,12 +2039,13 @@ the highest priority, and \code{or} the lowest, so that
 course, parentheses can be used to express the desired composition.
 
 The Boolean operators \code{and} and \code{or} are so-called
-\emph{shortcut} operators: their arguments are evaluated from left to
-right, and evaluation stops as soon as the outcome is determined.
-E.g., if \code{A} and \code{C} are true but \code{B} is false, \code{A
-and B and C} does not evaluate the expression C.  In general, the
-return value of a shortcut operator, when used as a general value and
-not as a Boolean, is the last evaluated argument.
+\emph{short-circuit} operators: their arguments are evaluated from
+left to right, and evaluation stops as soon as the outcome is
+determined.  For example, if \code{A} and \code{C} are true but
+\code{B} is false, \code{A and B and C} does not evaluate the
+expression \code{C}.  In general, the return value of a short-circuit
+operator, when used as a general value and not as a Boolean, is the
+last evaluated argument.
 
 It is possible to assign the result of a comparison or other Boolean
 expression to a variable.  For example,