Merged revisions 83160-83161,83166,83169,83171 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83160 | georg.brandl | 2010-07-26 10:51:42 +0200 (Mo, 26 Jul 2010) | 1 line
#9381: fix markup.
........
r83161 | georg.brandl | 2010-07-26 11:33:12 +0200 (Mo, 26 Jul 2010) | 1 line
Add Brian Quinlan.
........
r83166 | georg.brandl | 2010-07-26 17:11:49 +0200 (Mo, 26 Jul 2010) | 1 line
Fix grammar.
........
r83169 | georg.brandl | 2010-07-26 19:09:32 +0200 (Mo, 26 Jul 2010) | 1 line
Add Reid.
........
r83171 | georg.brandl | 2010-07-26 23:12:13 +0200 (Mo, 26 Jul 2010) | 1 line
Clarify.
........
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index b89c0983b..8973207 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -358,7 +358,7 @@
:cdata:`Py_FileSystemEncoding` should be used as the encoding, and
``"surrogateescape"`` should be used as the error handler (:pep:`383`). To
encode file names during argument parsing, the ``"O&"`` converter should be
-used, passsing :func:PyUnicode_FSConverter as the conversion function:
+used, passsing :func:`PyUnicode_FSConverter` as the conversion function:
.. cfunction:: int PyUnicode_FSConverter(PyObject* obj, void* result)
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
index 6b54c5b..dd33e81 100644
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -200,8 +200,8 @@
.. describe:: cmdoption
- Describes a command line option or switch. Option argument names should be
- enclosed in angle brackets. Example::
+ Describes a Python command line option or switch. Option argument names
+ should be enclosed in angle brackets. Example::
.. cmdoption:: -m <module>
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index 0751291..525a3ef 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -314,8 +314,8 @@
stash of Python modules. This scheme's name is derived from the idea of a
"home" directory on Unix, since it's not unusual for a Unix user to make their
home directory have a layout similar to :file:`/usr/` or :file:`/usr/local/`.
-This scheme can be used by anyone, regardless of the operating system their
-installing for.
+This scheme can be used by anyone, regardless of the operating system they
+are installing for.
Installing a new module distribution is as simple as ::
diff --git a/Misc/developers.txt b/Misc/developers.txt
index 25d5324..84962b7 100644
--- a/Misc/developers.txt
+++ b/Misc/developers.txt
@@ -20,6 +20,42 @@
Permissions History
-------------------
+- Brian Quinlan was given commit access on Jul 26 2010 by GFB,
+ for work related to PEP 3148.
+
+- Reid Kleckner was given commit access on Jul 11 2010 by GFB,
+ for work on the py3k-jit branch, at suggestion of the Unladen
+ Swallow team.
+
+- Alexander Belopolsky was given commit access on May 25 2010
+ by MvL at suggestion of Mark Dickinson.
+
+- Tim Golden was given commit access on April 21 2010 by MvL,
+ at suggestion of Michael Foord.
+
+- Giampaolo Rodolà was given commit access on April 17 2010 by
+ MvL, at suggestion of R. David Murray.
+
+- Jean-Paul Calderone was given commit access on April 6 2010 by
+ GFB, at suggestion of Michael Foord and others.
+
+- Brian Curtin was given commit access on March 24 2010 by MvL.
+
+- Florent Xicluna was given commit access on February 25 2010 by
+ MvL, based on Antoine Pitrou's recommendation.
+
+- Dino Viehland was given SVN access on February 23 2010 by Brett
+ Cannon, for backporting tests from IronPython.
+
+- Larry Hastings was given SVN access on February 22 2010 by
+ Andrew Kuchling, based on Brett Cannon's recommendation.
+
+- Victor Stinner was given SVN access on January 30 2010 by MvL,
+ at recommendation by Mark Dickinson and Amaury Forgeot d'Arc.
+
+- Stefan Krah was given SVN access on January 5 2010 by GFB, at
+ suggestion of Mark Dickinson, for work on the decimal module.
+
- Doug Hellmann was given SVN access on September 19 2009 by GFB, at
suggestion of Jesse Noller, for documentation work.