2007-03-14 Martin Hunt <hunt@redhat.com>

	* main.cxx (usage): Remove "-M" and edit description
	of "-b".
	* stap.1.in: Remove "-M" option and edit description of "-b".
	Edit description of "-o".

3 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 433f25f5..94666fef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2007-03-14  Martin Hunt  <hunt@redhat.com>	
+	* main.cxx (usage): Remove "-M" and edit description
+	of "-b".
 	* stap.1.in: Remove "-M" option and edit description of "-b".
-
+	Edit description of "-o".
+	
 2007-03-14  Martin Hunt  <hunt@redhat.com>
 	* Makefile.am: Don't install old relayfs sources.
 	* makefile.in: Rebuilt.
diff --git a/main.cxx b/main.cxx
index 554887a9..e2226e48 100644
--- a/main.cxx
+++ b/main.cxx
@@ -73,8 +73,7 @@ usage (systemtap_session& s, int exitcode)
     << "   -g         guru mode" << (s.guru_mode ? " [set]" : "") << endl
     << "   -P         prologue-searching for function probes" 
     << (s.prologue_searching ? " [set]" : "") << endl
-    << "   -b         bulk (relayfs) mode" << (s.bulk_mode ? " [set]" : "") << endl
-    << "   -M         Don't merge per-cpu files for bulk (relayfs) mode" << (s.merge ? "" : " [set]") << endl
+    << "   -b         bulk (percpu file) mode" << (s.bulk_mode ? " [set]" : "") << endl
     << "   -s NUM     buffer size in megabytes, instead of "
     << s.buffer_size << endl
     << "   -p NUM     stop after pass NUM 1-5, instead of "
diff --git a/stap.1.in b/stap.1.in
index 5f89c10e..02d6032f 100644
--- a/stap.1.in
+++ b/stap.1.in
@@ -140,7 +140,8 @@ Use the given name for the generated kernel object module, instead
 of a unique randomized name.
 .TP
 .BI \-o " FILE"
-Send standard output to named file.
+Send standard output to named file. In bulk mode, percpu files will
+start with FILE_ followed by the cpu number.
 .TP
 .BI \-c " CMD"
 Start the probes, run CMD, and exit when CMD finishes.