summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2014-04-02 07:59:11 (GMT)
committerRaymond Hettinger <python@rcn.com>2014-04-02 07:59:11 (GMT)
commit5236f89c2fe4359901a4d9ae8f6467a7edba641d (patch)
tree737a4dd4f0ee1d6331109e4238e73fcecc351a62
parent9fd908907e0e515667c1b788561f11af0d4c758d (diff)
parentf4284e45d037162835a5a5bc0bc23645b32da26c (diff)
downloadcpython-5236f89c2fe4359901a4d9ae8f6467a7edba641d.zip
cpython-5236f89c2fe4359901a4d9ae8f6467a7edba641d.tar.gz
cpython-5236f89c2fe4359901a4d9ae8f6467a7edba641d.tar.bz2
merge
-rw-r--r--Doc/library/functions.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 9a8c9d7..5c784ce 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -773,7 +773,7 @@ are always available. They are listed here in alphabetical order.
already arranged into argument tuples, see :func:`itertools.starmap`\.
-.. function:: max(iterable, *[, default, key])
+.. function:: max(iterable, *[, key, default])
max(arg1, arg2, *args[, key])
Return the largest item in an iterable or the largest of two or more
@@ -807,7 +807,7 @@ are always available. They are listed here in alphabetical order.
:ref:`typememoryview` for more information.
-.. function:: min(iterable, *[, default, key])
+.. function:: min(iterable, *[, key, default])
min(arg1, arg2, *args[, key])
Return the smallest item in an iterable or the smallest of two or more