From 635035ca64e9c6e6ad8252545446bbf9bc2a9c55 Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 1 Sep 2009 15:20:39 -0500 Subject: PR10552: Removed references to the merge ('-M') option. * hash.cxx (find_script_hash): Removed unused merge option. * main.cxx (checkOptions): Removed merge option checks. (main): Removed merge option. * session.h: Ditto. * initscript/README.initscript: Removed reference to '-M' option. * initscript/systemtap.in (stap_getopt): Ditto. * testsuite/parseko/cmdline01.stp: Removed merge option test. * testsuite/parseko/cmdline05.stp: Ditto. --- initscript/README.initscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'initscript/README.initscript') diff --git a/initscript/README.initscript b/initscript/README.initscript index ee11f3be..c7bb4888 100644 --- a/initscript/README.initscript +++ b/initscript/README.initscript @@ -223,7 +223,7 @@ Configuration file allows us - Below options are ignored when compiling script. -p,-m,-r,-c,-x,-e,-s,-o,-h,-V,-k - Below options are ignored when starting script. - -h,-V,-M,-v,-t,-p,-I,-e,-R,-r,-m,-k,-g,-P,-D,-b,-u,-q,-w,-l,-d,-L,-F, and + -h,-V,-v,-t,-p,-I,-e,-R,-r,-m,-k,-g,-P,-D,-b,-u,-q,-w,-l,-d,-L,-F, and other long options. 4.2.2 _REQ -- cgit