[Python-checkins] r73545 - in python/branches/py3k: Doc/using/cmdline.rst Misc/HISTORY Misc/Porting Misc/cheatsheet Misc/developers.txt Misc/python.man

Wed Jun 24 08:42:05 CEST 2009

Author: georg.brandl
Date: Wed Jun 24 08:42:05 2009
New Revision: 73545
Log:
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.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Doc/using/cmdline.rst
 python/branches/py3k/Misc/HISTORY
 python/branches/py3k/Misc/Porting
 python/branches/py3k/Misc/cheatsheet
 python/branches/py3k/Misc/developers.txt
 python/branches/py3k/Misc/python.man
Modified: python/branches/py3k/Doc/using/cmdline.rst
==============================================================================

--- python/branches/py3k/Doc/using/cmdline.rst	(original)
+++ python/branches/py3k/Doc/using/cmdline.rst	Wed Jun 24 08:42:05 2009
@@ -286,7 +286,7 @@
 warning is triggered repeatedly for the same source line, such as inside a
 loop).
 ``module``
- Print each warning only only the first time it occurs in each module.
+ Print each warning only the first time it occurs in each module.
 ``once``
 Print each warning only the first time it occurs in the program.
 ``error``
Modified: python/branches/py3k/Misc/HISTORY
==============================================================================
--- python/branches/py3k/Misc/HISTORY	(original)
+++ python/branches/py3k/Misc/HISTORY	Wed Jun 24 08:42:05 2009
@@ -17569,7 +17569,7 @@
 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 @@
 	(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 @@
 ----------------------------------------------------------
 
 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
Modified: python/branches/py3k/Misc/Porting
==============================================================================
--- python/branches/py3k/Misc/Porting	(original)
+++ python/branches/py3k/Misc/Porting	Wed Jun 24 08:42:05 2009
@@ -37,6 +37,6 @@
 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.
Modified: python/branches/py3k/Misc/cheatsheet
==============================================================================
--- python/branches/py3k/Misc/cheatsheet	(original)
+++ python/branches/py3k/Misc/cheatsheet	Wed Jun 24 08:42:05 2009
@@ -1106,7 +1106,7 @@
 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
Modified: python/branches/py3k/Misc/developers.txt
==============================================================================
--- python/branches/py3k/Misc/developers.txt	(original)
+++ python/branches/py3k/Misc/developers.txt	Wed Jun 24 08:42:05 2009
@@ -62,7 +62,7 @@
 - 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,
Modified: python/branches/py3k/Misc/python.man
==============================================================================
--- python/branches/py3k/Misc/python.man	(original)
+++ python/branches/py3k/Misc/python.man	Wed Jun 24 08:42:05 2009
@@ -193,7 +193,7 @@
 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
