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

[terry.reedy]

https://hg.python.org/cpython/rev/6d91c4f40ba1
changeset:   92737:6d91c4f40ba1
parent:      92734:80a515e255aa
parent:      92736:191c83f7c850
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Thu Oct 02 00:17:08 2014 -0400
summary:
  Merge with 3.4

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


diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -2274,10 +2274,13 @@
 not from within the demo-viewer).
 
 
-Demo scripts
-============
-
-There is a set of demo scripts in the :mod:`turtledemo` package.  These
+:mod:`turtledemo` --- Demo scripts
+==================================
+
+.. module:: turtledemo
+   :synopsis: A viewer for example turtle scripts
+
+The :mod:`turtledemo` package includes a set of demo scripts.  These
 scripts can be run and viewed using the supplied demo viewer as follows::
 
    python -m turtledemo
@@ -2288,16 +2291,13 @@
 
 The :mod:`turtledemo` package directory contains:
 
-- a set of 15 demo scripts demonstrating different features of the new module
-  :mod:`turtle`;
-- a demo viewer :file:`__main__.py` which can be used to view the sourcecode
-  of the scripts and run them at the same time. 14 of the examples can be
-  accessed via the Examples menu; all of them can also be run standalone.
-- The example :mod:`turtledemo.two_canvases` demonstrates the simultaneous
-  use of two canvases with the turtle module.  Therefore it only can be run
-  standalone.
-- There is a :file:`turtle.cfg` file in this directory, which serves as an
-  example for how to write and use such files.
+- A demo viewer :file:`__main__.py` which can be used to view the sourcecode
+  of the scripts and run them at the same time.
+- Multiple scripts demonstrating different features of the :mod:`turtle`
+  module.  Examples can be accessed via the Examples menu.  They can also
+  be run standalone.
+- A :file:`turtle.cfg` file which serves as an example of how to write
+  and use such files.
 
 The demo scripts are:
 
@@ -2320,6 +2320,8 @@
 +----------------+------------------------------+-----------------------+
 | colormixer     | experiment with r, g, b      | :func:`ondrag`        |
 +----------------+------------------------------+-----------------------+
+| forest         | 3 breadth-first trees        | randomization         |
++----------------+------------------------------+-----------------------+
 | fractalcurves  | Hilbert & Koch curves        | recursion             |
 +----------------+------------------------------+-----------------------+
 | lindenmayer    | ethnomathematics             | L-System              |
@@ -2352,6 +2354,9 @@
 | tree           | a (graphical) breadth        | :func:`clone`         |
 |                | first tree (using generators)|                       |
 +----------------+------------------------------+-----------------------+
+| two_canvases   | simple design                | turtles on two        |
+|                |                              | canvases              |
++----------------+------------------------------+-----------------------+
 | wikipedia      | a pattern from the wikipedia | :func:`clone`,        |
 |                | article on turtle graphics   | :func:`undo`          |
 +----------------+------------------------------+-----------------------+

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