diff options
| author | Andrew Kuchling <amk@amk.ca> | 2014-02-15 21:40:08 (GMT) |
|---|---|---|
| committer | Andrew Kuchling <amk@amk.ca> | 2014-02-15 21:40:08 (GMT) |
| commit | ac6e57869136e39b0141ce0722099f7fe1476b94 (patch) | |
| tree | dfedbdea4e5af2059644f59734cb25a4f145f9aa /Doc/library/socket.rst | |
| parent | 30f240150ecf4ff1c90443bc764f5fb77c39b783 (diff) | |
| parent | 46ff4ee81cf44c59992c00832a30546293aba0a9 (diff) | |
| download | cpython-ac6e57869136e39b0141ce0722099f7fe1476b94.zip cpython-ac6e57869136e39b0141ce0722099f7fe1476b94.tar.gz cpython-ac6e57869136e39b0141ce0722099f7fe1476b94.tar.bz2 | |
Merge from 3.3
Diffstat (limited to 'Doc/library/socket.rst')
| -rw-r--r-- | Doc/library/socket.rst | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index c2e9f00..5bbc7e4 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -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))] .. versionchanged:: 3.2 - parameters can now be passed as single keyword arguments. + parameters can now be passed using keyword arguments. .. 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, 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. - |