[Python-checkins] Fix hyperlink conflict in turtle docs (GH-27592)
miss-islington
webhook-mailer at python.org
Wed Aug 4 14:14:22 EDT 2021
https://github.com/python/cpython/commit/40a863185ee53b7c9044d970dfa0207a971764c2
commit: 40a863185ee53b7c9044d970dfa0207a971764c2
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-04T11:14:12-07:00
summary:
Fix hyperlink conflict in turtle docs (GH-27592)
(cherry picked from commit 3d2b4c6f18d7e644e5850d2af74ac5dc530eb24c)
Co-authored-by: Harry <harry.lees at gmail.com>
files:
M Doc/library/turtle.rst
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 6a9d61916ad1a..228cf1e01e74a 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -193,8 +193,8 @@ Methods of TurtleScreen/Screen
Window control
| :func:`bgcolor`
| :func:`bgpic`
- | :func:`clear` | :func:`clearscreen`
- | :func:`reset` | :func:`resetscreen`
+ | :func:`clearscreen`
+ | :func:`resetscreen`
| :func:`screensize`
| :func:`setworldcoordinates`
@@ -1069,7 +1069,6 @@ More drawing control
~~~~~~~~~~~~~~~~~~~~
.. function:: reset()
- :noindex:
Delete the turtle's drawings from the screen, re-center the turtle and set
variables to the default values.
@@ -1091,7 +1090,6 @@ More drawing control
.. function:: clear()
- :noindex:
Delete the turtle's drawings from the screen. Do not move turtle. State and
position of the turtle as well as drawings of other turtles are not affected.
@@ -1627,11 +1625,7 @@ Window control
.. function:: clear()
- clearscreen()
-
- Delete all drawings and all turtles from the TurtleScreen. Reset the now
- empty TurtleScreen to its initial state: white background, no background
- image, no event bindings and tracing on.
+ :noindex:
.. note::
This TurtleScreen method is available as a global function only under the
@@ -1639,10 +1633,15 @@ Window control
derived from the Turtle method ``clear``.
-.. function:: reset()
- resetscreen()
+.. function:: clearscreen()
- Reset all Turtles on the Screen to their initial state.
+ Delete all drawings and all turtles from the TurtleScreen. Reset the now
+ empty TurtleScreen to its initial state: white background, no background
+ image, no event bindings and tracing on.
+
+
+.. function:: reset()
+ :noindex:
.. note::
This TurtleScreen method is available as a global function only under the
@@ -1650,6 +1649,11 @@ Window control
derived from the Turtle method ``reset``.
+.. function:: resetscreen()
+
+ Reset all Turtles on the Screen to their initial state.
+
+
.. function:: screensize(canvwidth=None, canvheight=None, bg=None)
:param canvwidth: positive integer, new width of canvas in pixels
More information about the Python-checkins
mailing list