diff options
author | Georg Brandl <georg@python.org> | 2010-08-01 21:23:10 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-08-01 21:23:10 (GMT) |
commit | ec18c395eac3b42e18b4d03ac80ea9422eaded66 (patch) | |
tree | 2d3a671257eca172ac991e43316ab9af05298453 /Doc/documenting | |
parent | 80ff50a35df8e42ecb959fe7842c6db0a0f953f9 (diff) | |
download | cpython-ec18c395eac3b42e18b4d03ac80ea9422eaded66.zip cpython-ec18c395eac3b42e18b4d03ac80ea9422eaded66.tar.gz cpython-ec18c395eac3b42e18b4d03ac80ea9422eaded66.tar.bz2 |
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.
........
Diffstat (limited to 'Doc/documenting')
-rw-r--r-- | Doc/documenting/markup.rst | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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> |