From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 25 Mar 2006 21:27:08 +0000 (+0000)
Subject: Backport of rev 43312:
X-Git-Tag: v2.4.3~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af7bb8e95a1d7b1b2d35d3abdc9fe38786478161;p=thirdparty%2FPython%2Fcpython.git

Backport of rev 43312:

SF bug # 1457358 and patch # 1458419, floor division not documented.  Patch by Andy.
---

diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index 519082fed4ac..b1f3dc1269ab 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -249,6 +249,7 @@ comparison operations):
   \hline
   \lineiii{\var{x} * \var{y}}{product of \var{x} and \var{y}}{}
   \lineiii{\var{x} / \var{y}}{quotient of \var{x} and \var{y}}{(1)}
+  \lineiii{\var{x} // \var{y}}{(floored) quotient of \var{x} and \var{y}}{(5)}
   \lineiii{\var{x} \%{} \var{y}}{remainder of \code{\var{x} / \var{y}}}{(4)}
   \hline
   \lineiii{-\var{x}}{\var{x} negated}{}
@@ -299,6 +300,9 @@ Complex floor division operator, modulo operator, and \function{divmod()}.
 \deprecated{2.3}{Instead convert to float using \function{abs()}
 if appropriate.}
 
+\item[(5)]
+Also referred to as integer division.  The resultant value is a whole integer,
+though the result's type is not necessarily int.
 \end{description}
 % XXXJH exceptions: overflow (when? what operations?) zerodivision