[Python-checkins] CVS: python/dist/src/Doc/tut tut.tex,1.156.4.1.2.1,1.156.4.1.2.2

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc/tut
In directory usw-pr-cvs1:/tmp/cvs-serv27547/tut

Modified Files:
      Tag: release22-maint
	tut.tex 
Log Message:
"Shortcut" should be "short-circuit".
This closes SF bug #526277.


Index: tut.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v
retrieving revision 1.156.4.1.2.1
retrieving revision 1.156.4.1.2.2
diff -C2 -d -r1.156.4.1.2.1 -r1.156.4.1.2.2
*** tut.tex	29 Jan 2002 14:54:18 -0000	1.156.4.1.2.1
--- tut.tex	8 Mar 2002 01:01:23 -0000	1.156.4.1.2.2
***************
*** 2040,2049 ****
  
  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.
  
  It is possible to assign the result of a comparison or other Boolean
--- 2040,2050 ----
  
  The Boolean operators \code{and} and \code{or} are so-called
! \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