summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2008-09-17 12:57:04 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2008-09-17 12:57:04 (GMT)
commit026bcced2dee0decacf73e17d16797faf2e0bf2a (patch)
treeb322a798e604c7cdc00071a2760d96d2cbce3131
parentb40890db07cad4416135f4571ac89a46b6425562 (diff)
downloadcpython-026bcced2dee0decacf73e17d16797faf2e0bf2a.zip
cpython-026bcced2dee0decacf73e17d16797faf2e0bf2a.tar.gz
cpython-026bcced2dee0decacf73e17d16797faf2e0bf2a.tar.bz2
Markup fixes
-rw-r--r--Doc/whatsnew/2.6.rst12
1 files changed, 5 insertions, 7 deletions
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 24e41a8..a0959ef 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -2131,13 +2131,11 @@ changes, or look through the Subversion logs for all the details.
(Contributed by Christian Heimes and Mark Dickinson.)
-* The :mod:`MimeWriter` module has been deprecated; use the email
+* The :mod:`MimeWriter` module and :mod:`mimify` module
+ have been deprecated; use the :mod:`email`
package instead.
-* The :mod:`mimify` module has been deprecated; use the email package
- instead.
-
-* The :mod:`md5` module has been deprecated; use the hashlib module
+* The :mod:`md5` module has been deprecated; use the :mod:`hashlib` module
instead.
* :class:`mmap` objects now have a :meth:`rfind` method that searches for a
@@ -2235,7 +2233,7 @@ changes, or look through the Subversion logs for all the details.
opcodes, returning a shorter pickle that contains the same data structure.
(Contributed by Raymond Hettinger.)
-* The :mod:`popen2` module has been deprecated; use the subprocess
+* The :mod:`popen2` module has been deprecated; use the :mod:`subprocess`
module.
* A :func:`get_data` function was added to the :mod:`pkgutil`
@@ -2300,7 +2298,7 @@ changes, or look through the Subversion logs for all the details.
will now ignore exceptions triggered while evaluating a name.
(Fixed by Lorenz Quack; :issue:`2250`.)
-* The :mod:`sha` module has been deprecated; use the hashlib module
+* The :mod:`sha` module has been deprecated; use the :mod:`hashlib` module
instead.
* The :mod:`sched` module's :class:`scheduler` instances now