[oprof-cvs] CVS: oprofile/doc opreport.1.in,1.5,1.6 oprofile.xml,1.100,1.101

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv31265/doc

Modified Files:
	opreport.1.in oprofile.xml 
Log Message:
doc fixes


Index: opreport.1.in
===================================================================
RCS file: /cvsroot/oprofile/oprofile/doc/opreport.1.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- opreport.1.in	21 Sep 2003 19:18:14 -0000	1.5
+++ opreport.1.in	20 Oct 2003 02:06:12 -0000	1.6
@@ -60,7 +60,7 @@ Only include symbols in the given comma-
 Output full paths instead of basenames.
 .br
 .TP
-.BI "--merge / -m [cpu,pid,lib]"
+.BI "--merge / -m [lib,cpu,tid,tgid,unitmask,all]"
 Merge any profiles separated in a --separate session.
 .br
 .TP

Index: oprofile.xml
===================================================================
RCS file: /cvsroot/oprofile/oprofile/doc/oprofile.xml,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -d -r1.100 -r1.101
--- oprofile.xml	12 Oct 2003 23:03:24 -0000	1.100
+++ oprofile.xml	20 Oct 2003 02:06:12 -0000	1.101
@@ -557,7 +557,7 @@ is required. These settings are stored i
 		<row><entry><option>kernel</option></entry><entry>Create per-application profiles for the kernel and kernel modules</entry></row>
 		<row><entry><option>thread</option></entry><entry>Create profiles for each thread and each task</entry></row>
 		<row><entry><option>cpu</option></entry><entry>Create profiles for each physical CPU</entry></row>
-		<row><entry><option>all</option></entry><entry>Both of the above options</entry></row>
+		<row><entry><option>all</option></entry><entry>All of the above options</entry></row>
 		</tbody>
 		</tgroup>
 		</informaltable>
@@ -573,6 +573,11 @@ is required. These settings are stored i
 		On 2.2/2.4 only kernel threads already started when profiling begins are correctly profiled;
 		newly started kernel thread samples are credited to the vmlinux (kernel) profile.
 		</para>
+		<para>
+		Using <option>--separate=thread</option> creates a lot
+		of sample files if you leave OProfile running for a while; it's most
+		useful when used for short sessions.
+		</para>
 		</listitem>
 	</varlistentry>
 	<varlistentry>
@@ -1313,7 +1318,6 @@ excepting <filename>boring-test</filenam
 		</para></listitem>
 	</varlistentry>
 
-<!-- FIXME: introduce when it does  something useful
 	<varlistentry>
 		<term><option>cpu:</option><emphasis>cpulist</emphasis></term>
 		<listitem><para>
@@ -1344,7 +1348,6 @@ excepting <filename>boring-test</filenam
 		This is only useful when using per-process profile separation.
 		</para></listitem>
 	</varlistentry>
--->
 </variablelist>
 
 </sect2>
@@ -1488,7 +1491,7 @@ Only include symbols in the given comma-
 <varlistentry><term><option>--long-filenames / -l</option></term><listitem><para>
 Output full paths instead of basenames.
 </para></listitem></varlistentry>
-<varlistentry><term><option>--merge / -m [cpu,pid,lib]</option></term><listitem><para>
+<varlistentry><term><option>--merge / -m [lib,cpu,tid,tgid,unitmask,all]</option></term><listitem><para>
 Merge any profiles separated in a --separate session.
 </para></listitem></varlistentry>
 <varlistentry><term><option>--no-demangle</option></term><listitem><para>