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.
........
This commit is contained in:
Georg Brandl 2010-08-01 21:23:10 +00:00
parent 80ff50a35d
commit ec18c395ea
4 changed files with 41 additions and 5 deletions

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>