]> granicus.if.org Git - python/commitdiff
Merge doc fixes.
authorGeorg Brandl <georg@python.org>
Sun, 6 Mar 2011 10:12:42 +0000 (11:12 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 6 Mar 2011 10:12:42 +0000 (11:12 +0100)
1  2 
Doc/library/asyncore.rst
Doc/library/curses.rst
Doc/library/locale.rst
Doc/library/stdtypes.rst
Doc/library/turtle.rst
Doc/reference/simple_stmts.rst
Doc/tutorial/inputoutput.rst

Simple merge
Simple merge
Simple merge
Simple merge
index 692746fad1d99f583c16deb5e1cd62763cc853d8,1fe9699f9626220ab2df94a204dd4e5181e2ac8a..e995a7c0c3d21082188e7339a20f68b2eba62a9c
@@@ -2304,11 -2288,13 +2304,13 @@@ The demo scripts are
  | Name           | Description                  | Features              |
  +----------------+------------------------------+-----------------------+
  | bytedesign     | complex classical            | :func:`tracer`, delay,|
 -|                | turtlegraphics pattern       | :func:`update`        |
 +|                | turtle graphics pattern      | :func:`update`        |
  +----------------+------------------------------+-----------------------+
- | chaos          | graphs verhust dynamics,     | world coordinates     |
- |                | proves that you must not     |                       |
- |                | trust computers' computations|                       |
+ | chaos          | graphs Verhulst dynamics,    | world coordinates     |
+ |                | shows that computer's        |                       |
+ |                | computations can generate    |                       |
+ |                | results sometimes against the|                       |
+ |                | common sense expectations    |                       |
  +----------------+------------------------------+-----------------------+
  | clock          | analog clock showing time    | turtles as clock's    |
  |                | of your computer             | hands, ontimer        |
Simple merge
Simple merge