Merged revisions 73592,73823 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r73592 | ezio.melotti | 2009-06-28 00:58:15 +0200 (So, 28 Jun 2009) | 1 line

  Updated the last example as requested in #6350
........
  r73823 | ezio.melotti | 2009-07-04 03:14:30 +0200 (Sa, 04 Jul 2009) | 1 line

  #6398 typo: versio. -> version.
........
diff --git a/Doc/library/html.parser.rst b/Doc/library/html.parser.rst
index 78b7677..ef0ae83 100644
--- a/Doc/library/html.parser.rst
+++ b/Doc/library/html.parser.rst
@@ -163,13 +163,23 @@
 As a basic example, below is a very basic HTML parser that uses the
 :class:`HTMLParser` class to print out tags as they are encountered::
 
-   from html.parser import HTMLParser
+   >>> from html.parser import HTMLParser
+   >>>
+   >>> class MyHTMLParser(HTMLParser):
+   ...     def handle_starttag(self, tag, attrs):
+   ...         print("Encountered a {} start tag".format(tag))
+   ...     def handle_endtag(self, tag):
+   ...         print("Encountered a {} end tag".format(tag))
+   ...
+   >>> page = """<html><h1>Title</h1><p>I'm a paragraph!</p></html>"""
+   >>>
+   >>> myparser = MyHTMLParser()
+   >>> myparser.feed(page)
+   Encountered a html start tag
+   Encountered a h1 start tag
+   Encountered a h1 end tag
+   Encountered a p start tag
+   Encountered a p end tag
+   Encountered a html end tag
 
-   class MyHTMLParser(HTMLParser):
-
-       def handle_starttag(self, tag, attrs):
-           print "Encountered the beginning of a %s tag" % tag
-
-       def handle_endtag(self, tag):
-           print "Encountered the end of a %s tag" % tag
 
diff --git a/README b/README
index 40d3f0a..5fc791c 100644
--- a/README
+++ b/README
@@ -127,7 +127,7 @@
 On Unix and Mac systems if you intend to install multiple versions of Python
 using the same installation prefix (--prefix argument to the configure
 script) you must take care that your primary python executable is not
-overwritten by the installation of a different versio.  All files and
+overwritten by the installation of a different version.  All files and
 directories installed using "make altinstall" contain the major and minor
 version and can thus live side-by-side.  "make install" also creates
 ${prefix}/bin/python3 which refers to ${prefix}/bin/pythonX.Y.  If you intend