summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Cole <djc@object-craft.com.au>2004-08-26 00:51:16 (GMT)
committerDave Cole <djc@object-craft.com.au>2004-08-26 00:51:16 (GMT)
commite8bbfe4e6328f47284075e434bc6c812393ca449 (patch)
tree6dbf06cc137e073ae0899c1da5c648f78be5f07b
parent3203efb55fde14c3f567f6864dab1454155d1dcb (diff)
downloadcpython-e8bbfe4e6328f47284075e434bc6c812393ca449.zip
cpython-e8bbfe4e6328f47284075e434bc6c812393ca449.tar.gz
cpython-e8bbfe4e6328f47284075e434bc6c812393ca449.tar.bz2
Patch #1015012. Improve markup and punctuation in libsocket.tex
-rw-r--r--Doc/lib/libsocket.tex6
-rw-r--r--Modules/socketmodule.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/Doc/lib/libsocket.tex b/Doc/lib/libsocket.tex
index 762d762..db0b767 100644
--- a/Doc/lib/libsocket.tex
+++ b/Doc/lib/libsocket.tex
@@ -305,10 +305,10 @@ success, a new \class{SSLObject} is returned.
\begin{funcdesc}{socketpair}{\optional{family\optional{, type\optional{, proto}}}}
Build a pair of connected socket objects using the given address
-family, socket type and protocol number. Address family, socket type
+family, socket type, and protocol number. Address family, socket type,
and protocol number are as for the \function{socket()} function above.
-The default family is AF_UNIX if defined for the platform, otherwise
-the default is AF_INET.
+The default family is \constant{AF_UNIX} if defined on the platform;
+otherwise, the default is \constant{AF_INET}.
Availability: \UNIX. \versionadded{2.4}
\end{funcdesc}
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 061d5c2..5d8a552 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2981,7 +2981,7 @@ Return the protocol number for the named protocol. (Rarely used.)");
#ifdef HAVE_SOCKETPAIR
/* Create a pair of sockets using the socketpair() function.
Arguments as for socket() except the default family is AF_UNIX if
- defined for the platform, otherwise the default is AF_INET. */
+ defined on the platform; otherwise, the default is AF_INET. */
/*ARGSUSED*/
static PyObject *
@@ -3029,7 +3029,7 @@ PyDoc_STRVAR(socketpair_doc,
Create a pair of socket objects from the sockets returned by the platform\n\
socketpair() function.\n\
The arguments are the same as for socket() except the default family is\n\
-AF_UNIX if defined for the platform, otherwise the default is AF_INET.");
+AF_UNIX if defined on the platform; otherwise, the default is AF_INET.");
#endif /* HAVE_SOCKETPAIR */