summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2002-12-06 16:45:05 (GMT)
committerFred Drake <fdrake@acm.org>2002-12-06 16:45:05 (GMT)
commit08d10f985ebc26e0158591860ff26d5b33d50fea (patch)
treea109893427c72aee0cf7f7ed243c7c2a3ded7be2
parent9e43730ca3ded5c2e82d34f7e49704ad18dcd3a5 (diff)
downloadcpython-08d10f985ebc26e0158591860ff26d5b33d50fea.zip
cpython-08d10f985ebc26e0158591860ff26d5b33d50fea.tar.gz
cpython-08d10f985ebc26e0158591860ff26d5b33d50fea.tar.bz2
Typo: "dead lock" --> "deadlock"
-rw-r--r--Doc/lib/libos.tex2
-rw-r--r--Doc/lib/libpopen2.tex2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/lib/libos.tex b/Doc/lib/libos.tex
index cf68f60..6674e88 100644
--- a/Doc/lib/libos.tex
+++ b/Doc/lib/libos.tex
@@ -344,7 +344,7 @@ streams and also retrieve the return codes is to use the
\class{Popen3} and \class{Popen4} classes from the \refmodule{popen2}
module; these are only available on \UNIX.
-For a discussion of possible dead lock conditions related to the use
+For a discussion of possible deadlock conditions related to the use
of these functions, see ``\ulink{Flow Control
Issues}{popen2-flow-control.html}''
(section~\ref{popen2-flow-control}).
diff --git a/Doc/lib/libpopen2.tex b/Doc/lib/libpopen2.tex
index 83b85ab..41a7e8e 100644
--- a/Doc/lib/libpopen2.tex
+++ b/Doc/lib/libpopen2.tex
@@ -129,7 +129,7 @@ module equivalents).
When reading output from a child process that writes a lot of data to
standard error while the parent is reading from the child's standard
-out, a dead lock can occur. A similar situation can occur with other
+out, a deadlock can occur. A similar situation can occur with other
combinations of reads and writes. The essential factors are that more
than \constant{_PC_PIPE_BUF} bytes are being written by one process in
a blocking fashion, while the other process is reading from the other