[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[zach.ware]

http://hg.python.org/cpython/rev/0a4f286105b4
changeset:   91706:0a4f286105b4
parent:      91703:1d0ca204c36f
parent:      91705:04281a6f7940
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Wed Jul 16 14:49:05 2014 -0500
summary:
  Merge with 3.4

files:
  Doc/library/turtle.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -1981,7 +1981,7 @@
    :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
 

-- 
Repository URL: http://hg.python.org/cpython