Tweak the scons help message

Processing changed a bit - some lines can now be joined instead of
split (if the usage part is short so the combination will still fit).
Dropped the "Ingored for compatibility" chunk from the printout.

The usage: message was changed as it didn't mention variables.  A number
of tests expected the exact value of that line, and so were updated.

Updated docstrings (for the API docs).

Signed-off-by: Mats Wichmann <mats@linux.com>

4 files changed, 16 insertions, 20 deletions

diff --git a/test/Removed/debug-dtree.py b/test/Removed/debug-dtree.py
index a016f96df..0cd41b37c 100644
--- a/test/Removed/debug-dtree.py
+++ b/test/Removed/debug-dtree.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# MIT License
+#
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,9 +22,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 Test that the --debug=dtree option fails with expected exception
@@ -37,7 +36,7 @@ test = TestSCons.TestSCons()
 
 test.write('SConstruct', "")
 
-expect = r"""usage: scons [OPTION] [TARGET] ...
+expect = r"""usage: scons [OPTIONS] [VARIABLES] [TARGETS]
 
 SCons Error: `dtree' is not a valid debug option type ; please use --tree=derived instead
 """
diff --git a/test/Removed/debug-nomemoizer.py b/test/Removed/debug-nomemoizer.py
index a830a88e0..827ace606 100644
--- a/test/Removed/debug-nomemoizer.py
+++ b/test/Removed/debug-nomemoizer.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# MIT License
+#
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,9 +22,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 Test that the --debug=nomemoizer option fails with expected exception
@@ -37,7 +36,7 @@ test = TestSCons.TestSCons()
 
 test.write('SConstruct', "")
 
-expect=r"""usage: scons [OPTION] [TARGET] ...
+expect=r"""usage: scons [OPTIONS] [VARIABLES] [TARGETS]
 
 SCons Error: `nomemoizer' is not a valid debug option type ; there is no replacement
 """
diff --git a/test/Removed/debug-stree.py b/test/Removed/debug-stree.py
index 60ce4f21c..81d21f748 100644
--- a/test/Removed/debug-stree.py
+++ b/test/Removed/debug-stree.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# MIT License
+#
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,9 +22,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 Test that the --debug=stree option fails with expected exception
@@ -37,7 +36,7 @@ test = TestSCons.TestSCons()
 
 test.write('SConstruct', "")
 
-expect = r"""usage: scons [OPTION] [TARGET] ...
+expect = r"""usage: scons [OPTIONS] [VARIABLES] [TARGETS]
 
 SCons Error: `stree' is not a valid debug option type ; please use --tree=all,status instead
 """
diff --git a/test/Removed/debug-tree.py b/test/Removed/debug-tree.py
index 06287dee5..81063daad 100644
--- a/test/Removed/debug-tree.py
+++ b/test/Removed/debug-tree.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# MIT License
+#
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,9 +22,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 Test that the --debug=tree option fails with expected exception
@@ -38,7 +37,7 @@ test = TestSCons.TestSCons()
 
 test.write('SConstruct', "")
 
-expect = r"""usage: scons [OPTION] [TARGET] ...
+expect = r"""usage: scons [OPTIONS] [VARIABLES] [TARGETS]
 
 SCons Error: `tree' is not a valid debug option type ; please use --tree=all instead
 """