[Python-checkins] cpython (merge 3.5 -> default): Merge

[raymond.hettinger]

https://hg.python.org/cpython/rev/1bd1e31a3298
changeset:   103032:1bd1e31a3298
parent:      103030:0398f84b9c53
parent:      103031:7108f2a708c9
user:        Raymond Hettinger <python at rcn.com>
date:        Sun Sep 04 11:29:13 2016 -0700
summary:
  Merge

files:
  Doc/library/functions.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1237,8 +1237,8 @@
 .. function:: round(number[, ndigits])
 
    Return the floating point value *number* rounded to *ndigits* digits after
-   the decimal point.  If *ndigits* is omitted, it returns the nearest integer
-   to its input.  Delegates to ``number.__round__(ndigits)``.
+   the decimal point.  If *ndigits* is omitted or is ``None``, it returns the
+   nearest integer to its input.  Delegates to ``number.__round__(ndigits)``.
 
    For the built-in types supporting :func:`round`, values are rounded to the
    closest multiple of 10 to the power minus *ndigits*; if two multiples are

-- 
Repository URL: https://hg.python.org/cpython