summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-12-22 19:07:58 (GMT)
committerFred Drake <fdrake@acm.org>2001-12-22 19:07:58 (GMT)
commit39960f6ec9ea90be73c2fbeaeda8eb7119921389 (patch)
tree295da96ce8e3d5e8fdee519ff5c68cfcda7216d0 /Doc
parentfe7286c25238a914cc2f59f3e28a678496d07816 (diff)
downloadcpython-39960f6ec9ea90be73c2fbeaeda8eb7119921389.zip
cpython-39960f6ec9ea90be73c2fbeaeda8eb7119921389.tar.gz
cpython-39960f6ec9ea90be73c2fbeaeda8eb7119921389.tar.bz2
Fix the erroneous availability annotation for s.makefile() from the last
checkin (my fault!). Wrap some long lines and fix some markup inconsistencies.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/lib/libsocket.tex12
1 files changed, 7 insertions, 5 deletions
diff --git a/Doc/lib/libsocket.tex b/Doc/lib/libsocket.tex
index b067f97..97c5184 100644
--- a/Doc/lib/libsocket.tex
+++ b/Doc/lib/libsocket.tex
@@ -140,6 +140,7 @@ used for the second argument to \function{socket()}.
\dataline{EAI_*}
\dataline{AI_*}
\dataline{NI_*}
+\dataline{TCP_*}
Many constants of these forms, documented in the \UNIX{} documentation on
sockets and/or the IP protocol, are also defined in the socket module.
They are generally used in arguments to the \method{setsockopt()} and
@@ -325,8 +326,9 @@ If the IPv4 address string passed to this function is invalid,
valid depends on the underlying C implementation of
\cfunction{inet_aton()}.
-\function{inet_aton} does not support IPv6, and
-\function{getnameinfo()} should be used instead for IPv4/v6 dual stack support.
+\function{inet_aton()} does not support IPv6, and
+\function{getnameinfo()} should be used instead for IPv4/v6 dual stack
+support.
\end{funcdesc}
\begin{funcdesc}{inet_ntoa}{packed_ip}
@@ -341,8 +343,9 @@ for the 32-bit packed binary this function takes as an argument.
If the string passed to this function is not exactly 4 bytes in
length, \exception{socket.error} will be raised.
-\function{inet_ntoa} does not support IPv6, and
-\function{getnameinfo()} should be used instead for IPv4/v6 dual stack support.
+\function{inet_ntoa()} does not support IPv6, and
+\function{getnameinfo()} should be used instead for IPv4/v6 dual stack
+support.
\end{funcdesc}
\begin{datadesc}{SocketType}
@@ -455,7 +458,6 @@ closed or garbage-collected independently.
and \var{bufsize} arguments are interpreted the same way as by the
built-in \function{file()} function; see ``Built-in Functions''
(section \ref{built-in-funcs}) for more information.
-Availability: \UNIX.
\end{methoddesc}
\begin{methoddesc}[socket]{recv}{bufsize\optional{, flags}}