diff -r 7fdc9a71d314 -r 8ad140f3dd41 analyzetool/commandlineengine/src/helps.cpp
--- a/analyzetool/commandlineengine/src/helps.cpp	Wed Sep 15 13:53:27 2010 +0300
+++ b/analyzetool/commandlineengine/src/helps.cpp	Wed Oct 13 16:17:58 2010 +0300
@@ -32,8 +32,9 @@
 	cout<< "\n";
 	cout<< "Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).\nAll rights reserved.\n\n";
 	cout<< "Usage:\n";
-	cout<< "atool -tr [optional parameters] abld [abld parameters]\n";
-	cout<< "      -lf [optional parameters] abld [abld parameters]\n";
+	cout<< "atool -e [optional parameters] abld [abld parameters]\n";
+	cout<< "      -me [optional parameters] abld [abld parameters]\n";
+	cout<< "      -mi [optional parameters] [-f data-file] sbs [sbs parameters]\n";
 	cout<< "      -a data-file [output-file] [-s symbol-file] [-l#]\n";
 	cout<< "      -p data-file output-file\n";
 	cout<< "      -c\n";
@@ -41,8 +42,11 @@
 	cout<< "      -help\n";
 	cout<< "\n";
 	cout<< "Mandatory parameter to choose:\n";
-	cout<< " -tr             Build project for analysis using output to trace.\n";
-	cout<< " -lf             Build project for analysis using logging to file.\n";
+	cout<< " -e              Build project for analysis using external data gathering.\n";
+	cout<< " -me             Build project for analysis using monitored external\n";
+	cout<< "                 data gathering.\n";
+	cout<< " -mi             Build project for analysis using monitored internal\n";
+	cout<< "                 data gathering.\n";
 	cout<< " abld...         Use SBS v.1 build system with defined build command,\n";
 	cout<< "                 which includes supported platform and build type.\n";
 	cout<< " sbs...          Use SBS v.2 (Raptor) build system with defined sbs build\n";
@@ -59,10 +63,8 @@
 	cout<< "                 is allocated. Size can be between 0-256.\n";
 	cout<< " -fcs size       Specifies the call stack size gathered when memory is freed.\n";
 	cout<< "                 Size can be between 0-256.\n";
-	cout<< " -f data file    Specifies the filename for logging to file.\n";
+	cout<< " -f data file    Specifies the filename for monitored internal data gathering\n";
 	cout<< "                 (50 chars max). Cannot contain path.\n";
-	cout<< " -fp file path   Specifies the path of log file.\n";
-	cout<< "                 (in format <driveLetter>:\\<dir1>\\<dir2>\\...\\<dirN>\\)\n";
 	cout<< " output-file     Specifies the results data file name.\n";
 	cout<< " -l              Logging level of analyze report(0,1,2,3), default 3.\n";
 	cout<< " -s symbol-file  Specifies rom/rofs symbol file(s) to be used in analyze.\n";
@@ -123,37 +125,37 @@
 	cout<< "Building syntax examples:" << endl;
 	cout<< "Cmd   Description" << endl;
 	
-	cout<< "atool -tr abld build armv5 udeb" << endl;
-	cout<< "      Hooks every component from bld.inf. Using output to trace," << endl;
+	cout<< "atool -e abld build armv5 udeb" << endl;
+	cout<< "      Hooks every component from bld.inf. Using external data gathering," << endl;
 	cout<< "      udeb build type and armv5 platform." << endl;
 
-	cout<< "atool -lf -acs 5 sbs -c winscw_udeb" << endl;
+	cout<< "atool -mi -acs 5 sbs -c winscw_udeb" << endl;
 	cout<< "      Hooks every component from bld.inf. Using Symbian Build System v.2" << endl;
-	cout<< "      Using loging to data file, call stack size of 5" << endl;
+	cout<< "      Using monitored internal data gathering, call stack size of 5" << endl;
 	cout<< "      in allocations, udeb build type and winscw platform." << endl;
 	
-	cout<< "atool -tr abld build armv5 udeb foobar" << endl;
-	cout<< "      Hooks only foobar.mmp component from bld.inf. Using " << endl;
-	cout<< "      output to trace, udeb build type and armv5 platform." << endl;
+	cout<< "atool -me abld build armv5 udeb foobar" << endl;
+	cout<< "      Hooks only foobar.mmp component from bld.inf. Using monitored" << endl;
+	cout<< "      external data gathering, udeb build type and armv5 platform." << endl;
 	
-	cout<< "atool -lf -acs 0 -fcs 0 abld build armv5.default udeb" << endl;
+	cout<< "atool -e -acs 0 -fcs 0 abld build armv5.default udeb" << endl;
 	cout<< "      Hooks every component from bld.inf. Using default binary variant," << endl;
-	cout<< "      output to trace, 0 sized callstacks in allocation(s)/free(s)," << endl;
+	cout<< "      external data gathering, 0 sized callstacks in allocation(s)/free(s)," << endl;
 	cout<< "      udeb build type and armv5 platform." << endl;
 	
-	cout<< "atool -tr sbs -b bld.inf -c armv5_udeb" << endl;
+	cout<< "atool -e sbs -b bld.inf -c armv5_udeb" << endl;
 	cout<< "      Hooks every component from bld.inf. Using Symbian Build System v.2" << endl;
-	cout<< "      , output to trace, udeb build type and armv5 platform." << endl;
+	cout<< "      , external data gathering, udeb build type and armv5 platform." << endl;
 	
-	cout<< "atool -tr sbs -s system.xml --config=winscw_udeb" << endl;
+	cout<< "atool -me sbs -s system.xml --config=winscw_udeb" << endl;
 	cout<< "      Hooks every layer defined in system.xml system model. Using Symbian Build" << endl;
-	cout<< "      System v.2, output to trace, udeb build type and winscw platform." << endl;
+	cout<< "      System v.2, external data gathering, udeb build type and winscw platform." << endl;
 
 	cout<< endl;
 	cout<< "Instrumenting syntax examples:" << endl;
 	cout<< "Cmd   Description" << endl;
-	cout<< "atool -tr -nobuild abld build winscw udeb" << endl;
-	cout<< "      Instruments every component from bld.inf. Using output to trace,"<<endl;
+	cout<< "atool -e -nobuild abld build winscw udeb" << endl;
+	cout<< "      Instruments every component from bld.inf. Using external data gathering,"<<endl;
 	cout<< "      udeb build target and winscw platform." << endl;
     cout<< "   After project is instrumented, it needs to compiled using same platform and" << endl;
 	cout<< "   build type as given to instrumenting. Use -c parameter to remove changes." << endl;