document the renames for modules moved to the html package
(http://bugs.python.org/issue2882)
diff --git a/Doc/library/htmllib.rst b/Doc/library/htmllib.rst
index ffaaaec..8241c14 100644
--- a/Doc/library/htmllib.rst
+++ b/Doc/library/htmllib.rst
@@ -152,10 +152,18 @@
:mod:`html.entities` --- Definitions of HTML general entities
=============================================================
+.. module:: htmlentitydefs
+ :synopsis: Old name for the :mod:`html.entities` module.
+
.. module:: html.entities
:synopsis: Definitions of HTML general entities.
.. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>
+.. note::
+ The :mod:`htmlentitydefs` module has been renamed to
+ :mod:`html.entities` in Python 3.0. It is importable under both names
+ in Python 2.6 and the rest of the 2.x series.
+
This module defines three dictionaries, ``name2codepoint``, ``codepoint2name``,
and ``entitydefs``. ``entitydefs`` is used by the :mod:`htmllib` module to
diff --git a/Doc/library/htmlparser.rst b/Doc/library/htmlparser.rst
index ee3e1f2..a58769a 100644
--- a/Doc/library/htmlparser.rst
+++ b/Doc/library/htmlparser.rst
@@ -2,9 +2,17 @@
:mod:`html.parser` --- Simple HTML and XHTML parser
===================================================
+.. module:: HTMLParser
+ :synopsis: Old name for the :mod:`html.parser` module.
+
.. module:: html.parser
:synopsis: A simple parser that can handle HTML and XHTML.
+.. note::
+ The :mod:`HTMLParser` module has been renamed to
+ :mod:`html.parser` in Python 3.0. It is importable under both names
+ in Python 2.6 and the rest of the 2.x series.
+
.. versionadded:: 2.2