Merged revisions 72085,72132,72159,72288,72290,72292 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72085 | georg.brandl | 2009-04-28 23:48:35 +0200 (Di, 28 Apr 2009) | 1 line

  Make the doctests in the docs pass, except for those in the turtle module.
........
  r72132 | georg.brandl | 2009-04-30 00:44:07 +0200 (Do, 30 Apr 2009) | 1 line

  #5878: fix repr of re object.
........
  r72159 | georg.brandl | 2009-05-01 10:51:37 +0200 (Fr, 01 Mai 2009) | 2 lines

  #5889: remove comma at the end of a list that some C compilers don't like.
........
  r72288 | georg.brandl | 2009-05-04 22:42:08 +0200 (Mo, 04 Mai 2009) | 1 line

  #5925: fix highlighting of keyword table.
........
  r72290 | georg.brandl | 2009-05-04 22:45:13 +0200 (Mo, 04 Mai 2009) | 1 line

  #5927, 5928: typos.
........
  r72292 | georg.brandl | 2009-05-04 22:49:17 +0200 (Mo, 04 Mai 2009) | 1 line

  #5916, 5917: small socket doc improvements.
........
diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index d589f36..4f606d7 100644
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -472,7 +472,7 @@
 
     >>> gen = generate_ints(3)
     >>> gen
-    <generator object at ...>
+    <generator object generate_ints at ...>
     >>> gen.next()
     0
     >>> gen.next()