Another merge. Only doc stuff was affected (but this aligns the UTF-32
codec changes in trubk and branch). Hopefully the Py3k glossary wasn't
different from the trunk one.
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 7bbc5ef..dcd6659 100644
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -158,13 +158,15 @@
>>> import smtplib
>>> server = smtplib.SMTP('localhost')
>>> server.sendmail('soothsayer@example.org', 'jcaesar@example.org',
- """To: jcaesar@example.org
- From: soothsayer@example.org
-
- Beware the Ides of March.
- """)
+ ... """To: jcaesar@example.org
+ ... From: soothsayer@example.org
+ ...
+ ... Beware the Ides of March.
+ ... """)
>>> server.quit()
+(Note that the second example needs a mailserver running on localhost.)
+
.. _tut-dates-and-times: