diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 21:23:50 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 21:23:50 (GMT) |
| commit | 8891e23c15adff9149273705e812508f9fe88dd5 (patch) | |
| tree | c4860ba732754480449949103972e5eb7b827b28 /Doc | |
| parent | f3295e456d46f3e4c2e990841be1c1eedbaefceb (diff) | |
| download | cpython-8891e23c15adff9149273705e812508f9fe88dd5.zip cpython-8891e23c15adff9149273705e812508f9fe88dd5.tar.gz cpython-8891e23c15adff9149273705e812508f9fe88dd5.tar.bz2 | |
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.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/documenting/markup.rst | 4 | ||||
| -rw-r--r-- | Doc/install/index.rst | 4 | ||||
| -rw-r--r-- | Doc/library/argparse.rst | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst index 9cffc6c..eb73cf6 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 b270d57..32cc251 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 c0ed140..b3a1171 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) |