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

4 files changed, 64 insertions, 4 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 41060910..e2ad1d80 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,17 @@
+2008-11-26  Will Cohen <wcohen@redhat.com>
+
+	* SystemTap_Tapset_Reference/tapsets.am: Correct location for html/man.
+	* SystemTap_Tapset_Reference/tapsets.in: Regenerate.
+	
+2008-11-26  Will Cohen <wcohen@redhat.com>
+
+	* SystemTap_Tapset_Reference/tapsets.tmpl: Add process.
+	
+2008-11-25  Will Cohen <wcohen@redhat.com>
+
+	* SystemTap_Tapset_Reference/tapsets.tmpl: Add ioscheduler, socket, tcp,
+	and upd.
+
 2008-11-24  Will Cohen <wcohen@redhat.com>
 
 	* SystemTap_Tapset_Reference/tapsets.tmpl: Add context, timestamp,
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am
index 8327e900..c196e977 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.am
+++ b/doc/SystemTap_Tapset_Reference/Makefile.am
@@ -22,13 +22,13 @@ xmldocs: docproc
 	SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml
 
 htmldocs: xmldocs
-	xmlto html -o tapset tapsets.xml
+	xmlto html -o tapsets tapsets.xml
 
 pdfdocs: xmldocs
 	xmlto pdf tapsets.xml
 
 mandocs: xmldocs
-	xmlto man tapsets.xml
+	xmlto man -o man5 tapsets.xml
 
 #FIXME need to figure out where to install things appropriately
 #installmandocs: mandocs
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in
index 5dff66f8..b61be1b7 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.in
+++ b/doc/SystemTap_Tapset_Reference/Makefile.in
@@ -441,13 +441,13 @@ xmldocs: docproc
 	SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml
 
 htmldocs: xmldocs
-	xmlto html -o tapset tapsets.xml
+	xmlto html -o tapsets tapsets.xml
 
 pdfdocs: xmldocs
 	xmlto pdf tapsets.xml
 
 mandocs: xmldocs
-	xmlto man tapsets.xml
+	xmlto man -o man5 tapsets.xml
 
 #FIXME need to figure out where to install things appropriately
 #installmandocs: mandocs
diff --git a/doc/SystemTap_Tapset_Reference/tapsets.tmpl b/doc/SystemTap_Tapset_Reference/tapsets.tmpl
index ccdba8c2..6c3abd0f 100644
--- a/doc/SystemTap_Tapset_Reference/tapsets.tmpl
+++ b/doc/SystemTap_Tapset_Reference/tapsets.tmpl
@@ -141,6 +141,16 @@ This is common among
 !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.
+      It contains the following probe points:
+    </para>
+!Itapset/ioscheduler.stp
+  </chapter>
+
+
   <chapter id="networking.stp">
     <title>Networking Tapset</title>
     <para>
@@ -150,4 +160,40 @@ This is common among
 !Itapset/networking.stp
   </chapter>
 
+  <chapter id="socket.stp">
+    <title>Socket Tapset</title>
+    <para>
+      This family of probe points is used to probe socket activities.
+      It contains the following probe points:
+   </para>
+!Itapset/socket.stp
+  </chapter>
+
+  <chapter id="tcp.stp">
+    <title>TCP Tapset</title>
+    <para>
+      This family of probe points is used to probe TCP layer activities.
+      It contains the following probe points:
+    </para>
+!Itapset/tcp.stp
+  </chapter>
+
+  <chapter id="upd.stp">
+    <title>UDP Tapset</title>
+    <para>
+      This family of probe points is used to probe UDP layer activities.
+      It contains the following probe points:
+    </para>
+!Itapset/udp.stp
+  </chapter>
+
+  <chapter id="process.stp">
+    <title>Process Tapset</title>
+    <para>
+      This family of probe points is used to probe the process activities.
+      It contains the following probe points:
+    </para>
+!Itapset/process.stp
+  </chapter>
+
 </book>