9 files changed, 45 insertions, 38 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index eead7f19769d..fc909c488845 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150705: Rename DTrace provider man pages.
+OLD_FILES+=usr/share/man/man4/dtrace-io.4.gz
+OLD_FILES+=usr/share/man/man4/dtrace-ip.4.gz
+OLD_FILES+=usr/share/man/man4/dtrace-proc.4.gz
+OLD_FILES+=usr/share/man/man4/dtrace-sched.4.gz
+OLD_FILES+=usr/share/man/man4/dtrace-tcp.4.gz
+OLD_FILES+=usr/share/man/man4/dtrace-udp.4.gz
 # 20150604: Move nvlist man pages to section 9.
 OLD_FILES+=usr/share/man/man3/libnv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist.3.gz
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index b21002a76712..498f905b2d7e 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -820,12 +820,12 @@ _ccd.4=		ccd.4
 .endif
 
 .if ${MK_CDDL} != "no"
-_dtrace_io.4=	dtrace-io.4
-_dtrace_ip.4=	dtrace-ip.4
-_dtrace_proc.4=	dtrace-proc.4
-_dtrace_sched.4= dtrace-sched.4
-_dtrace_tcp.4=	dtrace-tcp.4
-_dtrace_udp.4=	dtrace-udp.4
+_dtrace_io.4=	dtrace_io.4
+_dtrace_ip.4=	dtrace_ip.4
+_dtrace_proc.4=	dtrace_proc.4
+_dtrace_sched.4= dtrace_sched.4
+_dtrace_tcp.4=	dtrace_tcp.4
+_dtrace_udp.4=	dtrace_udp.4
 .endif
 
 .if ${MK_ISCSI} != "no"
diff --git a/share/man/man4/dtrace-io.4 b/share/man/man4/dtrace_io.4
index 4f81434ab9aa..dea622188b92 100644
--- a/share/man/man4/dtrace-io.4
+++ b/share/man/man4/dtrace_io.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-IO 4
+.Dt DTRACE_IO 4
 .Os
 .Sh NAME
-.Nm dtrace-io
+.Nm dtrace_io
 .Nd a DTrace provider for tracing events related to disk I/O
 .Sh SYNOPSIS
 .Fn io:::start "struct bio *" "struct devstat *"
diff --git a/share/man/man4/dtrace-ip.4 b/share/man/man4/dtrace_ip.4
index f0a4ea931243..62148e9c9a16 100644
--- a/share/man/man4/dtrace-ip.4
+++ b/share/man/man4/dtrace_ip.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-IP 4
+.Dt DTRACE_IP 4
 .Os
 .Sh NAME
-.Nm dtrace-ip
+.Nm dtrace_ip
 .Nd a DTrace provider for tracing events related to the IPv4 and IPv6 protocols
 .Sh SYNOPSIS
 .Fn ip:::receive "pktinfo_t *" "csinfo_t *" "ipinfo_t *" "ifinfo_t *" \
@@ -52,9 +52,9 @@ The arguments to these probes can be used to obtain detailed information about
 the IP headers of the corresponding packet, as well as the network interface on
 which the packet was sent or received.
 Unlike the
-.Xr dtrace-tcp 4
+.Xr dtrace_tcp 4
 and
-.Xr dtrace-udp 4
+.Xr dtrace_udp 4
 providers,
 .Nm ip
 provider probes are triggered by forwarded packets.
@@ -268,8 +268,8 @@ This provider is compatible with the
 providers found in Solaris and Darwin.
 .Sh SEE ALSO
 .Xr dtrace 1 ,
-.Xr dtrace-tcp 4 ,
-.Xr dtrace-udp 4 ,
+.Xr dtrace_tcp 4 ,
+.Xr dtrace_udp 4 ,
 .Xr ip 4 ,
 .Xr ip6 4 ,
 .Xr ifnet 9 ,
diff --git a/share/man/man4/dtrace-proc.4 b/share/man/man4/dtrace_proc.4
index 9ba74fb26069..8b27ac1e77f7 100644
--- a/share/man/man4/dtrace-proc.4
+++ b/share/man/man4/dtrace_proc.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-PROC 4
+.Dt DTRACE_PROC 4
 .Os
 .Sh NAME
-.Nm dtrace-proc
+.Nm dtrace_proc
 .Nd a DTrace provider for tracing events related to user processes
 .Sh SYNOPSIS
 .Fn proc:::create "struct proc *" "struct proc *" "int"
@@ -251,7 +251,7 @@ provider probes found in Solaris are not currently available on
 .Xr vfork 2 ,
 .Xr siginfo 3 ,
 .Xr signal 3 ,
-.Xr dtrace-sched 4 ,
+.Xr dtrace_sched 4 ,
 .Xr kproc 9
 .Sh HISTORY
 The
diff --git a/share/man/man4/dtrace-sched.4 b/share/man/man4/dtrace_sched.4
index 0b26e5eb1a18..5c45f401d052 100644
--- a/share/man/man4/dtrace-sched.4
+++ b/share/man/man4/dtrace_sched.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-SCHED 4
+.Dt DTRACE_SCHED 4
 .Os
 .Sh NAME
-.Nm dtrace-sched
+.Nm dtrace_sched
 .Nd a DTrace provider for tracing CPU scheduling events
 .Sh SYNOPSIS
 .Fn sched:::change-pri "struct thread *" "struct proc *" "uint8_t"
diff --git a/share/man/man4/dtrace-tcp.4 b/share/man/man4/dtrace_tcp.4
index 3c1ffa249527..144f096ab677 100644
--- a/share/man/man4/dtrace-tcp.4
+++ b/share/man/man4/dtrace_tcp.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-TCP 4
+.Dt DTRACE_TCP 4
 .Os
 .Sh NAME
-.Nm dtrace-tcp
+.Nm dtrace_tcp
 .Nd a DTrace provider for tracing events related to the
 .Xr tcp 4
 protocol
@@ -56,9 +56,9 @@ provider allows users to trace events in the
 .Xr tcp 4
 protocol implementation.
 This provider is similar to the
-.Xr dtrace-ip 4
+.Xr dtrace_ip 4
 and
-.Xr dtrace-udp 4
+.Xr dtrace_udp 4
 providers, but additionally contains probes corresponding to protocol events at
 a level higher than packet reception and transmission.
 All
@@ -120,12 +120,12 @@ and
 .Fn tcp:::receive
 probes fire when the host sends or receives a TCP packet, respectively.
 As with the
-.Xr dtrace-udp 4
+.Xr dtrace_udp 4
 provider,
 .Nm tcp
 probes fire only for packets sent by or to the local host; forwarded packets are
 handled in the IP layer and are only visible to the
-.Xr dtrace-ip 4
+.Xr dtrace_ip 4
 provider.
 .Pp
 The
@@ -168,7 +168,7 @@ The
 .Vt ipinfo_t
 type is a version-agnostic representation of fields from an IP header.
 Its fields are described in the
-.Xr dtrace-ip 4
+.Xr dtrace_ip 4
 manual page.
 .Pp
 The
@@ -373,8 +373,8 @@ This provider is compatible with the
 provider in Solaris.
 .Sh SEE ALSO
 .Xr dtrace 1 ,
-.Xr dtrace-ip 4 ,
-.Xr dtrace-udp 4 ,
+.Xr dtrace_ip 4 ,
+.Xr dtrace_udp 4 ,
 .Xr tcp 4 ,
 .Xr SDT 9
 .Sh HISTORY
diff --git a/share/man/man4/dtrace-udp.4 b/share/man/man4/dtrace_udp.4
index 7ebc9066d497..e39cc7573d1e 100644
--- a/share/man/man4/dtrace-udp.4
+++ b/share/man/man4/dtrace_udp.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-UDP 4
+.Dt DTRACE_UDP 4
 .Os
 .Sh NAME
-.Nm dtrace-udp
+.Nm dtrace_udp
 .Nd a DTrace provider for tracing events related to the UDP protocol
 .Sh SYNOPSIS
 .Fn udp:::receive "pktinfo_t *" "csinfo_t *" "ipinfo_t *" "udpsinfo_t *" \
@@ -184,8 +184,8 @@ This provider is compatible with the
 provider in Solaris.
 .Sh SEE ALSO
 .Xr dtrace 1 ,
-.Xr dtrace-ip 4 ,
-.Xr dtrace-tcp 4 ,
+.Xr dtrace_ip 4 ,
+.Xr dtrace_tcp 4 ,
 .Xr udp 4 ,
 .Xr SDT 9
 .Sh HISTORY
diff --git a/share/man/man9/SDT.9 b/share/man/man9/SDT.9
index 2765c4c37a2c..2da0773a7b7e 100644
--- a/share/man/man9/SDT.9
+++ b/share/man/man9/SDT.9
@@ -305,12 +305,12 @@ SDT_PROBE_DEFINE1_XLATE(ip, , , receive, "struct icmp *",
 .Ed
 .Sh SEE ALSO
 .Xr dtrace 1 ,
-.Xr dtrace-io 4 ,
-.Xr dtrace-ip 4 ,
-.Xr dtrace-proc 4 ,
-.Xr dtrace-sched 4 ,
-.Xr dtrace-tcp 4 ,
-.Xr dtrace-udp 4
+.Xr dtrace_io 4 ,
+.Xr dtrace_ip 4 ,
+.Xr dtrace_proc 4 ,
+.Xr dtrace_sched 4 ,
+.Xr dtrace_tcp 4 ,
+.Xr dtrace_udp 4
 .Sh AUTHORS
 .An -nosplit
 DTrace and the