mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge from 3.3

Browse source
This commit is contained in:
Andrew Kuchling 2014-02-15 16:40:08 -05:00
commit ac6e578691
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Doc/library/socket.rst
View file

@ -468,7 +468,7 @@ The :mod:`socket` module also offers various network-related services:
(10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))] (10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))]
.. versionchanged:: 3.2 .. versionchanged:: 3.2
parameters can now be passed as single keyword arguments. parameters can now be passed using keyword arguments.
.. function:: getfqdn([name]) .. function:: getfqdn([name])
@ -1512,4 +1512,3 @@ the :data:`SO_REUSEADDR` flag tells the kernel to reuse a local socket in
details of socket semantics. For Unix, refer to the manual pages; for Windows, details of socket semantics. For Unix, refer to the manual pages; for Windows,
see the WinSock (or Winsock 2) specification. For IPv6-ready APIs, readers may see the WinSock (or Winsock 2) specification. For IPv6-ready APIs, readers may
want to refer to :rfc:`3493` titled Basic Socket Interface Extensions for IPv6. want to refer to :rfc:`3493` titled Basic Socket Interface Extensions for IPv6.