diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2009-12-19 23:26:38 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2009-12-19 23:26:38 (GMT) |
| commit | 0639d5aeb61d6b7b0e1e1cbbdd7dd89a420a47f5 (patch) | |
| tree | e10c3b719b557d04b2e66354c2e64f564f0a934e /Doc/library/socket.rst | |
| parent | 480e8e38a077280313ea66476350a06ee5d7ca5d (diff) | |
| download | cpython-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/socket.rst')
| -rw-r--r-- | Doc/library/socket.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index d9045ed..79a4964 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -696,7 +696,7 @@ Note that the :meth:`connect` operation is subject to the timeout setting, and in general it is recommended to call :meth:`settimeout` before calling :meth:`connect` or pass a timeout parameter to :meth:`create_connection`. The system network stack may return a connection timeout error -of its own regardless of any python socket timeout setting. +of its own regardless of any Python socket timeout setting. .. method:: socket.setsockopt(level, optname, value) |