diff options
| author | Éric Araujo <merwok@netwok.org> | 2010-12-16 03:53:53 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2010-12-16 03:53:53 (GMT) |
| commit | a8132ec27efc5b1f136db38d819c7ecc389b90f4 (patch) | |
| tree | 16c960282d4d96865308680d7b88511da6439e8a /Doc/library/idle.rst | |
| parent | 0f39690dc49781037f9523c456878ee0756744de (diff) | |
| download | cpython-a8132ec27efc5b1f136db38d819c7ecc389b90f4.zip cpython-a8132ec27efc5b1f136db38d819c7ecc389b90f4.tar.gz cpython-a8132ec27efc5b1f136db38d819c7ecc389b90f4.tar.bz2 | |
Merged revisions 86521,86632,86823-86824,87294,87296,87300,87302 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86521 | eric.araujo | 2010-11-18 17:38:46 +0100 (jeu., 18 nov. 2010) | 17 lines
Fix usage of :option: in the docs (#9312).
:option: is used to create a link to an option of python, not to mark
up any instance of any arbitrary command-line option. These were
changed to ````.
For modules which do have a command-line interface, lists of options
have been properly marked up with the program/cmdoption directives
combo. Options defined in such blocks can be linked to with :option:
later in the same file, they won’t link to an option of python.
Finally, the markup of command-line fragments in optparse.rst has
been cleaned to use ``x`` instead of ``"x"``, keeping that latter
form for actual Python strings.
Patch by Eli Bendersky and Éric Araujo.
........
r86632 | eric.araujo | 2010-11-21 04:09:17 +0100 (dim., 21 nov. 2010) | 2 lines
Style edits in followup to r86521 (#9312)
........
r86823 | eric.araujo | 2010-11-27 00:31:07 +0100 (sam., 27 nov. 2010) | 2 lines
Use link-generating markup (see #9312)
........
r86824 | eric.araujo | 2010-11-27 00:46:18 +0100 (sam., 27 nov. 2010) | 2 lines
Rewrap long lines + minor edits
........
r87294 | eric.araujo | 2010-12-16 01:07:01 +0100 (jeu., 16 déc. 2010) | 2 lines
No need to generate a link for something that’s just above.
........
r87296 | eric.araujo | 2010-12-16 01:23:30 +0100 (jeu., 16 déc. 2010) | 2 lines
Advertise “python -m” instead of direct filename.
........
r87300 | eric.araujo | 2010-12-16 02:40:26 +0100 (jeu., 16 déc. 2010) | 2 lines
Advertise “python -m test” over test.regrtest (r87296 followup)
........
r87302 | eric.araujo | 2010-12-16 03:10:11 +0100 (jeu., 16 déc. 2010) | 2 lines
Add versionadded directive missing from r78983.
........
Diffstat (limited to 'Doc/library/idle.rst')
| -rw-r--r-- | Doc/library/idle.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index 1b78fb9..6bd1898 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -286,13 +286,13 @@ Command line usage If there are arguments: -#. If :option:`-e` is used, arguments are files opened for editing and +#. If ``-e`` is used, arguments are files opened for editing and ``sys.argv`` reflects the arguments passed to IDLE itself. -#. Otherwise, if :option:`-c` is used, all arguments are placed in +#. Otherwise, if ``-c`` is used, all arguments are placed in ``sys.argv[1:...]``, with ``sys.argv[0]`` set to ``'-c'``. -#. Otherwise, if neither :option:`-e` nor :option:`-c` is used, the first +#. Otherwise, if neither ``-e`` nor ``-c`` is used, the first argument is a script which is executed with the remaining arguments in ``sys.argv[1:...]`` and ``sys.argv[0]`` set to the script name. If the script name is '-', no script is executed but an interactive Python session is started; |