[Python-checkins] devguide (merge default -> default): Merge with head

[nick.coghlan]

http://hg.python.org/devguide/rev/986ea2e2798b
changeset:   429:986ea2e2798b
parent:      428:fabcea815a19
parent:      424:fe159fa6166f
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Jun 19 22:54:41 2011 +1000
summary:
  Merge with head

files:
  developers.rst |   4 ++++
  experts.rst    |  23 +++++++++++++----------
  index.rst      |   2 +-
  triaging.rst   |   5 +++++
  4 files changed, 23 insertions(+), 11 deletions(-)


diff --git a/developers.rst b/developers.rst
--- a/developers.rst
+++ b/developers.rst
@@ -24,6 +24,10 @@
 Permissions History
 -------------------
 
+- Charles-François Natali was given push privileges on May 19 2011 by Antoine
+  Pitrou, for general contributions, on recommandation by Victor Stinner,
+  Brian Curtin and others.
+
 - Nadeem Vawda was given push privileges on Apr 10 2011 by GFB, for
   general contributions, on recommendation by Antoine Pitrou.
 
diff --git a/experts.rst b/experts.rst
--- a/experts.rst
+++ b/experts.rst
@@ -17,6 +17,8 @@
 that person, only make them nosy.  Names followed by a '*' may be assigned
 issues involving the module or topic.
 
+.. TODO document automatic assignment/nosy: people need not add them manually
+
 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.
@@ -45,7 +47,7 @@
 Module                Maintainers
 ====================  =============================================
 __future__
-__main__              gvanrossum,ncoghlan
+__main__              gvanrossum, ncoghlan
 _dummy_thread         brett.cannon
 _thread               pitrou
 abc
@@ -128,7 +130,7 @@
 inspect
 io                    pitrou, benjamin.peterson, stutzbach
 itertools             rhettinger
-json                  bob.ippolito (inactive), rhettinger
+json                  bob.ippolito (inactive), ezio.melotti, rhettinger
 keyword
 lib2to3               benjamin.peterson
 linecache
@@ -153,6 +155,7 @@
 optparse              aronacher
 os                    loewis
 ossaudiodev
+packaging             tarek*, eric.araujo*, alexis
 parser
 pdb                   georg.brandl*
 pickle                alexandre.vassalotti, pitrou
@@ -296,25 +299,25 @@
 context managers    ncoghlan
 data formats        mark.dickinson, georg.brandl
 database            lemburg
-devguide            ncoghlan,eric.araujo
-documentation       georg.brandl, ezio.melotti
+devguide            ncoghlan, eric.araujo
+documentation       georg.brandl, ezio.melotti, eric.araujo
 GUI
-i18n                lemburg
+i18n                lemburg, eric.araujo
 import machinery    brett.cannon, ncoghlan
 io                  pitrou, benjamin.peterson, stutzbach
 locale              lemburg, loewis
 mathematics         mark.dickinson, eric.smith, lemburg, stutzbach
 memory management   tim_one, lemburg
 networking          giampaolo.rodola
-packaging           tarek, lemburg, alexis
+packaging           tarek, lemburg, alexis, eric.araujo
 py3 transition      benjamin.peterson
 release management  tarek, lemburg, benjamin.peterson, barry, loewis,
-                    gvanrossum, anthonybaxter
+                    gvanrossum, anthonybaxter, eric.araujo
 str.format          eric.smith
-testing             michael.foord, pitrou, giampaolo.rodola, ezio.melotti
-test coverage       ncoghlan
+testing             michael.foord, pitrou, ezio.melotti
+test coverage       ncoghlan, giampaolo.rodola
 threads             pitrou
 time and dates      lemburg, belopolsky
 unicode             lemburg, ezio.melotti, haypo
-version control
+version control     eric.araujo
 ==================  ===========
diff --git a/index.rst b/index.rst
--- a/index.rst
+++ b/index.rst
@@ -37,7 +37,7 @@
 Quick Links
 -----------
 
-Here are some links that you may find you refererence frequently while
+Here are some links that you may find you reference frequently while
 contributing to Python.
 
 * `Issue tracker <http://bugs.python.org/>`_
diff --git a/triaging.rst b/triaging.rst
--- a/triaging.rst
+++ b/triaging.rst
@@ -206,6 +206,11 @@
   :abbr:`VCS (version control system)` to Mercurial.
   The issue tracker automatically translates the legacy svn revision
   ``<number>`` to its corresponding Mercurial changeset identifier.
+* ``Dir/file.ext`` and ``Dir/file.ext:NNN`` generate links to files in the
+  `Python source code repositories <http://hg.python.org/cpython/file/>`_,
+  possibly linking to the line number specified after the ``:``.
+* ``PEP <number>`` and ``PEP<number>`` link to the
+  :abbr:`PEP (Python Enhancement Proposal)` ``<number>``.
 
 
 Reporting Issues About the Tracker

-- 
Repository URL: http://hg.python.org/devguide