From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 10 Sep 2016 10:38:28 +0000 (+0000)
Subject: Correct spelling in documentation and code comments
X-Git-Tag: v2.7.13rc1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcc8a0f0f561af9cf4c7975691a883ff401f3401;p=thirdparty%2FPython%2Fcpython.git

Correct spelling in documentation and code comments
---

diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst
index 83227e1d5bd2..553df85ae95e 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/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
index 635f48d56c80..7444d45344f9 100644
--- a/Lib/lib-tk/turtle.py
+++ b/Lib/lib-tk/turtle.py
@@ -981,7 +981,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.
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index fb3489385779..b70e285e892c 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -634,7 +634,7 @@ class TestInvalidFD(unittest.TestCase):
     singles = ["fchdir", "fdopen", "dup", "fdatasync", "fstat",
                "fstatvfs", "fsync", "tcgetpgrp", "ttyname"]
     #singles.append("close")
-    #We omit close because it doesn'r raise an exception on some platforms
+    #We omit close because it doesn't raise an exception on some platforms
     def get_single(f):
         def helper(self):
             if  hasattr(os, f):
diff --git a/Mac/Demo/textedit.html b/Mac/Demo/textedit.html
index fcd8c973dfbc..e7b76ae4c73f 100644
--- a/Mac/Demo/textedit.html
+++ b/Mac/Demo/textedit.html
@@ -24,7 +24,7 @@ the main event handling code. Normal use is to override the <code>__init__</code
 to do your own initializations and override <code>makeusermenus</code> to create your menus
 (your menu callback routines may be here too, but this is by no means necessary).
 The event handling code can be overridden at various levels, from very low-level (the
-<code>dispatch</code> method) to intermedeate level (<code>do_keyDown</code>, for instance)
+<code>dispatch</code> method) to intermediate level (<code>do_keyDown</code>, for instance)
 to high-level (<code>do_key</code>). The application class knows about the <code>Window</code>
 objects you create, and will forward events to the appropriate window (So, normally you
 would have a <code>do_key</code> method in your window object, not your application object).
diff --git a/Mac/Modules/res/_Resmodule.c b/Mac/Modules/res/_Resmodule.c
index f5824b1f7c2a..7f545860b3d8 100644
--- a/Mac/Modules/res/_Resmodule.c
+++ b/Mac/Modules/res/_Resmodule.c
@@ -551,7 +551,7 @@ static int ResObj_set_data(ResourceObject *self, PyObject *v, void *closure)
             HLock(self->ob_itself);
             memcpy((char *)*self->ob_itself, data, size);
             HUnlock(self->ob_itself);
-            /* XXXX Should I do the Changed call immedeately? */
+            /* XXXX Should I do the Changed call immediately? */
             return 0;
 
     return 0;
diff --git a/Mac/Modules/res/ressupport.py b/Mac/Modules/res/ressupport.py
index 9e42a454232a..899ddc04a1e2 100644
--- a/Mac/Modules/res/ressupport.py
+++ b/Mac/Modules/res/ressupport.py
@@ -125,7 +125,7 @@ class ResDefinition(PEP253Mixin, GlobalObjectDefinition):
             HLock(self->ob_itself);
             memcpy((char *)*self->ob_itself, data, size);
             HUnlock(self->ob_itself);
-            /* XXXX Should I do the Changed call immedeately? */
+            /* XXXX Should I do the Changed call immediately? */
             return 0;
             """,
             'The resource data'