Merged revisions 73544 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73544 | georg.brandl | 2009-06-24 06:41:19 +0000 (Mi, 24 Jun 2009) | 1 line

  #6332: fix word dupes throughout the source.
........

5 files changed, 7 insertions, 7 deletions

diff --git a/Misc/HISTORY b/Misc/HISTORY
index 2b76831..b2d3fba 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -17569,7 +17569,7 @@ people seemed not to have picked it up.  There's a Python script that
 fixes old code: demo/scripts/classfix.py.
 
 * There's a new reserved word: "access".  The syntax and semantics are
-still subject of of research and debate (as well as undocumented), but
+still subject of research and debate (as well as undocumented), but
 the parser knows about the keyword so you must not use it as a
 variable, function, or attribute name.
 
@@ -17819,7 +17819,7 @@ you could get away with the following:
 	(a) define a function of one argument and call it with any
 	    number of arguments; if the actual argument count wasn't
 	    one, the function would receive a tuple containing the
-	    arguments arguments (an empty tuple if there were none).
+	    arguments (an empty tuple if there were none).
 
 	(b) define a function of two arguments, and call it with more
 	    than two arguments; if there were more than two arguments,
@@ -18141,7 +18141,7 @@ Changes to the source code that affect C extension writers
 ----------------------------------------------------------
 
 The function strdup() no longer exists (it was used only in one places
-and is somewhat of a a portability problem sice some systems have the
+and is somewhat of a portability problem since some systems have the
 same function in their C library.
 
 The functions NEW() and RENEW() allocate one spare byte to guard
diff --git a/Misc/Porting b/Misc/Porting
index 60ce9a8..1b94f14 100644
--- a/Misc/Porting
+++ b/Misc/Porting
@@ -37,6 +37,6 @@ options.
 Then bang on it until it executes very simple Python statements.
 
 Now bang on it some more.  At some point you'll want to use the os
-module; this is the time to start thinking about what to to with the
+module; this is the time to start thinking about what to do with the
 posix module.  It's okay to simply #ifdef out those functions that
 cause problems; the remaining ones will be quite useful.
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
index 789e9c3..8c5ddcb 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -1106,7 +1106,7 @@ Exception>
 Standard methods & operators redefinition in classes
 
 Standard methods & operators map to special '__methods__' and thus may be
- redefined (mostly in in user-defined classes), e.g.:
+ redefined (mostly in user-defined classes), e.g.:
     class x:
          def __init__(self, v): self.value = v
          def __add__(self, r): return self.value + r
diff --git a/Misc/developers.txt b/Misc/developers.txt
index b52e14a..d9c7870 100644
--- a/Misc/developers.txt
+++ b/Misc/developers.txt
@@ -62,7 +62,7 @@ Permissions History
 - Heiko Weinen was given SVN access on 29 April 2008 by MvL,
   for GSoC contributions.
 
-- Jesus Cea was was given SVN access on 24 April 2008 by MvL,
+- Jesus Cea was given SVN access on 24 April 2008 by MvL,
   for maintenance of bsddb.
 
 - Guilherme Polo was given SVN access on 24 April 2008 by MvL,
diff --git a/Misc/python.man b/Misc/python.man
index 3c7d606..2f0e744 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -193,7 +193,7 @@ to print a warning each time it occurs (this may generate many
 messages if a warning is triggered repeatedly for the same source
 line, such as inside a loop);
 .B module
-to print each warning only only the first time it occurs in each
+to print each warning only the first time it occurs in each
 module;
 .B once
 to print each warning only the first time it occurs in the program; or