Merged revisions 75538,75542,77012,77928,79113,79999,80109 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r75538 | kurt.kaiser | 2009-10-19 15:39:00 -0400 (Mon, 19 Oct 2009) | 2 lines

  add myself to idlelib
........
  r75542 | raymond.hettinger | 2009-10-19 15:52:20 -0400 (Mon, 19 Oct 2009) | 1 line

  Add maintainers.
........
  r77012 | ezio.melotti | 2009-12-23 15:56:09 -0500 (Wed, 23 Dec 2009) | 1 line

  Rephrased the introduction, added missing commas and my name for Unicode
........
  r77928 | tarek.ziade | 2010-02-02 18:31:01 -0500 (Tue, 02 Feb 2010) | 1 line

  added myself as the maintainer for sysconfig and shutil
........
  r79113 | benjamin.peterson | 2010-03-19 17:01:27 -0400 (Fri, 19 Mar 2010) | 1 line

  make maintainers.rst have correct eol
........
  r79999 | r.david.murray | 2010-04-12 11:19:03 -0400 (Mon, 12 Apr 2010) | 4 lines

  Kurt's roundup id is kbk, use that in maintainers.rst instead of
  his checkin id, since maintainers is for finding people to make
  nosy in the tracker.
........
  r80109 | r.david.murray | 2010-04-16 08:34:45 -0400 (Fri, 16 Apr 2010) | 5 lines

  maintainers.rst additions.

  Add Giampaolo Rodola as an expert for ftplib, and Victor Stinner
  to the 'unicode' interest area.
........

1 files changed, 21 insertions, 22 deletions

diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
index a5008ab..a2f7931 100644
--- a/Misc/maintainers.rst
+++ b/Misc/maintainers.rst
@@ -1,21 +1,19 @@
 Maintainers Index
 =================
 
-This document cross references Python Modules (first table) and platforms
-(second table) with the Tracker user names of people who are experts
-and/or resources for that module or platform.  This list is intended
-to be used by issue submitters, issue triage people, and other issue
-participants to find people to add to the nosy list or to contact
-directly by email for help and decisions on feature requests and bug
-fixes.  People on this list may be asked to render final judgement on a
-feature or bug.  If no active maintainer is listed for a given module,
-then questionable changes should go to python-dev, while any other issues
-can and should be decided by any committer.
+This document has tables that list Python Modules, Tools, Platforms and
+Interest Areas and names for each item that indicate a maintainer or an
+expert in the field.  This list is intended to be used by issue submitters,
+issue triage people, and other issue participants to find people to add to
+the nosy list or to contact directly by email for help and decisions on
+feature requests and bug fixes.  People on this list may be asked to render
+final judgement on a feature or bug.  If no active maintainer is listed for
+a given module, then questionable changes should go to python-dev, while
+any other issues can and should be decided by any committer.
 
-The last part of this document is a third table, listing broader topic
-areas in which various people have expertise.  These people can also
-be contacted for help, opinions, and decisions when issues involve
-their areas.
+The Platform and Interest Area tables list broader fields in which various
+people have expertise.  These people can also be contacted for help,
+opinions, and decisions when issues involve their areas.
 
 If a listed maintainer does not respond to requests for comment for an
 extended period (three weeks or more), they should be marked as inactive
@@ -85,7 +83,7 @@ curses              andrew.kuchling
 datetime
 dbm
 decimal             facundobatista, rhettinger, mark.dickinson
-difflib
+difflib             tim_one
 dis
 distutils           tarek
 doctest             tim_one (inactive)
@@ -100,8 +98,8 @@ fileinput
 fnmatch
 formatter
 fpectl
-fractions           mark.dickinson
-ftplib
+fractions           mark.dickinson, rhettinger
+ftplib              giampaolo.rodola
 functools
 gc                  pitrou
 getopt
@@ -115,7 +113,7 @@ heapq               rhettinger
 hmac
 html
 http
-idlelib
+idlelib             kbk
 imaplib
 imghdr
 imp
@@ -133,7 +131,7 @@ macpath
 mailbox             andrew.kuchling
 mailcap
 marshal
-math                mark.dickinson
+math                mark.dickinson, rhettinger
 mimetypes
 mmap
 modulefinder        theller, jvr
@@ -166,7 +164,7 @@ py_compile
 pybench             lemburg, pitrou
 pyclbr
 pydoc
-queue
+queue               rhettinger
 quopri
 random              rhettinger
 re                  effbot (inactive), pitrou
@@ -199,6 +197,7 @@ sunau
 symbol
 symtable            benjamin.peterson
 sys
+sysconfig           tarek
 syslog
 tabnanny            tim_one
 tarfile             lars.gustaebel
@@ -208,7 +207,7 @@ termios
 test
 textwrap
 threading
-time                brett.cannon
+time
 timeit
 tkinter             gpolo
 token               georg.brandl
@@ -290,7 +289,7 @@ time and dates      lemburg
 testing             michael.foord, pitrou
 threads
 tracker
-unicode             lemburg
+unicode             lemburg, ezio.melotti, haypo
 version control
 windows
 ==================  ===========