Make usage messages given by -h and man pages consistent for the scripts.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10756 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
index 83f3483..29d9426 100644
--- a/cachegrind/cg_annotate.in
+++ b/cachegrind/cg_annotate.in
@@ -142,7 +142,7 @@
# Usage message.
my $usage = <<END
-usage: cg_annotate [options] output-file [source-files]
+usage: cg_annotate [options] cachegrind-out-file [source-files...]
options for the user, with defaults in [ ], are:
-h --help show this message
diff --git a/cachegrind/docs/cg_annotate-manpage.xml b/cachegrind/docs/cg_annotate-manpage.xml
index a817889..0952071 100644
--- a/cachegrind/docs/cg_annotate-manpage.xml
+++ b/cachegrind/docs/cg_annotate-manpage.xml
@@ -21,7 +21,8 @@
<cmdsynopsis>
<command>cg_annotate</command>
<arg><replaceable>options</replaceable></arg>
- <arg>filename</arg>
+ <arg choice="plain"><replaceable>cachegrind-out-file</replaceable></arg>
+ <arg choice="opt" rep="repeat"><replaceable>source-files</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/callgrind/callgrind_annotate.in b/callgrind/callgrind_annotate.in
index 60ecde0..5f7393d 100644
--- a/callgrind/callgrind_annotate.in
+++ b/callgrind/callgrind_annotate.in
@@ -196,7 +196,7 @@
# Usage message.
my $usage = <<END
-usage: callgrind_annotate [options] [data-file [source-files]]
+usage: callgrind_annotate [options] [callgrind-out-file [source-files...]]
options for the user, with defaults in [ ], are:
-h --help show this message
diff --git a/callgrind/callgrind_control.in b/callgrind/callgrind_control.in
index 74df031..7cb7b35 100644
--- a/callgrind/callgrind_control.in
+++ b/callgrind/callgrind_control.in
@@ -84,7 +84,7 @@
sub printHelp {
printHeader;
- print "Usage: callgrind_control [options] [<pid>|<name> ...]\n\n";
+ print "Usage: callgrind_control [options] [pid|program-name...]\n\n";
print "If no pids/names are given, an action is applied to all currently\n";
print "active Callgrind runs. Default action is printing short information.\n\n";
print "Options:\n";
diff --git a/callgrind/docs/callgrind_annotate-manpage.xml b/callgrind/docs/callgrind_annotate-manpage.xml
index a1d8aa8..2d0482b 100644
--- a/callgrind/docs/callgrind_annotate-manpage.xml
+++ b/callgrind/docs/callgrind_annotate-manpage.xml
@@ -21,7 +21,9 @@
<cmdsynopsis>
<command>callgrind_annotate</command>
<arg choice="opt"><replaceable>options</replaceable></arg>
- <arg choice="opt"><replaceable>source-files</replaceable></arg>
+ <!-- note the deliberate <arg> nesting here -->
+ <arg choice="opt"><replaceable>callgrind-out-file</replaceable>
+ <arg choice="opt" rep="repeat"><replaceable>source-files</replaceable></arg></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/callgrind/docs/callgrind_control-manpage.xml b/callgrind/docs/callgrind_control-manpage.xml
index dd71af0..952a1c0 100644
--- a/callgrind/docs/callgrind_control-manpage.xml
+++ b/callgrind/docs/callgrind_control-manpage.xml
@@ -20,7 +20,7 @@
<cmdsynopsis>
<command>callgrind_control</command>
<arg choice="opt"><replaceable>options</replaceable></arg>
- <arg choice="opt" rep="repeat"><replaceable>pid/program-name</replaceable></arg>
+ <arg choice="opt" rep="repeat"><replaceable>pid|program-name</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/massif/docs/ms_print-manpage.xml b/massif/docs/ms_print-manpage.xml
index 835d49b..cd1f4a0 100644
--- a/massif/docs/ms_print-manpage.xml
+++ b/massif/docs/ms_print-manpage.xml
@@ -10,6 +10,7 @@
<refentrytitle>ms_print</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo>Release &rel-version;</refmiscinfo>
+ <date>rel-date</date>
</refmeta>
<refnamediv>
@@ -21,7 +22,7 @@
<cmdsynopsis>
<command>ms_print</command>
<arg><replaceable>options</replaceable></arg>
- <arg>filename</arg>
+ <arg choice="plain"><replaceable>massif-out-file</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/massif/ms_print.in b/massif/ms_print.in
index 2b2a412..e6ffdbf 100755
--- a/massif/ms_print.in
+++ b/massif/ms_print.in
@@ -62,7 +62,7 @@
# Usage message.
my $usage = <<END
-usage: ms_print [options] <file>
+usage: ms_print [options] massif-out-file
options for the user, with defaults in [ ], are:
-h --help show this message