Merged revisions 82573 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82573 | senthil.kumaran | 2010-07-05 17:30:56 +0530 (Mon, 05 Jul 2010) | 3 lines

  Fix the docstrings of the capitalize method.
........

diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c
index a5d0c5bd8a500cbf53f4e94d2194edd7251a531f..1406ac11caefa98f470a64d5e657b56c35a2dfa4 100644 (file)
--- a/Objects/bytes_methods.c
+++ b/Objects/bytes_methods.c
@@ -332,7 +332,8 @@ _Py_bytes_title(char *result, char *s, Py_ssize_t len)
 PyDoc_STRVAR_shared(_Py_capitalize__doc__,
 "B.capitalize() -> copy of B\n\
 \n\
-Return a copy of B with only its first character capitalized (ASCII).");
+Return a copy of B with only its first character capitalized (ASCII)\n\
+and the rest lower-cased.");
 
 void
 _Py_bytes_capitalize(char *result, char *s, Py_ssize_t len)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 8b3b861bee612ed0381562881ce54a5152ddafdf..b18292791107def405fae8d53deb9a9a15f44b62 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -5938,7 +5938,7 @@ PyDoc_STRVAR(capitalize__doc__,
              "S.capitalize() -> unicode\n\
 \n\
 Return a capitalized version of S, i.e. make the first character\n\
-have upper case.");
+have upper case and the rest lower case.");
 
 static PyObject*
 unicode_capitalize(PyUnicodeObject *self)