Merge with 3.4

zware · zware · commit 05d7d156266a · 2014-07-16T14:49:05.000-05:00
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
@@ -1981,7 +1981,7 @@ Methods specific to Screen, not inherited from TurtleScreen
    :param startx: if positive, starting position in pixels from the left
                   edge of the screen, if negative from the right edge, if None,
                   center window horizontally
-   :param startx: if positive, starting position in pixels from the top
+   :param starty: if positive, starting position in pixels from the top
                   edge of the screen, if negative from the bottom edge, if None,
                   center window vertically
 
