--- rest25/library/htmllib.rst	2008-12-19 16:58:07.000000000 +0900
+++ rest262/library/htmllib.rst	2009-04-05 05:02:09.000000000 +0900
@@ -1,18 +1,21 @@
-
 :mod:`htmllib` --- A parser for HTML documents
 ==============================================
 
 .. module:: htmllib
    :synopsis: A parser for HTML documents.
+   :deprecated:
+
+.. deprecated:: 2.6
+    The :mod:`htmllib` module has been removed in Python 3.0.
 
 
 .. index::
    single: HTML
    single: hypertext
 
 .. index::
    module: sgmllib
    module: formatter
    single: SGMLParser (in module sgmllib)
 
 This module defines a class which can serve as a base for parsing text files
@@ -50,26 +53,26 @@
   encountered; :meth:`end_tag` is called when a closing tag of the form ``<tag>``
   is encountered.  If an opening tag requires a corresponding closing tag, like
   ``<H1>`` ... ``</H1>``, the class should define the :meth:`start_tag` method; if
   a tag requires no closing tag, like ``<P>``, the class should define the
   :meth:`do_tag` method.
 
 The module defines a parser class and an exception:
 
 
 .. class:: HTMLParser(formatter)
 
    This is the basic HTML parser class.  It supports all entity names required by
-   the XHTML 1.0 Recommendation (`<http://www.w3.org/TR/xhtml1>`_).   It also
-   defines handlers for all HTML 2.0 and many HTML 3.0 and 3.2 elements.
+   the XHTML 1.0 Recommendation (http://www.w3.org/TR/xhtml1).   It also defines
+   handlers for all HTML 2.0 and many HTML 3.0 and 3.2 elements.
 
 
 .. exception:: HTMLParseError
 
    Exception raised by the :class:`HTMLParser` class when it encounters an error
    while parsing.
 
    .. versionadded:: 2.4
 
 
 .. seealso::
 
@@ -89,82 +92,88 @@
       Base class for :class:`HTMLParser`.
 
 
 .. _html-parser-objects:
 
 HTMLParser Objects
 ------------------
 
 In addition to tag methods, the :class:`HTMLParser` class provides some
 additional methods and instance variables for use within tag methods.
 
 
-.. attribute:: XXX Class.formatter
+.. attribute:: HTMLParser.formatter
 
    This is the formatter instance associated with the parser.
 
 
-.. attribute:: XXX Class.nofill
+.. attribute:: HTMLParser.nofill
 
    Boolean flag which should be true when whitespace should not be collapsed, or
    false when it should be.  In general, this should only be true when character
    data is to be treated as "preformatted" text, as within a ``<PRE>`` element.
    The default value is false.  This affects the operation of :meth:`handle_data`
    and :meth:`save_end`.
 
 
-.. method:: XXX Class.anchor_bgn(href, name, type)
+.. method:: HTMLParser.anchor_bgn(href, name, type)
 
    This method is called at the start of an anchor region.  The arguments
    correspond to the attributes of the ``<A>`` tag with the same names.  The
    default implementation maintains a list of hyperlinks (defined by the ``HREF``
    attribute for ``<A>`` tags) within the document.  The list of hyperlinks is
    available as the data attribute :attr:`anchorlist`.
 
 
-.. method:: XXX Class.anchor_end()
+.. method:: HTMLParser.anchor_end()
 
    This method is called at the end of an anchor region.  The default
    implementation adds a textual footnote marker using an index into the list of
    hyperlinks created by :meth:`anchor_bgn`.
 
 
-.. method:: XXX Class.handle_image(source, alt[, ismap[, align[, width[, height]]]])
+.. method:: HTMLParser.handle_image(source, alt[, ismap[, align[, width[, height]]]])
 
    This method is called to handle images.  The default implementation simply
    passes the *alt* value to the :meth:`handle_data` method.
 
 
-.. method:: XXX Class.save_bgn()
+.. method:: HTMLParser.save_bgn()
 
    Begins saving character data in a buffer instead of sending it to the formatter
    object.  Retrieve the stored data via :meth:`save_end`. Use of the
    :meth:`save_bgn` / :meth:`save_end` pair may not be nested.
 
 
-.. method:: XXX Class.save_end()
+.. method:: HTMLParser.save_end()
 
    Ends buffering character data and returns all data saved since the preceding
    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:`htmlentitydefs` --- Definitions of HTML general entities
 ==============================================================
 
 .. module:: htmlentitydefs
    :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.  The :term:`2to3` tool will automatically adapt imports when
+   converting your sources to 3.0.
+
 
 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
