Merge usage of argument/parameter and markup fixes from 3.2.

diff --cc Doc/library/email.mime.rst
index acaba1ce400331866727d2dfbe18f7d3f9c3c40a,d6addc8287d0d00983dc8e6253d8418834a4c9dc..192e353c2bc4d7f4bfe96cfa6a7d37c9f7891341
--- 1/Doc/library/email.mime.rst
--- 2/Doc/library/email.mime.rst
+++ b/Doc/library/email.mime.rst
@@@ -183,12 -183,11 +183,12 @@@ 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``.
 +   to ``us-ascii`` if the string contains only ``ascii`` codepoints, and
 +   ``utf-8`` otherwise.
  
-    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