summaryrefslogtreecommitdiffstats
path: root/Doc/library/email.util.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-06-24 20:48:30 (GMT)
committerGeorg Brandl <georg@python.org>2012-06-24 20:48:30 (GMT)
commit61063cca6abe36005f6e327358d533af8a56d33c (patch)
treeebd093befdd9a90317bd95efef9525b93ce43e62 /Doc/library/email.util.rst
parentf55100132288304b8e5d4798bbb7929a512e9b57 (diff)
downloadcpython-61063cca6abe36005f6e327358d533af8a56d33c.zip
cpython-61063cca6abe36005f6e327358d533af8a56d33c.tar.gz
cpython-61063cca6abe36005f6e327358d533af8a56d33c.tar.bz2
Fix a couple of versionadded/versionchanged related markup errors.
Diffstat (limited to 'Doc/library/email.util.rst')
-rw-r--r--Doc/library/email.util.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/Doc/library/email.util.rst b/Doc/library/email.util.rst
index b05c5d2..bad0b24 100644
--- a/Doc/library/email.util.rst
+++ b/Doc/library/email.util.rst
@@ -41,7 +41,8 @@ There are several useful utilities provided in the :mod:`email.utils` module:
characters. Can be an instance of :class:`str` or a
:class:`~email.charset.Charset`. Defaults to ``utf-8``.
- .. versionchanged: 3.3 added the *charset* option
+ .. versionchanged:: 3.3
+ Added the *charset* option.
.. function:: getaddresses(fieldvalues)
@@ -93,6 +94,8 @@ There are several useful utilities provided in the :mod:`email.utils` module:
corresponding a :class:`~datetime.timezone` :class:`~datetime.tzinfo`.
.. versionadded:: 3.3
+
+
.. function:: mktime_tz(tuple)
Turn a 10-tuple as returned by :func:`parsedate_tz` into a UTC timestamp. It
@@ -164,7 +167,8 @@ There are several useful utilities provided in the :mod:`email.utils` module:
may be useful certain cases, such as a constructing distributed system that
uses a consistent domain name across multiple hosts.
- .. versionchanged:: 3.2 domain keyword added
+ .. versionchanged:: 3.2
+ Added the *domain* keyword.
.. function:: decode_rfc2231(s)