summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-09-10 10:44:12 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-09-10 10:44:12 (GMT)
commitb61ede4ba2ab1abae5bd339fc30d010c74c8a312 (patch)
tree85279adeaddc1f0157da3ddd35033ade39b2a6d7
parent0fc55a234f037d05a61d29eb1689ae727cd0ba05 (diff)
parent99e843b48e68818c1c7475e203250e2afa1bd1f1 (diff)
downloadcpython-b61ede4ba2ab1abae5bd339fc30d010c74c8a312.zip
cpython-b61ede4ba2ab1abae5bd339fc30d010c74c8a312.tar.gz
cpython-b61ede4ba2ab1abae5bd339fc30d010c74c8a312.tar.bz2
Merge spelling fixes from 3.5
-rw-r--r--Doc/whatsnew/2.2.rst4
-rw-r--r--Lib/turtle.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst
index 4e8d7fa..c4ecb26 100644
--- a/Doc/whatsnew/2.2.rst
+++ b/Doc/whatsnew/2.2.rst
@@ -1159,7 +1159,7 @@ Some of the more notable changes are:
The main change is the possibility to build Python as a
framework. This installs a self-contained Python installation plus the
OSX framework "glue" into /Library/Frameworks/Python.framework (or
- another location of choice). For now there is little immedeate added
+ another location of choice). For now there is little immediate added
benefit to this (actually, there is the disadvantage that you have to
change your PATH to be able to find Python), but it is the basis for
creating a fullblown Python application, porting the MacPython IDE,
@@ -1168,7 +1168,7 @@ Some of the more notable changes are:
The other change is that most MacPython toolbox modules, which
interface to all the MacOS APIs such as windowing, quicktime,
scripting, etc. have been ported. Again, most of these are not of
- immedeate use, as they need a full application to be really useful, so
+ immediate use, as they need a full application to be really useful, so
they have been commented out in setup.py. People wanting to experiment
can uncomment them. Gestalt and Internet Config modules are enabled by
default.
diff --git a/Lib/turtle.py b/Lib/turtle.py
index 57cf3d9..8036b7f 100644
--- a/Lib/turtle.py
+++ b/Lib/turtle.py
@@ -1035,7 +1035,7 @@ class TurtleScreen(TurtleScreenBase):
"""Set turtle-mode ('standard', 'logo' or 'world') and perform reset.
Optional argument:
- mode -- on of the strings 'standard', 'logo' or 'world'
+ mode -- one of the strings 'standard', 'logo' or 'world'
Mode 'standard' is compatible with turtle.py.
Mode 'logo' is compatible with most Logo-Turtle-Graphics.