PR 11210 move stapprobe.* man pages to tapset::*

Complete the renaming scheme with prefix of "tapset::" for the man
pages related to over all description of groups of probes.

19 files changed, 68 insertions, 119 deletions

diff --git a/Makefile.am b/Makefile.am
index 4bee5ff1..684a9ecb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,12 +15,12 @@ AM_CXXFLAGS = -Wall -Werror
 man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap \
 dtrace.1 \
 staprun.8 \
-man/stapprobes.iosched.3stap man/stapprobes.netdev.3stap \
-man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap \
-man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap \
-man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap \
-man/stapprobes.signal.3stap man/stapprobes.socket.3stap \
-man/stapprobes.tcp.3stap man/stapprobes.udp.3stap
+$(srcdir)/man/tapset\:\:iosched.3stap $(srcdir)/man/tapset\:\:netdev.3stap \
+$(srcdir)/man/tapset\:\:nfs.3stap $(srcdir)/man/tapset\:\:nfsd.3stap \
+$(srcdir)/man/tapset\:\:pagefault.3stap $(srcdir)/man/tapset\:\:kprocess.3stap \
+$(srcdir)/man/tapset\:\:rpc.3stap $(srcdir)/man/tapset\:\:scsi.3stap \
+$(srcdir)/man/tapset\:\:signal.3stap $(srcdir)/man/tapset\:\:socket.3stap \
+$(srcdir)/man/tapset\:\:tcp.3stap $(srcdir)/man/tapset\:\:udp.3stap
 # see also configure.ac
 
 bin_PROGRAMS = staprun
diff --git a/Makefile.in b/Makefile.in
index 678baf24..96fd0c9b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,20 +74,6 @@ DIST_COMMON = INSTALL NEWS README AUTHORS $(srcdir)/Makefile.in \
 	$(srcdir)/stap-server.8.in \
 	$(srcdir)/stap-authorize-server-cert.8.in \
 	$(srcdir)/stap-authorize-signing-cert.8.in \
-	$(top_srcdir)/man/stapprobes.iosched.3stap.in \
-	$(top_srcdir)/man/stapprobes.irq.3stap.in \
-	$(top_srcdir)/man/stapprobes.netdev.3stap.in \
-	$(top_srcdir)/man/stapprobes.nfs.3stap.in \
-	$(top_srcdir)/man/stapprobes.nfsd.3stap.in \
-	$(top_srcdir)/man/stapprobes.pagefault.3stap.in \
-	$(top_srcdir)/man/stapprobes.kprocess.3stap.in \
-	$(top_srcdir)/man/stapprobes.rpc.3stap.in \
-	$(top_srcdir)/man/stapprobes.scsi.3stap.in \
-	$(top_srcdir)/man/stapprobes.signal.3stap.in \
-	$(top_srcdir)/man/stapprobes.socket.3stap.in \
-	$(top_srcdir)/man/stapprobes.tcp.3stap.in \
-	$(top_srcdir)/man/stapprobes.udp.3stap.in \
-	$(top_srcdir)/man/stapprobes.snmp.3stap.in \
 	$(top_srcdir)/initscript/systemtap.in \
 	$(top_srcdir)/initscript/stap-server.in $(srcdir)/dtrace.1.in \
 	$(srcdir)/run-stap.in $(srcdir)/run-staprun.in \
@@ -103,14 +89,7 @@ CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = stap.1 stapprobes.3stap stapfuncs.3stap \
 	stapvars.3stap stapex.3stap staprun.8 stap-client.8 \
 	stap-server.8 stap-authorize-server-cert.8 \
-	stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap \
-	man/stapprobes.irq.3stap man/stapprobes.netdev.3stap \
-	man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap \
-	man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap \
-	man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap \
-	man/stapprobes.signal.3stap man/stapprobes.socket.3stap \
-	man/stapprobes.tcp.3stap man/stapprobes.udp.3stap \
-	man/stapprobes.snmp.3stap initscript/systemtap \
+	stap-authorize-signing-cert.8 initscript/systemtap \
 	initscript/stap-server dtrace.1 run-stap run-staprun dtrace
 CONFIG_CLEAN_VPATH_FILES =
 @BUILD_TRANSLATOR_TRUE@am__EXEEXT_1 = stap$(EXEEXT)
@@ -399,14 +378,20 @@ AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR
 AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wunused -Wformat=2 -W
 AM_CXXFLAGS = -Wall -Werror
 man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap \
-	stapex.3stap dtrace.1 staprun.8 man/stapprobes.iosched.3stap \
-	man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap \
-	man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap \
-	man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap \
-	man/stapprobes.scsi.3stap man/stapprobes.signal.3stap \
-	man/stapprobes.socket.3stap man/stapprobes.tcp.3stap \
-	man/stapprobes.udp.3stap $(am__append_2) $(am__append_4) \
-	$(am__append_8)
+	stapex.3stap dtrace.1 staprun.8 \
+	$(srcdir)/man/tapset\:\:iosched.3stap \
+	$(srcdir)/man/tapset\:\:netdev.3stap \
+	$(srcdir)/man/tapset\:\:nfs.3stap \
+	$(srcdir)/man/tapset\:\:nfsd.3stap \
+	$(srcdir)/man/tapset\:\:pagefault.3stap \
+	$(srcdir)/man/tapset\:\:kprocess.3stap \
+	$(srcdir)/man/tapset\:\:rpc.3stap \
+	$(srcdir)/man/tapset\:\:scsi.3stap \
+	$(srcdir)/man/tapset\:\:signal.3stap \
+	$(srcdir)/man/tapset\:\:socket.3stap \
+	$(srcdir)/man/tapset\:\:tcp.3stap \
+	$(srcdir)/man/tapset\:\:udp.3stap $(am__append_2) \
+	$(am__append_4) $(am__append_8)
 bin_SCRIPTS = stap-report $(am__append_3) $(am__append_5) \
 	$(am__append_10)
 pkglibexec_SCRIPTS = stap-env $(am__append_7) $(am__append_11)
@@ -569,34 +554,6 @@ stap-authorize-server-cert.8: $(top_builddir)/config.status $(srcdir)/stap-autho
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 stap-authorize-signing-cert.8: $(top_builddir)/config.status $(srcdir)/stap-authorize-signing-cert.8.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.iosched.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.iosched.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.irq.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.irq.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.netdev.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.netdev.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.nfs.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.nfs.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.nfsd.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.nfsd.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.pagefault.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.pagefault.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.kprocess.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.kprocess.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.rpc.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.rpc.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.scsi.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.scsi.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.signal.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.signal.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.socket.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.socket.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.tcp.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.tcp.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.udp.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.udp.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-man/stapprobes.snmp.3stap: $(top_builddir)/config.status $(top_srcdir)/man/stapprobes.snmp.3stap.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 initscript/systemtap: $(top_builddir)/config.status $(top_srcdir)/initscript/systemtap.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 initscript/stap-server: $(top_builddir)/config.status $(top_srcdir)/initscript/stap-server.in
diff --git a/configure b/configure
index 786e43bd..18642146 100755
--- a/configure
+++ b/configure
@@ -9327,7 +9327,7 @@ _ACEOF
 
 ac_config_headers="$ac_config_headers config.h:config.in"
 
-ac_config_files="$ac_config_files Makefile doc/Makefile doc/beginners/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap man/stapprobes.irq.3stap man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap man/stapprobes.signal.3stap man/stapprobes.socket.3stap man/stapprobes.tcp.3stap man/stapprobes.udp.3stap man/stapprobes.snmp.3stap initscript/systemtap initscript/stap-server dtrace.1"
+ac_config_files="$ac_config_files Makefile doc/Makefile doc/beginners/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 initscript/systemtap initscript/stap-server dtrace.1"
 
 
 
@@ -10094,20 +10094,6 @@ do
     "stap-server.8") CONFIG_FILES="$CONFIG_FILES stap-server.8" ;;
     "stap-authorize-server-cert.8") CONFIG_FILES="$CONFIG_FILES stap-authorize-server-cert.8" ;;
     "stap-authorize-signing-cert.8") CONFIG_FILES="$CONFIG_FILES stap-authorize-signing-cert.8" ;;
-    "man/stapprobes.iosched.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.iosched.3stap" ;;
-    "man/stapprobes.irq.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.irq.3stap" ;;
-    "man/stapprobes.netdev.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.netdev.3stap" ;;
-    "man/stapprobes.nfs.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.nfs.3stap" ;;
-    "man/stapprobes.nfsd.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.nfsd.3stap" ;;
-    "man/stapprobes.pagefault.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.pagefault.3stap" ;;
-    "man/stapprobes.kprocess.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.kprocess.3stap" ;;
-    "man/stapprobes.rpc.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.rpc.3stap" ;;
-    "man/stapprobes.scsi.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.scsi.3stap" ;;
-    "man/stapprobes.signal.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.signal.3stap" ;;
-    "man/stapprobes.socket.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.socket.3stap" ;;
-    "man/stapprobes.tcp.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.tcp.3stap" ;;
-    "man/stapprobes.udp.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.udp.3stap" ;;
-    "man/stapprobes.snmp.3stap") CONFIG_FILES="$CONFIG_FILES man/stapprobes.snmp.3stap" ;;
     "initscript/systemtap") CONFIG_FILES="$CONFIG_FILES initscript/systemtap" ;;
     "initscript/stap-server") CONFIG_FILES="$CONFIG_FILES initscript/stap-server" ;;
     "dtrace.1") CONFIG_FILES="$CONFIG_FILES dtrace.1" ;;
diff --git a/configure.ac b/configure.ac
index 46719599..501e4805 100644
--- a/configure.ac
+++ b/configure.ac
@@ -500,7 +500,13 @@ test "$stap_prefix" = NONE && stap_prefix=$ac_default_prefix
 AC_DEFINE_UNQUOTED(STAP_PREFIX, "$stap_prefix", [configure prefix location])
 
 AC_CONFIG_HEADERS([config.h:config.in])
-AC_CONFIG_FILES(Makefile doc/Makefile doc/beginners/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap man/stapprobes.irq.3stap man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap man/stapprobes.signal.3stap man/stapprobes.socket.3stap man/stapprobes.tcp.3stap man/stapprobes.udp.3stap man/stapprobes.snmp.3stap initscript/systemtap initscript/stap-server dtrace.1)
+AC_CONFIG_FILES([Makefile doc/Makefile \
+doc/beginners/Makefile doc/SystemTap_Tapset_Reference/Makefile \
+grapher/Makefile \
+grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap \
+stapex.3stap staprun.8 stap-client.8 stap-server.8 \
+stap-authorize-server-cert.8 stap-authorize-signing-cert.8 \
+initscript/systemtap initscript/stap-server dtrace.1])
 AC_CONFIG_SUBDIRS(testsuite)
 if test $enable_translator == "yes"; then
 	AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
diff --git a/man/stapprobes.iosched.3stap.in b/man/tapset::iosched.3stap
index 873251ac..58e27c9a 100644
--- a/man/stapprobes.iosched.3stap.in
+++ b/man/tapset::iosched.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.IOSCHED 3stap @DATE@ "IBM"
+.TH TAPSET::IOSCHED 3stap "" "IBM"
 .SH NAME
-stapprobes.iosched \- systemtap IO scheduler probe points
+tapset::iosched \- systemtap IO scheduler probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.irq.3stap.in b/man/tapset::irq.3stap
index cc74c6df..33cae35a 100644
--- a/man/stapprobes.irq.3stap.in
+++ b/man/tapset::irq.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.IRQ 3stap @DATE@ "IBM"
+.TH TAPSET::IRQ 3stap "" "IBM"
 .SH NAME
-stapprobes.irq \- Systemtap probes for IRQ, workqueue,etc
+tapset::irq \- Systemtap probes for IRQ, workqueue,etc
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.kprocess.3stap.in b/man/tapset::kprocess.3stap
index 4f5e7903..231cae36 100644
--- a/man/stapprobes.kprocess.3stap.in
+++ b/man/tapset::kprocess.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.KPROCESS 3stap @DATE@ "Intel, IBM"
+.TH TAPSET::KPROCESS 3stap "" "Intel, IBM"
 .SH NAME
-stapprobes.kprocess \- systemtap kernel process probe points
+tapset::kprocess \- systemtap kernel process probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.netdev.3stap.in b/man/tapset::netdev.3stap
index ff09f150..46468c05 100644
--- a/man/stapprobes.netdev.3stap.in
+++ b/man/tapset::netdev.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.NETDEV 3stap @DATE@ "IBM"
+.TH TAPSET::NETDEV 3stap "" "IBM"
 .SH NAME
-stapprobes.netdev \- systemtap network device probe points
+tapset::netdev \- systemtap network device probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.nfs.3stap.in b/man/tapset::nfs.3stap
index 14404b96..ce331ce0 100644
--- a/man/stapprobes.nfs.3stap.in
+++ b/man/tapset::nfs.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.NFS 3stap @DATE@ "IBM"
+.TH TAPSET::NFS 3stap "" "IBM"
 .SH NAME
-stapprobes.nfs \- systemtap NFS client side probe points
+tapset::nfs \- systemtap NFS client side probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.nfsd.3stap.in b/man/tapset::nfsd.3stap
index ea2ac2df..cc40e456 100644
--- a/man/stapprobes.nfsd.3stap.in
+++ b/man/tapset::nfsd.3stap
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.NFSD 3stap @DATE@ "IBM"
+.TH STAPPROBES.NFSD 3stap "" "IBM"
 .SH NAME
 stapprobes.nfsd \- systemtap NFS server side probe points
 
diff --git a/man/stapprobes.pagefault.3stap.in b/man/tapset::pagefault.3stap
index 7d4f266e..06d31b71 100644
--- a/man/stapprobes.pagefault.3stap.in
+++ b/man/tapset::pagefault.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.PAGEFAULT 3stap @DATE@ "IBM"
+.TH TAPSET::PAGEFAULT 3stap "" "IBM"
 .SH NAME
-stapprobes.pagefault \- systemtap pagefault probe points
+tapset::pagefault \- systemtap pagefault probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.rpc.3stap.in b/man/tapset::rpc.3stap
index 02b37a8b..c336bbed 100644
--- a/man/stapprobes.rpc.3stap.in
+++ b/man/tapset::rpc.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.RPC 3stap @DATE@ "IBM"
+.TH TAPSET::RPC 3stap "" "IBM"
 .SH NAME
-stapprobes.rpc \- systemtap SunRPC probe points
+tapset::rpc \- systemtap SunRPC probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.scsi.3stap.in b/man/tapset::scsi.3stap
index afe16541..63266e93 100644
--- a/man/stapprobes.scsi.3stap.in
+++ b/man/tapset::scsi.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.SCSI 3stap @DATE@ "IBM"
+.TH TAPSET::SCSI 3stap "" "IBM"
 .SH NAME
-stapprobes.scsi \- systemtap scsi probe points
+tapset::scsi \- systemtap scsi probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.signal.3stap.in b/man/tapset::signal.3stap
index cdaa51b9..decdded8 100644
--- a/man/stapprobes.signal.3stap.in
+++ b/man/tapset::signal.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.SIGNAL 3stap @DATE@ "IBM"
+.TH TAPSET::SIGNAL 3stap "" "IBM"
 .SH NAME
-stapprobes.signal \- systemtap signal probe points
+tapset::signal \- systemtap signal probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.snmp.3stap.in b/man/tapset::snmp.3stap
index 95da75c9..31fad619 100644
--- a/man/stapprobes.snmp.3stap.in
+++ b/man/tapset::snmp.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.SNMP 3stap @DATE@ "IBM"
+.TH TAPSET::SNMP 3stap "" "IBM"
 .SH NAME
-stapprobes.snmp \- Systemtap simple network management protocol probe points.
+tapset::snmp \- Systemtap simple network management protocol probe points.
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.socket.3stap.in b/man/tapset::socket.3stap
index fa6f1c0a..26833217 100644
--- a/man/stapprobes.socket.3stap.in
+++ b/man/tapset::socket.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.SOCKET 3stap @DATE@ "IBM"
+.TH TAPSET::SOCKET 3stap "" "IBM"
 .SH NAME
-stapprobes.socket \- systemtap socket probe points
+tapset::socket \- systemtap socket probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.tcp.3stap.in b/man/tapset::tcp.3stap
index 88603f58..8ebfccb7 100644
--- a/man/stapprobes.tcp.3stap.in
+++ b/man/tapset::tcp.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.TCP 3stap @DATE@ "IBM, Intel"
+.TH TAPSET::TCP 3stap "" "IBM, Intel"
 .SH NAME
-stapprobes.tcp \- systemtap tcp probe points
+tapset::tcp \- systemtap tcp probe points
 
 .\" macros
 .de SAMPLE
diff --git a/man/stapprobes.udp.3stap.in b/man/tapset::udp.3stap
index dae11578..54c242aa 100644
--- a/man/stapprobes.udp.3stap.in
+++ b/man/tapset::udp.3stap
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
-.TH STAPPROBES.UDP 3stap @DATE@ "Intel"
+.TH TAPSET::UDP 3stap "" "Intel"
 .SH NAME
-stapprobes.udp \- systemtap udp probe points
+tapset::udp \- systemtap udp probe points
 
 .\" macros
 .de SAMPLE
diff --git a/stapprobes.3stap.in b/stapprobes.3stap.in
index 0e1bd66f..3c482252 100644
--- a/stapprobes.3stap.in
+++ b/stapprobes.3stap.in
@@ -787,16 +787,16 @@ refers to the group of probe aliases with any name in the third position
 
 .SH SEE ALSO
 .IR stap (1),
-.IR stapprobes.iosched (3stap),
-.IR stapprobes.netdev (3stap),
-.IR stapprobes.nfs (3stap),
-.IR stapprobes.nfsd (3stap),
-.IR stapprobes.pagefault (3stap),
-.IR stapprobes.process (3stap),
-.IR stapprobes.rpc (3stap),
-.IR stapprobes.scsi (3stap),
-.IR stapprobes.signal (3stap),
-.IR stapprobes.socket (3stap),
-.IR stapprobes.tcp (3stap),
-.IR stapprobes.udp (3stap),
+.IR tapset::iosched (3stap),
+.IR tapset::netdev (3stap),
+.IR tapset::nfs (3stap),
+.IR tapset::nfsd (3stap),
+.IR tapset::pagefault (3stap),
+.IR tapset::process (3stap),
+.IR tapset::rpc (3stap),
+.IR tapset::scsi (3stap),
+.IR tapset::signal (3stap),
+.IR tapset::socket (3stap),
+.IR tapset::tcp (3stap),
+.IR tapset::udp (3stap),
 .IR proc (3stap)