[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3
andrew.kuchling
python-checkins at python.org
Sat Feb 15 22:40:23 CET 2014
http://hg.python.org/cpython/rev/8a1d3551881f
changeset: 89208:8a1d3551881f
parent: 89206:1c0bc2514603
parent: 89207:3352b5abe1e4
user: Andrew Kuchling <amk at amk.ca>
date: Sat Feb 15 16:40:08 2014 -0500
summary:
Merge from 3.3
files:
Doc/library/socket.rst | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -468,7 +468,7 @@
(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 @@
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.
-
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list