summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-11-10 19:05:38 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-11-10 19:05:38 (GMT)
commit74af9d3cc432373ab83449eff9b3ee40a4d8d878 (patch)
tree5cfe8882fcaf23a08ca8e7cb21036699e1f2fb01 /Doc
parent81895f8ee327474b5a07a12e957b786510227b29 (diff)
parent72cd8b9eda9c66c4883bb43855e8107d29e6d7d0 (diff)
downloadcpython-74af9d3cc432373ab83449eff9b3ee40a4d8d878.zip
cpython-74af9d3cc432373ab83449eff9b3ee40a4d8d878.tar.gz
cpython-74af9d3cc432373ab83449eff9b3ee40a4d8d878.tar.bz2
Merge heads
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/socket.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 658b8c9..b01238c 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -594,7 +594,7 @@ The module :mod:`socket` exports the following constants and functions:
both the value of *address_family* and the underlying implementation of
:c:func:`inet_pton`.
- Availability: Unix (maybe not all platforms).
+ Availability: Unix (maybe not all platforms), Windows.
.. function:: inet_ntop(address_family, packed_ip)
@@ -610,7 +610,7 @@ The module :mod:`socket` exports the following constants and functions:
specified address family, :exc:`ValueError` will be raised. A
:exc:`OSError` is raised for errors from the call to :func:`inet_ntop`.
- Availability: Unix (maybe not all platforms).
+ Availability: Unix (maybe not all platforms), Windows.
..