summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Doc/documenting/markup.rst4
-rw-r--r--Doc/install/index.rst4
-rw-r--r--Doc/library/argparse.rst4
-rw-r--r--Misc/developers.txt7
4 files changed, 13 insertions, 6 deletions
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
index 9cffc6c8b8..eb73cf6257 100644
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -200,8 +200,8 @@ The directives are:
.. 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 b270d577e6..32cc251ec8 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -314,8 +314,8 @@ The idea behind the "home scheme" is that you build and maintain a personal
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/Doc/library/argparse.rst b/Doc/library/argparse.rst
index c0ed140e06..b3a1171048 100644
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -698,8 +698,8 @@ An example of a custom action::
>>> class FooAction(argparse.Action):
... def __call__(self, parser, namespace, values, option_string=None):
- ... print '%r %r %r' % (namespace, values, option_string)
- ... setattr(namespace, self.dest, values)
+ ... print '%r %r %r' % (namespace, values, option_string)
+ ... setattr(namespace, self.dest, values)
...
>>> parser = argparse.ArgumentParser()
>>> parser.add_argument('--foo', action=FooAction)
diff --git a/Misc/developers.txt b/Misc/developers.txt
index fe981d1563..84962b797d 100644
--- a/Misc/developers.txt
+++ b/Misc/developers.txt
@@ -20,6 +20,13 @@ for details. When the agreement is signed, please note it in this log.
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.