[Python-checkins] cpython (3.2): Fix usage of argument/parameter and markup.

ezio.melotti python-checkins at python.org
Wed Mar 20 12:54:44 CET 2013


http://hg.python.org/cpython/rev/5cbb3bcdb390
changeset:   82835:5cbb3bcdb390
branch:      3.2
parent:      82808:ae9aea1b3546
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Mar 20 13:53:32 2013 +0200
summary:
  Fix usage of argument/parameter and markup.

files:
  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
--- a/Doc/library/email.mime.rst
+++ b/Doc/library/email.mime.rst
@@ -116,7 +116,7 @@
    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 @@
    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 @@
    :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

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list