summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2001-11-05 01:55:03 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2001-11-05 01:55:03 (GMT)
commit43dc1fc92611d77728277527138248112c511b0f (patch)
treee20195214c1f8826e45e134a5ba7aae5c1d939ed /Doc
parent6f97e493e1626d101c53472c239e28e3fae3b42a (diff)
downloadcpython-43dc1fc92611d77728277527138248112c511b0f.zip
cpython-43dc1fc92611d77728277527138248112c511b0f.tar.gz
cpython-43dc1fc92611d77728277527138248112c511b0f.tar.bz2
Minor grammar and typo fixes
Diffstat (limited to 'Doc')
-rw-r--r--Doc/lib/email.tex4
-rw-r--r--Doc/lib/emailgenerator.tex4
-rw-r--r--Doc/lib/emailmessage.tex2
-rw-r--r--Doc/lib/emailutil.tex2
4 files changed, 6 insertions, 6 deletions
diff --git a/Doc/lib/email.tex b/Doc/lib/email.tex
index a6ad567..dbfc735 100644
--- a/Doc/lib/email.tex
+++ b/Doc/lib/email.tex
@@ -26,7 +26,7 @@ using the \module{email} package deal primarily with objects; you can
add sub-objects to messages, remove sub-objects from messages,
completely re-arrange the contents, etc. There is a separate parser
and a separate generator which handles the transformation from flat
-text to the object module, and then back to flat text again. There
+text to the object model, and then back to flat text again. There
are also handy subclasses for some common MIME object types, and a few
miscellaneous utilities that help with such common tasks as extracting
and parsing message field values, creating RFC-compliant dates, etc.
@@ -48,7 +48,7 @@ modules that the \module{email} package provides, the exception
classes you might encounter while using the \module{email} package,
some auxiliary utilities, and a few examples. For users of the older
\module{mimelib} package, from which the \module{email} package is
-descendent, a section on differences and porting is provided.
+descended, a section on differences and porting is provided.
\subsection{Representing an email message}
\input{emailmessage}
diff --git a/Doc/lib/emailgenerator.tex b/Doc/lib/emailgenerator.tex
index 6ded8d1..63ceb73 100644
--- a/Doc/lib/emailgenerator.tex
+++ b/Doc/lib/emailgenerator.tex
@@ -15,7 +15,7 @@ generate most email in a standards-compliant way, should handle MIME
and non-MIME email messages just fine, and is designed so that the
transformation from flat text, to an object tree via the
\class{Parser} class,
-and back to flat text, be idempotent (the input is identical to the
+and back to flat text, is idempotent (the input is identical to the
output).
Here are the public methods of the \class{Generator} class:
@@ -27,7 +27,7 @@ object called \var{outfp} for an argument. \var{outfp} must support
the \method{write()} method and be usable as the output file in a
Python 2.0 extended print statement.
-Optional \var{mangle_from_} is a flag that, when true, puts a ``>''
+Optional \var{mangle_from_} is a flag that, when true, puts a \samp{>}
character in front of any line in the body that starts exactly as
\samp{From } (i.e. \code{From} followed by a space at the front of the
line). This is the only guaranteed portable way to avoid having such
diff --git a/Doc/lib/emailmessage.tex b/Doc/lib/emailmessage.tex
index fbf30cf..ecf24eb 100644
--- a/Doc/lib/emailmessage.tex
+++ b/Doc/lib/emailmessage.tex
@@ -132,7 +132,7 @@ Return the total number of headers, including duplicates.
\begin{methoddesc}[Message]{__contains__}{name}
Return true if the message object has a field named \var{name}.
-Match is done case-insensitively and \var{name} should not include the
+Matching is done case-insensitively and \var{name} should not include the
trailing colon. Used for the \code{in} operator,
e.g.:
diff --git a/Doc/lib/emailutil.tex b/Doc/lib/emailutil.tex
index a5030d2..d1c7ec9 100644
--- a/Doc/lib/emailutil.tex
+++ b/Doc/lib/emailutil.tex
@@ -101,7 +101,7 @@ timestamp. It the timezone item in the tuple is \code{None}, assume
local time. Minor deficiency: \function{mktime_tz()} interprets the
first 8 elements of \var{tuple} as a local time and then compensates
for the timezone difference. This may yield a slight error around
-changes in daylight savings time, though not worth worring about for
+changes in daylight savings time, though not worth worrying about for
common use.
\end{funcdesc}