[Python-checkins] cpython (merge 3.2 -> default): #14763: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/bcc964092437
changeset:   76857:bcc964092437
parent:      76854:ce39a4ec2906
parent:      76856:62659067f5b6
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu May 10 15:33:13 2012 +0300
summary:
  #14763: merge with 3.2.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1328,8 +1328,8 @@
    Return a list of the words in the string, using *sep* as the delimiter
    string.  If *maxsplit* is given, at most *maxsplit* splits are done (thus,
    the list will have at most ``maxsplit+1`` elements).  If *maxsplit* is not
-   specified, then there is no limit on the number of splits (all possible
-   splits are made).
+   specified or ``-1``, then there is no limit on the number of splits
+   (all possible splits are made).
 
    If *sep* is given, consecutive delimiters are not grouped together and are
    deemed to delimit empty strings (for example, ``'1,,2'.split(',')`` returns

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