Merged revisions 76906 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76906 | ezio.melotti | 2009-12-20 01:26:38 +0200 (Sun, 20 Dec 2009) | 9 lines
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
........
................
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 292ea2d..fc447c5 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -697,7 +697,7 @@
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)