From 9ca3f02dc00179673a04f4bda77920b860b42ea5 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Sun, 15 Jun 2003 23:08:45 +0000 Subject: [PATCH] ^D means EOF on Unix but not on Windows. Expand the example's prompt to tell Windows Truth too. Bugfix candidate. --- Doc/lib/libsmtplib.tex | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Doc/lib/libsmtplib.tex b/Doc/lib/libsmtplib.tex index 2f6e59e0384..d461a321321 100644 --- a/Doc/lib/libsmtplib.tex +++ b/Doc/lib/libsmtplib.tex @@ -50,7 +50,7 @@ A nice selection of exceptions is defined as well: \end{excdesc} \begin{excdesc}{SMTPSenderRefused} - Sender address refused. In addition to the attributes set by on all + Sender address refused. In addition to the attributes set by on all \exception{SMTPResponseException} exceptions, this sets `sender' to the string that the SMTP server refused. \end{excdesc} @@ -98,10 +98,10 @@ received from the server. \end{methoddesc} \begin{methoddesc}{connect}{\optional{host\optional{, port}}} -Connect to a host on a given port. The defaults are to connect to the +Connect to a host on a given port. The defaults are to connect to the local host at the standard SMTP port (25). If the hostname ends with a colon (\character{:}) followed by a -number, that suffix will be stripped off and the number interpreted as +number, that suffix will be stripped off and the number interpreted as the port number to use. This method is automatically invoked by the constructor if a host is specified during instantiation. @@ -257,7 +257,7 @@ consult the module code. This example prompts the user for addresses needed in the message envelope (`To' and `From' addresses), and the message to be -delivered. Note that the headers to be included with the message must +delivered. Note that the headers to be included with the message must be included in the message as entered; this example doesn't do any processing of the \rfc{822} headers. In particular, the `To' and `From' addresses must be included in the message headers explicitly. @@ -271,7 +271,7 @@ def prompt(prompt): fromaddr = prompt("From: ") toaddrs = prompt("To: ").split() -print "Enter message, end with ^D:" +print "Enter message, end with ^D (Unix) or ^Z (Windows):" # Add the From: and To: headers at the start! msg = ("From: %s\r\nTo: %s\r\n\r\n"