Merged revisions 71540,71544,71546,71563,71572,71607,71653 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71540 | georg.brandl | 2009-04-12 22:30:53 +0200 (So, 12 Apr 2009) | 1 line
#5719: add short usage example to optparse docstring.
........
r71544 | benjamin.peterson | 2009-04-13 01:19:56 +0200 (Mo, 13 Apr 2009) | 1 line
fix extra parenthesis #5774
........
r71546 | benjamin.peterson | 2009-04-13 01:44:15 +0200 (Mo, 13 Apr 2009) | 1 line
fix missing quote
........
r71563 | georg.brandl | 2009-04-13 14:36:18 +0200 (Mo, 13 Apr 2009) | 1 line
Simplify markup.
........
r71572 | georg.brandl | 2009-04-13 15:13:25 +0200 (Mo, 13 Apr 2009) | 1 line
#5745: more linking for identifiers in email docs.
........
r71607 | benjamin.peterson | 2009-04-14 23:23:09 +0200 (Di, 14 Apr 2009) | 1 line
tupel -> tuple
........
r71653 | raymond.hettinger | 2009-04-16 20:16:10 +0200 (Do, 16 Apr 2009) | 1 line
Clarify the behavior of any() and all() with an empty iterable.
........
diff --git a/Doc/library/email.generator.rst b/Doc/library/email.generator.rst
index 1bffa73..8ba426a 100644
--- a/Doc/library/email.generator.rst
+++ b/Doc/library/email.generator.rst
@@ -16,8 +16,8 @@
yourself. However the bundled generator knows how to 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 a message
-structure via the :class:`Parser` class, and back to flat text, is idempotent
-(the input is identical to the output).
+structure via the :class:`~email.parser.Parser` class, and back to flat text,
+is idempotent (the input is identical to the output).
Here are the public methods of the :class:`Generator` class, imported from the
:mod:`email.generator` module:
@@ -41,8 +41,8 @@
Optional *maxheaderlen* specifies the longest length for a non-continued header.
When a header line is longer than *maxheaderlen* (in characters, with tabs
expanded to 8 spaces), the header will be split as defined in the
- :mod:`email.header.Header` class. Set to zero to disable header wrapping. The
- default is 78, as recommended (but not required) by :rfc:`2822`.
+ :class:`~email.header.Header` class. Set to zero to disable header wrapping.
+ The default is 78, as recommended (but not required) by :rfc:`2822`.
The other public :class:`Generator` methods are: