From 921722a590e38747ab92e91f8d048b6a63345b9e Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Tue, 18 Nov 2003 05:27:57 +0000
Subject: Added better -H documentation for --debug and remove -e from man
 page.  (Anthony Roach)

---
 doc/man/scons.1                     | 8 ++++----
 src/CHANGES.txt                     | 4 ++++
 src/engine/SCons/Script/__init__.py | 4 +++-
 test/option--H.py                   | 1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index f3ccafc..cdf785a 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -496,10 +496,10 @@ of a given derived file:
 $ scons --debug=includes foo.o
 .EE
 
-.TP
--e, --environment-overrides
-Variables from the execution environment override construction
-variables from the SConscript files.
+.\" .TP
+.\" -e, --environment-overrides
+.\" Variables from the execution environment override construction
+.\" variables from the SConscript files.
 
 .TP
 .RI -f " file" ", --file=" file ", --makefile=" file ", --sconstruct=" file
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index d4fb532..a36b2ab 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -42,6 +42,10 @@ RELEASE 0.95 - XXX
   - Supply an error message if the user tries to configure a BuildDir
     for a directory that already has one.
 
+  - Remove documentation of the still-unimplemented -e option.
+
+  - Add -H help text listing the legal --debug values.
+
 
 
 RELEASE 0.94 - Fri, 07 Nov 2003 05:29:48 -0600
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 71ed2be..0134b97 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -482,7 +482,9 @@ class OptParser(OptionParser):
                 raise OptionValueError("Warning:  %s is not a valid debug type" % value)
         self.add_option('--debug', action="callback", type="string",
                         callback=opt_debug, nargs=1, dest="debug",
-                        help="Print various types of debugging information.")
+                        metavar="TYPE",
+                        help="Print various types of debugging information: "
+                             "pdb, tree, dtree, time, or includes.")
 
         self.add_option('-f', '--file', '--makefile', '--sconstruct',
                         action="append", nargs=1,
diff --git a/test/option--H.py b/test/option--H.py
index e0f7b82..5cf9ab7 100644
--- a/test/option--H.py
+++ b/test/option--H.py
@@ -35,6 +35,7 @@ test.write('SConstruct', "")
 test.run(arguments = '-H')
 
 test.fail_test(string.find(test.stdout(), '-H, --help-options') == -1)
+test.fail_test(string.find(test.stdout(), '--debug=TYPE') == -1)
 
 test.pass_test()
  
-- 
cgit v0.12