Rename html.parser file, and split html.entities from htmllib
to ease removal of the latter in Py3k.
diff --git a/Doc/library/html.entities.rst b/Doc/library/html.entities.rst
new file mode 100644
index 0000000..601e181
--- /dev/null
+++ b/Doc/library/html.entities.rst
@@ -0,0 +1,42 @@
+:mod:`html.entities` --- Definitions of HTML general entities
+=============================================================
+
+.. module:: htmlentitydefs
+ :synopsis: Old name for the 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
+provide the :attr:`entitydefs` member of the :class:`HTMLParser` class. The
+definition provided here contains all the entities defined by XHTML 1.0 that
+can be handled using simple textual substitution in the Latin-1 character set
+(ISO-8859-1).
+
+
+.. data:: entitydefs
+
+ A dictionary mapping XHTML 1.0 entity definitions to their replacement text in
+ ISO Latin-1.
+
+
+.. data:: name2codepoint
+
+ A dictionary that maps HTML entity names to the Unicode codepoints.
+
+ .. versionadded:: 2.3
+
+
+.. data:: codepoint2name
+
+ A dictionary that maps Unicode codepoints to HTML entity names.
+
+ .. versionadded:: 2.3
diff --git a/Doc/library/htmlparser.rst b/Doc/library/html.parser.rst
similarity index 96%
rename from Doc/library/htmlparser.rst
rename to Doc/library/html.parser.rst
index a58769a..5fa5a70 100644
--- a/Doc/library/htmlparser.rst
+++ b/Doc/library/html.parser.rst
@@ -1,17 +1,16 @@
-
:mod:`html.parser` --- Simple HTML and XHTML parser
===================================================
.. module:: HTMLParser
- :synopsis: Old name for the :mod:`html.parser` module.
+ :synopsis: Old name for the 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.
+ 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
diff --git a/Doc/library/htmllib.rst b/Doc/library/htmllib.rst
index 8241c14..953a4e4 100644
--- a/Doc/library/htmllib.rst
+++ b/Doc/library/htmllib.rst
@@ -147,48 +147,3 @@
call to :meth:`save_bgn`. If the :attr:`nofill` flag is false, whitespace is
collapsed to single spaces. A call to this method without a preceding call to
:meth:`save_bgn` will raise a :exc:`TypeError` exception.
-
-
-: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
-provide the :attr:`entitydefs` member of the :class:`HTMLParser` class. The
-definition provided here contains all the entities defined by XHTML 1.0 that
-can be handled using simple textual substitution in the Latin-1 character set
-(ISO-8859-1).
-
-
-.. data:: entitydefs
-
- A dictionary mapping XHTML 1.0 entity definitions to their replacement text in
- ISO Latin-1.
-
-
-.. data:: name2codepoint
-
- A dictionary that maps HTML entity names to the Unicode codepoints.
-
- .. versionadded:: 2.3
-
-
-.. data:: codepoint2name
-
- A dictionary that maps Unicode codepoints to HTML entity names.
-
- .. versionadded:: 2.3
-
diff --git a/Doc/library/markup.rst b/Doc/library/markup.rst
index dd0dd8f..e08f953 100644
--- a/Doc/library/markup.rst
+++ b/Doc/library/markup.rst
@@ -23,7 +23,8 @@
.. toctree::
- htmlparser.rst
+ html.parser.rst
+ html.entities.rst
sgmllib.rst
htmllib.rst
pyexpat.rst