Merged revisions 71786-71787,71814-71817,71901-71903 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71786 | georg.brandl | 2009-04-21 20:23:08 +0200 (Di, 21 Apr 2009) | 1 line

  #5757: fix copy-paste error in notify().
........
  r71787 | georg.brandl | 2009-04-21 20:24:34 +0200 (Di, 21 Apr 2009) | 1 line

  #5751: fix escaping of \\n.
........
  r71814 | georg.brandl | 2009-04-23 10:44:57 +0200 (Do, 23 Apr 2009) | 1 line

  #5820: fix bug in usage of getreader().
........
  r71815 | georg.brandl | 2009-04-23 10:49:39 +0200 (Do, 23 Apr 2009) | 1 line

  Fix rewrapping accident.
........
  r71816 | georg.brandl | 2009-04-23 10:49:56 +0200 (Do, 23 Apr 2009) | 1 line

  #5813: add a reference to the "future statements" section.
........
  r71817 | georg.brandl | 2009-04-23 10:52:03 +0200 (Do, 23 Apr 2009) | 1 line

  Add link to PEP 236.
........
  r71901 | georg.brandl | 2009-04-25 16:50:25 +0200 (Sa, 25 Apr 2009) | 1 line

  #3320: fix spelling.
........
  r71902 | georg.brandl | 2009-04-25 16:51:31 +0200 (Sa, 25 Apr 2009) | 1 line

  #5834: use "failure" instead of "error" because the two have different meanings in unittest context.
........
  r71903 | georg.brandl | 2009-04-25 17:05:04 +0200 (Sa, 25 Apr 2009) | 1 line

  #5821: add some capabilities of TarFile's file-like object.
........
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index bf567a2..a0c7694 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -1244,9 +1244,9 @@
 
 .. function:: screensize(canvwidth=None, canvheight=None, bg=None)
 
-   :param canvwidth: positive integer, new width of canvas in pixels :param
-   canvheight: positive integer, new height of canvas in pixels :param bg:
-   colorstring or color-tuple, new background color
+   :param canvwidth: positive integer, new width of canvas in pixels
+   :param canvheight: positive integer, new height of canvas in pixels
+   :param bg: colorstring or color-tuple, new background color
 
    If no arguments are given, return current (canvaswidth, canvasheight).  Else
    resize the canvas the turtles are drawing on.  Do not alter the drawing