diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-20 11:53:32 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-20 11:53:32 (GMT) |
| commit | 93115e0914306ed1f5bdfc28b6449d863ff0b655 (patch) | |
| tree | aaf6cc6db4a9fcf96e0824e9001a9ca37cee3b47 /Doc | |
| parent | 2a4d24510ad120b492afd63e60a6f8060556897c (diff) | |
| download | cpython-93115e0914306ed1f5bdfc28b6449d863ff0b655.zip cpython-93115e0914306ed1f5bdfc28b6449d863ff0b655.tar.gz cpython-93115e0914306ed1f5bdfc28b6449d863ff0b655.tar.bz2 | |
Fix usage of argument/parameter and markup.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/email.mime.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst index 2ce4868..d6addc8 100644 --- a/Doc/library/email.mime.rst +++ b/Doc/library/email.mime.rst @@ -116,7 +116,7 @@ Here are the classes: this data can be decoded by the standard Python module :mod:`sndhdr`, then the subtype will be automatically included in the :mailheader:`Content-Type` header. Otherwise you can explicitly specify the audio subtype via the *_subtype* - parameter. If the minor type could not be guessed and *_subtype* was not given, + argument. If the minor type could not be guessed and *_subtype* was not given, then :exc:`TypeError` is raised. Optional *_encoder* is a callable (i.e. function) which will perform the actual @@ -142,7 +142,7 @@ Here are the classes: this data can be decoded by the standard Python module :mod:`imghdr`, then the subtype will be automatically included in the :mailheader:`Content-Type` header. Otherwise you can explicitly specify the image subtype via the *_subtype* - parameter. If the minor type could not be guessed and *_subtype* was not given, + argument. If the minor type could not be guessed and *_subtype* was not given, then :exc:`TypeError` is raised. Optional *_encoder* is a callable (i.e. function) which will perform the actual @@ -183,11 +183,11 @@ Here are the classes: :class:`MIMEText` class is used to create MIME objects of major type :mimetype:`text`. *_text* is the string for the payload. *_subtype* is the minor type and defaults to :mimetype:`plain`. *_charset* is the character - set of the text and is passed as a parameter to the + set of the text and is passed as an argument to the :class:`~email.mime.nonmultipart.MIMENonMultipart` constructor; it defaults to ``us-ascii``. - Unless the ``_charset`` parameter is explicitly set to ``None``, the + Unless the *_charset* argument is explicitly set to ``None``, the MIMEText object created will have both a :mailheader:`Content-Type` header with a ``charset`` parameter, and a :mailheader:`Content-Transfer-Endcoding` header. This means that a subsequent ``set_payload`` call will not result |