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

[sandro.tosi]

http://hg.python.org/cpython/rev/c7963dff98fa
changeset:   73241:c7963dff98fa
parent:      73238:101919aba8d6
parent:      73240:e23baae539f7
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Mon Oct 31 10:13:30 2011 +0100
summary:
  merge with 3.2

files:
  Doc/library/turtle.rst |  3 ++-
  1 files changed, 2 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
@@ -204,7 +204,7 @@
    | :func:`onkeypress`
    | :func:`onclick` | :func:`onscreenclick`
    | :func:`ontimer`
-   | :func:`mainloop`
+   | :func:`mainloop` | :func:`done`
 
 Settings and special methods
    | :func:`mode`
@@ -1773,6 +1773,7 @@
 
 
 .. function:: mainloop()
+              done()
 
    Starts event loop - calling Tkinter's mainloop function.
    Must be the last statement in a turtle graphics program.

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