Bunch of updates necessary due to recent changes; added docs for File

menu, command line and color preferences.

diff --git a/Tools/idle/help.txt b/Tools/idle/help.txt
index 80c669faad49f114409be173a571cd67df872346..001da01fca7c38df6f2677ddb69f9cee5f70b784 100644 (file)
--- a/Tools/idle/help.txt
+++ b/Tools/idle/help.txt
@@ -4,7 +4,24 @@ Click on the dotted line at the top of a menu to "tear it off": a
 separate window containing the menu is created.
 
 File menu:
-       (This should speak for itself.)
+
+       New window -- create a new editing window
+       Open... -- open an existing file
+       Open module... -- open an existing module (searches sys.path)
+       Class browser -- show classes and methods in current file
+       Path browser -- show sys.path directories, modules, classes
+               and methods
+       ---
+       Save -- save current window to the associated file (unsaved
+               windows have a * before and after the window title)
+
+       Save As... -- save current window to new file, which becomes
+               the associated file
+       Save Copy As... -- save current window to different file
+               without changing the associated file
+       ---
+       Close -- close current window (asks to save if unsaved)
+       Exit -- close all windows and quit IDLE (asks to save if unsaved)
 
 Edit menu:
 
@@ -33,8 +50,8 @@ Edit menu:
                word in the same buffer; repeat to get a different expansion
        Format Paragraph -- Reformat the current blank-line-separated paragraph
        ---
-       Run module -- Import or reload the current module
-       Debug module -- Ditto, under debugger control
+       Import module -- Import or reload the current module
+       Run script -- Execute the current file in the __main__ namespace
 
 Windows menu:
 
@@ -64,9 +81,12 @@ Basic editing and navigation:
 Automatic indentation:
 
        After a block-opening statement, the next line is indented by
-       4 spaces (in the Python Shell window by one tab).  In leading
-       indentation, Backspace deletes 4 spaces if they are there.
-       Also see the indent/dedent region commands.
+       4 spaces (in the Python Shell window by one tab).  After
+       certain keywords (break, return etc.) the next line is
+       dedented.  In leading indentation, Backspace deletes up to 4
+       spaces if they are there.  Tab inserts 1-4 spaces (in the
+       Python Shell window one tab).  See also the indent/dedent
+       region commands in the edit menu.
 
 Python Shell window:
 
@@ -80,26 +100,56 @@ Python Shell window:
        Return while on any previous command retrieves that command
        Alt-/ (Expand word) is also useful here
 
-Python syntax colors: the coloring is applied in the background.
+Syntax colors:
+
+       The coloring is applied in a background "thread", so you may
+       occasionally see uncolorized text.  To change the color
+       scheme, edit the ColorPrefs class in IdlePrefs.py.
+
+    Python syntax colors:
 
        Keywords        orange
        Strings         green
        Comments        red
        Definitions     blue
 
-Shell colors:
+    Shell colors:
 
        Console output  brown
        stdout          blue
        stderr          dark green
        stdin           black
 
-Tips:
+Other preferences:
+
        To change the font on Windows, open EditorWindow.py and change
-           text['font'] = ("verdana", 8)
+           text['font'] = ("lucida console", 8)
        to, e.g.,
            text['font'] = ("courier new", 10)
 
-       To change the Python syntax colors, edit the tagdefs table in
-       ColorDelegator.py; to change the shell colors, edit the tagdefs
-       table in PyShell.py.
+       To change keyboard bindings, edit Bindings.py
+
+Command line usage:
+
+       idle.py [-c command] [-d] [-e] [-s] [-t title] [arg] ...
+
+       -c command  run this command
+       -d          enable debugger
+       -e          edit mode; arguments are files to be edited
+       -s          run $IDLESTARTUP or $PYTHONSTARTUP first
+       -t title    set title of shell window
+
+       If there are arguments:
+
+           If -e is used, arguments are files opened for editing and
+           sys.argv reflects the arguments passed to IDLE itself.
+
+           Otherwise, if -c is used, all arguments are placed in
+           sys.argv[1:...], with sys.argv[0] set to '-c'.
+
+           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; the
+           arguments are still available in sys.argv.