[Python-checkins] r72293 - in python/branches/py3k: Doc/library/socket.rst

Mon May 4 22:50:30 CEST 2009

Author: georg.brandl
Date: Mon May 4 22:50:30 2009
New Revision: 72293
Log:
Merged revisions 72292 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r72292 | georg.brandl | 2009年05月04日 22:49:17 +0200 (Mo, 04 Mai 2009) | 1 line
 
 #5916, 5917: small socket doc improvements.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Doc/library/socket.rst
Modified: python/branches/py3k/Doc/library/socket.rst
==============================================================================

--- python/branches/py3k/Doc/library/socket.rst	(original)
+++ python/branches/py3k/Doc/library/socket.rst	Mon May 4 22:50:30 2009
@@ -385,7 +385,7 @@
 :exc:`socket.error` will be raised. Note that exactly what is valid depends on
 the underlying C implementation of :cfunc:`inet_aton`.
 
- :func:`inet_aton` does not support IPv6, and :func:`getnameinfo` should be used
+ :func:`inet_aton` does not support IPv6, and :func:`inet_pton` should be used
 instead for IPv4/v6 dual stack support.
 
 
@@ -400,7 +400,7 @@
 
 If the byte sequence passed to this function is not exactly 4 bytes in
 length, :exc:`socket.error` will be raised. :func:`inet_ntoa` does not
- support IPv6, and :func:`getnameinfo` should be used instead for IPv4/v6 dual
+ support IPv6, and :func:`inet_ntop` should be used instead for IPv4/v6 dual
 stack support.
 
 
@@ -419,6 +419,11 @@
 
 Availability: Unix (maybe not all platforms).
 
+ .. seealso::
+
+ :func:`ipaddr.BaseIP.packed`
+ Platform-independent conversion to a packed, binary format.
+
 
 .. function:: inet_ntop(address_family, packed_ip)
 
