summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-10-02 00:17:08 -0400
committerTerry Jan Reedy <tjreedy@udel.edu>2014-10-02 00:17:08 -0400
commitf1a37168daf0406c725d70fbbbbf76913250f05a (patch)
treedf48d938fc769c0656506c37c018e73396d6a2ca
parentdc2f5b9b3399002dc59d4f73822b8d26d4172b0f (diff)
parent2053e92eabca0c1554b1fd374c04686e75885af3 (diff)
downloadcpython-f1a37168daf0406c725d70fbbbbf76913250f05a.tar.gz
Merge with 3.4
-rw-r--r--Doc/library/turtle.rst31
1 files changed, 18 insertions, 13 deletions
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 269a1a7714..157fe9329b 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -2274,10 +2274,13 @@ study it as an example and see its effects when running the demos (preferably
not from within the demo-viewer).
-Demo scripts
-============
+:mod:`turtledemo` --- Demo scripts
+==================================
+
+.. module:: turtledemo
+ :synopsis: A viewer for example turtle scripts
-There is a set of demo scripts in the :mod:`turtledemo` package. These
+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 @@ Alternatively, you can run the demo scripts individually. For example, ::
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 @@ The demo scripts are:
+----------------+------------------------------+-----------------------+
| 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 @@ The demo scripts are:
| 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` |
+----------------+------------------------------+-----------------------+