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

[terry.reedy]

https://hg.python.org/cpython/rev/664432718dcb
changeset:   96249:664432718dcb
parent:      96246:57776eee74f2
parent:      96248:8c6170954789
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sat May 23 16:16:46 2015 -0400
summary:
  Merge with 3.4

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


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -249,7 +249,7 @@
 
 .. class:: complex([real[, imag]])
 
-   Return a complex number with the value *real* + *imag*\*j or convert a string
+   Return a complex number with the value *real* + *imag*\*1j or convert a string
    or number to a complex number.  If the first parameter is a string, it will
    be interpreted as a complex number and the function must be called without a
    second parameter.  The second parameter can never be a string. Each argument

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