diff options
| author | Georg Brandl <georg@python.org> | 2009-01-03 22:47:39 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-01-03 22:47:39 (GMT) |
| commit | 1f01debe6f94d7f178e14ee7417786461b724e96 (patch) | |
| tree | f092e467dbf9846ec29f59e626f4d50eb1b2b8c1 /Doc/library/email.mime.rst | |
| parent | 814a2ca9e4b6360f1de37ed3d8d8d4313ab333bc (diff) | |
| download | cpython-1f01debe6f94d7f178e14ee7417786461b724e96.zip cpython-1f01debe6f94d7f178e14ee7417786461b724e96.tar.gz cpython-1f01debe6f94d7f178e14ee7417786461b724e96.tar.bz2 | |
Merged revisions 68162,68166,68171,68176,68195-68196,68210,68232 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 4472 is incompatible with Cygwin, this patch
should fix that.
........
r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
document PyMemberDef
........
r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
........
r68176 | andrew.kuchling | 2009-01-02 22:00:35 +0100 (Fri, 02 Jan 2009) | 1 line
Add various items
........
r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove useless string literal.
........
r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix indentation.
........
r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
Set eol-style correctly for mp_distributing.py.
........
r68232 | georg.brandl | 2009-01-03 22:52:16 +0100 (Sat, 03 Jan 2009) | 2 lines
Grammar fix.
........
Diffstat (limited to 'Doc/library/email.mime.rst')
| -rw-r--r-- | Doc/library/email.mime.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst index 83f4228..95407b0 100644 --- a/Doc/library/email.mime.rst +++ b/Doc/library/email.mime.rst @@ -55,14 +55,14 @@ Here are the classes: .. currentmodule:: email.mime.multipart -.. class:: MIMEMultipart([subtype[, boundary[, _subparts[, _params]]]]) +.. class:: MIMEMultipart([_subtype[, boundary[, _subparts[, _params]]]]) Module: :mod:`email.mime.multipart` A subclass of :class:`MIMEBase`, this is an intermediate base class for MIME messages that are :mimetype:`multipart`. Optional *_subtype* defaults to :mimetype:`mixed`, but can be used to specify the subtype of the message. A - :mailheader:`Content-Type` header of :mimetype:`multipart/`*_subtype* will be + :mailheader:`Content-Type` header of :mimetype:`multipart/_subtype` will be added to the message object. A :mailheader:`MIME-Version` header will also be added. |