Merged revisions 75074 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75074 | ezio.melotti | 2009-09-26 15:33:22 +0300 (Sat, 26 Sep 2009) | 9 lines
Merged revisions 75070 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75070 | ezio.melotti | 2009-09-26 14:20:53 +0300 (Sat, 26 Sep 2009) | 1 line
#7000: document "sep" in capwords. Add a few tests
........
................
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 2fd70be..ae068a9 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -565,12 +565,14 @@
Helper functions
----------------
-.. function:: capwords(s)
+.. function:: capwords(s[, sep])
- Split the argument into words using :func:`split`, capitalize each word using
- :func:`capitalize`, and join the capitalized words using :func:`join`. Note
- that this replaces runs of whitespace characters by a single space, and removes
- leading and trailing whitespace.
+ Split the argument into words using :meth:`str.split`, capitalize each word
+ using :meth:`str.capitalize`, and join the capitalized words using
+ :meth:`str.join`. If the optional second argument *sep* is absent
+ or ``None``, runs of whitespace characters are replaced by a single space
+ and leading and trailing whitespace are removed, otherwise *sep* is used to
+ split and join the words.
.. function:: maketrans(frm, to)