Merged revisions 73140 via svnmerge from

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

................
  r73140 | mark.dickinson | 2009-06-02 08:41:26 +0100 (Tue, 02 Jun 2009) | 9 lines

  Merged revisions 73138 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73138 | mark.dickinson | 2009-06-02 08:39:26 +0100 (Tue, 02 Jun 2009) | 1 line

    Typo in socket.py.  Thanks Pablo Torres Navarrete.
  ........
................

diff --git a/Lib/socket.py b/Lib/socket.py
index 737930d0032d97a09b3e23179a183f6e7a9a4d11..a06838769a9597044c5629866834a6696a01eb87 100644 (file)
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -16,7 +16,7 @@ gethostname() -- return the current hostname
 gethostbyname() -- map a hostname to its IP number
 gethostbyaddr() -- map an IP number or hostname to DNS info
 getservbyname() -- map a service name and a protocol name to a port number
-getprotobyname() -- mape a protocol name (e.g. 'tcp') to a number
+getprotobyname() -- map a protocol name (e.g. 'tcp') to a number
 ntohs(), ntohl() -- convert 16, 32 bit int from network to host byte order
 htons(), htonl() -- convert 16, 32 bit int from host to network byte order
 inet_aton() -- convert IP addr string (123.45.67.89) to 32-bit packed format