Streamlined --help message a bit.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2430

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 8051155e12a55b65447bc1bac41be8fb179364ac..57463fbefa869538428f42a7ae079780ff63fa82 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1508,26 +1508,21 @@ void usage ( Bool debug_help )
 "usage: valgrind --tool=<toolname> [options] prog-and-args\n"
 "\n"
 "  common user options for all Valgrind tools, with defaults in [ ]:\n"
-"    --tool=<name>             Use the Valgrind tool named <name>\n"
+"    --tool=<name>             use the Valgrind tool named <name>\n"
 "    -h --help                 show this message\n"
 "    --help-debug              show this message, plus debugging options\n"
 "    --version                 show version\n"
 "    -q --quiet                run silently; only print error msgs\n"
 "    -v --verbose              be more verbose, incl counts of errors\n"
 "    --trace-children=no|yes   Valgrind-ise child processes? [no]\n"
-"    --track-fds=no|yes        Track open file descriptors? [no]\n"
+"    --track-fds=no|yes        track open file descriptors? [no]\n"
 "\n"
 "  uncommon user options for all Valgrind tools:\n"
-"    --run-libc-freeres=no|yes Free up glibc memory at exit? [yes]\n"
-"    --weird-hacks=hack1,hack2,...  [none]\n"
-"         recognised hacks are: lax-ioctls\n"
-"    --signal-polltime=<time>  time, in mS, we should poll for signals.\n"
-"                              Only applies for older kernels which need\n"
-"                              signal routing [50]\n"
-"    --lowlat-signals=no|yes   improve wake-up latency when a thread receives\n"
-"                             a signal [no]\n"
-"    --lowlat-syscalls=no|yes  improve wake-up latency when a thread's\n"
-"                             syscall completes [no]\n"
+"    --run-libc-freeres=no|yes free up glibc memory at exit? [yes]\n"
+"    --weird-hacks=hack1,hack2,...  recognised hacks: lax-ioctls [none]\n"
+"    --signal-polltime=<time>  signal poll period (mS) for older kernels [50]\n"
+"    --lowlat-signals=no|yes   improve thread signal wake-up latency [no]\n"
+"    --lowlat-syscalls=no|yes  improve thread syscall wake-up latency [no]\n"
 "    --pointercheck=no|yes     enforce client address space limits [yes]\n"
 "\n"
 "  user options for Valgrind tools that report errors:\n"

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index b12ded489ada17bd9d05b55a7ffa96b780d805fa..3a2b31629f0af146c2e4f829570beb1d8fb6603e 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -1,26 +1,21 @@
 usage: valgrind --tool=<toolname> [options] prog-and-args
 
   common user options for all Valgrind tools, with defaults in [ ]:
-    --tool=<name>             Use the Valgrind tool named <name>
+    --tool=<name>             use the Valgrind tool named <name>
     -h --help                 show this message
     --help-debug              show this message, plus debugging options
     --version                 show version
     -q --quiet                run silently; only print error msgs
     -v --verbose              be more verbose, incl counts of errors
     --trace-children=no|yes   Valgrind-ise child processes? [no]
-    --track-fds=no|yes        Track open file descriptors? [no]
+    --track-fds=no|yes        track open file descriptors? [no]
 
   uncommon user options for all Valgrind tools:
-    --run-libc-freeres=no|yes Free up glibc memory at exit? [yes]
-    --weird-hacks=hack1,hack2,...  [none]
-         recognised hacks are: lax-ioctls
-    --signal-polltime=<time>  time, in mS, we should poll for signals.
-                              Only applies for older kernels which need
-                              signal routing [50]
-    --lowlat-signals=no|yes   improve wake-up latency when a thread receives
-                              a signal [no]
-    --lowlat-syscalls=no|yes  improve wake-up latency when a thread's
-                              syscall completes [no]
+    --run-libc-freeres=no|yes free up glibc memory at exit? [yes]
+    --weird-hacks=hack1,hack2,...  recognised hacks: lax-ioctls [none]
+    --signal-polltime=<time>  signal poll period (mS) for older kernels [50]
+    --lowlat-signals=no|yes   improve thread signal wake-up latency [no]
+    --lowlat-syscalls=no|yes  improve thread syscall wake-up latency [no]
     --pointercheck=no|yes     enforce client address space limits [yes]
 
   user options for Valgrind tools that report errors:

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 535733695f9d6902b55e9d981b199310b48c3c1f..3c5c5733a87240e54c37289110e792cfec8beef7 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -1,26 +1,21 @@
 usage: valgrind --tool=<toolname> [options] prog-and-args
 
   common user options for all Valgrind tools, with defaults in [ ]:
-    --tool=<name>             Use the Valgrind tool named <name>
+    --tool=<name>             use the Valgrind tool named <name>
     -h --help                 show this message
     --help-debug              show this message, plus debugging options
     --version                 show version
     -q --quiet                run silently; only print error msgs
     -v --verbose              be more verbose, incl counts of errors
     --trace-children=no|yes   Valgrind-ise child processes? [no]
-    --track-fds=no|yes        Track open file descriptors? [no]
+    --track-fds=no|yes        track open file descriptors? [no]
 
   uncommon user options for all Valgrind tools:
-    --run-libc-freeres=no|yes Free up glibc memory at exit? [yes]
-    --weird-hacks=hack1,hack2,...  [none]
-         recognised hacks are: lax-ioctls
-    --signal-polltime=<time>  time, in mS, we should poll for signals.
-                              Only applies for older kernels which need
-                              signal routing [50]
-    --lowlat-signals=no|yes   improve wake-up latency when a thread receives
-                              a signal [no]
-    --lowlat-syscalls=no|yes  improve wake-up latency when a thread's
-                              syscall completes [no]
+    --run-libc-freeres=no|yes free up glibc memory at exit? [yes]
+    --weird-hacks=hack1,hack2,...  recognised hacks: lax-ioctls [none]
+    --signal-polltime=<time>  signal poll period (mS) for older kernels [50]
+    --lowlat-signals=no|yes   improve thread signal wake-up latency [no]
+    --lowlat-syscalls=no|yes  improve thread syscall wake-up latency [no]
     --pointercheck=no|yes     enforce client address space limits [yes]
 
   user options for Valgrind tools that report errors: