Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 83160-83161,83166,83168-83169,83171 via svnmerge from 

svn+ssh://pythondev@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.
........
  r83168 | georg.brandl | 2010-07-26 19:00:20 +0200 (Mo, 26 Jul 2010) | 1 line

  Fix indentation in example.
........
  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.
........
This commit is contained in:
Georg Brandl 2010-08-01 21:23:50 +00:00
parent f3295e456d
commit 8891e23c15
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/documenting/markup.rst
View File

@ -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>

4
Doc/install/index.rst
View File

@ -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 ::

4
Doc/library/argparse.rst
View File

@ -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)

7
Misc/developers.txt
View File

@ -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.