Merge branch 'master' of git://sources.redhat.com/git/systemtap

1 files changed, 12 insertions, 8 deletions

diff --git a/doc/SystemTap_Tapset_Reference/tapsets.tmpl b/doc/SystemTap_Tapset_Reference/tapsets.tmpl
index 798cfb3b..892d30a9 100644
--- a/doc/SystemTap_Tapset_Reference/tapsets.tmpl
+++ b/doc/SystemTap_Tapset_Reference/tapsets.tmpl
@@ -117,8 +117,8 @@
     <title>Context Functions</title>
     <para>
       The context functions provide additional information about where
-      the event occurred.
-      These functions can provide information such as a backtrace
+      an event occurred.
+      These functions can provide information such as a backtrace to 
       where the event occured
       and the current register values for the processor.
     </para>
@@ -132,22 +132,26 @@
     <para>
       Each timestamp function returns a value to indicate when
       a function is executed.
-      Thus, these returned values can be used to indicate
-      when an event occurs, provide an ordering for events, or compute
-      the amount of time elapsed between to time stamps.
+      These returned values can then be used to indicate
+      when an event occurred, provide an ordering for events, or compute
+      the amount of time elapsed between two time stamps.
     </para>
 !Itapset/timestamp.stp
   </chapter>
 
   <chapter id="memory_stp">
     <title>Memory Tapset</title>
+ <para>
+      This family of probe points is used to probe memory-related events.
+      It contains the following probe points:
+    </para>
 !Itapset/memory.stp
   </chapter>
 
   <chapter id="iosched.stp">
     <title>IO Scheduler Tapset</title>
     <para>
-      This family of probe points is used to probe the IO scheduler activities.
+      This family of probe points is used to probe IO scheduler activities.
       It contains the following probe points:
     </para>
 !Itapset/ioscheduler.stp
@@ -156,7 +160,7 @@
   <chapter id="scsi.stp">
     <title>SCSI Tapset</title>
     <para>
-      This family of probe points is used to probe the SCSI activities.  
+      This family of probe points is used to probe SCSI activities.  
       It contains the following probe points:
     </para>
 !Itapset/scsi.stp
@@ -203,7 +207,7 @@
   <chapter id="process.stp">
     <title>Process Tapset</title>
     <para>
-      This family of probe points is used to probe the process activities.
+      This family of probe points is used to probe process-related activities.
       It contains the following probe points:
     </para>
 !Itapset/process.stp