From a5f9c6cd906fd8079aeb427db8023913f277cac5 Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Mon, 8 Dec 2008 14:07:40 -0500
Subject: Minor edits in Chapter 2 and avoid using using yum file that may not
 be there.

---
 .../en-US/CrossInstrumenting.xml                          | 15 ++++++++-------
 doc/SystemTap_Beginners_Guide/en-US/Using_SystemTap.xml   | 14 +++++++-------
 .../en-US/extras/rheldebugurl.sh                          |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'doc/SystemTap_Beginners_Guide/en-US')

diff --git a/doc/SystemTap_Beginners_Guide/en-US/CrossInstrumenting.xml b/doc/SystemTap_Beginners_Guide/en-US/CrossInstrumenting.xml
index c4b643d3..fab33217 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/CrossInstrumenting.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/CrossInstrumenting.xml
@@ -42,7 +42,7 @@
 
   <para>
     When users run a SystemTap script, SystemTap builds a kernel module out of
-    that script. SystemTap then loads the module onto the kernel, allowing it to
+    that script. SystemTap then loads the module into the kernel, allowing it to
     extract the specified data directly from the kernel (refer to
     <xref linkend="systemtapsession"/> in
     <xref linkend="understanding-architecture-tools"/> for more information).
@@ -217,17 +217,18 @@
     <step>
       <para>
 	Determine the kernel running on each <emphasis>target system</emphasis>
-	by running the by running <command>uname -r</command> on each
+	by running <command>uname -r</command> on each
 	<emphasis>target system</emphasis>.
       </para>
     </step>
 
     <step>
       <para>
-	Install SystemTap on the <emphasis>host system</emphasis>. It is from
-	this machine that you will be building the <emphasis>instrumentation
-	module</emphasis> (to be used on <emphasis>target
-	systems</emphasis>). For instructions on how to install SystemTap, refer
+	Install SystemTap on the <emphasis>host system</emphasis>.
+	You will be building the <emphasis>instrumentation
+	module</emphasis> for the <emphasis>target
+	systems</emphasis> on the <emphasis>host system</emphasis>.
+	For instructions on how to install SystemTap, refer
 	to <xref linkend="installproper"/>.
       </para>
     </step>
@@ -293,7 +294,7 @@ stap -r <replaceable>kernel_version</replaceable> <replaceable>script</replaceab
 
   <para>
     Once the the <emphasis>instrumentation module</emphasis> is compiled, copy
-    it to the <emphasis>target system</emphasis> and load it using:
+    it to the <emphasis>target system</emphasis> and then load it using:
   </para>
 
 <screen>
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Using_SystemTap.xml b/doc/SystemTap_Beginners_Guide/en-US/Using_SystemTap.xml
index 2b5384c4..acaf0e17 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Using_SystemTap.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Using_SystemTap.xml
@@ -166,13 +166,6 @@
 	</listitem>	
 </varlistentry>	
 
-<varlistentry>
-	<term>-e '<replaceable>script</replaceable>'</term>
-	<listitem>
-		<para>Run given <command><replaceable>script</replaceable></command>.</para>
-	</listitem>
-</varlistentry>
-
 <varlistentry>
 	<term>-x <replaceable>process ID</replaceable></term>
 	<listitem>
@@ -194,6 +187,13 @@
 	</listitem>	
 </varlistentry>	
 			-->
+<varlistentry>
+	<term>-e '<replaceable>script</replaceable>'</term>
+	<listitem>
+	  <para>Use <command><replaceable>script</replaceable></command>
+	    string rather than a file as input for systemtap translator.</para>
+	</listitem>
+</varlistentry>
 </variablelist>
 
 <para>You can also instruct <command>stap</command> to run scripts from standard input using the switch <command>-</command>. To illustrate:</para>
diff --git a/doc/SystemTap_Beginners_Guide/en-US/extras/rheldebugurl.sh b/doc/SystemTap_Beginners_Guide/en-US/extras/rheldebugurl.sh
index 72b03bcd..0449843e 100755
--- a/doc/SystemTap_Beginners_Guide/en-US/extras/rheldebugurl.sh
+++ b/doc/SystemTap_Beginners_Guide/en-US/extras/rheldebugurl.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-pkg=`grep distroverpkg /etc/yum.conf |awk -F= '{print $2}'`
+pkg="redhat-release"
 releasever=`rpm -q --qf "%{version}" $pkg`
 base=`uname -m`
 echo "ftp://ftp.redhat.com/pub/redhat/linux/\
-- 
cgit