summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-08-03 17:29:13 (GMT)
committerFred Drake <fdrake@acm.org>2000-08-03 17:29:13 (GMT)
commit8b168ba505eaebb93170219e1e00208f69908fa7 (patch)
treed0be3120e3b4cc36c31c9ea3873cf4c5d0018c2f /Doc
parent73ed8e566ef3f7cdbc989a8277a57818cc0da15a (diff)
downloadcpython-8b168ba505eaebb93170219e1e00208f69908fa7.zip
cpython-8b168ba505eaebb93170219e1e00208f69908fa7.tar.gz
cpython-8b168ba505eaebb93170219e1e00208f69908fa7.tar.bz2
int() description: Fix markup to avoid image generation for math mode.
zip() description: Fix broken markup, three small markup consistency nits, and one really minor usage nit. Introduce use of \moreargs instead of hardcoding "..." with \optional.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/lib/libfuncs.tex11
1 files changed, 6 insertions, 5 deletions
diff --git a/Doc/lib/libfuncs.tex b/Doc/lib/libfuncs.tex
index d00df16..1a1d916 100644
--- a/Doc/lib/libfuncs.tex
+++ b/Doc/lib/libfuncs.tex
@@ -319,7 +319,7 @@ module from which it is called).
representable as a Python integer, possibly embedded in whitespace;
this behaves identical to \code{string.atoi(\var{x}\optional{,
\var{radix}})}. The \var{radix} parameter gives the base for the
- conversion and may be any integer in the range $[2, 36]$. If
+ conversion and may be any integer in the range [2, 36]. If
\var{radix} is specified and \var{x} is not a string,
\exception{TypeError} is raised.
Otherwise, the argument may be a plain or
@@ -704,11 +704,12 @@ machine (e.g. MS-DOS) or when all of the range's elements are never
used (e.g. when the loop is usually terminated with \keyword{break}).
\end{funcdesc}
-\begin{funcdesc}{zip}{seq1\optional{, seq2\optional{, ...}}}
+\begin{funcdesc}{zip}{seq1, \moreargs}
This function returns a list of tuples, where each tuple contains the
-i-th element from each of the argument sequences. At least one
+\var{i}-th element from each of the argument sequences. At least one
sequence is required, otherwise a \exception{TypeError} is raised.
The returned list is truncated in length to the length of the shortest
argument sequence. When the argument sequences are all of the same
-length, \function{zip} is similar to \function{map} with an initial
-None argument.
+length, \function{zip()} is similar to \function{map()} with an
+initial argument of \code{None}.
+\end{funcdesc}