summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2007-03-26 20:28:28 (GMT)
committerGeorg Brandl <georg@python.org>2007-03-26 20:28:28 (GMT)
commitf03facfe901d63df4ba83dab0677eb1379b7cb2c (patch)
tree528c9ea62bd29658edd6b3fbc4c7c64f71be8648 /Doc
parent51b7abc5199cb87d9e17fbbb276a6695888d12f1 (diff)
downloadcpython-f03facfe901d63df4ba83dab0677eb1379b7cb2c.zip
cpython-f03facfe901d63df4ba83dab0677eb1379b7cb2c.tar.gz
cpython-f03facfe901d63df4ba83dab0677eb1379b7cb2c.tar.bz2
Some nits.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/lib/libhttplib.tex5
-rw-r--r--Doc/lib/libsocket.tex12
2 files changed, 8 insertions, 9 deletions
diff --git a/Doc/lib/libhttplib.tex b/Doc/lib/libhttplib.tex
index 67371a4..328ae9d 100644
--- a/Doc/lib/libhttplib.tex
+++ b/Doc/lib/libhttplib.tex
@@ -32,12 +32,11 @@ An \class{HTTPConnection} instance represents one transaction with an HTTP
server. It should be instantiated passing it a host and optional port number.
If no port number is passed, the port is extracted from the host string if it
has the form \code{\var{host}:\var{port}}, else the default HTTP port (80) is
-used.
-When True the optional parameter \var{strict}
+used. When True, the optional parameter \var{strict}
causes \code{BadStatusLine} to be raised if the status line can't be parsed
as a valid HTTP/1.0 or 1.1 status line. If the optional \var{timeout}
parameter is given, connection attempts will timeout after that many
-seconds (if no timeout is passed, or is passed as None, the global default
+seconds (if it is not given or \code{None}, the global default
timeout setting is used).
For example, the following calls all create instances that connect to
diff --git a/Doc/lib/libsocket.tex b/Doc/lib/libsocket.tex
index c63b52b..d6aab50 100644
--- a/Doc/lib/libsocket.tex
+++ b/Doc/lib/libsocket.tex
@@ -171,12 +171,12 @@ supported on this platform.
\end{datadesc}
\begin{funcdesc}{create_connection}{address\optional{, timeout}}
-Connects to the \var{address} received (as usual, a pair host/port), with
-an optional timeout for the connection. Specially useful for higher-level
-protocols, it is not normally used directly from application-level code.
-Passing the optional \var{timeout} parameter will set the timeout on the
-socket instance (if not present, or passed as None, the global default
-timeout setting is used).
+Connects to the \var{address} received (as usual, a \code{(host, port)}
+pair), with an optional timeout for the connection. Specially useful for
+higher-level protocols, it is not normally used directly from
+application-level code. Passing the optional \var{timeout} parameter
+will set the timeout on the socket instance (if it is not given or
+\code{None}, the global default timeout setting is used).
\end{funcdesc}
\begin{funcdesc}{getaddrinfo}{host, port\optional{, family\optional{,