From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 27 Feb 2006 16:31:12 +0000 (+0000)
Subject: Note version added for conditional expressions
X-Git-Tag: v2.5a0~525
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9f61b4aa281c1b19546dba7f1ee529b8b80bc9a;p=thirdparty%2FPython%2Fcpython.git

Note version added for conditional expressions
---

diff --git a/Doc/ref/ref5.tex b/Doc/ref/ref5.tex
index 65a3cffd81b9..1f2dc5e4387e 100644
--- a/Doc/ref/ref5.tex
+++ b/Doc/ref/ref5.tex
@@ -1039,7 +1039,7 @@ The operator \keyword{not} yields \code{True} if its argument is false,
 The expression \code{\var{x} if \var{C} else \var{y}} first evaluates
 \var{C} (\emph{not} \var{x}); if \var{C} is true, \var{x} is evaluated and
 its value is returned; otherwise, \var{y} is evaluated and its value is
-returned.
+returned.  \versionadded{2.5}
 
 The expression \code{\var{x} and \var{y}} first evaluates \var{x}; if
 \var{x} is false, its value is returned; otherwise, \var{y} is