Merged revisions 73286,73294,73296,73459,73462-73463,73544,73576-73577,73595-73596,73693-73694,73704-73705,73707,73713,73937-73940,73945,73951,73979 via svnmerge from

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

........
  r73286 | georg.brandl | 2009-06-08 09:57:35 +0200 (Mo, 08 Jun 2009) | 1 line

  Remove period from end of headings.
........
  r73294 | georg.brandl | 2009-06-08 15:34:52 +0200 (Mo, 08 Jun 2009) | 1 line

  #6194: O_SHLOCK/O_EXLOCK are not really more platform independent than lockf().
........
  r73296 | georg.brandl | 2009-06-08 18:03:41 +0200 (Mo, 08 Jun 2009) | 1 line

  #6238: add fillchar to string.just function family.
........
  r73459 | raymond.hettinger | 2009-06-17 03:43:47 +0200 (Mi, 17 Jun 2009) | 1 line

  Add usage note.
........
  r73462 | georg.brandl | 2009-06-17 11:36:21 +0200 (Mi, 17 Jun 2009) | 1 line

  #6295: clarify blocking behavior of getch().
........
  r73463 | georg.brandl | 2009-06-17 11:43:31 +0200 (Mi, 17 Jun 2009) | 1 line

  #6255: document PyInt_FromSize_t.
........
  r73544 | georg.brandl | 2009-06-24 08:41:19 +0200 (Mi, 24 Jun 2009) | 1 line

  #6332: fix word dupes throughout the source.
........
  r73576 | benjamin.peterson | 2009-06-27 01:37:06 +0200 (Sa, 27 Jun 2009) | 1 line

  document is_declared_global()
........
  r73577 | benjamin.peterson | 2009-06-27 16:16:23 +0200 (Sa, 27 Jun 2009) | 1 line

  link to extensive generator docs in the reference manual
........
  r73595 | ezio.melotti | 2009-06-28 01:45:39 +0200 (So, 28 Jun 2009) | 1 line

  stmt and setup can contain multiple statements, see #5896
........
  r73596 | ezio.melotti | 2009-06-28 02:07:45 +0200 (So, 28 Jun 2009) | 1 line

  Fixed a wrong apostrophe
........
  r73693 | jesse.noller | 2009-06-29 20:20:34 +0200 (Mo, 29 Jun 2009) | 1 line

  Bug 5906: add a documentation note for unix daemons vs. multiprocessing daemons
........
  r73694 | jesse.noller | 2009-06-29 20:24:26 +0200 (Mo, 29 Jun 2009) | 1 line

  Issue 5740: multiprocessing.connection.* authkey fixes
........
  r73704 | georg.brandl | 2009-06-30 18:15:43 +0200 (Di, 30 Jun 2009) | 1 line

  #6376: fix copy-n-paste oversight.
........
  r73705 | georg.brandl | 2009-06-30 18:17:28 +0200 (Di, 30 Jun 2009) | 1 line

  #6374: add a bit of explanation about shell=True on Windows.
........
  r73707 | georg.brandl | 2009-06-30 18:35:11 +0200 (Di, 30 Jun 2009) | 1 line

  #6371: fix link targets.
........
  r73713 | ezio.melotti | 2009-07-01 00:56:16 +0200 (Mi, 01 Jul 2009) | 1 line

  Fixed a backslash that was not supposed to be there
........
  r73937 | georg.brandl | 2009-07-11 12:12:36 +0200 (Sa, 11 Jul 2009) | 1 line

  Fix style.
........
  r73938 | georg.brandl | 2009-07-11 12:14:54 +0200 (Sa, 11 Jul 2009) | 1 line

  #6446: fix import_spam() function to use correct error and reference handling.
........
  r73939 | georg.brandl | 2009-07-11 12:18:10 +0200 (Sa, 11 Jul 2009) | 1 line

  #6448: clarify docs for find_module().
........
  r73940 | georg.brandl | 2009-07-11 12:37:38 +0200 (Sa, 11 Jul 2009) | 1 line

  #6430: add note about size of "u" type.
........
  r73945 | georg.brandl | 2009-07-11 12:51:31 +0200 (Sa, 11 Jul 2009) | 1 line

  #6456: clarify the meaning of constants used as arguments to nl_langinfo().
........
  r73951 | georg.brandl | 2009-07-11 16:23:38 +0200 (Sa, 11 Jul 2009) | 2 lines

  array.array is actually a class.
........
  r73979 | benjamin.peterson | 2009-07-12 18:56:54 +0200 (So, 12 Jul 2009) | 1 line

  add versionadded
........

6 files changed, 8 insertions, 8 deletions

diff --git a/Misc/HISTORY b/Misc/HISTORY
index 14f283d..127b782 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -16184,7 +16184,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.
 
@@ -16434,7 +16434,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,
@@ -16756,7 +16756,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/NEWS b/Misc/NEWS
index d265ef1..53d1721 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3576,7 +3576,7 @@ Library
 - Bug #1565661: in webbrowser, split() the command for the default
   GNOME browser in case it is a command with args.
 
-- Made the error message for time.strptime when the data data and
+- Made the error message for time.strptime when the data and
   format do match be more clear.
 
 - Fix a bug in traceback.format_exception_only() that led to an error
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 df69f24..98e3399 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -1145,7 +1145,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 b4f6c70..5b90e4c 100644
--- a/Misc/developers.txt
+++ b/Misc/developers.txt
@@ -41,7 +41,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 1db77ea..fd9ed45 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -204,7 +204,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