summaryrefslogtreecommitdiffstats
path: root/Doc/library/stdtypes.rst
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2009-12-19 23:26:38 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2009-12-19 23:26:38 (GMT)
commit0639d5aeb61d6b7b0e1e1cbbdd7dd89a420a47f5 (patch)
treee10c3b719b557d04b2e66354c2e64f564f0a934e /Doc/library/stdtypes.rst
parent480e8e38a077280313ea66476350a06ee5d7ca5d (diff)
downloadcpython-0639d5aeb61d6b7b0e1e1cbbdd7dd89a420a47f5.zip
cpython-0639d5aeb61d6b7b0e1e1cbbdd7dd89a420a47f5.tar.gz
cpython-0639d5aeb61d6b7b0e1e1cbbdd7dd89a420a47f5.tar.bz2
Merged revisions 76904 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76904 | ezio.melotti | 2009-12-20 00:41:49 +0200 (Sun, 20 Dec 2009) | 1 line #7388: "python".capitalize() in the Doc ........
Diffstat (limited to 'Doc/library/stdtypes.rst')
-rw-r--r--Doc/library/stdtypes.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 89c7b67..eaa413b 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1311,10 +1311,10 @@ The conversion types are:
| ``'c'`` | Single character (accepts integer or single | |
| | character string). | |
+------------+-----------------------------------------------------+-------+
-| ``'r'`` | String (converts any python object using | \(5) |
+| ``'r'`` | String (converts any Python object using | \(5) |
| | :func:`repr`). | |
+------------+-----------------------------------------------------+-------+
-| ``'s'`` | String (converts any python object using | |
+| ``'s'`` | String (converts any Python object using | |
| | :func:`str`). | |
+------------+-----------------------------------------------------+-------+
| ``'%'`` | No argument is converted, results in a ``'%'`` | |