manual: move section 7D to section 4D (no non-mandatory content fixes)

361 files changed, 911 insertions, 911 deletions

diff --git a/usr/src/cmd/mandoc/msec.in b/usr/src/cmd/mandoc/msec.in
index 9ae253534e..deb90df88c 100644
--- a/usr/src/cmd/mandoc/msec.in
+++ b/usr/src/cmd/mandoc/msec.in
@@ -95,10 +95,10 @@ LINE("3XNET",		"X/Open Networking Services Library Functions")
 LINE("3F",		"Fortran Library Routines")
 LINE("3X",		"Miscellaneous Library Functions")
 LINE("4",		"File Formats and Configurations")
+LINE("4D",		"Devices")
 LINE("5",		"Standards, Environments, and Macros")
 LINE("6",		"Games and Demos")
 LINE("7",		"Device and Network Interfaces")
-LINE("7D",		"Devices")
 LINE("7FS",		"File Systems")
 LINE("7I",		"Ioctl Requests")
 LINE("7IPP",		"IP Quality of Service Modules")
diff --git a/usr/src/cmd/troff/troff.d/tmac.d/an b/usr/src/cmd/troff/troff.d/tmac.d/an
index a269f77464..6342e2c0e7 100644
--- a/usr/src/cmd/troff/troff.d/tmac.d/an
+++ b/usr/src/cmd/troff/troff.d/tmac.d/an
@@ -331,13 +331,13 @@
 .if '\\$2'4' .ds ]D File Formats
 .if '\\$2'4B' .ds ]D SunOS/BSD Compatibility Package File Formats
 .if '\\$2'4b' .ds ]D SunOS/BSD Compatibility Package File Formats
+.if '\\$2'4D' .ds ]D Devices
+.if '\\$2'4d' .ds ]D Devices
 .if '\\$2'5' .ds ]D Standards, Environments, and Macros
 .if '\\$2'6' .ds ]D Games and Demos
 .if '\\$2'7' .ds ]D Device and Network Interfaces
 .if '\\$2'7B' .ds ]D SunOS/BSD Compatibility Special Files
 .if '\\$2'7b' .ds ]D SunOS/BSD Compatibility Special Files
-.if '\\$2'7D' .ds ]D Devices
-.if '\\$2'7d' .ds ]D Devices
 .if '\\$2'7FS' .ds ]D File Systems
 .if '\\$2'7fs' .ds ]D File Systems
 .if '\\$2'7I' .ds ]D Ioctl Requests
diff --git a/usr/src/cmd/troff/troff.d/tmac.d/ansun b/usr/src/cmd/troff/troff.d/tmac.d/ansun
index 7b5aacdc1e..3800fcf51e 100644
--- a/usr/src/cmd/troff/troff.d/tmac.d/ansun
+++ b/usr/src/cmd/troff/troff.d/tmac.d/ansun
@@ -335,13 +335,13 @@
 .if '\\$2'4' .ds ]D File Formats
 .if '\\$2'4B' .ds ]D SunOS/BSD Compatibility Package File Formats
 .if '\\$2'4b' .ds ]D SunOS/BSD Compatibility Package File Formats
+.if '\\$2'4D' .ds ]D Devices
+.if '\\$2'4d' .ds ]D Devices
 .if '\\$2'5' .ds ]D Standards, Environments, and Macros
 .if '\\$2'6' .ds ]D Games and Demos
 .if '\\$2'7' .ds ]D Device and Network Interfaces
 .if '\\$2'7B' .ds ]D SunOS/BSD Compatibility Special Files
 .if '\\$2'7b' .ds ]D SunOS/BSD Compatibility Special Files
-.if '\\$2'7D' .ds ]D Devices
-.if '\\$2'7d' .ds ]D Devices
 .if '\\$2'7FS' .ds ]D File Systems
 .if '\\$2'7fs' .ds ]D File Systems
 .if '\\$2'7I' .ds ]D Ioctl Requests
diff --git a/usr/src/man/Makefile b/usr/src/man/Makefile
index e9b3593682..28a3b7c525 100644
--- a/usr/src/man/Makefile
+++ b/usr/src/man/Makefile
@@ -88,9 +88,9 @@ SUBDIRS=	man1		\
 		man3xcurses	\
 		man3xnet	\
 		man4		\
+		man4d		\
 		man5		\
 		man7		\
-		man7d		\
 		man7fs		\
 		man7i		\
 		man7ipp		\
diff --git a/usr/src/man/man4d/Makefile b/usr/src/man/man4d/Makefile
new file mode 100644
index 0000000000..0089ad0b4b
--- /dev/null
+++ b/usr/src/man/man4d/Makefile
@@ -0,0 +1,296 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet
+# at http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2011, Richard Lowe
+# Copyright 2016 Garrett D'Amore <garrett@damore.org>
+# Copyright 2019 Joyent, Inc.
+# Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
+# Copyright 2018 Nexenta Systems, Inc.
+# Copyright 2020 Peter Tribble
+# Copyright 2021 Oxide Computer Company
+#
+
+include		$(SRC)/Makefile.master
+
+MANSECT=	4d
+
+_MANFILES=	aac.4d		\
+		afe.4d		\
+		audio.4d	\
+		audio1575.4d	\
+		audioens.4d	\
+		audiols.4d	\
+		audiop16x.4d	\
+		audiopci.4d	\
+		audiots.4d	\
+		av1394.4d	\
+		bge.4d		\
+		blkdev.4d	\
+		bnxe.4d		\
+		ccid.4d		\
+		chxge.4d	\
+		console.4d	\
+		cpuid.4d	\
+		dca.4d		\
+		dcam1394.4d	\
+		devinfo.4d	\
+		dmfe.4d		\
+		dtrace.4d	\
+		e1000g.4d	\
+		ehci.4d		\
+		ena.4d		\
+		fasttrap.4d	\
+		fbt.4d		\
+		fcip.4d		\
+		fcoe.4d		\
+		fcoei.4d	\
+		fcoet.4d	\
+		fcp.4d		\
+		fctl.4d		\
+		fd.4d		\
+		fp.4d		\
+		full.4d		\
+		gld.4d		\
+		hci1394.4d	\
+		hermon.4d	\
+		hid.4d		\
+		hme.4d		\
+		hubd.4d		\
+		hxge.4d		\
+		ib.4d		\
+		ibcm.4d		\
+		ibd.4d		\
+		ibdm.4d		\
+		ibdma.4d	\
+		ibtl.4d		\
+		ieee1394.4d	\
+		igb.4d		\
+		ipnet.4d	\
+		iscsi.4d	\
+		iser.4d		\
+		ixgbe.4d	\
+		kmdb.4d		\
+		kstat.4d	\
+		ksensor.4d	\
+		ksyms.4d	\
+		llc1.4d		\
+		lockstat.4d	\
+		lofi.4d		\
+		log.4d		\
+		mem.4d		\
+		mpt_sas.4d	\
+		mr_sas.4d	\
+		msglog.4d	\
+		mt.4d		\
+		mxfe.4d		\
+		myri10ge.4d	\
+		null.4d		\
+		nulldriver.4d	\
+		nxge.4d		\
+		ohci.4d		\
+		openprom.4d	\
+		pcic.4d		\
+		pcmcia.4d	\
+		physmem.4d	\
+		pm.4d		\
+		poll.4d		\
+		profile.4d	\
+		ptm.4d		\
+		pts.4d		\
+		pty.4d		\
+		qlc.4d		\
+		ramdisk.4d	\
+		random.4d	\
+		rge.4d		\
+		rtls.4d		\
+		sad.4d		\
+		sata.4d		\
+		scsa1394.4d	\
+		scsa2usb.4d	\
+		sd.4d		\
+		sdp.4d		\
+		sdt.4d		\
+		ses.4d		\
+		sfe.4d		\
+		sgen.4d		\
+		srpt.4d		\
+		st.4d		\
+		sysmsg.4d	\
+		systrace.4d	\
+		ticlts.4d	\
+		tty.4d		\
+		tzmon.4d	\
+		ufm.4d		\
+		ugen.4d		\
+		uhci.4d		\
+		usb_ac.4d	\
+		usb_as.4d	\
+		usb_ia.4d	\
+		usb_mid.4d	\
+		usba.4d		\
+		usbftdi.4d	\
+		usbprn.4d	\
+		usbsacm.4d	\
+		usbsksp.4d	\
+		usbsprl.4d	\
+		usbvc.4d	\
+		virtualkm.4d	\
+		vni.4d		\
+		vr.4d		\
+		wscons.4d	\
+		xge.4d		\
+		yge.4d		\
+		zcons.4d	\
+		zero.4d
+
+sparc_MANFILES=	audiocs.4d	\
+		bbc_beep.4d	\
+		dad.4d		\
+		dm2s.4d		\
+		dr.4d		\
+		eri.4d		\
+		fas.4d		\
+		gpio_87317.4d	\
+		grbeep.4d	\
+		mc-opl.4d	\
+		n2rng.4d	\
+		ntwdt.4d	\
+		oplkmdrv.4d	\
+		oplmsu.4d	\
+		oplpanel.4d	\
+		pcicmu.4d	\
+		pcipsy.4d	\
+		pcisch.4d	\
+		sf.4d		\
+		smbus.4d	\
+		socal.4d	\
+		ssd.4d		\
+		su.4d		\
+		todopl.4d	\
+		tsalarm.4d	\
+		zs.4d		\
+		zsh.4d
+
+i386_MANFILES=	ahci.4d		\
+		amd8111s.4d	\
+		amdnbtemp.4d	\
+		amdzen.4d	\
+		amr.4d		\
+		arcmsr.4d	\
+		arn.4d		\
+		asy.4d		\
+		ata.4d		\
+		atge.4d		\
+		ath.4d		\
+		atu.4d		\
+		audio810.4d	\
+		audiocmi.4d	\
+		audiocmihd.4d	\
+		audioemu10k.4d	\
+		audiohd.4d	\
+		audioixp.4d	\
+		audiosolo.4d	\
+		audiovia823x.4d \
+		bcm_sata.4d	\
+		bfe.4d		\
+		cmdk.4d		\
+		coretemp.4d	\
+		cpqary3.4d	\
+		dnet.4d		\
+		ecpp.4d		\
+		elxl.4d		\
+		i40e.4d		\
+		imc.4d		\
+		imcstub.4d	\
+		ipmi.4d		\
+		iprb.4d		\
+		ipw.4d		\
+		iwh.4d		\
+		iwi.4d		\
+		iwn.4d		\
+		mega_sas.4d	\
+		mlxcx.4d	\
+		npe.4d		\
+		ntxn.4d		\
+		nv_sata.4d	\
+		nvme.4d		\
+		pchtemp.4d	\
+		pcn.4d		\
+		qede.4d		\
+		ral.4d		\
+		rtw.4d		\
+		rum.4d		\
+		rwd.4d		\
+		rwn.4d		\
+		sda.4d		\
+		sdhost.4d	\
+		sfxge.4d	\
+		si3124.4d	\
+		skd.4d		\
+		smbios.4d	\
+		smntemp.4d	\
+		uath.4d		\
+		ural.4d		\
+		urtw.4d		\
+		usmn.4d		\
+		vioblk.4d	\
+		vioif.4d	\
+		virtio.4d	\
+		wpi.4d		\
+		xhci.4d		\
+		zen_udf.4d	\
+		zyd.4d
+
+_MANLINKS=	1394.4d		\
+		allkmem.4d	\
+		fdc.4d		\
+		firewire.4d	\
+		kmem.4d		\
+		lo0.4d		\
+		ticots.4d	\
+		ticotsord.4d	\
+		urandom.4d	\
+		usb.4d
+
+sparc_MANLINKS=	drmach.4d
+
+i386_MANLINKS=	amdzen_stub.4d
+
+MANFILES =	$(_MANFILES) $($(MACH)_MANFILES)
+MANLINKS =	$(_MANLINKS) $($(MACH)_MANLINKS)
+
+amdzen_stub.4d	:= LINKSRC = amdzen.4d
+
+drmach.4d	:= LINKSRC = dr.4d
+
+fdc.4d		:= LINKSRC = fd.4d
+
+1394.4d		:= LINKSRC = ieee1394.4d
+firewire.4d	:= LINKSRC = ieee1394.4d
+
+lo0.4d		:= LINKSRC = ipnet.4d
+
+allkmem.4d	:= LINKSRC = mem.4d
+kmem.4d		:= LINKSRC = mem.4d
+
+urandom.4d	:= LINKSRC = random.4d
+
+ticots.4d	:= LINKSRC = ticlts.4d
+ticotsord.4d	:= LINKSRC = ticlts.4d
+
+usb.4d		:= LINKSRC = usba.4d
+
+.KEEP_STATE:
+
+include		$(SRC)/man/Makefile.man
+
+install:	$(ROOTMANFILES) $(ROOTMANLINKS)
diff --git a/usr/src/man/man7d/aac.7d b/usr/src/man/man4d/aac.4d
index 15b896685d..a9adac04ed 100644
--- a/usr/src/man/man7d/aac.7d
+++ b/usr/src/man/man4d/aac.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AAC 7D "Dec 27, 2007"
+.TH AAC 4D "Dec 27, 2007"
 .SH NAME
 aac \- SCSI HBA driver for Adaptec AdvancedRAID Controller
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/afe.7d b/usr/src/man/man4d/afe.4d
index 3fb7991769..f4b411077d 100644
--- a/usr/src/man/man7d/afe.7d
+++ b/usr/src/man/man4d/afe.4d
@@ -21,7 +21,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 .\"
 .Dd "Aug 3, 2014"
-.Dt AFE 7D
+.Dt AFE 4D
 .Os
 .Sh NAME
 .Nm afe
diff --git a/usr/src/man/man7d/ahci.7d b/usr/src/man/man4d/ahci.4d
index 914dbae098..5ab937e7d4 100644
--- a/usr/src/man/man7d/ahci.7d
+++ b/usr/src/man/man4d/ahci.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AHCI 7D "Sep 10, 2009"
+.TH AHCI 4D "Sep 10, 2009"
 .SH NAME
 ahci \- Advanced Host Controller Interface SATA controller driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/amd8111s.7d b/usr/src/man/man4d/amd8111s.4d
index ce0600c117..3d1ca597e2 100644
--- a/usr/src/man/man7d/amd8111s.7d
+++ b/usr/src/man/man4d/amd8111s.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AMD8111S 7D "Jul 30, 2007"
+.TH AMD8111S 4D "Jul 30, 2007"
 .SH NAME
 amd8111s \- AMD-8111 Fast Ethernet Network Adapter driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/amdnbtemp.7d b/usr/src/man/man4d/amdnbtemp.4d
index a086ebce99..80b73777bc 100644
--- a/usr/src/man/man7d/amdnbtemp.7d
+++ b/usr/src/man/man4d/amdnbtemp.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2019 Robert Mustacchi
 .\"
 .Dd December 24, 2019
-.Dt AMDNBTEMP 7D
+.Dt AMDNBTEMP 4D
 .Os
 .Sh NAME
 .Nm amdnbtemp
diff --git a/usr/src/man/man7d/amdzen.7d b/usr/src/man/man4d/amdzen.4d
index 7c24b7106a..7275d7c3e8 100644
--- a/usr/src/man/man7d/amdzen.7d
+++ b/usr/src/man/man4d/amdzen.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2020 Oxide Computer Company
 .\"
 .Dd September 26, 2020
-.Dt AMDZEN 7D
+.Dt AMDZEN 4D
 .Os
 .Sh NAME
 .Nm amdzen ,
diff --git a/usr/src/man/man7d/amr.7d b/usr/src/man/man4d/amr.4d
index 2b58a19ec1..8fc4d2fbbd 100644
--- a/usr/src/man/man7d/amr.7d
+++ b/usr/src/man/man4d/amr.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AMR 7D "Apr 20, 2005"
+.TH AMR 4D "Apr 20, 2005"
 .SH NAME
 amr \- SCSI HBA driver for Dell PERC 3/DC, 4/SC, 4/DC and 4/DI
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/arcmsr.7d b/usr/src/man/man4d/arcmsr.4d
index 32dea74672..4d3b3c083b 100644
--- a/usr/src/man/man7d/arcmsr.7d
+++ b/usr/src/man/man4d/arcmsr.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ARCMSR 7D "May 28, 2011"
+.TH ARCMSR 4D "May 28, 2011"
 .SH NAME
 arcmsr \- SAS and SATA HBA driver for Areca Hardware Raid devices
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/arn.7d b/usr/src/man/man4d/arn.4d
index fdf564d05f..cea086b6fa 100644
--- a/usr/src/man/man7d/arn.7d
+++ b/usr/src/man/man4d/arn.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ARN 7D "Aug 24, 2009"
+.TH ARN 4D "Aug 24, 2009"
 .SH NAME
 arn \- Atheros AR9280/9281/9285 IEEE802.11 a/b/g/n wireless network device
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/asy.7d b/usr/src/man/man4d/asy.4d
index 9de8a2f94d..cf2dff0d7f 100644
--- a/usr/src/man/man7d/asy.7d
+++ b/usr/src/man/man4d/asy.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ASY 7D "Oct 9, 2004"
+.TH ASY 4D "Oct 9, 2004"
 .SH NAME
 asy \- asynchronous serial port driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/ata.7d b/usr/src/man/man4d/ata.4d
index 9a08b674bf..9f01b36d68 100644
--- a/usr/src/man/man7d/ata.7d
+++ b/usr/src/man/man4d/ata.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ATA 7D "Aug 18, 2016"
+.TH ATA 4D "Aug 18, 2016"
 .SH NAME
 ata \- AT attachment disk driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/atge.7d b/usr/src/man/man4d/atge.4d
index 2811ba6558..812236037d 100644
--- a/usr/src/man/man7d/atge.7d
+++ b/usr/src/man/man4d/atge.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ATGE 7D "Sep 11, 2009"
+.TH ATGE 4D "Sep 11, 2009"
 .SH NAME
 atge \- Device driver for Atheros/Attansic Ethernet chipsets
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ath.7d b/usr/src/man/man4d/ath.4d
index 58dc94a532..4029ec6681 100644
--- a/usr/src/man/man7d/ath.7d
+++ b/usr/src/man/man4d/ath.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ATH 7D "Nov 14, 2006"
+.TH ATH 4D "Nov 14, 2006"
 .SH NAME
 ath \- Atheros AR52xx 802.11b/g wireless NIC driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/atu.7d b/usr/src/man/man4d/atu.4d
index eecb895078..5bfac8c0bd 100644
--- a/usr/src/man/man7d/atu.7d
+++ b/usr/src/man/man4d/atu.4d
@@ -3,7 +3,7 @@
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
-.TH ATU 7D "Mar 26, 2009"
+.TH ATU 4D "Mar 26, 2009"
 .SH NAME
 atu \- Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audio.7d b/usr/src/man/man4d/audio.4d
index 76aa2bdf8e..cad1660e8a 100644
--- a/usr/src/man/man7d/audio.7d
+++ b/usr/src/man/man4d/audio.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIO 7D "Jan 10, 2020"
+.TH AUDIO 4D "Jan 10, 2020"
 .SH NAME
 audio \- common audio framework
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audio1575.7d b/usr/src/man/man4d/audio1575.4d
index e071e73a30..93edc55fbc 100644
--- a/usr/src/man/man7d/audio1575.7d
+++ b/usr/src/man/man4d/audio1575.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIO1575 7D "May 13, 2009"
+.TH AUDIO1575 4D "May 13, 2009"
 .SH NAME
 audio1575 \- Uli M1575 Super South Bridge audio digital controller interface
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audio810.7d b/usr/src/man/man4d/audio810.4d
index 53abf390d5..e1434d6d37 100644
--- a/usr/src/man/man7d/audio810.7d
+++ b/usr/src/man/man4d/audio810.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIO810 7D "September 12, 2020"
+.TH AUDIO810 4D "September 12, 2020"
 .SH NAME
 audio810 \- Intel ICH series, nVidia nForce series and AMD 8111 audio core
 support
diff --git a/usr/src/man/man7d/audiocmi.7d b/usr/src/man/man4d/audiocmi.4d
index a74ab6eb81..6facbb8933 100644
--- a/usr/src/man/man7d/audiocmi.7d
+++ b/usr/src/man/man4d/audiocmi.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOCMI 7D "Aug 17, 2009"
+.TH AUDIOCMI 4D "Aug 17, 2009"
 .SH NAME
 audiocmi \- C-Media 8738, 8768, and 8338 driver support
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audiocmihd.7d b/usr/src/man/man4d/audiocmihd.4d
index 52038cb4df..68007df323 100644
--- a/usr/src/man/man7d/audiocmihd.7d
+++ b/usr/src/man/man4d/audiocmihd.4d
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 .\"
-.TH AUDIOCMIHD 7D "Mar 18, 2011"
+.TH AUDIOCMIHD 4D "Mar 18, 2011"
 .SH NAME
 audiocmihd \- CMI8788 HD audio driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audiocs.7d b/usr/src/man/man4d/audiocs.4d
index ab555b8cd2..409e4aa9eb 100644
--- a/usr/src/man/man7d/audiocs.7d
+++ b/usr/src/man/man4d/audiocs.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOCS 7D "May 12, 2009"
+.TH AUDIOCS 4D "May 12, 2009"
 .SH NAME
 audiocs \- Crystal Semiconductor 4231 Audio driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audioemu10k.7d b/usr/src/man/man4d/audioemu10k.4d
index a5b3d826fb..34e1324cdf 100644
--- a/usr/src/man/man7d/audioemu10k.7d
+++ b/usr/src/man/man4d/audioemu10k.4d
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 .\"
-.TH AUDIOEMU10K 7D "Mar 18, 2011"
+.TH AUDIOEMU10K 4D "Mar 18, 2011"
 .SH NAME
 audioemu10k \- EMU10K audio driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audioens.7d b/usr/src/man/man4d/audioens.4d
index bfe24ebd8c..71ef61c47d 100644
--- a/usr/src/man/man7d/audioens.7d
+++ b/usr/src/man/man4d/audioens.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOENS 7D "May 15, 2009"
+.TH AUDIOENS 4D "May 15, 2009"
 .SH NAME
 audioens \- Ensoniq ESS 1371 and ESS 1373 audio driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audiohd.7d b/usr/src/man/man4d/audiohd.4d
index 4b50c86861..5c1e8da4b9 100644
--- a/usr/src/man/man7d/audiohd.7d
+++ b/usr/src/man/man4d/audiohd.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOHD 7D "May 12, 2009"
+.TH AUDIOHD 4D "May 12, 2009"
 .SH NAME
 audiohd \- Intel High Definition Audio Controller support
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audioixp.7d b/usr/src/man/man4d/audioixp.4d
index c0871fb91d..0b5a5d47fa 100644
--- a/usr/src/man/man7d/audioixp.7d
+++ b/usr/src/man/man4d/audioixp.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOIXP 7D "May 12, 2009"
+.TH AUDIOIXP 4D "May 12, 2009"
 .SH NAME
 audioixp \- ATI IXP400 south bridge audio digital controller interface
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audiols.7d b/usr/src/man/man4d/audiols.4d
index a1b29e76f2..b66b7e5964 100644
--- a/usr/src/man/man7d/audiols.7d
+++ b/usr/src/man/man4d/audiols.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOLS 7D "Sep 8, 2009"
+.TH AUDIOLS 4D "Sep 8, 2009"
 .SH NAME
 audiols \- Creative Audigy LS audio device support
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audiop16x.7d b/usr/src/man/man4d/audiop16x.4d
index fc04871739..e7bd8a81c2 100644
--- a/usr/src/man/man7d/audiop16x.7d
+++ b/usr/src/man/man4d/audiop16x.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOP16X 7D "Sep 8, 2009"
+.TH AUDIOP16X 4D "Sep 8, 2009"
 .SH NAME
 audiop16x \- Creative Sound Blaster Live! OEM support
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audiopci.7d b/usr/src/man/man4d/audiopci.4d
index 116efce9f3..5f43c6445f 100644
--- a/usr/src/man/man7d/audiopci.7d
+++ b/usr/src/man/man4d/audiopci.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOPCI 7D "May 13, 2017"
+.TH AUDIOPCI 4D "May 13, 2017"
 .SH NAME
 audiopci \- Ensoniq 1370 driver support
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audiosolo.7d b/usr/src/man/man4d/audiosolo.4d
index cabe29ba74..caeeba82e7 100644
--- a/usr/src/man/man7d/audiosolo.7d
+++ b/usr/src/man/man4d/audiosolo.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER,
 .\" with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOSOLO 7D "Sep 18, 2009"
+.TH AUDIOSOLO 4D "Sep 18, 2009"
 .SH NAME
 audiosolo \- ESS Solo-1 audio device support
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audiots.7d b/usr/src/man/man4d/audiots.4d
index 484231026b..931440ef7a 100644
--- a/usr/src/man/man7d/audiots.7d
+++ b/usr/src/man/man4d/audiots.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOTS 7D "May 12, 2009"
+.TH AUDIOTS 4D "May 12, 2009"
 .SH NAME
 audiots \- Acer Laboratories Inc. M5451 audio processor interface
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/audiovia823x.7d b/usr/src/man/man4d/audiovia823x.4d
index d4c61f09fa..7bed49c65f 100644
--- a/usr/src/man/man7d/audiovia823x.7d
+++ b/usr/src/man/man4d/audiovia823x.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH AUDIOVIA823X 7D "May 12, 2009"
+.TH AUDIOVIA823X 4D "May 12, 2009"
 .SH NAME
 audiovia823x \- VIA VT8233, VT8235, and VT8237) support
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/av1394.7d b/usr/src/man/man4d/av1394.4d
index 53ce958979..e6d3fda3d9 100644
--- a/usr/src/man/man7d/av1394.7d
+++ b/usr/src/man/man4d/av1394.4d
@@ -3,7 +3,7 @@
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
 .\"  Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
-.TH AV1394 7D "Jan 10, 2020"
+.TH AV1394 4D "Jan 10, 2020"
 .SH NAME
 av1394 \- 1394 audio/video driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/bbc_beep.7d b/usr/src/man/man4d/bbc_beep.4d
index 55b50c1e03..c5c9019df8 100644
--- a/usr/src/man/man7d/bbc_beep.7d
+++ b/usr/src/man/man4d/bbc_beep.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH BBC_BEEP 7D "Dec 18, 2001"
+.TH BBC_BEEP 4D "Dec 18, 2001"
 .SH NAME
 bbc_beep \-  Platform-dependent Beep driver for BBC-based hardware.
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/bcm_sata.7d b/usr/src/man/man4d/bcm_sata.4d
index a536507864..7e828ef5e9 100644
--- a/usr/src/man/man7d/bcm_sata.7d
+++ b/usr/src/man/man4d/bcm_sata.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH BCM_SATA 7D "Aug 31, 2009"
+.TH BCM_SATA 4D "Aug 31, 2009"
 .SH NAME
 bcm_sata \- Broadcom HT1000 SATA controller driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/bfe.7d b/usr/src/man/man4d/bfe.4d
index 65007f8999..aafdf9392a 100644
--- a/usr/src/man/man7d/bfe.7d
+++ b/usr/src/man/man4d/bfe.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH BFE 7D "Jun 23, 2009"
+.TH BFE 4D "Jun 23, 2009"
 .SH NAME
 bfe \- Device driver for Broadcom BCM4401 100Base-T NIC
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/bge.7d b/usr/src/man/man4d/bge.4d
index d9be2c667f..b027e848c4 100644
--- a/usr/src/man/man7d/bge.7d
+++ b/usr/src/man/man4d/bge.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH BGE 7D "Apr 9, 2008"
+.TH BGE 4D "Apr 9, 2008"
 .SH NAME
 bge \- SUNW,bge Gigabit Ethernet driver for Broadcom BCM57xx
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/blkdev.7d b/usr/src/man/man4d/blkdev.4d
index 8ff6f4745e..4a67668da9 100644
--- a/usr/src/man/man7d/blkdev.7d
+++ b/usr/src/man/man4d/blkdev.4d
@@ -11,7 +11,7 @@
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .
 .Dd "Jul 30, 2014"
-.Dt BLKDEV 7D
+.Dt BLKDEV 4D
 .Os
 .Sh NAME
 .Nm blkdev
diff --git a/usr/src/man/man7d/bnxe.7d b/usr/src/man/man4d/bnxe.4d
index 0696dc6c47..00eb6678e6 100644
--- a/usr/src/man/man7d/bnxe.7d
+++ b/usr/src/man/man4d/bnxe.4d
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright (c) 2014 QLogic Corporation. All Rights Reserved
 .\"
-.TH BNXE 7D "Jan 10, 2020"
+.TH BNXE 4D "Jan 10, 2020"
 .SH NAME
 bnxe \- QLogic NetXtreme II 10 Gigabit Ethernet Device Driver
 
diff --git a/usr/src/man/man7d/ccid.7d b/usr/src/man/man4d/ccid.4d
index f5158b0d0d..9031256e82 100644
--- a/usr/src/man/man7d/ccid.7d
+++ b/usr/src/man/man4d/ccid.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2019 Joyent, Inc.
 .\"
 .Dd December 20, 2019
-.Dt CCID 7D
+.Dt CCID 4D
 .Os
 .Sh NAME
 .Nm ccid
diff --git a/usr/src/man/man7d/chxge.7d b/usr/src/man/man4d/chxge.4d
index 05db2a4bde..d1662b5bc3 100644
--- a/usr/src/man/man7d/chxge.7d
+++ b/usr/src/man/man4d/chxge.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH CHXGE 7D "Jan 17, 2005"
+.TH CHXGE 4D "Jan 17, 2005"
 .SH NAME
 chxge \- Chelsio Ethernet network interface controllers
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/cmdk.7d b/usr/src/man/man4d/cmdk.4d
index 92c90ff360..1151b7c8bc 100644
--- a/usr/src/man/man7d/cmdk.7d
+++ b/usr/src/man/man4d/cmdk.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH CMDK 7D "Nov 4, 2008"
+.TH CMDK 4D "Nov 4, 2008"
 .SH NAME
 cmdk \- common disk driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/console.7d b/usr/src/man/man4d/console.4d
index d372831b92..8611f64e32 100644
--- a/usr/src/man/man7d/console.7d
+++ b/usr/src/man/man4d/console.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH CONSOLE 7D "Apr 23, 1999"
+.TH CONSOLE 4D "Apr 23, 1999"
 .SH NAME
 console \- STREAMS-based console interface
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/coretemp.7d b/usr/src/man/man4d/coretemp.4d
index d194d02fde..99d720d64f 100644
--- a/usr/src/man/man7d/coretemp.7d
+++ b/usr/src/man/man4d/coretemp.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2019, Joyent, Inc.
 .\"
 .Dd January 10, 2020
-.Dt CORETEMP 7D
+.Dt CORETEMP 4D
 .Os
 .Sh NAME
 .Nm coretemp
diff --git a/usr/src/man/man7d/cpqary3.7d b/usr/src/man/man4d/cpqary3.4d
index 1ed77081ee..4f356782ba 100644
--- a/usr/src/man/man7d/cpqary3.7d
+++ b/usr/src/man/man4d/cpqary3.4d
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright (C) 2013 Hewlett-Packard Development Company, L.P.
 .\"
-.TH CPQARY3 7D "December 28, 2020"
+.TH CPQARY3 4D "December 28, 2020"
 .SH NAME
 cpqary3 - provides disk and SCSI tape support for HP Smart Array controllers
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/cpuid.7d b/usr/src/man/man4d/cpuid.4d
index cc522b1969..ed3f7cd0bc 100644
--- a/usr/src/man/man7d/cpuid.7d
+++ b/usr/src/man/man4d/cpuid.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH CPUID 7D "April 9, 2016"
+.TH CPUID 4D "April 9, 2016"
 .SH NAME
 cpuid \- CPU identification driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/dad.7d b/usr/src/man/man4d/dad.4d
index 6f1d9312c4..3321b8b8d5 100644
--- a/usr/src/man/man7d/dad.7d
+++ b/usr/src/man/man4d/dad.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DAD 7D "Oct 24, 2005"
+.TH DAD 4D "Oct 24, 2005"
 .SH NAME
 dad \- driver for IDE disk devices
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/dca.7d b/usr/src/man/man4d/dca.4d
index 03651d7151..11b9303e4c 100644
--- a/usr/src/man/man7d/dca.7d
+++ b/usr/src/man/man4d/dca.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DCA 7D "Aug 14, 2005"
+.TH DCA 4D "Aug 14, 2005"
 .SH NAME
 dca \- Crypto Accelerator device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/dcam1394.7d b/usr/src/man/man4d/dcam1394.4d
index c1323c8a8f..9472fb6839 100644
--- a/usr/src/man/man7d/dcam1394.7d
+++ b/usr/src/man/man4d/dcam1394.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DCAM1394 7D "Jan 10, 2020"
+.TH DCAM1394 4D "Jan 10, 2020"
 .SH NAME
 dcam1394 \- 1394-based digital camera (IIDC) driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/devinfo.7d b/usr/src/man/man4d/devinfo.4d
index 834f8528f5..9a4d5cde46 100644
--- a/usr/src/man/man7d/devinfo.7d
+++ b/usr/src/man/man4d/devinfo.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DEVINFO 7D "Jan 9, 1998"
+.TH DEVINFO 4D "Jan 9, 1998"
 .SH NAME
 devinfo \- device information driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/dm2s.7d b/usr/src/man/man4d/dm2s.4d
index 88f16fc8ac..ed05698a3f 100644
--- a/usr/src/man/man7d/dm2s.7d
+++ b/usr/src/man/man4d/dm2s.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DM2S 7D "Apr 6, 2006"
+.TH DM2S 4D "Apr 6, 2006"
 .SH NAME
 dm2s \- loadable STREAMS driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/dmfe.7d b/usr/src/man/man4d/dmfe.4d
index a4a48cf53a..ffab1eb38e 100644
--- a/usr/src/man/man7d/dmfe.7d
+++ b/usr/src/man/man4d/dmfe.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DMFE 7D "Sep 17, 2007"
+.TH DMFE 4D "Sep 17, 2007"
 .SH NAME
 dmfe \- Davicom Fast Ethernet driver for Davicom DM9102A
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/dnet.7d b/usr/src/man/man4d/dnet.4d
index 348e6b9429..6a72ee86e5 100644
--- a/usr/src/man/man7d/dnet.7d
+++ b/usr/src/man/man4d/dnet.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DNET 7D "Oct 20, 2000"
+.TH DNET 4D "Oct 20, 2000"
 .SH NAME
 dnet \- Ethernet driver for DEC 21040, 21041, 21140 Ethernet cards
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/dr.7d b/usr/src/man/man4d/dr.4d
index d3494d1736..166c8d159c 100644
--- a/usr/src/man/man7d/dr.7d
+++ b/usr/src/man/man4d/dr.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DR 7D "Jun 13, 2019"
+.TH DR 4D "Jun 13, 2019"
 .SH NAME
 dr, drmach \- dynamic reconfiguration driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/dtrace.7d b/usr/src/man/man4d/dtrace.4d
index cefee6a2cd..bf52e9dd52 100644
--- a/usr/src/man/man7d/dtrace.7d
+++ b/usr/src/man/man4d/dtrace.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DTRACE 7D "Dec 10, 2017"
+.TH DTRACE 4D "Dec 10, 2017"
 .SH NAME
 dtrace \- DTrace dynamic tracing facility
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/e1000g.7d b/usr/src/man/man4d/e1000g.4d
index 3582d0dc20..a11afcb9d3 100644
--- a/usr/src/man/man7d/e1000g.7d
+++ b/usr/src/man/man4d/e1000g.4d
@@ -13,7 +13,7 @@
 .\" Copyright 2022 Oxide Computer Company
 .\"
 .Dd January 17, 2022
-.Dt E1000G 7D
+.Dt E1000G 4D
 .Os
 .Sh NAME
 .Nm e1000g
diff --git a/usr/src/man/man7d/ecpp.7d b/usr/src/man/man4d/ecpp.4d
index dc5259dbdf..8852a7ead9 100644
--- a/usr/src/man/man7d/ecpp.7d
+++ b/usr/src/man/man4d/ecpp.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ECPP 7D "May 17, 2020"
+.TH ECPP 4D "May 17, 2020"
 .SH NAME
 ecpp \- IEEE 1284 compliant parallel port driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/ehci.7d b/usr/src/man/man4d/ehci.4d
index b9ba26cf3d..43310076de 100644
--- a/usr/src/man/man7d/ehci.7d
+++ b/usr/src/man/man4d/ehci.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH EHCI 7D "Jan 10, 2020"
+.TH EHCI 4D "Jan 10, 2020"
 .SH NAME
 ehci \- Enhanced host controller driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/elxl.7d b/usr/src/man/man4d/elxl.4d
index a6d3d3bf64..d6c295e371 100644
--- a/usr/src/man/man7d/elxl.7d
+++ b/usr/src/man/man4d/elxl.4d
@@ -21,7 +21,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 .\"
 .Dd "Jan 10, 2020"
-.Dt ELXL 7D
+.Dt ELXL 4D
 .Os
 .Sh NAME
 .Nm elxl
diff --git a/usr/src/man/man7d/ena.7d b/usr/src/man/man4d/ena.4d
index d4070e1745..6bc1699b42 100644
--- a/usr/src/man/man7d/ena.7d
+++ b/usr/src/man/man4d/ena.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2021 Oxide Computer Company
 .\"
 .Dd Nov 17, 2021
-.Dt ENA 7D
+.Dt ENA 4D
 .Os
 .Sh NAME
 .Nm ena
diff --git a/usr/src/man/man7d/eri.7d b/usr/src/man/man4d/eri.4d
index 58b5b9aa35..3027eb15cd 100644
--- a/usr/src/man/man7d/eri.7d
+++ b/usr/src/man/man4d/eri.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ERI 7D "Mar 1, 2000"
+.TH ERI 4D "Mar 1, 2000"
 .SH NAME
 eri \- eri Fast-Ethernet device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/fas.7d b/usr/src/man/man4d/fas.4d
index c993025ee3..21cfc57d74 100644
--- a/usr/src/man/man7d/fas.7d
+++ b/usr/src/man/man4d/fas.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FAS 7D "Jun 20, 1997"
+.TH FAS 4D "Jun 20, 1997"
 .SH NAME
 fas \- FAS SCSI Host Bus Adapter Driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/fasttrap.7d b/usr/src/man/man4d/fasttrap.4d
index 63a1335e25..5e0320b85d 100644
--- a/usr/src/man/man7d/fasttrap.7d
+++ b/usr/src/man/man4d/fasttrap.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FASTTRAP 7D "Dec 10, 2017"
+.TH FASTTRAP 4D "Dec 10, 2017"
 .SH NAME
 fasttrap \- DTrace user instruction tracing provider
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/fbt.7d b/usr/src/man/man4d/fbt.4d
index 3b62aa3392..8b9ca08d34 100644
--- a/usr/src/man/man7d/fbt.7d
+++ b/usr/src/man/man4d/fbt.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FBT 7D "Dec 10, 2017"
+.TH FBT 4D "Dec 10, 2017"
 .SH NAME
 fbt \- DTrace function boundary tracing provider
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/fcip.7d b/usr/src/man/man4d/fcip.4d
index 9f7d7c0093..049dfef398 100644
--- a/usr/src/man/man7d/fcip.7d
+++ b/usr/src/man/man4d/fcip.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FCIP 7D "Oct 18, 2004"
+.TH FCIP 4D "Oct 18, 2004"
 .SH NAME
 fcip \- IP/ARP over Fibre Channel datagram encapsulation driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/fcoe.7d b/usr/src/man/man4d/fcoe.4d
index a3354b5649..8194d53332 100644
--- a/usr/src/man/man7d/fcoe.7d
+++ b/usr/src/man/man4d/fcoe.4d
@@ -4,7 +4,7 @@
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
 .\" Copyright 2020 Peter Tribble.
-.TH FCOE 7D "Jan 10, 2020"
+.TH FCOE 4D "Jan 10, 2020"
 .SH NAME
 fcoe \- fibre channel over Ethernet transport driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/fcoei.7d b/usr/src/man/man4d/fcoei.4d
index 2835290d9e..df77863e1e 100644
--- a/usr/src/man/man7d/fcoei.7d
+++ b/usr/src/man/man4d/fcoei.4d
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following
 .\" below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FCOEI 7D "Jan 10, 2020"
+.TH FCOEI 4D "Jan 10, 2020"
 .SH NAME
 fcoei \- Fibre Channel Over Ethernet Initiator Mode Driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/fcoet.7d b/usr/src/man/man4d/fcoet.4d
index dd604f360b..9c40d74dfa 100644
--- a/usr/src/man/man7d/fcoet.7d
+++ b/usr/src/man/man4d/fcoet.4d
@@ -3,7 +3,7 @@
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
-.TH FCOET 7D "Jan 10, 2020"
+.TH FCOET 4D "Jan 10, 2020"
 .SH NAME
 fcoet \- fibre channel over Ethernet target mode driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/fcp.7d b/usr/src/man/man4d/fcp.4d
index 0d966d4050..bb04569049 100644
--- a/usr/src/man/man7d/fcp.7d
+++ b/usr/src/man/man4d/fcp.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FCP 7D "Oct 20, 2004"
+.TH FCP 4D "Oct 20, 2004"
 .SH NAME
 fcp \- Fibre Channel protocol driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/fctl.7d b/usr/src/man/man4d/fctl.4d
index 8a7e99442e..8d0a3db48a 100644
--- a/usr/src/man/man7d/fctl.7d
+++ b/usr/src/man/man4d/fctl.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FCTL 7D "Oct 20, 2004"
+.TH FCTL 4D "Oct 20, 2004"
 .SH NAME
 fctl \- Sun Fibre Channel transport library
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/fd.7d b/usr/src/man/man4d/fd.4d
index ecd82a7be6..d291772fc9 100644
--- a/usr/src/man/man7d/fd.7d
+++ b/usr/src/man/man4d/fd.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FD 7D "Mar 2, 2007"
+.TH FD 4D "Mar 2, 2007"
 .SH NAME
 fd, fdc \- drivers for floppy disks and floppy disk controllers
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/fp.7d b/usr/src/man/man4d/fp.4d
index 2cc529486d..605dd706f0 100644
--- a/usr/src/man/man7d/fp.7d
+++ b/usr/src/man/man4d/fp.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FP 7D "Jan 10, 2008"
+.TH FP 4D "Jan 10, 2008"
 .SH NAME
 fp \- Sun Fibre Channel port driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/full.7d b/usr/src/man/man4d/full.4d
index 34d58e8e28..2923257e45 100644
--- a/usr/src/man/man7d/full.7d
+++ b/usr/src/man/man4d/full.4d
@@ -11,7 +11,7 @@
 .\" Copyright 2017 James S Blachly, MD <james.blachly@gmail.com>
 .
 .Dd "Feb 7, 2017"
-.Dt FULL 7D
+.Dt FULL 4D
 .Os
 .Sh NAME
 .Nm full
diff --git a/usr/src/man/man7d/gld.7d b/usr/src/man/man4d/gld.4d
index 74e1db2052..ae74ec1538 100644
--- a/usr/src/man/man7d/gld.7d
+++ b/usr/src/man/man4d/gld.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH GLD 7D "Nov 10, 2005"
+.TH GLD 4D "Nov 10, 2005"
 .SH NAME
 gld \- Generic \fBLAN\fR Driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/gpio_87317.7d b/usr/src/man/man4d/gpio_87317.4d
index 6124f4fe13..24db5ebfe5 100644
--- a/usr/src/man/man7d/gpio_87317.7d
+++ b/usr/src/man/man4d/gpio_87317.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH GPIO_87317 7D "Apr 12, 2000"
+.TH GPIO_87317 4D "Apr 12, 2000"
 .SH NAME
 gpio_87317 \- General purpose I/O driver for SuperIO
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/grbeep.7d b/usr/src/man/man4d/grbeep.4d
index 86bb7f3440..cf2645c73a 100644
--- a/usr/src/man/man7d/grbeep.7d
+++ b/usr/src/man/man4d/grbeep.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH GRBEEP 7D "Dec 18, 2001"
+.TH GRBEEP 4D "Dec 18, 2001"
 .SH NAME
 grbeep \-  Platform-dependent beep driver for SMBus-based hardware
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/hci1394.7d b/usr/src/man/man4d/hci1394.4d
index 34ac56762f..724a9c76af 100644
--- a/usr/src/man/man7d/hci1394.7d
+++ b/usr/src/man/man4d/hci1394.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH HCI1394 7D "Jan 10, 2020"
+.TH HCI1394 4D "Jan 10, 2020"
 .SH NAME
 hci1394 \- 1394 OpenHCI host controller driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/hermon.7d b/usr/src/man/man4d/hermon.4d
index 708652966d..ef8510dc5b 100644
--- a/usr/src/man/man7d/hermon.7d
+++ b/usr/src/man/man4d/hermon.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH HERMON 7D "Jul 31, 2008"
+.TH HERMON 4D "Jul 31, 2008"
 .SH NAME
 hermon \- ConnectX MT25408/MT25418/MT25428 InfiniBand (IB) Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/hid.7d b/usr/src/man/man4d/hid.4d
index 6601f7997b..9af06e429f 100644
--- a/usr/src/man/man7d/hid.7d
+++ b/usr/src/man/man4d/hid.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH HID 7D "June 19, 2021"
+.TH HID 4D "June 19, 2021"
 .SH NAME
 hid \- Human interface device (HID) class driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/hme.7d b/usr/src/man/man4d/hme.4d
index 79944244a2..8014dad552 100644
--- a/usr/src/man/man7d/hme.7d
+++ b/usr/src/man/man4d/hme.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH HME 7D "Sep 5, 1995"
+.TH HME 4D "Sep 5, 1995"
 .SH NAME
 hme \- SUNW,hme Fast-Ethernet device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/hubd.7d b/usr/src/man/man4d/hubd.4d
index 881272cadb..c5ec8a2d29 100644
--- a/usr/src/man/man7d/hubd.7d
+++ b/usr/src/man/man4d/hubd.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH HUBD 7D "May 13, 2017"
+.TH HUBD 4D "May 13, 2017"
 .SH NAME
 hubd \- USB hub driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/hxge.7d b/usr/src/man/man4d/hxge.4d
index 2574c00391..b86bc92e69 100644
--- a/usr/src/man/man7d/hxge.7d
+++ b/usr/src/man/man4d/hxge.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH HXGE 7D "June 20, 2021"
+.TH HXGE 4D "June 20, 2021"
 .SH NAME
 hxge \- Sun Blade 10 Gigabit Ethernet network driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/i40e.7d b/usr/src/man/man4d/i40e.4d
index 2bb840c2d7..4a36026fe8 100644
--- a/usr/src/man/man7d/i40e.7d
+++ b/usr/src/man/man4d/i40e.4d
@@ -14,7 +14,7 @@
 .\" Copyright 2021 Oxide Computer Company
 .\"
 .Dd January 18, 2021
-.Dt I40E 7D
+.Dt I40E 4D
 .Os
 .Sh NAME
 .Nm i40e
diff --git a/usr/src/man/man7d/ib.7d b/usr/src/man/man4d/ib.4d
index 2fe714dac0..52883a8625 100644
--- a/usr/src/man/man7d/ib.7d
+++ b/usr/src/man/man4d/ib.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IB 7D "Jan 26, 2009"
+.TH IB 4D "Jan 26, 2009"
 .SH NAME
 ib \- InfiniBand Bus Nexus Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ibcm.7d b/usr/src/man/man4d/ibcm.4d
index 3f0c57dab6..8ff1898386 100644
--- a/usr/src/man/man7d/ibcm.7d
+++ b/usr/src/man/man4d/ibcm.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IBCM 7D "Apr 2, 2004"
+.TH IBCM 4D "Apr 2, 2004"
 .SH NAME
 ibcm \- Solaris InfiniBand Communication Manager
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ibd.7d b/usr/src/man/man4d/ibd.4d
index 90350ac5c9..d595dc411b 100644
--- a/usr/src/man/man7d/ibd.7d
+++ b/usr/src/man/man4d/ibd.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IBD 7D "April 9, 2016"
+.TH IBD 4D "April 9, 2016"
 .SH NAME
 ibd \- Infiniband IPoIB device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/ibdm.7d b/usr/src/man/man4d/ibdm.4d
index 84ce1b3e09..21bef85def 100644
--- a/usr/src/man/man7d/ibdm.7d
+++ b/usr/src/man/man4d/ibdm.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IBDM 7D "Oct 9, 2004"
+.TH IBDM 4D "Oct 9, 2004"
 .SH NAME
 ibdm \- Solaris InfiniBand Device Manager
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ibdma.7d b/usr/src/man/man4d/ibdma.4d
index 7bc7185aeb..c5a5c31e1f 100644
--- a/usr/src/man/man7d/ibdma.7d
+++ b/usr/src/man/man4d/ibdma.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IBDMA 7D "May 21, 2009"
+.TH IBDMA 4D "May 21, 2009"
 .SH NAME
 ibdma \- Solaris InfiniBand Device Manager Agent
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ibtl.7d b/usr/src/man/man4d/ibtl.4d
index 7ebdd6ae6e..b5baf27cc5 100644
--- a/usr/src/man/man7d/ibtl.7d
+++ b/usr/src/man/man4d/ibtl.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IBTL 7D "Oct 9, 2004"
+.TH IBTL 4D "Oct 9, 2004"
 .SH NAME
 ibtl \- Solaris InfiniBand Transport Layer
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ieee1394.7d b/usr/src/man/man4d/ieee1394.4d
index 07cf605b11..de30092ce0 100644
--- a/usr/src/man/man7d/ieee1394.7d
+++ b/usr/src/man/man4d/ieee1394.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IEEE1394 7D "Jan 10, 2020"
+.TH IEEE1394 4D "Jan 10, 2020"
 .SH NAME
 ieee1394, firewire, 1394 \- illumos IEEE-1394 Architecture
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/igb.7d b/usr/src/man/man4d/igb.4d
index de03b084aa..f3fcb429fb 100644
--- a/usr/src/man/man7d/igb.7d
+++ b/usr/src/man/man4d/igb.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2020 Oxide Computer Company
 .\"
 .Dd September 14, 2020
-.Dt IGB 7D
+.Dt IGB 4D
 .Os
 .Sh NAME
 .Nm igb
diff --git a/usr/src/man/man7d/imc.7d b/usr/src/man/man4d/imc.4d
index 9389afd0f1..d1da2da485 100644
--- a/usr/src/man/man7d/imc.7d
+++ b/usr/src/man/man4d/imc.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2019 Joyent, Inc.
 .\"
 .Dd June 25, 2019
-.Dt IMC 7D
+.Dt IMC 4D
 .Os
 .Sh NAME
 .Nm imc
diff --git a/usr/src/man/man7d/imcstub.7d b/usr/src/man/man4d/imcstub.4d
index d4f69c3b7a..1c2b4091a5 100644
--- a/usr/src/man/man7d/imcstub.7d
+++ b/usr/src/man/man4d/imcstub.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2019 Joyent, Inc.
 .\"
 .Dd June 25, 2019
-.Dt IMCSTUB 7D
+.Dt IMCSTUB 4D
 .Os
 .Sh NAME
 .Nm imcstub
diff --git a/usr/src/man/man7d/ipmi.7d b/usr/src/man/man4d/ipmi.4d
index 43a9ead9d6..c61dfd6776 100644
--- a/usr/src/man/man7d/ipmi.7d
+++ b/usr/src/man/man4d/ipmi.4d
@@ -21,7 +21,7 @@
 .\" Copyright (c) 2012, Joyent, Inc. All Rights Reserved
 .\" Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 .\"
-.TH IPMI 7D "Oct 31, 2013"
+.TH IPMI 4D "Oct 31, 2013"
 .SH NAME
 ipmi \- OpenIPMI compatible IPMI interface driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/ipnet.7d b/usr/src/man/man4d/ipnet.4d
index eab138ec78..dd5ace0f1a 100644
--- a/usr/src/man/man7d/ipnet.7d
+++ b/usr/src/man/man4d/ipnet.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IPNET 7D "Apr 8, 2009"
+.TH IPNET 4D "Apr 8, 2009"
 .SH NAME
 ipnet, lo0 \- ipnet device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/iprb.7d b/usr/src/man/man4d/iprb.4d
index 6ac7c445ac..986d687add 100644
--- a/usr/src/man/man7d/iprb.7d
+++ b/usr/src/man/man4d/iprb.4d
@@ -21,7 +21,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 .\"
 .Dd "Aug 3, 2014"
-.Dt IPRB 7D
+.Dt IPRB 4D
 .Os
 .Sh NAME
 .Nm iprb
diff --git a/usr/src/man/man7d/ipw.7d b/usr/src/man/man4d/ipw.4d
index 13d29efd5f..8f564f7866 100644
--- a/usr/src/man/man7d/ipw.7d
+++ b/usr/src/man/man4d/ipw.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IPW 7D "Mar 11, 2007"
+.TH IPW 4D "Mar 11, 2007"
 .SH NAME
 ipw \- Intel Pro. Wireless 802.11b IPW2100B driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/iscsi.7d b/usr/src/man/man4d/iscsi.4d
index 7f4d34ab5e..0ea390605f 100644
--- a/usr/src/man/man7d/iscsi.7d
+++ b/usr/src/man/man4d/iscsi.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ISCSI 7D "Mar 30, 2009"
+.TH ISCSI 4D "Mar 30, 2009"
 .SH NAME
 iscsi \- iSCSI software initiator driver and service
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/iser.7d b/usr/src/man/man4d/iser.4d
index 952775ce88..1684046f5b 100644
--- a/usr/src/man/man7d/iser.7d
+++ b/usr/src/man/man4d/iser.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ISER 7D "Mar 30, 2009"
+.TH ISER 4D "Mar 30, 2009"
 .SH NAME
 iser \- iSCSI Extensions for Remote DMA driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/iwh.7d b/usr/src/man/man4d/iwh.4d
index 6adc1a1c49..d75472ad56 100644
--- a/usr/src/man/man7d/iwh.7d
+++ b/usr/src/man/man4d/iwh.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IWH 7D "Aug 26, 2008"
+.TH IWH 4D "Aug 26, 2008"
 .SH NAME
 iwh \- Intel(R) WiFi Link 5100/5300 Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/iwi.7d b/usr/src/man/man4d/iwi.4d
index 9c0c9118c3..fa70d03789 100644
--- a/usr/src/man/man7d/iwi.7d
+++ b/usr/src/man/man4d/iwi.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IWI 7D "Mar 11, 2007"
+.TH IWI 4D "Mar 11, 2007"
 .SH NAME
 iwi \- Intel Pro. Wireless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/iwn.7d b/usr/src/man/man4d/iwn.4d
index 3769adb11d..b4048f169a 100644
--- a/usr/src/man/man7d/iwn.7d
+++ b/usr/src/man/man4d/iwn.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
 .\"
 .Dd Jun 11, 2016
-.Dt IWN 7D
+.Dt IWN 4D
 .Os
 .Sh NAME
 .Nm iwn
diff --git a/usr/src/man/man7d/ixgbe.7d b/usr/src/man/man4d/ixgbe.4d
index 5b7f8e25e2..2a810986dd 100644
--- a/usr/src/man/man7d/ixgbe.7d
+++ b/usr/src/man/man4d/ixgbe.4d
@@ -5,7 +5,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IXGBE 7D "Jan 10, 2020"
+.TH IXGBE 4D "Jan 10, 2020"
 .SH NAME
 ixgbe \- Intel 10Gb PCI Express NIC Driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/kmdb.7d b/usr/src/man/man4d/kmdb.4d
index d181a42942..a3e00fabbd 100644
--- a/usr/src/man/man7d/kmdb.7d
+++ b/usr/src/man/man4d/kmdb.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH KMDB 7D "May 8, 2004"
+.TH KMDB 4D "May 8, 2004"
 .SH NAME
 kmdb \- Kernel debugger
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ksensor.7d b/usr/src/man/man4d/ksensor.4d
index 1c3449f7a5..4f4a99d41e 100644
--- a/usr/src/man/man7d/ksensor.7d
+++ b/usr/src/man/man4d/ksensor.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2020 Oxide Computer Company
 .\"
 .Dd June 9, 2020
-.Dt KSENSOR 7D
+.Dt KSENSOR 4D
 .Os
 .Sh NAME
 .Nm ksensor
diff --git a/usr/src/man/man7d/kstat.7d b/usr/src/man/man4d/kstat.4d
index d468e9489d..a73b0f403c 100644
--- a/usr/src/man/man7d/kstat.7d
+++ b/usr/src/man/man4d/kstat.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH KSTAT 7D "May 26, 1994"
+.TH KSTAT 4D "May 26, 1994"
 .SH NAME
 kstat \- kernel statistics driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ksyms.7d b/usr/src/man/man4d/ksyms.4d
index fe094d97b8..ed2c313f25 100644
--- a/usr/src/man/man7d/ksyms.7d
+++ b/usr/src/man/man4d/ksyms.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH KSYMS 7D "Dec 11, 2000"
+.TH KSYMS 4D "Dec 11, 2000"
 .SH NAME
 ksyms \- kernel symbols
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/llc1.7d b/usr/src/man/man4d/llc1.4d
index ae9c01c024..a3a6f7bf8e 100644
--- a/usr/src/man/man7d/llc1.7d
+++ b/usr/src/man/man4d/llc1.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LLC1 7D "Feb 13, 1997"
+.TH LLC1 4D "Feb 13, 1997"
 .SH NAME
 llc1 \- Logical Link Control Protocol Class 1 Driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/lockstat.7d b/usr/src/man/man4d/lockstat.4d
index 8bd748536f..ce7e6d822c 100644
--- a/usr/src/man/man7d/lockstat.7d
+++ b/usr/src/man/man4d/lockstat.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LOCKSTAT 7D "Dec 10, 2017"
+.TH LOCKSTAT 4D "Dec 10, 2017"
 .SH NAME
 lockstat \- DTrace kernel lock instrumentation provider
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/lofi.7d b/usr/src/man/man4d/lofi.4d
index 81fffc6354..d3361eba4a 100644
--- a/usr/src/man/man7d/lofi.7d
+++ b/usr/src/man/man4d/lofi.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LOFI 7D "Nov 25, 2008"
+.TH LOFI 4D "Nov 25, 2008"
 .SH NAME
 lofi \- Loopback file driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/log.7d b/usr/src/man/man4d/log.4d
index e6d7fef23d..7ba7825d29 100644
--- a/usr/src/man/man7d/log.7d
+++ b/usr/src/man/man4d/log.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LOG 7D "Mar 11, 1998"
+.TH LOG 4D "Mar 11, 1998"
 .SH NAME
 log \- interface to STREAMS error logging and event tracing
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/mc-opl.7d b/usr/src/man/man4d/mc-opl.4d
index 3dd7028be9..b75fda6801 100644
--- a/usr/src/man/man7d/mc-opl.7d
+++ b/usr/src/man/man4d/mc-opl.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MC-OPL 7D "Apr 18, 2006"
+.TH MC-OPL 4D "Apr 18, 2006"
 .SH NAME
 mc-opl \- memory controller driver for the SPARC Enterprise Server family
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/mega_sas.7d b/usr/src/man/man4d/mega_sas.4d
index 6db8635a58..020c08d190 100644
--- a/usr/src/man/man7d/mega_sas.7d
+++ b/usr/src/man/man4d/mega_sas.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MEGA_SAS 7D "Aug 14, 2008"
+.TH MEGA_SAS 4D "Aug 14, 2008"
 .SH NAME
 mega_sas \- SCSI HBA driver for LSI MegaRAID SAS controller
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/mem.7d b/usr/src/man/man4d/mem.4d
index ab430b7092..a05fe099d8 100644
--- a/usr/src/man/man7d/mem.7d
+++ b/usr/src/man/man4d/mem.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MEM 7D "Feb 18, 2002"
+.TH MEM 4D "Feb 18, 2002"
 .SH NAME
 mem, kmem, allkmem \- physical or virtual memory access
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/mlxcx.7d b/usr/src/man/man4d/mlxcx.4d
index ccbc257641..bf7f39d353 100644
--- a/usr/src/man/man7d/mlxcx.7d
+++ b/usr/src/man/man4d/mlxcx.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2020 the University of Queensland
 .\"
 .Dd August 27, 2020
-.Dt MLXCX 7D
+.Dt MLXCX 4D
 .Os
 .Sh NAME
 .Nm mlxcx
diff --git a/usr/src/man/man7d/mpt_sas.7d b/usr/src/man/man4d/mpt_sas.4d
index bdb5899ae1..b6e0424ebf 100644
--- a/usr/src/man/man7d/mpt_sas.7d
+++ b/usr/src/man/man4d/mpt_sas.4d
@@ -5,7 +5,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 .\" or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add
 .\" the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MPT_SAS 7D "Dec 15, 2017"
+.TH MPT_SAS 4D "Dec 15, 2017"
 .SH NAME
 mpt_sas \- SAS-2/3 host bus adapter driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/mr_sas.7d b/usr/src/man/man4d/mr_sas.4d
index bd4913b07b..88ad8b6c1b 100644
--- a/usr/src/man/man7d/mr_sas.7d
+++ b/usr/src/man/man4d/mr_sas.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MR_SAS 7D "May 28, 2009"
+.TH MR_SAS 4D "May 28, 2009"
 .SH NAME
 mr_sas \- LSI MegaRAID SAS2.0 Controller HBA driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/msglog.7d b/usr/src/man/man4d/msglog.4d
index a22f2f1953..6d24a325f7 100644
--- a/usr/src/man/man7d/msglog.7d
+++ b/usr/src/man/man4d/msglog.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MSGLOG 7D "Oct 13, 1998"
+.TH MSGLOG 4D "Oct 13, 1998"
 .SH NAME
 msglog \- message output collection from system startup or background
 applications
diff --git a/usr/src/man/man7d/mt.7d b/usr/src/man/man4d/mt.4d
index 5f779b5166..d2f3bd8720 100644
--- a/usr/src/man/man7d/mt.7d
+++ b/usr/src/man/man4d/mt.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MT 7D "Jul 3, 1990"
+.TH MT 4D "Jul 3, 1990"
 .SH NAME
 mt \- tape interface
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/mxfe.7d b/usr/src/man/man4d/mxfe.4d
index 5b0f49fe76..72b62122a7 100644
--- a/usr/src/man/man7d/mxfe.7d
+++ b/usr/src/man/man4d/mxfe.4d
@@ -21,7 +21,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 .\"
 .Dd "Aug 7, 2014"
-.Dt MXFE 7D
+.Dt MXFE 4D
 .Os
 .Sh NAME
 .Nm mxfe
diff --git a/usr/src/man/man7d/myri10ge.7d b/usr/src/man/man4d/myri10ge.4d
index 682339de18..dd755f2872 100644
--- a/usr/src/man/man7d/myri10ge.7d
+++ b/usr/src/man/man4d/myri10ge.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 .\" or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add
 .\" the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MYRI10GE 7D "Sep 10, 2009"
+.TH MYRI10GE 4D "Sep 10, 2009"
 .SH NAME
 myri10ge \- Myricom Myri10GE 10Gb PCI Express NIC Driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/n2rng.7d b/usr/src/man/man4d/n2rng.4d
index e851b7bd9e..ee370e6907 100644
--- a/usr/src/man/man7d/n2rng.7d
+++ b/usr/src/man/man4d/n2rng.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH N2RNG 7D "Jan 12, 2020"
+.TH N2RNG 4D "Jan 12, 2020"
 .SH NAME
 n2rng \- Ultra-SPARC T2 random number generator device driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/npe.7d b/usr/src/man/man4d/npe.4d
index e00dd4932e..e478fc6bfe 100644
--- a/usr/src/man/man7d/npe.7d
+++ b/usr/src/man/man4d/npe.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH NPE 7D "Oct 12, 2005"
+.TH NPE 4D "Oct 12, 2005"
 .SH NAME
 npe \- PCI Express bus nexus driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ntwdt.7d b/usr/src/man/man4d/ntwdt.4d
index 553c8c7a38..8e0948ce0d 100644
--- a/usr/src/man/man7d/ntwdt.7d
+++ b/usr/src/man/man4d/ntwdt.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH NTWDT 7D "Jan 10, 2020"
+.TH NTWDT 4D "Jan 10, 2020"
 .SH NAME
 ntwdt \- Netra\(embased application watchdog timer driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/ntxn.7d b/usr/src/man/man4d/ntxn.4d
index 6b14a1cc68..45c1ee4fa5 100644
--- a/usr/src/man/man7d/ntxn.7d
+++ b/usr/src/man/man4d/ntxn.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH NTXN 7D "Oct 13, 2008"
+.TH NTXN 4D "Oct 13, 2008"
 .SH NAME
 ntxn \- NetXen 10/1 Gigabit Ethernet network driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/null.7d b/usr/src/man/man4d/null.4d
index 4c8cec2277..66b14d308d 100644
--- a/usr/src/man/man7d/null.7d
+++ b/usr/src/man/man4d/null.4d
@@ -5,7 +5,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH NULL 7D "Apr 4, 2001"
+.TH NULL 4D "Apr 4, 2001"
 .SH NAME
 null \- the null file, also called the null device
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/nulldriver.7d b/usr/src/man/man4d/nulldriver.4d
index e21efee16d..173abb4d58 100644
--- a/usr/src/man/man7d/nulldriver.7d
+++ b/usr/src/man/man4d/nulldriver.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH NULLDRIVER 7D "Nov 8, 2008"
+.TH NULLDRIVER 4D "Nov 8, 2008"
 .SH NAME
 nulldriver \- Null driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/nv_sata.7d b/usr/src/man/man4d/nv_sata.4d
index 29f2b145a6..ea393d5029 100644
--- a/usr/src/man/man7d/nv_sata.7d
+++ b/usr/src/man/man4d/nv_sata.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH NV_SATA 7D "Sep 25, 2011"
+.TH NV_SATA 4D "Sep 25, 2011"
 .SH NAME
 nv_sata \- NVIDIA CK804/MCP04/MCP51/MCP55/MCP61 SATA controller driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/nvme.7d b/usr/src/man/man4d/nvme.4d
index e7b2dda4c4..94b308e7e4 100644
--- a/usr/src/man/man7d/nvme.7d
+++ b/usr/src/man/man4d/nvme.4d
@@ -14,7 +14,7 @@
 .\" Copyright 2019, Western Digital Corporation
 .\"
 .Dd January 22, 2022
-.Dt NVME 7D
+.Dt NVME 4D
 .Os
 .Sh NAME
 .Nm nvme
diff --git a/usr/src/man/man7d/nxge.7d b/usr/src/man/man4d/nxge.4d
index b940e85cae..5e10ee2be0 100644
--- a/usr/src/man/man7d/nxge.7d
+++ b/usr/src/man/man4d/nxge.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH NXGE 7D "Apr 12, 2008"
+.TH NXGE 4D "Apr 12, 2008"
 .SH NAME
 nxge \- Sun 10/1 Gigabit Ethernet network driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/ohci.7d b/usr/src/man/man4d/ohci.4d
index 922cd18bfd..a47c8cfc32 100644
--- a/usr/src/man/man7d/ohci.7d
+++ b/usr/src/man/man4d/ohci.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH OHCI 7D "May 13, 2017"
+.TH OHCI 4D "May 13, 2017"
 .SH NAME
 ohci \- OpenHCI host controller driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/openprom.7d b/usr/src/man/man4d/openprom.4d
index bc60638cdf..4e6648575d 100644
--- a/usr/src/man/man7d/openprom.7d
+++ b/usr/src/man/man4d/openprom.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH OPENPROM 7D "Jan 13, 1997"
+.TH OPENPROM 4D "Jan 13, 1997"
 .SH NAME
 openprom \- PROM monitor configuration interface
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/oplkmdrv.7d b/usr/src/man/man4d/oplkmdrv.4d
index 6c73dfdb14..3569c76cc8 100644
--- a/usr/src/man/man7d/oplkmdrv.7d
+++ b/usr/src/man/man4d/oplkmdrv.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH OPLKMDRV 7D "Apr 18, 2006"
+.TH OPLKMDRV 4D "Apr 18, 2006"
 .SH NAME
 oplkmdrv \- key management driver for the SPARC Enterprise Server family
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/oplmsu.7d b/usr/src/man/man4d/oplmsu.4d
index 003f66cf3f..aa577a9dd0 100644
--- a/usr/src/man/man7d/oplmsu.7d
+++ b/usr/src/man/man4d/oplmsu.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH OPLMSU 7D "Apr 18, 2006"
+.TH OPLMSU 4D "Apr 18, 2006"
 .SH NAME
 oplmsu \- Serial I/O multiplexing STREAMS device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/oplpanel.7d b/usr/src/man/man4d/oplpanel.4d
index 21a658aa64..20ea13d417 100644
--- a/usr/src/man/man7d/oplpanel.7d
+++ b/usr/src/man/man4d/oplpanel.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH OPLPANEL 7D "Apr 18, 2006"
+.TH OPLPANEL 4D "Apr 18, 2006"
 .SH NAME
 oplpanel \- device driver for the SPARC Enterprise Server family
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/pchtemp.7d b/usr/src/man/man4d/pchtemp.4d
index 954a7d76f3..23d382239f 100644
--- a/usr/src/man/man7d/pchtemp.7d
+++ b/usr/src/man/man4d/pchtemp.4d
@@ -13,7 +13,7 @@
 .\" Copyright 2021 Oxide Computer Company
 .\"
 .Dd January 21, 2021
-.Dt PCHTEMP 7D
+.Dt PCHTEMP 4D
 .Os
 .Sh NAME
 .Nm pchtemp
diff --git a/usr/src/man/man7d/pcic.7d b/usr/src/man/man4d/pcic.4d
index 8d74265931..0b43385efe 100644
--- a/usr/src/man/man7d/pcic.7d
+++ b/usr/src/man/man4d/pcic.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PCIC 7D "Jun 27, 2006"
+.TH PCIC 4D "Jun 27, 2006"
 .SH NAME
 pcic \- Intel i82365SL PC Card Interface Controller
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/pcicmu.7d b/usr/src/man/man4d/pcicmu.4d
index d487645c06..e9d78babd9 100644
--- a/usr/src/man/man7d/pcicmu.7d
+++ b/usr/src/man/man4d/pcicmu.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PCICMU 7D "Apr 18, 2006"
+.TH PCICMU 4D "Apr 18, 2006"
 .SH NAME
 pcicmu \- PCI bus nexus driver for the SPARC Enterprise Server family
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/pcipsy.7d b/usr/src/man/man4d/pcipsy.4d
index 327c700827..d95e59da35 100644
--- a/usr/src/man/man7d/pcipsy.7d
+++ b/usr/src/man/man4d/pcipsy.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PCIPSY 7D "Jan 28, 2019"
+.TH PCIPSY 4D "Jan 28, 2019"
 .SH NAME
 pcipsy \- PCI bus to Safari bus nexus driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/pcisch.7d b/usr/src/man/man4d/pcisch.4d
index a484f11c0b..81ae2949ee 100644
--- a/usr/src/man/man7d/pcisch.7d
+++ b/usr/src/man/man4d/pcisch.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PCISCH 7D "May 26, 2005"
+.TH PCISCH 4D "May 26, 2005"
 .SH NAME
 pcisch \- PCI Bus to Safari bus nexus driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/pcmcia.7d b/usr/src/man/man4d/pcmcia.4d
index 415b94047b..82d5dba8d2 100644
--- a/usr/src/man/man7d/pcmcia.7d
+++ b/usr/src/man/man4d/pcmcia.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PCMCIA 7D "Feb 28, 2005"
+.TH PCMCIA 4D "Feb 28, 2005"
 .SH NAME
 pcmcia \- PCMCIA nexus driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/pcn.7d b/usr/src/man/man4d/pcn.4d
index f78375239d..5460b5abb1 100644
--- a/usr/src/man/man7d/pcn.7d
+++ b/usr/src/man/man4d/pcn.4d
@@ -24,7 +24,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 .\" Portions Copyright (c) 2007 by Sun Microsystems, Inc.  All Rights Reserved.
 
-.TH "PCN" "7D" "Jan 10, 2020"
+.TH "PCN" "4D" "Jan 10, 2020"
 .
 .SH "NAME"
 \fBpcn\fR \- PCnet Ethernet device driver
diff --git a/usr/src/man/man7d/physmem.7d b/usr/src/man/man4d/physmem.4d
index 5881f90aa4..c56ce5d4b9 100644
--- a/usr/src/man/man7d/physmem.7d
+++ b/usr/src/man/man4d/physmem.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PHYSMEM 7D "Nov 15, 2006"
+.TH PHYSMEM 4D "Nov 15, 2006"
 .SH NAME
 physmem \-  physmem driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/pm.7d b/usr/src/man/man4d/pm.4d
index 60679b69f7..f7f9373a6e 100644
--- a/usr/src/man/man7d/pm.7d
+++ b/usr/src/man/man4d/pm.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PM 7D "Sep 20, 1999"
+.TH PM 4D "Sep 20, 1999"
 .SH NAME
 pm \- Power Management driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/poll.7d b/usr/src/man/man4d/poll.4d
index b69594d7da..5418ffa644 100644
--- a/usr/src/man/man7d/poll.7d
+++ b/usr/src/man/man4d/poll.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH POLL 7D "January 10, 2020"
+.TH POLL 4D "January 10, 2020"
 .SH NAME
 poll \- driver for fast poll on many file descriptors
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/profile.7d b/usr/src/man/man4d/profile.4d
index 26f6722179..cdcf04c57c 100644
--- a/usr/src/man/man7d/profile.7d
+++ b/usr/src/man/man4d/profile.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PROFILE 7D "Dec 10, 2017"
+.TH PROFILE 4D "Dec 10, 2017"
 .SH NAME
 profile \- DTrace profile interrupt provider
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ptm.7d b/usr/src/man/man4d/ptm.4d
index 83c7830293..1af8c0d861 100644
--- a/usr/src/man/man7d/ptm.7d
+++ b/usr/src/man/man4d/ptm.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PTM 7D "Feb 5, 1997"
+.TH PTM 4D "Feb 5, 1997"
 .SH NAME
 ptm \- STREAMS pseudo-tty master driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/pts.7d b/usr/src/man/man4d/pts.4d
index 6ac5bbcbd1..c25eac78c2 100644
--- a/usr/src/man/man7d/pts.7d
+++ b/usr/src/man/man4d/pts.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PTS 7D "Feb 29, 2020"
+.TH PTS 4D "Feb 29, 2020"
 .SH NAME
 pts \- STREAMS pseudo-tty slave driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/pty.7d b/usr/src/man/man4d/pty.4d
index e2f85c3224..4b4e2f18c1 100644
--- a/usr/src/man/man7d/pty.7d
+++ b/usr/src/man/man4d/pty.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PTY 7D "Aug 8, 1994"
+.TH PTY 4D "Aug 8, 1994"
 .SH NAME
 pty \- pseudo-terminal driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/qede.7d b/usr/src/man/man4d/qede.4d
index b819e21697..eca2bedfbe 100644
--- a/usr/src/man/man7d/qede.7d
+++ b/usr/src/man/man4d/qede.4d
@@ -12,7 +12,7 @@
 .\" Copyright (c) 2014 QLogic Corporation. All Rights Reserved
 .\"
 .Dd January 10, 2020
-.Dt QEDE 7D
+.Dt QEDE 4D
 .Os
 .Sh NAME
 .Nm qede
diff --git a/usr/src/man/man7d/qlc.7d b/usr/src/man/man4d/qlc.4d
index c4742f95a3..23459edd55 100644
--- a/usr/src/man/man7d/qlc.7d
+++ b/usr/src/man/man4d/qlc.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH QLC 7D "Feb 21, 2005"
+.TH QLC 4D "Feb 21, 2005"
 .SH NAME
 qlc \- ISP2200, ISP2300, and SP212 Family Fibre Channel host bus adapter
 driver.
diff --git a/usr/src/man/man7d/ral.7d b/usr/src/man/man4d/ral.4d
index 4f636ee8c6..182a5ca82e 100644
--- a/usr/src/man/man7d/ral.7d
+++ b/usr/src/man/man4d/ral.4d
@@ -3,7 +3,7 @@
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
 .\" DAMAGES OR ANY DAMAGES  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" Portions Copyright (c) 2007, Sun Microsystems, Inc.  All Rights Reserved
-.TH RAL 7D "Jun 25, 2007"
+.TH RAL 4D "Jun 25, 2007"
 .SH NAME
 ral \- Ralink RT2500 802.11b/g Wireless driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ramdisk.7d b/usr/src/man/man4d/ramdisk.4d
index b49b0b1db3..5d9e2f8462 100644
--- a/usr/src/man/man7d/ramdisk.7d
+++ b/usr/src/man/man4d/ramdisk.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RAMDISK 7D "Mar 04, 2003"
+.TH RAMDISK 4D "Mar 04, 2003"
 .SH NAME
 ramdisk \- RAM disk device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/random.7d b/usr/src/man/man4d/random.4d
index a1c312bd48..ae4471d719 100644
--- a/usr/src/man/man7d/random.7d
+++ b/usr/src/man/man4d/random.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RANDOM 7D "Sep 1, 2008"
+.TH RANDOM 4D "Sep 1, 2008"
 .SH NAME
 random, urandom \- Strong random number generator device
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/rge.7d b/usr/src/man/man4d/rge.4d
index c2c050bba6..0121e39e1b 100644
--- a/usr/src/man/man7d/rge.7d
+++ b/usr/src/man/man4d/rge.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RGE 7D "Dec 21, 2007"
+.TH RGE 4D "Dec 21, 2007"
 .SH NAME
 rge \- Realtek Gigabit/Fast Ethernet Network Adapter driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/rtls.7d b/usr/src/man/man4d/rtls.4d
index f3159bb278..31ffb46b4b 100644
--- a/usr/src/man/man7d/rtls.7d
+++ b/usr/src/man/man4d/rtls.4d
@@ -21,7 +21,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 .\"
 .Dd "Aug 3, 2014"
-.Dt RTLS 7D
+.Dt RTLS 4D
 .Os
 .Sh NAME
 .Nm rtls
diff --git a/usr/src/man/man7d/rtw.7d b/usr/src/man/man4d/rtw.4d
index 6377b80b1f..83b1f06589 100644
--- a/usr/src/man/man7d/rtw.7d
+++ b/usr/src/man/man4d/rtw.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RTW 7D "Jul 12, 2007"
+.TH RTW 4D "Jul 12, 2007"
 .SH NAME
 rtw \- RealTek 8180L 802.11b Wireless NIC driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/rum.7d b/usr/src/man/man4d/rum.4d
index aeb3c774b2..4981dedbab 100644
--- a/usr/src/man/man7d/rum.7d
+++ b/usr/src/man/man4d/rum.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RUM 7D "Oct 29, 2008"
+.TH RUM 4D "Oct 29, 2008"
 .SH NAME
 rum \- Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/rwd.7d b/usr/src/man/man4d/rwd.4d
index fbef0045c9..2c5725f312 100644
--- a/usr/src/man/man7d/rwd.7d
+++ b/usr/src/man/man4d/rwd.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RWD 7D "Jun 18, 2009"
+.TH RWD 4D "Jun 18, 2009"
 .SH NAME
 rwd \- Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g wireless network driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/rwn.7d b/usr/src/man/man4d/rwn.4d
index a0f03c595f..10b45ef504 100644
--- a/usr/src/man/man7d/rwn.7d
+++ b/usr/src/man/man4d/rwn.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RWN 7D "Mar 30, 2009"
+.TH RWN 4D "Mar 30, 2009"
 .SH NAME
 rwn \- Ralink RT2700/2800 IEEE802.11 a/b/g/n wireless network device
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/sad.7d b/usr/src/man/man4d/sad.4d
index ed70b755b9..0c69432867 100644
--- a/usr/src/man/man7d/sad.7d
+++ b/usr/src/man/man4d/sad.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SAD 7D "Apr 16, 1997"
+.TH SAD 4D "Apr 16, 1997"
 .SH NAME
 sad \- STREAMS Administrative Driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/sata.7d b/usr/src/man/man4d/sata.4d
index 558d273d6e..1a1684ce45 100644
--- a/usr/src/man/man7d/sata.7d
+++ b/usr/src/man/man4d/sata.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SATA 7D "May 13, 2017"
+.TH SATA 4D "May 13, 2017"
 .SH NAME
 sata \- Solaris SATA framework
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/scsa1394.7d b/usr/src/man/man4d/scsa1394.4d
index 239dbb0e31..6ab00e4247 100644
--- a/usr/src/man/man7d/scsa1394.7d
+++ b/usr/src/man/man4d/scsa1394.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SCSA1394 7D "May 13, 2017"
+.TH SCSA1394 4D "May 13, 2017"
 .SH NAME
 scsa1394 \- SCSI to 1394 bridge driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/scsa2usb.7d b/usr/src/man/man4d/scsa2usb.4d
index e52a46fb26..bf7e7aa04a 100644
--- a/usr/src/man/man7d/scsa2usb.7d
+++ b/usr/src/man/man4d/scsa2usb.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SCSA2USB 7D "May 23, 2021"
+.TH SCSA2USB 4D "May 23, 2021"
 .SH NAME
 scsa2usb \- SCSI to USB bridge driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/sd.7d b/usr/src/man/man4d/sd.4d
index 733179ebd3..6fc7581a9c 100644
--- a/usr/src/man/man7d/sd.7d
+++ b/usr/src/man/man4d/sd.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER,
 .\" with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SD 7D "September 12, 2020"
+.TH SD 4D "September 12, 2020"
 .SH NAME
 sd \- SCSI disk and ATAPI/SCSI CD-ROM device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/sda.7d b/usr/src/man/man4d/sda.4d
index 35d7e5d4b0..f4c01ff58e 100644
--- a/usr/src/man/man7d/sda.7d
+++ b/usr/src/man/man4d/sda.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SDA 7D "Jan 8, 2009"
+.TH SDA 4D "Jan 8, 2009"
 .SH NAME
 sda \- SD/MMC architecture
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/sdhost.7d b/usr/src/man/man4d/sdhost.4d
index c1cc7aaf0b..ec1c64c5ad 100644
--- a/usr/src/man/man7d/sdhost.7d
+++ b/usr/src/man/man4d/sdhost.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SDHOST 7D "Jan 8, 2009"
+.TH SDHOST 4D "Jan 8, 2009"
 .SH NAME
 sdhost \- Standard-compliant Secure Digital slot driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/sdp.7d b/usr/src/man/man4d/sdp.4d
index 2f7411761c..5c4b891c9e 100644
--- a/usr/src/man/man7d/sdp.7d
+++ b/usr/src/man/man4d/sdp.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SDP 7D "June 19, 2021"
+.TH SDP 4D "June 19, 2021"
 .SH NAME
 sdp \- Sockets Direct Protocol driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/sdt.7d b/usr/src/man/man4d/sdt.4d
index f42b6885a9..2ad66d7f79 100644
--- a/usr/src/man/man7d/sdt.7d
+++ b/usr/src/man/man4d/sdt.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SDT 7D "Dec 10, 2017"
+.TH SDT 4D "Dec 10, 2017"
 .SH NAME
 sdt \- DTrace statically defined tracing provider
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ses.7d b/usr/src/man/man4d/ses.4d
index 76e92bd4cb..da3344369a 100644
--- a/usr/src/man/man7d/ses.7d
+++ b/usr/src/man/man4d/ses.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SES 7D "May 27, 2008"
+.TH SES 4D "May 27, 2008"
 .SH NAME
 ses \- SCSI enclosure services device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/sf.7d b/usr/src/man/man4d/sf.4d
index 719e43b46a..10e2bd8251 100644
--- a/usr/src/man/man7d/sf.7d
+++ b/usr/src/man/man4d/sf.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SF 7D "Mar 27, 1997"
+.TH SF 4D "Mar 27, 1997"
 .SH NAME
 sf \- SOC+ FC-AL FCP Driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/sfe.7d b/usr/src/man/man4d/sfe.4d
index b1bf0b2902..a485ff70cc 100644
--- a/usr/src/man/man7d/sfe.7d
+++ b/usr/src/man/man4d/sfe.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SFE 7D "Dec 12, 2007"
+.TH SFE 4D "Dec 12, 2007"
 .SH NAME
 sfe \- SiS900 series Fast Ethernet device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/sfxge.7d b/usr/src/man/man4d/sfxge.4d
index ae375587f1..03187fa26d 100644
--- a/usr/src/man/man7d/sfxge.7d
+++ b/usr/src/man/man4d/sfxge.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2016 Garrett D'Amore <garrett@damore.org>
 .\"
 .Dd Apr 11, 2016
-.Dt SFXGE 7D
+.Dt SFXGE 4D
 .Os
 .Sh NAME
 .Nm sfxge
diff --git a/usr/src/man/man7d/sgen.7d b/usr/src/man/man4d/sgen.4d
index dc2c9078f1..ea80efea2c 100644
--- a/usr/src/man/man7d/sgen.7d
+++ b/usr/src/man/man4d/sgen.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SGEN 7D "April 9, 2016"
+.TH SGEN 4D "April 9, 2016"
 .SH NAME
 sgen \- Generic SCSI device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/si3124.7d b/usr/src/man/man4d/si3124.4d
index 6205e21618..6f8f66fac0 100644
--- a/usr/src/man/man7d/si3124.7d
+++ b/usr/src/man/man4d/si3124.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SI3124 7D "Aug 17, 2007"
+.TH SI3124 4D "Aug 17, 2007"
 .SH NAME
 si3124 \- SiliconImage 3124/3132/3531 SATA controller driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/skd.7d b/usr/src/man/man4d/skd.4d
index 4d9488674f..04ca660f1e 100644
--- a/usr/src/man/man7d/skd.7d
+++ b/usr/src/man/man4d/skd.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 .\"
 
-.TH SKD 7D "August 10, 2013"
+.TH SKD 4D "August 10, 2013"
 .SH NAME
 skd \- sTec S112x PCIe Solid-State Disk driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/smbios.7d b/usr/src/man/man4d/smbios.4d
index b38a90b70b..751a50212a 100644
--- a/usr/src/man/man7d/smbios.7d
+++ b/usr/src/man/man4d/smbios.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SMBIOS 7D "Aug 26, 2005"
+.TH SMBIOS 4D "Aug 26, 2005"
 .SH NAME
 smbios \- System Management BIOS image
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/smbus.7d b/usr/src/man/man4d/smbus.4d
index cbeb16a8c4..ed1d755720 100644
--- a/usr/src/man/man7d/smbus.7d
+++ b/usr/src/man/man4d/smbus.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SMBUS 7D "Jul 23, 2003"
+.TH SMBUS 4D "Jul 23, 2003"
 .SH NAME
 smbus \- System Management Bus controller driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/smntemp.7d b/usr/src/man/man4d/smntemp.4d
index 903d060825..14e9070b59 100644
--- a/usr/src/man/man7d/smntemp.7d
+++ b/usr/src/man/man4d/smntemp.4d
@@ -13,7 +13,7 @@
 .\" Copyright 2020 Oxide Computer Company
 .\"
 .Dd September 1, 2020
-.Dt SMNTEMP 7D
+.Dt SMNTEMP 4D
 .Os
 .Sh NAME
 .Nm smntemp
diff --git a/usr/src/man/man7d/socal.7d b/usr/src/man/man4d/socal.4d
index 9a00167866..2d272ce7c7 100644
--- a/usr/src/man/man7d/socal.7d
+++ b/usr/src/man/man4d/socal.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SOCAL 7D "May 9, 1997"
+.TH SOCAL 4D "May 9, 1997"
 .SH NAME
 socal \- Serial Optical Controller for Fibre Channel Arbitrated Loop (SOC+)
 device driver
diff --git a/usr/src/man/man7d/srpt.7d b/usr/src/man/man4d/srpt.4d
index ee9917112c..621bec5775 100644
--- a/usr/src/man/man7d/srpt.7d
+++ b/usr/src/man/man4d/srpt.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SRPT 7D "May 21, 2009"
+.TH SRPT 4D "May 21, 2009"
 .SH NAME
 srpt \- SCSI RDMA Protocol Target Driver for Infiniband (IB)
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ssd.7d b/usr/src/man/man4d/ssd.4d
index 97e959b598..ce97aeeae6 100644
--- a/usr/src/man/man7d/ssd.7d
+++ b/usr/src/man/man4d/ssd.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SSD 7D "September 12, 2020"
+.TH SSD 4D "September 12, 2020"
 .SH NAME
 ssd \- Fibre Channel Arbitrated Loop disk device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/st.7d b/usr/src/man/man4d/st.4d
index 6d5734d97c..c246cd28b6 100644
--- a/usr/src/man/man7d/st.7d
+++ b/usr/src/man/man4d/st.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ST 7D "April 9, 2016"
+.TH ST 4D "April 9, 2016"
 .SH NAME
 st \- driver for SCSI tape devices
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/su.7d b/usr/src/man/man4d/su.4d
index 564c7e96a0..93ffb7f5b9 100644
--- a/usr/src/man/man7d/su.7d
+++ b/usr/src/man/man4d/su.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SU 7D "April 9, 2016"
+.TH SU 4D "April 9, 2016"
 .SH NAME
 su \- asynchronous serial port driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/sysmsg.7d b/usr/src/man/man4d/sysmsg.4d
index be7166207c..f242d3feb6 100644
--- a/usr/src/man/man7d/sysmsg.7d
+++ b/usr/src/man/man4d/sysmsg.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SYSMSG 7D "Oct 13, 1998"
+.TH SYSMSG 4D "Oct 13, 1998"
 .SH NAME
 sysmsg \- system message routing to console devices
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/systrace.7d b/usr/src/man/man4d/systrace.4d
index aab1fa03fd..4e416d54be 100644
--- a/usr/src/man/man7d/systrace.7d
+++ b/usr/src/man/man4d/systrace.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SYSTRACE 7D "Dec 10, 2017"
+.TH SYSTRACE 4D "Dec 10, 2017"
 .SH NAME
 systrace \- DTrace system call tracing provider
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ticlts.7d b/usr/src/man/man4d/ticlts.4d
index f05474ed85..1e69d3466e 100644
--- a/usr/src/man/man7d/ticlts.7d
+++ b/usr/src/man/man4d/ticlts.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH TICLTS 7D "Jul 3, 1990"
+.TH TICLTS 4D "Jul 3, 1990"
 .SH NAME
 ticlts, ticots, ticotsord \- loopback transport providers
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/todopl.7d b/usr/src/man/man4d/todopl.4d
index 14e0a001f7..02935434bc 100644
--- a/usr/src/man/man7d/todopl.7d
+++ b/usr/src/man/man4d/todopl.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH TODOPOL 7D "Apr 18, 2006"
+.TH TODOPOL 4D "Apr 18, 2006"
 .SH NAME
 todopl \- Time-Of-Day driver for SPARC Enterprise Server family
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/tsalarm.7d b/usr/src/man/man4d/tsalarm.4d
index c2ee9ae421..d8be6cf190 100644
--- a/usr/src/man/man7d/tsalarm.7d
+++ b/usr/src/man/man4d/tsalarm.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH TSALARM 7D "Sep 10, 2013"
+.TH TSALARM 4D "Sep 10, 2013"
 .SH NAME
 tsalarm \- Alarm device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/tty.7d b/usr/src/man/man4d/tty.4d
index 0a814ada28..09554c9da8 100644
--- a/usr/src/man/man7d/tty.7d
+++ b/usr/src/man/man4d/tty.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH TTY 7D "Jul 3, 1990"
+.TH TTY 4D "Jul 3, 1990"
 .SH NAME
 tty \- controlling terminal interface
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/tzmon.7d b/usr/src/man/man4d/tzmon.4d
index 388087a506..d8bcfff524 100644
--- a/usr/src/man/man7d/tzmon.7d
+++ b/usr/src/man/man4d/tzmon.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH TZMON 7D "Oct 31, 2006"
+.TH TZMON 4D "Oct 31, 2006"
 .SH NAME
 tzmon \- ACPI Thermal Zone Monitor
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/uath.7d b/usr/src/man/man4d/uath.4d
index 585e18311f..93b934e372 100644
--- a/usr/src/man/man7d/uath.7d
+++ b/usr/src/man/man4d/uath.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH UATH 7D "Sep 10, 2009"
+.TH UATH 4D "Sep 10, 2009"
 .SH NAME
 uath \- Atheros AR5523 USB IEEE802.11a/b/g Wireless Network Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/ufm.7d b/usr/src/man/man4d/ufm.4d
index ea3b7fa4c3..99d6a8c699 100644
--- a/usr/src/man/man7d/ufm.7d
+++ b/usr/src/man/man4d/ufm.4d
@@ -13,7 +13,7 @@
 .\" Copyright 2020 Oxide Computer Company
 .\"
 .Dd May 23, 2021
-.Dt UFM 7D
+.Dt UFM 4D
 .Os
 .Sh NAME
 .Nm ufm
diff --git a/usr/src/man/man7d/ugen.7d b/usr/src/man/man4d/ugen.4d
index b7a3079a28..910e24c01e 100644
--- a/usr/src/man/man7d/ugen.7d
+++ b/usr/src/man/man4d/ugen.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH UGEN 7D "May 13, 2017"
+.TH UGEN 4D "May 13, 2017"
 .SH NAME
 ugen \- USB generic driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/uhci.7d b/usr/src/man/man4d/uhci.4d
index b291369a35..7a97b3464d 100644
--- a/usr/src/man/man7d/uhci.7d
+++ b/usr/src/man/man4d/uhci.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH UHCI 7D "May 13, 2017"
+.TH UHCI 4D "May 13, 2017"
 .SH NAME
 uhci \- host controller driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/ural.7d b/usr/src/man/man4d/ural.4d
index b115ce96d9..822d82d9fc 100644
--- a/usr/src/man/man7d/ural.7d
+++ b/usr/src/man/man4d/ural.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH URAL 7D "May 6, 2008"
+.TH URAL 4D "May 6, 2008"
 .SH NAME
 ural \- Ralink RT2500USB 802.11b/g Wireless Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/urtw.7d b/usr/src/man/man4d/urtw.4d
index 39037a6f2f..d1d0ad14f3 100644
--- a/usr/src/man/man7d/urtw.7d
+++ b/usr/src/man/man4d/urtw.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH URTW 7D "Aug 20, 2009"
+.TH URTW 4D "Aug 20, 2009"
 .SH NAME
 urtw \- RealTek RTL8187L/RTL8187B USB 802.11b/g Wireless Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/usb_ac.7d b/usr/src/man/man4d/usb_ac.4d
index d0cd3b3a51..b2786e8880 100644
--- a/usr/src/man/man7d/usb_ac.7d
+++ b/usr/src/man/man4d/usb_ac.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USB_AC 7D "May 13, 2009"
+.TH USB_AC 4D "May 13, 2009"
 .SH NAME
 usb_ac \- USB audio control driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usb_as.7d b/usr/src/man/man4d/usb_as.4d
index 1ab1bdb569..d34b2c1a0a 100644
--- a/usr/src/man/man7d/usb_as.7d
+++ b/usr/src/man/man4d/usb_as.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USB_AS 7D "May 15, 2009"
+.TH USB_AS 4D "May 15, 2009"
 .SH NAME
 usb_as \- USB audio streaming driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usb_ia.7d b/usr/src/man/man4d/usb_ia.4d
index 206d5c0e1e..c47b14c60f 100644
--- a/usr/src/man/man7d/usb_ia.7d
+++ b/usr/src/man/man4d/usb_ia.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USB_IA 7D "May 13, 2017"
+.TH USB_IA 4D "May 13, 2017"
 .SH NAME
 usb_ia \- USB interface association driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usb_mid.7d b/usr/src/man/man4d/usb_mid.4d
index 6baa22f718..1d77e99b54 100644
--- a/usr/src/man/man7d/usb_mid.7d
+++ b/usr/src/man/man4d/usb_mid.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USB_MID 7D "May 13, 2017"
+.TH USB_MID 4D "May 13, 2017"
 .SH NAME
 usb_mid \- USB Multi Interface Driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usba.7d b/usr/src/man/man4d/usba.4d
index 25cc63c8ea..fcf142fad1 100644
--- a/usr/src/man/man7d/usba.7d
+++ b/usr/src/man/man4d/usba.4d
@@ -5,7 +5,7 @@
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
 .Dd Jan 10, 2020
-.Dt USBA 7D
+.Dt USBA 4D
 .Os
 .Sh NAME
 .Nm usba ,
diff --git a/usr/src/man/man7d/usbftdi.7d b/usr/src/man/man4d/usbftdi.4d
index 0fc49718d7..6d60c1f75a 100644
--- a/usr/src/man/man7d/usbftdi.7d
+++ b/usr/src/man/man4d/usbftdi.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USBFTDI 7D "Aug 13, 2021"
+.TH USBFTDI 4D "Aug 13, 2021"
 .SH NAME
 usbftdi \- FTDI USB to serial converter driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usbprn.7d b/usr/src/man/man4d/usbprn.4d
index 9f5d326917..974e0ff1d2 100644
--- a/usr/src/man/man7d/usbprn.7d
+++ b/usr/src/man/man4d/usbprn.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USBPRN 7D "May 17, 2020"
+.TH USBPRN 4D "May 17, 2020"
 .SH NAME
 usbprn \- USB printer class driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usbsacm.7d b/usr/src/man/man4d/usbsacm.4d
index ac478e5c21..bf18edcda3 100644
--- a/usr/src/man/man7d/usbsacm.7d
+++ b/usr/src/man/man4d/usbsacm.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USBSACM 7D "Aug 13, 2021"
+.TH USBSACM 4D "Aug 13, 2021"
 .SH NAME
 usbsacm \- USB communication device class ACM driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usbsksp.7d b/usr/src/man/man4d/usbsksp.4d
index c0a946ae97..47b07503e0 100644
--- a/usr/src/man/man7d/usbsksp.7d
+++ b/usr/src/man/man4d/usbsksp.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USBSKSP 7D "May 13, 2017"
+.TH USBSKSP 4D "May 13, 2017"
 .SH NAME
 usbsksp \- Keyspan USB to serial converter driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usbsprl.7d b/usr/src/man/man4d/usbsprl.4d
index 6b66182f79..3f69040503 100644
--- a/usr/src/man/man7d/usbsprl.7d
+++ b/usr/src/man/man4d/usbsprl.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USBSPRL 7D "Nov 23, 2006"
+.TH USBSPRL 4D "Nov 23, 2006"
 .SH NAME
 usbsprl \- Prolific PL2303 USB to serial converter driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usbvc.7d b/usr/src/man/man4d/usbvc.4d
index 9fe2bd332b..fddecea13f 100644
--- a/usr/src/man/man7d/usbvc.7d
+++ b/usr/src/man/man4d/usbvc.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USBVC 7D "May 13, 2017"
+.TH USBVC 4D "May 13, 2017"
 .SH NAME
 usbvc \- USB video class driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/usmn.7d b/usr/src/man/man4d/usmn.4d
index 97655c0c79..c2ae057cd5 100644
--- a/usr/src/man/man7d/usmn.7d
+++ b/usr/src/man/man4d/usmn.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2021 Oxide Computer Company
 .\"
 .Dd July 30, 2021
-.Dt USMN 7D
+.Dt USMN 4D
 .Os
 .Sh NAME
 .Nm usmn
diff --git a/usr/src/man/man7d/vioblk.7d b/usr/src/man/man4d/vioblk.4d
index 26c45507bb..3497a3347c 100644
--- a/usr/src/man/man7d/vioblk.7d
+++ b/usr/src/man/man4d/vioblk.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2020 Oxide Computer Company
 .\"
 .Dd August 28, 2021
-.Dt VIOBLK 7D
+.Dt VIOBLK 4D
 .Os
 .Sh NAME
 .Nm vioblk
diff --git a/usr/src/man/man7d/vioif.7d b/usr/src/man/man4d/vioif.4d
index b2302cf36c..d560b15d98 100644
--- a/usr/src/man/man7d/vioif.7d
+++ b/usr/src/man/man4d/vioif.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2020 Oxide Computer Company
 .\"
 .Dd October 3, 2020
-.Dt VIOIF 7D
+.Dt VIOIF 4D
 .Os
 .Sh NAME
 .Nm vioif
diff --git a/usr/src/man/man7d/virtio.7d b/usr/src/man/man4d/virtio.4d
index f5751f4fa7..54bf35e364 100644
--- a/usr/src/man/man7d/virtio.7d
+++ b/usr/src/man/man4d/virtio.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2020 Oxide Computer Company
 .\"
 .Dd October 3, 2020
-.Dt VIRTIO 7D
+.Dt VIRTIO 4D
 .Os
 .Sh NAME
 .Nm virtio
diff --git a/usr/src/man/man7d/virtualkm.7d b/usr/src/man/man4d/virtualkm.4d
index f5eb32a428..c46b7e4f18 100644
--- a/usr/src/man/man7d/virtualkm.7d
+++ b/usr/src/man/man4d/virtualkm.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH VIRTUALKM 7D "May 13, 2017"
+.TH VIRTUALKM 4D "May 13, 2017"
 .SH NAME
 virtualkm \- Virtual keyboard and mouse
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/vni.7d b/usr/src/man/man4d/vni.4d
index f97ec438d2..7747dfe4c5 100644
--- a/usr/src/man/man7d/vni.7d
+++ b/usr/src/man/man4d/vni.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH VNI 7D "Jul 18, 2004"
+.TH VNI 4D "Jul 18, 2004"
 .SH NAME
 vni \- STREAMS virtual network interface driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/vr.7d b/usr/src/man/man4d/vr.4d
index b6f98c46a1..2679d4cb39 100644
--- a/usr/src/man/man7d/vr.7d
+++ b/usr/src/man/man4d/vr.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH VR 7D "May 5, 2009"
+.TH VR 4D "May 5, 2009"
 .SH NAME
 vr \- driver for VIA Rhine fast Ethernet controllers
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/wpi.7d b/usr/src/man/man4d/wpi.4d
index 6cf2991334..5e56afbb16 100644
--- a/usr/src/man/man7d/wpi.7d
+++ b/usr/src/man/man4d/wpi.4d
@@ -6,7 +6,7 @@
 .\" A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 .\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 .\" Portions Copyright (c) 2007 by Sun Microsystems, Inc.  All Rights Reserved.
-.TH WPI 7D "Apr 23, 2007"
+.TH WPI 4D "Apr 23, 2007"
 .SH NAME
 wpi \- Intel Pro Wireless 802.11a/b/g 3945 driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/wscons.7d b/usr/src/man/man4d/wscons.4d
index cbafe66ddd..04ed20207c 100644
--- a/usr/src/man/man7d/wscons.7d
+++ b/usr/src/man/man4d/wscons.4d
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH WSCONS 7D "August 29, 2021"
+.TH WSCONS 4D "August 29, 2021"
 .SH NAME
 wscons \- workstation console
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/xge.7d b/usr/src/man/man4d/xge.4d
index c55d8bedd4..948455c2dc 100644
--- a/usr/src/man/man7d/xge.7d
+++ b/usr/src/man/man4d/xge.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH XGE 7D "Oct 3, 2005"
+.TH XGE 4D "Oct 3, 2005"
 .SH NAME
 xge \- Neterion Xframe 10Gigabit Ethernet Network Adapter driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/xhci.7d b/usr/src/man/man4d/xhci.4d
index a915a099b1..2d72b6bf1a 100644
--- a/usr/src/man/man7d/xhci.7d
+++ b/usr/src/man/man4d/xhci.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2016 Joyent, Inc.
 .\"
 .Dd January 10, 2020
-.Dt XHCI 7D
+.Dt XHCI 4D
 .Os
 .Sh NAME
 .Nm xhci
diff --git a/usr/src/man/man7d/yge.7d b/usr/src/man/man4d/yge.4d
index 1d1d013478..76bf335ec5 100644
--- a/usr/src/man/man7d/yge.7d
+++ b/usr/src/man/man4d/yge.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH YGE 7D "Sep 15, 2009"
+.TH YGE 4D "Sep 15, 2009"
 .SH NAME
 yge \- Marvell Yukon 2 Ethernet device driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/zcons.7d b/usr/src/man/man4d/zcons.4d
index 433daddbcf..3a4158eae2 100644
--- a/usr/src/man/man7d/zcons.7d
+++ b/usr/src/man/man4d/zcons.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ZCONS 7D "Aug 24, 2003"
+.TH ZCONS 4D "Aug 24, 2003"
 .SH NAME
 zcons \- Zone console device driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/zen_udf.7d b/usr/src/man/man4d/zen_udf.4d
index a2243ef67f..b85fc9f4f1 100644
--- a/usr/src/man/man7d/zen_udf.7d
+++ b/usr/src/man/man4d/zen_udf.4d
@@ -12,7 +12,7 @@
 .\" Copyright 2020 Oxide Computer Company
 .\"
 .Dd October 7, 2020
-.Dt ZEN_UDF 7D
+.Dt ZEN_UDF 4D
 .Os
 .Sh NAME
 .Nm zen_udf
diff --git a/usr/src/man/man7d/zero.7d b/usr/src/man/man4d/zero.4d
index 35734e6f6c..d02b92a281 100644
--- a/usr/src/man/man7d/zero.7d
+++ b/usr/src/man/man4d/zero.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ZERO 7D "Jul 3, 1990"
+.TH ZERO 4D "Jul 3, 1990"
 .SH NAME
 zero \- source of zeroes
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/zs.7d b/usr/src/man/man4d/zs.4d
index 690935cca8..1711ee0b63 100644
--- a/usr/src/man/man7d/zs.7d
+++ b/usr/src/man/man4d/zs.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ZS 7D "April 9, 2016"
+.TH ZS 4D "April 9, 2016"
 .SH NAME
 zs \- Zilog 8530 SCC serial communications driver
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/zsh.7d b/usr/src/man/man4d/zsh.4d
index a62707e8a2..e8bb0c9ffd 100644
--- a/usr/src/man/man7d/zsh.7d
+++ b/usr/src/man/man4d/zsh.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ZSH 7D "Jan 1, 1997"
+.TH ZSH 4D "Jan 1, 1997"
 .SH NAME
 zsh \- On-board serial HDLC/SDLC interface
 .SH SYNOPSIS
diff --git a/usr/src/man/man7d/zyd.7d b/usr/src/man/man4d/zyd.4d
index 83a2912dd2..ca5ff9da96 100644
--- a/usr/src/man/man7d/zyd.7d
+++ b/usr/src/man/man4d/zyd.4d
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ZYD 7D "Dec 10, 2008"
+.TH ZYD 4D "Dec 10, 2008"
 .SH NAME
 zyd \- ZyDAS ZD1211/ZD1211B USB 802.11b/g Wireless Driver
 .SH DESCRIPTION
diff --git a/usr/src/man/man7d/Makefile b/usr/src/man/man7d/Makefile
deleted file mode 100644
index af38c7a9bd..0000000000
--- a/usr/src/man/man7d/Makefile
+++ /dev/null
@@ -1,296 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet
-# at http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2011, Richard Lowe
-# Copyright 2016 Garrett D'Amore <garrett@damore.org>
-# Copyright 2019 Joyent, Inc.
-# Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
-# Copyright 2018 Nexenta Systems, Inc.
-# Copyright 2020 Peter Tribble
-# Copyright 2021 Oxide Computer Company
-#
-
-include		$(SRC)/Makefile.master
-
-MANSECT=	7d
-
-_MANFILES=	aac.7d		\
-		afe.7d		\
-		audio.7d	\
-		audio1575.7d	\
-		audioens.7d	\
-		audiols.7d	\
-		audiop16x.7d	\
-		audiopci.7d	\
-		audiots.7d	\
-		av1394.7d	\
-		bge.7d		\
-		blkdev.7d	\
-		bnxe.7d		\
-		ccid.7d		\
-		chxge.7d	\
-		console.7d	\
-		cpuid.7d	\
-		dca.7d		\
-		dcam1394.7d	\
-		devinfo.7d	\
-		dmfe.7d		\
-		dtrace.7d	\
-		e1000g.7d	\
-		ehci.7d		\
-		ena.7d		\
-		fasttrap.7d	\
-		fbt.7d		\
-		fcip.7d		\
-		fcoe.7d		\
-		fcoei.7d	\
-		fcoet.7d	\
-		fcp.7d		\
-		fctl.7d		\
-		fd.7d		\
-		fp.7d		\
-		full.7d		\
-		gld.7d		\
-		hci1394.7d	\
-		hermon.7d	\
-		hid.7d		\
-		hme.7d		\
-		hubd.7d		\
-		hxge.7d		\
-		ib.7d		\
-		ibcm.7d		\
-		ibd.7d		\
-		ibdm.7d		\
-		ibdma.7d	\
-		ibtl.7d		\
-		ieee1394.7d	\
-		igb.7d		\
-		ipnet.7d	\
-		iscsi.7d	\
-		iser.7d		\
-		ixgbe.7d	\
-		kmdb.7d		\
-		kstat.7d	\
-		ksensor.7d	\
-		ksyms.7d	\
-		llc1.7d		\
-		lockstat.7d	\
-		lofi.7d		\
-		log.7d		\
-		mem.7d		\
-		mpt_sas.7d	\
-		mr_sas.7d	\
-		msglog.7d	\
-		mt.7d		\
-		mxfe.7d		\
-		myri10ge.7d	\
-		null.7d		\
-		nulldriver.7d	\
-		nxge.7d		\
-		ohci.7d		\
-		openprom.7d	\
-		pcic.7d		\
-		pcmcia.7d	\
-		physmem.7d	\
-		pm.7d		\
-		poll.7d		\
-		profile.7d	\
-		ptm.7d		\
-		pts.7d		\
-		pty.7d		\
-		qlc.7d		\
-		ramdisk.7d	\
-		random.7d	\
-		rge.7d		\
-		rtls.7d		\
-		sad.7d		\
-		sata.7d		\
-		scsa1394.7d	\
-		scsa2usb.7d	\
-		sd.7d		\
-		sdp.7d		\
-		sdt.7d		\
-		ses.7d		\
-		sfe.7d		\
-		sgen.7d		\
-		srpt.7d		\
-		st.7d		\
-		sysmsg.7d	\
-		systrace.7d	\
-		ticlts.7d	\
-		tty.7d		\
-		tzmon.7d	\
-		ufm.7d		\
-		ugen.7d		\
-		uhci.7d		\
-		usb_ac.7d	\
-		usb_as.7d	\
-		usb_ia.7d	\
-		usb_mid.7d	\
-		usba.7d		\
-		usbftdi.7d	\
-		usbprn.7d	\
-		usbsacm.7d	\
-		usbsksp.7d	\
-		usbsprl.7d	\
-		usbvc.7d	\
-		virtualkm.7d	\
-		vni.7d		\
-		vr.7d		\
-		wscons.7d	\
-		xge.7d		\
-		yge.7d		\
-		zcons.7d	\
-		zero.7d
-
-sparc_MANFILES=	audiocs.7d	\
-		bbc_beep.7d	\
-		dad.7d		\
-		dm2s.7d		\
-		dr.7d		\
-		eri.7d		\
-		fas.7d		\
-		gpio_87317.7d	\
-		grbeep.7d	\
-		mc-opl.7d	\
-		n2rng.7d	\
-		ntwdt.7d	\
-		oplkmdrv.7d	\
-		oplmsu.7d	\
-		oplpanel.7d	\
-		pcicmu.7d	\
-		pcipsy.7d	\
-		pcisch.7d	\
-		sf.7d		\
-		smbus.7d	\
-		socal.7d	\
-		ssd.7d		\
-		su.7d		\
-		todopl.7d	\
-		tsalarm.7d	\
-		zs.7d		\
-		zsh.7d
-
-i386_MANFILES=	ahci.7d		\
-		amd8111s.7d	\
-		amdnbtemp.7d	\
-		amdzen.7d	\
-		amr.7d		\
-		arcmsr.7d	\
-		arn.7d		\
-		asy.7d		\
-		ata.7d		\
-		atge.7d		\
-		ath.7d		\
-		atu.7d		\
-		audio810.7d	\
-		audiocmi.7d	\
-		audiocmihd.7d	\
-		audioemu10k.7d	\
-		audiohd.7d	\
-		audioixp.7d	\
-		audiosolo.7d	\
-		audiovia823x.7d \
-		bcm_sata.7d	\
-		bfe.7d		\
-		cmdk.7d		\
-		coretemp.7d	\
-		cpqary3.7d	\
-		dnet.7d		\
-		ecpp.7d		\
-		elxl.7d		\
-		i40e.7d		\
-		imc.7d		\
-		imcstub.7d	\
-		ipmi.7d		\
-		iprb.7d		\
-		ipw.7d		\
-		iwh.7d		\
-		iwi.7d		\
-		iwn.7d		\
-		mega_sas.7d	\
-		mlxcx.7d	\
-		npe.7d		\
-		ntxn.7d		\
-		nv_sata.7d	\
-		nvme.7d		\
-		pchtemp.7d	\
-		pcn.7d		\
-		qede.7d		\
-		ral.7d		\
-		rtw.7d		\
-		rum.7d		\
-		rwd.7d		\
-		rwn.7d		\
-		sda.7d		\
-		sdhost.7d	\
-		sfxge.7d	\
-		si3124.7d	\
-		skd.7d		\
-		smbios.7d	\
-		smntemp.7d	\
-		uath.7d		\
-		ural.7d		\
-		urtw.7d		\
-		usmn.7d		\
-		vioblk.7d	\
-		vioif.7d	\
-		virtio.7d	\
-		wpi.7d		\
-		xhci.7d		\
-		zen_udf.7d	\
-		zyd.7d
-
-_MANLINKS=	1394.7d		\
-		allkmem.7d	\
-		fdc.7d		\
-		firewire.7d	\
-		kmem.7d		\
-		lo0.7d		\
-		ticots.7d	\
-		ticotsord.7d	\
-		urandom.7d	\
-		usb.7d
-
-sparc_MANLINKS=	drmach.7d
-
-i386_MANLINKS=	amdzen_stub.7d
-
-MANFILES =	$(_MANFILES) $($(MACH)_MANFILES)
-MANLINKS =	$(_MANLINKS) $($(MACH)_MANLINKS)
-
-amdzen_stub.7d	:= LINKSRC = amdzen.7d
-
-drmach.7d	:= LINKSRC = dr.7d
-
-fdc.7d		:= LINKSRC = fd.7d
-
-1394.7d		:= LINKSRC = ieee1394.7d
-firewire.7d	:= LINKSRC = ieee1394.7d
-
-lo0.7d		:= LINKSRC = ipnet.7d
-
-allkmem.7d	:= LINKSRC = mem.7d
-kmem.7d		:= LINKSRC = mem.7d
-
-urandom.7d	:= LINKSRC = random.7d
-
-ticots.7d	:= LINKSRC = ticlts.7d
-ticotsord.7d	:= LINKSRC = ticlts.7d
-
-usb.7d		:= LINKSRC = usba.7d
-
-.KEEP_STATE:
-
-include		$(SRC)/man/Makefile.man
-
-install:	$(ROOTMANFILES) $(ROOTMANLINKS)
diff --git a/usr/src/pkg/manifests/SUNWcs.man7d.inc b/usr/src/pkg/manifests/SUNWcs.man4d.inc
index 66aec80ed4..9e4743776f 100644
--- a/usr/src/pkg/manifests/SUNWcs.man7d.inc
+++ b/usr/src/pkg/manifests/SUNWcs.man4d.inc
@@ -11,7 +11,7 @@
 
 # Copyright 2011, Richard Lowe
 
-file path=usr/share/man/man7d/kstat.7d
-file path=usr/share/man/man7d/ksyms.7d
-file path=usr/share/man/man7d/ptm.7d
-file path=usr/share/man/man7d/pts.7d
+file path=usr/share/man/man4d/kstat.4d
+file path=usr/share/man/man4d/ksyms.4d
+file path=usr/share/man/man4d/ptm.4d
+file path=usr/share/man/man4d/pts.4d
diff --git a/usr/src/pkg/manifests/SUNWcs.p5m b/usr/src/pkg/manifests/SUNWcs.p5m
index e7e3c3e3e7..e4f83f6dc9 100644
--- a/usr/src/pkg/manifests/SUNWcs.p5m
+++ b/usr/src/pkg/manifests/SUNWcs.p5m
@@ -34,8 +34,8 @@
 
 <include SUNWcs.man1.inc>
 <include SUNWcs.man4.inc>
+<include SUNWcs.man4d.inc>
 <include SUNWcs.man5.inc>
-<include SUNWcs.man7d.inc>
 <include SUNWcs.man7fs.inc>
 <include SUNWcs.man8.inc>
 set name=pkg.fmri value=pkg:/SUNWcs@$(PKGVERS)
@@ -1550,8 +1550,8 @@ file path=usr/share/lib/xml/style/adt_record.xsl.1
 dir  path=usr/share/man
 dir  path=usr/share/man/man1
 dir  path=usr/share/man/man4
+dir  path=usr/share/man/man4d
 dir  path=usr/share/man/man5
-dir  path=usr/share/man/man7d
 dir  path=usr/share/man/man7fs
 dir  path=usr/share/man/man8
 dir  path=usr/share/src group=sys
diff --git a/usr/src/pkg/manifests/driver-audio-audio810.p5m b/usr/src/pkg/manifests/driver-audio-audio810.p5m
index 77a26d0fdd..c91dc7e29b 100644
--- a/usr/src/pkg/manifests/driver-audio-audio810.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audio810.p5m
@@ -43,8 +43,8 @@ file path=kernel/drv/$(ARCH64)/audio810 group=sys
 file path=kernel/drv/audio810.conf group=sys \
     original_name=SUNWad810:kernel/drv/audio810.conf preserve=true
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audio810.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audio810.4d
 driver name=audio810 \
     alias=pci1022,7445 \
     alias=pci1022,746d \
diff --git a/usr/src/pkg/manifests/driver-audio-audiocmi.p5m b/usr/src/pkg/manifests/driver-audio-audiocmi.p5m
index 1ef7eaf2d8..804fcd0f3d 100644
--- a/usr/src/pkg/manifests/driver-audio-audiocmi.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audiocmi.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audiocmi group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audiocmi.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audiocmi.4d
 driver name=audiocmi \
     alias=pci13f6,100 \
     alias=pci13f6,101 \
diff --git a/usr/src/pkg/manifests/driver-audio-audiocmihd.p5m b/usr/src/pkg/manifests/driver-audio-audiocmihd.p5m
index b4293e8432..9a89a7e4e8 100644
--- a/usr/src/pkg/manifests/driver-audio-audiocmihd.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audiocmihd.p5m
@@ -43,7 +43,7 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audiocmihd group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audiocmihd.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audiocmihd.4d
 driver name=audiocmihd alias=pci13f6,8788
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-audio-audioemu10k.p5m b/usr/src/pkg/manifests/driver-audio-audioemu10k.p5m
index ab9c9192ba..99fd1ae14c 100644
--- a/usr/src/pkg/manifests/driver-audio-audioemu10k.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audioemu10k.p5m
@@ -43,8 +43,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audioemu10k group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audioemu10k.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audioemu10k.4d
 driver name=audioemu10k \
     alias=pci1102,2 \
     alias=pci1102,4 \
diff --git a/usr/src/pkg/manifests/driver-audio-audiohd.p5m b/usr/src/pkg/manifests/driver-audio-audiohd.p5m
index 0693f1844c..548f87536a 100644
--- a/usr/src/pkg/manifests/driver-audio-audiohd.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audiohd.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audiohd group=sys
 file path=kernel/drv/audiohd.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audiohd.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audiohd.4d
 driver name=audiohd \
     alias=pci10de,371 \
     alias=pci8086,2668 \
diff --git a/usr/src/pkg/manifests/driver-audio-audioixp.p5m b/usr/src/pkg/manifests/driver-audio-audioixp.p5m
index cc7b2f2f6a..0415d5b27d 100644
--- a/usr/src/pkg/manifests/driver-audio-audioixp.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audioixp.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audioixp group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audioixp.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audioixp.4d
 driver name=audioixp \
     alias=pci1002,4341 \
     alias=pci1002,4361 \
diff --git a/usr/src/pkg/manifests/driver-audio-audiols.p5m b/usr/src/pkg/manifests/driver-audio-audiols.p5m
index 9fbf893317..7bedc79c45 100644
--- a/usr/src/pkg/manifests/driver-audio-audiols.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audiols.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audiols group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audiols.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audiols.4d
 driver name=audiols alias=pci1102,7
 legacy pkg=SUNWaudiols desc="SunOS audio device driver for Creative Audigy LS" \
     name="Creative Audigy LS Audio Driver"
diff --git a/usr/src/pkg/manifests/driver-audio-audiop16x.p5m b/usr/src/pkg/manifests/driver-audio-audiop16x.p5m
index 8b07fb2ce9..0cf4d8f35a 100644
--- a/usr/src/pkg/manifests/driver-audio-audiop16x.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audiop16x.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audiop16x group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audiop16x.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audiop16x.4d
 driver name=audiop16x alias=pci1102,6
 legacy pkg=SUNWaudiop16x \
     desc="SunOS audio device driver for Creative P16X (EMU10K1X)" \
diff --git a/usr/src/pkg/manifests/driver-audio-audiosolo.p5m b/usr/src/pkg/manifests/driver-audio-audiosolo.p5m
index 21471eac19..b7cbd72e40 100644
--- a/usr/src/pkg/manifests/driver-audio-audiosolo.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audiosolo.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audiosolo group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audiosolo.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audiosolo.4d
 driver name=audiosolo alias=pci125d,1969
 legacy pkg=SUNWaudiosolo desc="SunOS audio device driver for ESS Solo-1" \
     name="ESS Solo-1 Audio Driver"
diff --git a/usr/src/pkg/manifests/driver-audio-audiovia823x.p5m b/usr/src/pkg/manifests/driver-audio-audiovia823x.p5m
index 4d6483aa8f..811c4d9ae7 100644
--- a/usr/src/pkg/manifests/driver-audio-audiovia823x.p5m
+++ b/usr/src/pkg/manifests/driver-audio-audiovia823x.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audiovia823x group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audiovia823x.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audiovia823x.4d
 driver name=audiovia823x alias=pci1106,3059
 legacy pkg=SUNWvia823x \
     desc="SunOS audio device driver for VIA VT823x south bridges" \
diff --git a/usr/src/pkg/manifests/driver-audio.p5m b/usr/src/pkg/manifests/driver-audio.p5m
index 47890255cd..4dc4ea4ec6 100644
--- a/usr/src/pkg/manifests/driver-audio.p5m
+++ b/usr/src/pkg/manifests/driver-audio.p5m
@@ -48,13 +48,13 @@ dir  path=kernel/misc group=sys
 dir  path=kernel/misc/$(ARCH64) group=sys
 file path=kernel/misc/$(ARCH64)/ac97 group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/audio.7d
-file path=usr/share/man/man7d/audio1575.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/audiocs.7d
-file path=usr/share/man/man7d/audioens.7d
-file path=usr/share/man/man7d/audiopci.7d
-file path=usr/share/man/man7d/audiots.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/audio.4d
+file path=usr/share/man/man4d/audio1575.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/audiocs.4d
+file path=usr/share/man/man4d/audioens.4d
+file path=usr/share/man/man4d/audiopci.4d
+file path=usr/share/man/man4d/audiots.4d
 dir  path=usr/share/man/man7i
 file path=usr/share/man/man7i/audio.7i
 file path=usr/share/man/man7i/dsp.7i
diff --git a/usr/src/pkg/manifests/driver-cpu-amd-zen.p5m b/usr/src/pkg/manifests/driver-cpu-amd-zen.p5m
index 7cb6a8bf78..a2ff3c2113 100644
--- a/usr/src/pkg/manifests/driver-cpu-amd-zen.p5m
+++ b/usr/src/pkg/manifests/driver-cpu-amd-zen.p5m
@@ -26,9 +26,9 @@ file path=kernel/drv/$(ARCH64)/amdzen group=sys
 file path=kernel/drv/$(ARCH64)/amdzen_stub group=sys
 file path=kernel/drv/amdzen.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/amdzen.7d
-link path=usr/share/man/man7d/amdzen_stub.7d target=amdzen.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/amdzen.4d
+link path=usr/share/man/man4d/amdzen_stub.4d target=amdzen.4d
 driver name=amdzen
 #
 # 1440-1447: f17h m70-7fh, f19h m20-2f df
diff --git a/usr/src/pkg/manifests/driver-cpu-mc.p5m b/usr/src/pkg/manifests/driver-cpu-mc.p5m
index 9e7f7f8e3b..9ab02ea43d 100644
--- a/usr/src/pkg/manifests/driver-cpu-mc.p5m
+++ b/usr/src/pkg/manifests/driver-cpu-mc.p5m
@@ -26,9 +26,9 @@ file path=kernel/drv/$(ARCH64)/imc group=sys
 file path=kernel/drv/$(ARCH64)/imcstub group=sys
 file path=kernel/drv/imc.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/imc.7d
-file path=usr/share/man/man7d/imcstub.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/imc.4d
+file path=usr/share/man/man4d/imcstub.4d
 driver name=imc
 driver name=imcstub \
     alias=pci8086,e1e,p \
diff --git a/usr/src/pkg/manifests/driver-cpu-sensor.p5m b/usr/src/pkg/manifests/driver-cpu-sensor.p5m
index 1cf50b2e5c..cea61b8608 100644
--- a/usr/src/pkg/manifests/driver-cpu-sensor.p5m
+++ b/usr/src/pkg/manifests/driver-cpu-sensor.p5m
@@ -29,11 +29,11 @@ file path=kernel/drv/$(ARCH64)/pchtemp group=sys
 file path=kernel/drv/$(ARCH64)/smntemp group=sys
 file path=kernel/drv/coretemp.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/amdnbtemp.7d
-file path=usr/share/man/man7d/coretemp.7d
-file path=usr/share/man/man7d/pchtemp.7d
-file path=usr/share/man/man7d/smntemp.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/amdnbtemp.4d
+file path=usr/share/man/man4d/coretemp.4d
+file path=usr/share/man/man4d/pchtemp.4d
+file path=usr/share/man/man4d/smntemp.4d
 driver name=amdnbtemp \
     alias=pci1022,1203,p \
     alias=pci1022,1303,p \
diff --git a/usr/src/pkg/manifests/driver-crypto-dca.p5m b/usr/src/pkg/manifests/driver-crypto-dca.p5m
index b6ef633d5f..7965623be6 100644
--- a/usr/src/pkg/manifests/driver-crypto-dca.p5m
+++ b/usr/src/pkg/manifests/driver-crypto-dca.p5m
@@ -49,8 +49,8 @@ dir  path=usr/lib/locale/C/LC_MESSAGES
 file path=usr/lib/locale/C/LC_MESSAGES/SCA1000.mo mode=0444
 file path=usr/lib/locale/C/LC_MESSAGES/SCA500.mo mode=0444
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/dca.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/dca.4d
 driver name=dca \
     alias=pci108e,5454 \
     alias=pci108e,5455 \
diff --git a/usr/src/pkg/manifests/driver-developer-amd-zen.p5m b/usr/src/pkg/manifests/driver-developer-amd-zen.p5m
index 86254e3fd5..19bed149e5 100644
--- a/usr/src/pkg/manifests/driver-developer-amd-zen.p5m
+++ b/usr/src/pkg/manifests/driver-developer-amd-zen.p5m
@@ -28,9 +28,9 @@ dir  path=usr/lib
 file path=usr/lib/udf mode=0555
 file path=usr/lib/usmn mode=0555
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/usmn.7d
-file path=usr/share/man/man7d/zen_udf.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/usmn.4d
+file path=usr/share/man/man4d/zen_udf.4d
 driver name=usmn
 driver name=zen_udf
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-firewire.p5m b/usr/src/pkg/manifests/driver-firewire.p5m
index ad61cc55c1..ae4c27551b 100644
--- a/usr/src/pkg/manifests/driver-firewire.p5m
+++ b/usr/src/pkg/manifests/driver-firewire.p5m
@@ -44,11 +44,11 @@ dir  path=kernel/misc group=sys
 dir  path=kernel/misc/$(ARCH64) group=sys
 file path=kernel/misc/$(ARCH64)/s1394 group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-link path=usr/share/man/man7d/1394.7d target=ieee1394.7d
-link path=usr/share/man/man7d/firewire.7d target=ieee1394.7d
-file path=usr/share/man/man7d/hci1394.7d
-file path=usr/share/man/man7d/ieee1394.7d
+dir  path=usr/share/man/man4d
+link path=usr/share/man/man4d/1394.4d target=ieee1394.4d
+link path=usr/share/man/man4d/firewire.4d target=ieee1394.4d
+file path=usr/share/man/man4d/hci1394.4d
+file path=usr/share/man/man4d/ieee1394.4d
 driver name=hci1394 perms="* 0600 root sys" alias=pciclass,0c0010
 legacy pkg=SUNW1394 desc="IEEE1394 Framework and OpenHCI Driver" \
     name="Sun IEEE1394 Framework"
diff --git a/usr/src/pkg/manifests/driver-graphics-av1394.p5m b/usr/src/pkg/manifests/driver-graphics-av1394.p5m
index 36c30481cb..475361de63 100644
--- a/usr/src/pkg/manifests/driver-graphics-av1394.p5m
+++ b/usr/src/pkg/manifests/driver-graphics-av1394.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/av1394 group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/av1394.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/av1394.4d
 driver name=av1394 perms="* 0600 root sys" \
     alias=firewire00a02d,010000 \
     alias=firewire00a02d,010001
diff --git a/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.p5m b/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.p5m
index 7c6a39a2b4..63b05fc81d 100644
--- a/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.p5m
+++ b/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.p5m
@@ -45,8 +45,8 @@ dir  path=usr/lib/devfsadm group=sys
 dir  path=usr/lib/devfsadm/linkmod group=sys
 file path=usr/lib/devfsadm/linkmod/SUNW_dcam1394_link.so group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/dcam1394.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/dcam1394.4d
 legacy pkg=SUNWfwdcu desc="Sun IEEE1394 Video Conferencing support" \
     name="Sun IEEE1394 Video Conferencing Support (Usr)"
 license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-graphics-usbvc.p5m b/usr/src/pkg/manifests/driver-graphics-usbvc.p5m
index fdb71e29f5..9947eb5318 100644
--- a/usr/src/pkg/manifests/driver-graphics-usbvc.p5m
+++ b/usr/src/pkg/manifests/driver-graphics-usbvc.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/usbvc group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/usbvc.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/usbvc.4d
 driver name=usbvc perms="* 0666 root sys" \
     alias=usbia46d,8c1.config1.0 \
     alias=usbia46d,8c2.config1.0 \
diff --git a/usr/src/pkg/manifests/driver-i86pc-platform.p5m b/usr/src/pkg/manifests/driver-i86pc-platform.p5m
index 6f8a1a071a..334845726a 100644
--- a/usr/src/pkg/manifests/driver-i86pc-platform.p5m
+++ b/usr/src/pkg/manifests/driver-i86pc-platform.p5m
@@ -62,11 +62,11 @@ file path=kernel/strmod/$(ARCH64)/vuidm3p group=sys mode=0755
 file path=kernel/strmod/$(ARCH64)/vuidm4p group=sys mode=0755
 file path=kernel/strmod/$(ARCH64)/vuidm5p group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/asy.7d
-file path=usr/share/man/man7d/cmdk.7d
-file path=usr/share/man/man7d/ecpp.7d
-file path=usr/share/man/man7d/fd.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/asy.4d
+file path=usr/share/man/man4d/cmdk.4d
+file path=usr/share/man/man4d/ecpp.4d
+file path=usr/share/man/man4d/fd.4d
 driver name=asy perms="* 0666 root sys" perms="*,cu 0600 uucp uucp" \
     alias=pci11c1,480
 driver name=cmdk perms="* 0640 root sys"
diff --git a/usr/src/pkg/manifests/driver-ipmi.p5m b/usr/src/pkg/manifests/driver-ipmi.p5m
index 6c19e586a2..1741c86709 100644
--- a/usr/src/pkg/manifests/driver-ipmi.p5m
+++ b/usr/src/pkg/manifests/driver-ipmi.p5m
@@ -36,8 +36,8 @@ file path=usr/kernel/drv/amd64/ipmi
 file path=usr/kernel/drv/ipmi.conf
 dir  path=usr/share
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ipmi.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ipmi.4d
 driver name=ipmi perms="* 0600 root sys"
 license lic_CDDL license=lic_CDDL
 license usr/src/uts/intel/io/ipmi/THIRDPARTYLICENSE \
diff --git a/usr/src/pkg/manifests/driver-misc-ccid.p5m b/usr/src/pkg/manifests/driver-misc-ccid.p5m
index b4c6c00d3b..b1f0f1a8e6 100644
--- a/usr/src/pkg/manifests/driver-misc-ccid.p5m
+++ b/usr/src/pkg/manifests/driver-misc-ccid.p5m
@@ -48,8 +48,8 @@ dir  path=usr/sbin variant.opensolaris.zone=global
 file path=usr/sbin/ccidadm mode=0555 variant.opensolaris.zone=global
 dir  path=usr/share
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ccid.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ccid.4d
 dir  path=usr/share/man/man8 variant.opensolaris.zone=global
 file path=usr/share/man/man8/ccidadm.8 variant.opensolaris.zone=global
 driver name=ccid perms="* 0600 root sys" class=misc alias=usbif,classb
diff --git a/usr/src/pkg/manifests/driver-misc-virtio.p5m b/usr/src/pkg/manifests/driver-misc-virtio.p5m
index dfe4ad0e8a..75e4b97e88 100644
--- a/usr/src/pkg/manifests/driver-misc-virtio.p5m
+++ b/usr/src/pkg/manifests/driver-misc-virtio.p5m
@@ -39,6 +39,6 @@ dir  path=kernel/misc group=sys
 dir  path=kernel/misc/$(ARCH64) group=sys
 file path=kernel/misc/$(ARCH64)/virtio group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/virtio.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/virtio.4d
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-afe.p5m b/usr/src/pkg/manifests/driver-network-afe.p5m
index 46d491aac1..a6937fbfbd 100644
--- a/usr/src/pkg/manifests/driver-network-afe.p5m
+++ b/usr/src/pkg/manifests/driver-network-afe.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/afe group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/afe.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/afe.4d
 driver name=afe perms="* 0666 root sys" clone_perms="afe 0666 root sys" \
     alias=pci10b7,9300 \
     alias=pci1113,1216 \
diff --git a/usr/src/pkg/manifests/driver-network-amd8111s.p5m b/usr/src/pkg/manifests/driver-network-amd8111s.p5m
index abe7f15e6c..e868187676 100644
--- a/usr/src/pkg/manifests/driver-network-amd8111s.p5m
+++ b/usr/src/pkg/manifests/driver-network-amd8111s.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/amd8111s group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/amd8111s.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/amd8111s.4d
 driver name=amd8111s alias=pci1022,7462
 legacy pkg=SUNWamd8111s desc="AMD8111 FAST Ethernet Network Adapter Driver" \
     name="AMD8111 Fast Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-arn.p5m b/usr/src/pkg/manifests/driver-network-arn.p5m
index 0f2652e4c2..3ea949e56c 100644
--- a/usr/src/pkg/manifests/driver-network-arn.p5m
+++ b/usr/src/pkg/manifests/driver-network-arn.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/arn group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/arn.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/arn.4d
 driver name=arn perms="* 0666 root sys" clone_perms="arn 0666 root sys" \
     alias=pciex168c,2a \
     alias=pciex168c,2b
diff --git a/usr/src/pkg/manifests/driver-network-atge.p5m b/usr/src/pkg/manifests/driver-network-atge.p5m
index 6dc9c9c238..22fb7666d3 100644
--- a/usr/src/pkg/manifests/driver-network-atge.p5m
+++ b/usr/src/pkg/manifests/driver-network-atge.p5m
@@ -42,8 +42,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/atge group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/atge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/atge.4d
 driver name=atge \
     alias=pciex1969,1026 \
     alias=pciex1969,1048 \
diff --git a/usr/src/pkg/manifests/driver-network-ath.p5m b/usr/src/pkg/manifests/driver-network-ath.p5m
index 0732fa5baa..dde91691e5 100644
--- a/usr/src/pkg/manifests/driver-network-ath.p5m
+++ b/usr/src/pkg/manifests/driver-network-ath.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/ath group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ath.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ath.4d
 driver name=ath perms="* 0666 root sys" clone_perms="ath 0666 root sys" \
     alias=pci168c,12 \
     alias=pci168c,13 \
diff --git a/usr/src/pkg/manifests/driver-network-atu.p5m b/usr/src/pkg/manifests/driver-network-atu.p5m
index b1dd610af0..6d8213b4c0 100644
--- a/usr/src/pkg/manifests/driver-network-atu.p5m
+++ b/usr/src/pkg/manifests/driver-network-atu.p5m
@@ -42,8 +42,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/atu group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/atu.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/atu.4d
 driver name=atu perms="* 0666 root sys" clone_perms="atu 0666 root sys" \
     alias=usb1915,2233
 legacy pkg=SUNWatu \
diff --git a/usr/src/pkg/manifests/driver-network-bfe.p5m b/usr/src/pkg/manifests/driver-network-bfe.p5m
index 1ce4612c68..c7920e6ff8 100644
--- a/usr/src/pkg/manifests/driver-network-bfe.p5m
+++ b/usr/src/pkg/manifests/driver-network-bfe.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/bfe group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/bfe.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/bfe.4d
 driver name=bfe \
     alias=pci14e4,170c \
     alias=pci14e4,4401 \
diff --git a/usr/src/pkg/manifests/driver-network-bge.p5m b/usr/src/pkg/manifests/driver-network-bge.p5m
index a1a309bcd2..2d0546f755 100644
--- a/usr/src/pkg/manifests/driver-network-bge.p5m
+++ b/usr/src/pkg/manifests/driver-network-bge.p5m
@@ -42,8 +42,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/bge group=sys
 file path=kernel/drv/bge.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/bge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/bge.4d
 $(i386_ONLY)driver name=bge perms="* 0666 root sys" \
     clone_perms="bge 0666 root sys" \
     alias=SUNW,bge \
diff --git a/usr/src/pkg/manifests/driver-network-bnxe.p5m b/usr/src/pkg/manifests/driver-network-bnxe.p5m
index 538022fce9..0c217302c5 100644
--- a/usr/src/pkg/manifests/driver-network-bnxe.p5m
+++ b/usr/src/pkg/manifests/driver-network-bnxe.p5m
@@ -43,8 +43,8 @@ file path=kernel/drv/$(ARCH64)/bnxe group=sys
 file path=kernel/drv/bnxe.conf group=sys \
     original_name=BRCMbnxe:kernel/drv/bnxe.conf preserve=renameold
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/bnxe.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/bnxe.4d
 driver name=bnxe perms="* 0666 root sys" \
     alias=pci14e4,164e \
     alias=pci14e4,164f \
diff --git a/usr/src/pkg/manifests/driver-network-chxge.p5m b/usr/src/pkg/manifests/driver-network-chxge.p5m
index afe0df7a10..b345259a85 100644
--- a/usr/src/pkg/manifests/driver-network-chxge.p5m
+++ b/usr/src/pkg/manifests/driver-network-chxge.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/chxge group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/chxge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/chxge.4d
 driver name=chxge perms="* 0666 root sys" clone_perms="chxge 0666 root sys" \
     alias=pci1425,7 \
     alias=pci1425,a
diff --git a/usr/src/pkg/manifests/driver-network-dmfe.p5m b/usr/src/pkg/manifests/driver-network-dmfe.p5m
index de16d9370c..632fd2cd63 100644
--- a/usr/src/pkg/manifests/driver-network-dmfe.p5m
+++ b/usr/src/pkg/manifests/driver-network-dmfe.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/dmfe group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/dmfe.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/dmfe.4d
 driver name=dmfe perms="* 0666 root sys" clone_perms="dmfe 0666 root sys" \
     alias=pci108e,9102 \
     alias=pci1282,9102
diff --git a/usr/src/pkg/manifests/driver-network-e1000g.p5m b/usr/src/pkg/manifests/driver-network-e1000g.p5m
index 28cfe93d77..8f795e5e96 100644
--- a/usr/src/pkg/manifests/driver-network-e1000g.p5m
+++ b/usr/src/pkg/manifests/driver-network-e1000g.p5m
@@ -42,8 +42,8 @@ file path=kernel/drv/$(ARCH64)/e1000g group=sys
 file path=kernel/drv/e1000g.conf group=sys \
     original_name=SUNWintgige:kernel/drv/e1000g.conf preserve=renamenew
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/e1000g.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/e1000g.4d
 driver name=e1000g perms="* 0666 root sys" clone_perms="e1000g 0666 root sys" \
     alias=pci8086,d4c,p \
     alias=pci8086,d4d,p \
diff --git a/usr/src/pkg/manifests/driver-network-elxl.p5m b/usr/src/pkg/manifests/driver-network-elxl.p5m
index c80ca32ffa..6302be0f29 100644
--- a/usr/src/pkg/manifests/driver-network-elxl.p5m
+++ b/usr/src/pkg/manifests/driver-network-elxl.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/elxl group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/elxl.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/elxl.4d
 driver name=elxl perms="* 0666 root sys" clone_perms="elxl 0666 root sys" \
     alias=pci10b7,9000 \
     alias=pci10b7,9001 \
diff --git a/usr/src/pkg/manifests/driver-network-ena.p5m b/usr/src/pkg/manifests/driver-network-ena.p5m
index cd64e9c504..7365be47cd 100644
--- a/usr/src/pkg/manifests/driver-network-ena.p5m
+++ b/usr/src/pkg/manifests/driver-network-ena.p5m
@@ -26,8 +26,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/ena group=sys
 file path=kernel/drv/ena.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ena.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ena.4d
 driver name=ena perms="* 0666 root sys" clone_perms="ena 0666 root sys" \
     alias=pciex1d0f,ec2 \
     alias=pciex1d0f,1ec2 \
diff --git a/usr/src/pkg/manifests/driver-network-eri.p5m b/usr/src/pkg/manifests/driver-network-eri.p5m
index 2d9d50a675..8f650d9abb 100644
--- a/usr/src/pkg/manifests/driver-network-eri.p5m
+++ b/usr/src/pkg/manifests/driver-network-eri.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/eri group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/eri.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/eri.4d
 driver name=eri clone_perms="eri 0666 root sys" alias=pci108e,1101
 legacy pkg=SUNWerid desc="Sun RIO 10/100 Mb Ethernet Drivers" \
     name="Sun RIO 10/100 Mb Ethernet Drivers"
diff --git a/usr/src/pkg/manifests/driver-network-fcip.p5m b/usr/src/pkg/manifests/driver-network-fcip.p5m
index 55bc38c4c3..1878b846fe 100644
--- a/usr/src/pkg/manifests/driver-network-fcip.p5m
+++ b/usr/src/pkg/manifests/driver-network-fcip.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/fcip group=sys
 file path=kernel/drv/fcip.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/fcip.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/fcip.4d
 driver name=fcip perms="* 0600 root sys"
 legacy pkg=SUNWfcip desc="Sun FCIP IP/ARP over FibreChannel Device Driver" \
     name="Sun FCIP IP/ARP over FibreChannel Device Driver"
diff --git a/usr/src/pkg/manifests/driver-network-fcoe.p5m b/usr/src/pkg/manifests/driver-network-fcoe.p5m
index 62574789c8..311c5b6fd5 100644
--- a/usr/src/pkg/manifests/driver-network-fcoe.p5m
+++ b/usr/src/pkg/manifests/driver-network-fcoe.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/fcoe group=sys
 file path=kernel/drv/fcoe.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/fcoe.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/fcoe.4d
 driver name=fcoe perms="* 0600 root sys"
 legacy pkg=SUNWfcoe \
     desc="Sun FCoE (Fibre Channel over Ethernet) Transport Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-fcoei.p5m b/usr/src/pkg/manifests/driver-network-fcoei.p5m
index 648a679262..05307eec01 100644
--- a/usr/src/pkg/manifests/driver-network-fcoei.p5m
+++ b/usr/src/pkg/manifests/driver-network-fcoei.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/fcoei group=sys
 file path=kernel/drv/fcoei.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/fcoei.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/fcoei.4d
 driver name=fcoei perms="* 0600 root sys"
 legacy pkg=SUNWfcoei \
     desc="Sun FCoE (Fibre Channel over Ethernet) Initiator Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-fcoet.p5m b/usr/src/pkg/manifests/driver-network-fcoet.p5m
index 2116a3044d..92b6145d04 100644
--- a/usr/src/pkg/manifests/driver-network-fcoet.p5m
+++ b/usr/src/pkg/manifests/driver-network-fcoet.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/fcoet group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/fcoet.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/fcoet.4d
 driver name=fcoet perms="* 0600 root sys"
 legacy pkg=SUNWfcoet \
     desc="Sun FCoE (Fibre Channel over Ethernet) COMSTAR Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-fcp.p5m b/usr/src/pkg/manifests/driver-network-fcp.p5m
index 6e5e38885e..be3fa8eb01 100644
--- a/usr/src/pkg/manifests/driver-network-fcp.p5m
+++ b/usr/src/pkg/manifests/driver-network-fcp.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/fcp group=sys
 file path=kernel/drv/fcp.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/fcp.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/fcp.4d
 driver name=fcp perms="* 0600 root sys"
 legacy pkg=SUNWfcp desc="Sun FCP SCSI Fibre Channel Device Driver" \
     name="Sun FCP SCSI Device Driver"
diff --git a/usr/src/pkg/manifests/driver-network-fp.p5m b/usr/src/pkg/manifests/driver-network-fp.p5m
index 88d8aab2c8..fcf18cb221 100644
--- a/usr/src/pkg/manifests/driver-network-fp.p5m
+++ b/usr/src/pkg/manifests/driver-network-fp.p5m
@@ -44,9 +44,9 @@ dir  path=kernel/misc group=sys
 dir  path=kernel/misc/$(ARCH64) group=sys
 file path=kernel/misc/$(ARCH64)/fctl group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/fctl.7d
-file path=usr/share/man/man7d/fp.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/fctl.4d
+file path=usr/share/man/man4d/fp.4d
 driver name=fp perms="* 0600 root sys"
 legacy pkg=SUNWfctl desc="fctl module and fp device driver" \
     name="Sun Fibre Channel Transport layer"
diff --git a/usr/src/pkg/manifests/driver-network-hermon.p5m b/usr/src/pkg/manifests/driver-network-hermon.p5m
index 69db8f548f..2b55f70c2b 100644
--- a/usr/src/pkg/manifests/driver-network-hermon.p5m
+++ b/usr/src/pkg/manifests/driver-network-hermon.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/hermon group=sys
 file path=kernel/drv/hermon.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/hermon.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/hermon.4d
 driver name=hermon perms="* 0666 root sys" \
     alias=pciex15b3,6340 \
     alias=pciex15b3,634a \
diff --git a/usr/src/pkg/manifests/driver-network-hme.p5m b/usr/src/pkg/manifests/driver-network-hme.p5m
index fc1e7180ae..af740c395f 100644
--- a/usr/src/pkg/manifests/driver-network-hme.p5m
+++ b/usr/src/pkg/manifests/driver-network-hme.p5m
@@ -41,9 +41,9 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 $(sparc_ONLY)file path=kernel/drv/$(ARCH64)/fas group=sys
 file path=kernel/drv/$(ARCH64)/hme group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-$(sparc_ONLY)file path=usr/share/man/man7d/fas.7d
-file path=usr/share/man/man7d/hme.7d
+dir  path=usr/share/man/man4d
+$(sparc_ONLY)file path=usr/share/man/man4d/fas.4d
+file path=usr/share/man/man4d/hme.4d
 $(sparc_ONLY)driver name=fas perms="devctl 0600 root sys" class=scsi \
     alias=SUNW,fas
 $(sparc_ONLY)driver name=hme alias=SUNW,hme
diff --git a/usr/src/pkg/manifests/driver-network-hxge.p5m b/usr/src/pkg/manifests/driver-network-hxge.p5m
index 2952b8ff9b..528d8a0596 100644
--- a/usr/src/pkg/manifests/driver-network-hxge.p5m
+++ b/usr/src/pkg/manifests/driver-network-hxge.p5m
@@ -42,8 +42,8 @@ file path=kernel/drv/$(ARCH64)/hxge group=sys
 file path=kernel/drv/hxge.conf group=sys \
     original_name=SUNWhxge:kernel/drv/hxge.conf preserve=renamenew
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/hxge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/hxge.4d
 $(i386_ONLY)driver name=hxge perms="* 0600 root sys" alias=pci108e,aaaa
 $(sparc_ONLY)driver name=hxge perms="* 0600 root sys" alias=pciex108e,aaaa
 legacy pkg=SUNWhxge desc="SUN 10Gb hxge Ethernet Network Adapter Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-i40e.p5m b/usr/src/pkg/manifests/driver-network-i40e.p5m
index c5418b36f0..9312ed9fc8 100644
--- a/usr/src/pkg/manifests/driver-network-i40e.p5m
+++ b/usr/src/pkg/manifests/driver-network-i40e.p5m
@@ -26,8 +26,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/i40e group=sys
 file path=kernel/drv/i40e.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/i40e.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/i40e.4d
 driver name=i40e perms="* 0666 root sys" clone_perms="i40e 0666 root sys" \
     alias=pciex8086,cf8 \
     alias=pciex8086,d58 \
diff --git a/usr/src/pkg/manifests/driver-network-ib.p5m b/usr/src/pkg/manifests/driver-network-ib.p5m
index dea467c7e3..7634169757 100644
--- a/usr/src/pkg/manifests/driver-network-ib.p5m
+++ b/usr/src/pkg/manifests/driver-network-ib.p5m
@@ -49,13 +49,13 @@ file path=kernel/misc/$(ARCH64)/ibtl group=sys mode=0755
 dir  path=usr/share/man
 dir  path=usr/share/man/man4
 file path=usr/share/man/man4/ib.4
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ib.4d
+file path=usr/share/man/man4d/ibcm.4d
+file path=usr/share/man/man4d/ibdm.4d
+file path=usr/share/man/man4d/ibtl.4d
 dir  path=usr/share/man/man7
 file path=usr/share/man/man7/ibmf.7
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ib.7d
-file path=usr/share/man/man7d/ibcm.7d
-file path=usr/share/man/man7d/ibdm.7d
-file path=usr/share/man/man7d/ibtl.7d
 driver name=ib perms="* 0644 root sys"
 legacy pkg=SUNWib desc="Sun InfiniBand Framework" \
     name="Sun InfiniBand Framework"
diff --git a/usr/src/pkg/manifests/driver-network-ibdma.p5m b/usr/src/pkg/manifests/driver-network-ibdma.p5m
index 6dc6b1397f..0d7b538b68 100644
--- a/usr/src/pkg/manifests/driver-network-ibdma.p5m
+++ b/usr/src/pkg/manifests/driver-network-ibdma.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/misc group=sys
 dir  path=kernel/misc/$(ARCH64) group=sys
 file path=kernel/misc/$(ARCH64)/ibdma group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ibdma.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ibdma.4d
 legacy pkg=SUNWibdmar desc="Sun InfiniBand Device Management Agent (Root)" \
     name="Sun InfiniBand Device Management Agent (Root)"
 license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-ibp.p5m b/usr/src/pkg/manifests/driver-network-ibp.p5m
index df238d5512..fab655d5fc 100644
--- a/usr/src/pkg/manifests/driver-network-ibp.p5m
+++ b/usr/src/pkg/manifests/driver-network-ibp.p5m
@@ -51,9 +51,9 @@ dir  path=sbin group=sys
 file path=sbin/ibd_delete_link mode=0555
 file path=sbin/ibd_upgrade mode=0555
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
+dir  path=usr/share/man/man4d
 # XXX: Should rename to deal with ibd -> ibp?
-file path=usr/share/man/man7d/ibd.7d
+file path=usr/share/man/man4d/ibd.4d
 driver name=ibp perms="* 0666 root sys" clone_perms="ibp 0666 root sys" \
     alias=ib.ipib
 legacy pkg=SUNWipoib desc="Sun IP over InfiniBand" name="Sun IP over InfiniBand"
diff --git a/usr/src/pkg/manifests/driver-network-igb.p5m b/usr/src/pkg/manifests/driver-network-igb.p5m
index ccf4bee7e4..95b8bce0ad 100644
--- a/usr/src/pkg/manifests/driver-network-igb.p5m
+++ b/usr/src/pkg/manifests/driver-network-igb.p5m
@@ -44,8 +44,8 @@ file path=kernel/drv/$(ARCH64)/igb group=sys
 file path=kernel/drv/igb.conf group=sys \
     original_name=SUNWigb:kernel/drv/igb.conf preserve=renamenew
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/igb.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/igb.4d
 driver name=igb perms="* 0666 root sys" clone_perms="igb 0666 root sys" \
     alias=pciex8086,438 \
     alias=pciex8086,10a7 \
diff --git a/usr/src/pkg/manifests/driver-network-iprb.p5m b/usr/src/pkg/manifests/driver-network-iprb.p5m
index 68bb6f654e..f08f3a3e85 100644
--- a/usr/src/pkg/manifests/driver-network-iprb.p5m
+++ b/usr/src/pkg/manifests/driver-network-iprb.p5m
@@ -43,8 +43,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/iprb group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/iprb.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/iprb.4d
 driver name=iprb perms="* 0666 root sys" clone_perms="iprb 0666 root sys" \
     alias=pci8086,1029 \
     alias=pci8086,1030 \
diff --git a/usr/src/pkg/manifests/driver-network-ipw.p5m b/usr/src/pkg/manifests/driver-network-ipw.p5m
index b94c786da9..c9d53549e3 100644
--- a/usr/src/pkg/manifests/driver-network-ipw.p5m
+++ b/usr/src/pkg/manifests/driver-network-ipw.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/ipw group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ipw.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ipw.4d
 driver name=ipw perms="* 0666 root sys" clone_perms="ipw 0666 root sys" \
     alias=pci8086,1043
 legacy pkg=SUNWipw desc="Intel Pro. Wirless 802.11b IPW2100B Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-iwh.p5m b/usr/src/pkg/manifests/driver-network-iwh.p5m
index fadc379416..edfff399d2 100644
--- a/usr/src/pkg/manifests/driver-network-iwh.p5m
+++ b/usr/src/pkg/manifests/driver-network-iwh.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/iwh group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/iwh.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/iwh.4d
 driver name=iwh perms="* 0666 root sys" clone_perms="iwh 0666 root sys" \
     alias=pciex8086,4232 \
     alias=pciex8086,4235 \
diff --git a/usr/src/pkg/manifests/driver-network-iwi.p5m b/usr/src/pkg/manifests/driver-network-iwi.p5m
index c9a1cf26a9..e07e7fa677 100644
--- a/usr/src/pkg/manifests/driver-network-iwi.p5m
+++ b/usr/src/pkg/manifests/driver-network-iwi.p5m
@@ -42,8 +42,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/iwi group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/iwi.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/iwi.4d
 driver name=iwi perms="* 0666 root sys" clone_perms="iwi 0666 root sys" \
     alias=pci8086,4220 \
     alias=pci8086,4223 \
diff --git a/usr/src/pkg/manifests/driver-network-iwn.p5m b/usr/src/pkg/manifests/driver-network-iwn.p5m
index f3497004f3..6472031b54 100644
--- a/usr/src/pkg/manifests/driver-network-iwn.p5m
+++ b/usr/src/pkg/manifests/driver-network-iwn.p5m
@@ -47,8 +47,8 @@ file path=kernel/firmware/iwn/iwlwifi-6000g2a-6.ucode
 file path=kernel/firmware/iwn/iwlwifi-6000g2b-6.ucode
 file path=kernel/firmware/iwn/iwlwifi-6050-5.ucode
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/iwn.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/iwn.4d
 driver name=iwn perms="* 0666 root sys" clone_perms="iwn 0666 root sys" \
     alias=pciex8086,82 \
     alias=pciex8086,83 \
diff --git a/usr/src/pkg/manifests/driver-network-ixgbe.p5m b/usr/src/pkg/manifests/driver-network-ixgbe.p5m
index 83cc3e0423..a043a8ae86 100644
--- a/usr/src/pkg/manifests/driver-network-ixgbe.p5m
+++ b/usr/src/pkg/manifests/driver-network-ixgbe.p5m
@@ -45,8 +45,8 @@ file path=kernel/drv/$(ARCH64)/ixgbe group=sys
 file path=kernel/drv/ixgbe.conf group=sys \
     original_name=SUNWixgbe:kernel/drv/ixgbe.conf preserve=renamenew
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ixgbe.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ixgbe.4d
 driver name=ixgbe perms="* 0666 root sys" clone_perms="ixgbe 0666 root sys" \
     alias=pciex8086,10b6 \
     alias=pciex8086,10c6 \
diff --git a/usr/src/pkg/manifests/driver-network-mlxcx.p5m b/usr/src/pkg/manifests/driver-network-mlxcx.p5m
index 51712475a4..def641e374 100644
--- a/usr/src/pkg/manifests/driver-network-mlxcx.p5m
+++ b/usr/src/pkg/manifests/driver-network-mlxcx.p5m
@@ -32,8 +32,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/mlxcx group=sys
 file path=kernel/drv/mlxcx.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/mlxcx.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/mlxcx.4d
 driver name=mlxcx \
     alias=pciex15b3,1013 \
     alias=pciex15b3,1014 \
diff --git a/usr/src/pkg/manifests/driver-network-mxfe.p5m b/usr/src/pkg/manifests/driver-network-mxfe.p5m
index 5d589ed131..3f60a238fd 100644
--- a/usr/src/pkg/manifests/driver-network-mxfe.p5m
+++ b/usr/src/pkg/manifests/driver-network-mxfe.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/mxfe group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/mxfe.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/mxfe.4d
 driver name=mxfe perms="* 0666 root sys" clone_perms="mxfe 0666 root sys" \
     alias=pci10d9,512 \
     alias=pci10d9,531 \
diff --git a/usr/src/pkg/manifests/driver-network-myri10ge.p5m b/usr/src/pkg/manifests/driver-network-myri10ge.p5m
index fa7b4e6bc6..deb6d971e3 100644
--- a/usr/src/pkg/manifests/driver-network-myri10ge.p5m
+++ b/usr/src/pkg/manifests/driver-network-myri10ge.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/myri10ge group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/myri10ge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/myri10ge.4d
 driver name=myri10ge perms="* 0666 root sys" \
     clone_perms="myri10ge 0666 root sys" \
     alias=pci14c1,8 \
diff --git a/usr/src/pkg/manifests/driver-network-ntxn.p5m b/usr/src/pkg/manifests/driver-network-ntxn.p5m
index 35fc95965f..9baace9373 100644
--- a/usr/src/pkg/manifests/driver-network-ntxn.p5m
+++ b/usr/src/pkg/manifests/driver-network-ntxn.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/ntxn group=sys
 file path=kernel/drv/ntxn.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ntxn.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ntxn.4d
 driver name=ntxn \
     alias=pci4040,1 \
     alias=pci4040,2 \
diff --git a/usr/src/pkg/manifests/driver-network-nxge.p5m b/usr/src/pkg/manifests/driver-network-nxge.p5m
index 43678bafb5..f9744ce247 100644
--- a/usr/src/pkg/manifests/driver-network-nxge.p5m
+++ b/usr/src/pkg/manifests/driver-network-nxge.p5m
@@ -60,8 +60,8 @@ $(sparc_ONLY)file path=platform/sun4v/kernel/drv/nxge.conf group=sys \
     original_name=SUNWnxge:platform/sun4v/kernel/drv/nxge.conf \
     preserve=renamenew
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/nxge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/nxge.4d
 $(sparc_ONLY)driver name=nxge perms="* 0600 root sys" \
     alias=SUNW,niusl \
     alias=SUNW,niusl-kt \
diff --git a/usr/src/pkg/manifests/driver-network-pcn.p5m b/usr/src/pkg/manifests/driver-network-pcn.p5m
index 24a5df5c76..109db1ccf5 100644
--- a/usr/src/pkg/manifests/driver-network-pcn.p5m
+++ b/usr/src/pkg/manifests/driver-network-pcn.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/pcn group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/pcn.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/pcn.4d
 driver name=pcn perms="* 0666 root sys" clone_perms="pcn 0666 root sys" \
     alias=pci1022,2000 \
     alias=pci103c,104c
diff --git a/usr/src/pkg/manifests/driver-network-platform.p5m b/usr/src/pkg/manifests/driver-network-platform.p5m
index a3cf3ec671..490a32718c 100644
--- a/usr/src/pkg/manifests/driver-network-platform.p5m
+++ b/usr/src/pkg/manifests/driver-network-platform.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/dnet group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/dnet.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/dnet.4d
 driver name=dnet perms="* 0666 root sys" clone_perms="dnet 0666 root sys" \
     alias=pci1011,2 \
     alias=pci1011,9 \
diff --git a/usr/src/pkg/manifests/driver-network-qede.p5m b/usr/src/pkg/manifests/driver-network-qede.p5m
index 586060622e..0e148dd872 100644
--- a/usr/src/pkg/manifests/driver-network-qede.p5m
+++ b/usr/src/pkg/manifests/driver-network-qede.p5m
@@ -26,8 +26,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/qede group=sys
 file path=kernel/drv/qede.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/qede.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/qede.4d
 driver name=qede perms="* 0666 root sys" clone_perms="qede 0666 root sys" \
     alias=pciex1077,1629 \
     alias=pciex1077,1630 \
diff --git a/usr/src/pkg/manifests/driver-network-qlc.p5m b/usr/src/pkg/manifests/driver-network-qlc.p5m
index 3e2fd7b4f3..dfd88f2c4a 100644
--- a/usr/src/pkg/manifests/driver-network-qlc.p5m
+++ b/usr/src/pkg/manifests/driver-network-qlc.p5m
@@ -54,8 +54,8 @@ file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2500 group=sys mode=0755
 file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_6322 group=sys mode=0755
 file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_8100 group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/qlc.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/qlc.4d
 driver name=qlc perms="* 0666 root sys" class=fibre-channel \
     alias=pci1077,2200 \
     alias=pci1077,2300 \
diff --git a/usr/src/pkg/manifests/driver-network-ral.p5m b/usr/src/pkg/manifests/driver-network-ral.p5m
index 0335245f53..26e1220b50 100644
--- a/usr/src/pkg/manifests/driver-network-ral.p5m
+++ b/usr/src/pkg/manifests/driver-network-ral.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/ral group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ral.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ral.4d
 driver name=ral perms="* 0666 root sys" clone_perms="ral 0666 root sys" \
     alias=pci1814,201
 legacy pkg=SUNWralink desc="Ralink RT2500 802.11b/g Wireless Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-rge.p5m b/usr/src/pkg/manifests/driver-network-rge.p5m
index c1b17d2a64..f7c8c532c4 100644
--- a/usr/src/pkg/manifests/driver-network-rge.p5m
+++ b/usr/src/pkg/manifests/driver-network-rge.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/rge group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/rge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/rge.4d
 driver name=rge perms="* 0666 root sys" clone_perms="rge 0666 root sys" \
     alias=pci10ec,8136 \
     alias=pci10ec,8167 \
diff --git a/usr/src/pkg/manifests/driver-network-rtls.p5m b/usr/src/pkg/manifests/driver-network-rtls.p5m
index 2556742359..a9b99c3f8c 100644
--- a/usr/src/pkg/manifests/driver-network-rtls.p5m
+++ b/usr/src/pkg/manifests/driver-network-rtls.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/rtls group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/rtls.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/rtls.4d
 driver name=rtls perms="* 0666 root sys" clone_perms="rtls 0666 root sys" \
     alias=pci10ec,8139 \
     alias=pci1113,1211 \
diff --git a/usr/src/pkg/manifests/driver-network-rtw.p5m b/usr/src/pkg/manifests/driver-network-rtw.p5m
index 6f95b9884a..9b12d9e185 100644
--- a/usr/src/pkg/manifests/driver-network-rtw.p5m
+++ b/usr/src/pkg/manifests/driver-network-rtw.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/rtw group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/rtw.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/rtw.4d
 driver name=rtw perms="* 0666 root sys" clone_perms="rtw 0666 root sys" \
     alias=pci10ec,8180
 legacy pkg=SUNWrtw desc="realtek 8180L 802.11b driver" \
diff --git a/usr/src/pkg/manifests/driver-network-rum.p5m b/usr/src/pkg/manifests/driver-network-rum.p5m
index 82f52090ea..938588a040 100644
--- a/usr/src/pkg/manifests/driver-network-rum.p5m
+++ b/usr/src/pkg/manifests/driver-network-rum.p5m
@@ -42,8 +42,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/rum group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/rum.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/rum.4d
 driver name=rum perms="* 0666 root sys" clone_perms="rum 0666 root sys" \
     alias=usb7d1,3c03 \
     alias=usb7d1,3c04 \
diff --git a/usr/src/pkg/manifests/driver-network-rwd.p5m b/usr/src/pkg/manifests/driver-network-rwd.p5m
index 5e69e857e7..325d1ede10 100644
--- a/usr/src/pkg/manifests/driver-network-rwd.p5m
+++ b/usr/src/pkg/manifests/driver-network-rwd.p5m
@@ -42,8 +42,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/rwd group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/rwd.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/rwd.4d
 driver name=rwd perms="* 0666 root sys" clone_perms="rwd 0666 root sys" \
     alias=pci1814,401
 legacy pkg=SUNWrwd \
diff --git a/usr/src/pkg/manifests/driver-network-rwn.p5m b/usr/src/pkg/manifests/driver-network-rwn.p5m
index 6ac9064e28..e0f53b3f69 100644
--- a/usr/src/pkg/manifests/driver-network-rwn.p5m
+++ b/usr/src/pkg/manifests/driver-network-rwn.p5m
@@ -42,8 +42,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/rwn group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/rwn.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/rwn.4d
 driver name=rwn perms="* 0666 root sys" clone_perms="rwn 0666 root sys" \
     alias=pci1814,601 \
     alias=pci1814,681 \
diff --git a/usr/src/pkg/manifests/driver-network-sdp.p5m b/usr/src/pkg/manifests/driver-network-sdp.p5m
index 6ac16babce..60e5f56fae 100644
--- a/usr/src/pkg/manifests/driver-network-sdp.p5m
+++ b/usr/src/pkg/manifests/driver-network-sdp.p5m
@@ -48,8 +48,8 @@ dir  path=kernel/socketmod group=sys
 dir  path=kernel/socketmod/$(ARCH64) group=sys
 file path=kernel/socketmod/$(ARCH64)/socksdp group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/sdp.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/sdp.4d
 driver name=sdp perms="* 0644 root sys" perms="sdp 0666 root sys"
 legacy pkg=SUNWibsdp desc="Sun InfiniBand layered Sockets Direct Protocol" \
     name="Sun InfiniBand layered Sockets Direct Protocol"
diff --git a/usr/src/pkg/manifests/driver-network-sfe.p5m b/usr/src/pkg/manifests/driver-network-sfe.p5m
index ecf1c90ec3..68e02bca6f 100644
--- a/usr/src/pkg/manifests/driver-network-sfe.p5m
+++ b/usr/src/pkg/manifests/driver-network-sfe.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/sfe group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/sfe.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/sfe.4d
 driver name=sfe perms="* 0666 root root" \
     alias=pci100b,20 \
     alias=pci1039,900 \
diff --git a/usr/src/pkg/manifests/driver-network-sfxge.p5m b/usr/src/pkg/manifests/driver-network-sfxge.p5m
index 95e97c6fdd..0309266bc6 100644
--- a/usr/src/pkg/manifests/driver-network-sfxge.p5m
+++ b/usr/src/pkg/manifests/driver-network-sfxge.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/sfxge group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/sfxge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/sfxge.4d
 driver name=sfxge perms="* 0666 root sys" clone_perms="sfxge 0666 root sys" \
     alias=pci1924,803 \
     alias=pci1924,810 \
diff --git a/usr/src/pkg/manifests/driver-network-socal.p5m b/usr/src/pkg/manifests/driver-network-socal.p5m
index 09a11e9ff1..654e809323 100644
--- a/usr/src/pkg/manifests/driver-network-socal.p5m
+++ b/usr/src/pkg/manifests/driver-network-socal.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/socal group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/socal.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/socal.4d
 driver name=socal alias=SUNW,socal
 legacy pkg=SUNWluxl desc="Sun Enterprise Network Array socal Device Driver" \
     name="Sun Enterprise Network Array socal Device Driver"
diff --git a/usr/src/pkg/manifests/driver-network-srpt.p5m b/usr/src/pkg/manifests/driver-network-srpt.p5m
index 80bd8a361a..2295c08286 100644
--- a/usr/src/pkg/manifests/driver-network-srpt.p5m
+++ b/usr/src/pkg/manifests/driver-network-srpt.p5m
@@ -62,8 +62,8 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/srpt.so group=sys mode=0555
 dir  path=usr/sbin
 file path=usr/sbin/srptadm mode=0555
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/srpt.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/srpt.4d
 driver name=srpt perms="* 0644 root sys"
 legacy pkg=SUNWsrptr desc="Sun SRP COMSTAR Port Provider (Root)" \
     name="Sun SRP COMSTAR Port Provider (Root)"
diff --git a/usr/src/pkg/manifests/driver-network-uath.p5m b/usr/src/pkg/manifests/driver-network-uath.p5m
index 0f113bcd9a..d71a4125dc 100644
--- a/usr/src/pkg/manifests/driver-network-uath.p5m
+++ b/usr/src/pkg/manifests/driver-network-uath.p5m
@@ -45,8 +45,8 @@ dir  path=kernel/misc group=sys
 dir  path=kernel/misc/$(ARCH64) group=sys
 file path=kernel/misc/$(ARCH64)/uathfw group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/uath.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/uath.4d
 driver name=uath perms="* 0666 root sys" clone_perms="uath 0666 root sys" \
     alias=usbcf3,2 \
     alias=usbcf3,3 \
diff --git a/usr/src/pkg/manifests/driver-network-ural.p5m b/usr/src/pkg/manifests/driver-network-ural.p5m
index 9ee0343f58..fbf2345c10 100644
--- a/usr/src/pkg/manifests/driver-network-ural.p5m
+++ b/usr/src/pkg/manifests/driver-network-ural.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/ural group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ural.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ural.4d
 driver name=ural perms="* 0666 root sys" clone_perms="ural 0666 root sys" \
     alias=usb411,67 \
     alias=usb1044,8007 \
diff --git a/usr/src/pkg/manifests/driver-network-urtw.p5m b/usr/src/pkg/manifests/driver-network-urtw.p5m
index 8aaf00613b..e243f8d702 100644
--- a/usr/src/pkg/manifests/driver-network-urtw.p5m
+++ b/usr/src/pkg/manifests/driver-network-urtw.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/urtw group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/urtw.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/urtw.4d
 driver name=urtw perms="* 0666 root sys" clone_perms="urtw 0666 root sys" \
     alias=usb50d,705e \
     alias=usb769,11f2 \
diff --git a/usr/src/pkg/manifests/driver-network-vioif.p5m b/usr/src/pkg/manifests/driver-network-vioif.p5m
index 73263bd6cc..f5c0c371b1 100644
--- a/usr/src/pkg/manifests/driver-network-vioif.p5m
+++ b/usr/src/pkg/manifests/driver-network-vioif.p5m
@@ -34,8 +34,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/vioif group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/vioif.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/vioif.4d
 driver name=vioif perms="* 0666 root sys" alias=pci1af4,1
 legacy pkg=SUNWvioif desc="VirtIO network driver" name="VirtIO network driver"
 license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-vr.p5m b/usr/src/pkg/manifests/driver-network-vr.p5m
index 9a962d2ec0..20481bd6ea 100644
--- a/usr/src/pkg/manifests/driver-network-vr.p5m
+++ b/usr/src/pkg/manifests/driver-network-vr.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/vr group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/vr.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/vr.4d
 driver name=vr perms="* 0666 root sys" \
     alias=pci1106,3043 \
     alias=pci1106,3053 \
diff --git a/usr/src/pkg/manifests/driver-network-wpi.p5m b/usr/src/pkg/manifests/driver-network-wpi.p5m
index 4538827a6a..5d49eb785a 100644
--- a/usr/src/pkg/manifests/driver-network-wpi.p5m
+++ b/usr/src/pkg/manifests/driver-network-wpi.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/wpi group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/wpi.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/wpi.4d
 driver name=wpi perms="* 0666 root sys" clone_perms="wpi 0666 root sys" \
     alias=pciex8086,4222 \
     alias=pciex8086,4222.8086.1000 \
diff --git a/usr/src/pkg/manifests/driver-network-xge.p5m b/usr/src/pkg/manifests/driver-network-xge.p5m
index 3b56345492..b22ad5bfab 100644
--- a/usr/src/pkg/manifests/driver-network-xge.p5m
+++ b/usr/src/pkg/manifests/driver-network-xge.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/xge group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/xge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/xge.4d
 driver name=xge perms="* 0666 root sys" clone_perms="xge 0666 root sys" \
     alias=pci17d5,5731 \
     alias=pci17d5,5831 \
diff --git a/usr/src/pkg/manifests/driver-network-yge.p5m b/usr/src/pkg/manifests/driver-network-yge.p5m
index e7263d469f..f20bf0cdcc 100644
--- a/usr/src/pkg/manifests/driver-network-yge.p5m
+++ b/usr/src/pkg/manifests/driver-network-yge.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/yge group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/yge.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/yge.4d
 driver name=yge perms="* 0666 root sys" \
     alias=pciex1148,9e00 \
     alias=pciex1186,4b00 \
diff --git a/usr/src/pkg/manifests/driver-network-zyd.p5m b/usr/src/pkg/manifests/driver-network-zyd.p5m
index 10daecb6ec..b7b6be45d6 100644
--- a/usr/src/pkg/manifests/driver-network-zyd.p5m
+++ b/usr/src/pkg/manifests/driver-network-zyd.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/zyd group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/zyd.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/zyd.4d
 driver name=zyd perms="* 0666 root sys" clone_perms="zyd 0666 root sys" \
     alias=usbace,1211 \
     alias=usbace,1215 \
diff --git a/usr/src/pkg/manifests/driver-pcmcia.p5m b/usr/src/pkg/manifests/driver-pcmcia.p5m
index 94b220023e..78330d1c37 100644
--- a/usr/src/pkg/manifests/driver-pcmcia.p5m
+++ b/usr/src/pkg/manifests/driver-pcmcia.p5m
@@ -42,9 +42,9 @@ file path=kernel/drv/$(ARCH64)/pcic group=sys
 file path=kernel/drv/$(ARCH64)/pcs group=sys
 file path=kernel/drv/pcic.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/pcic.7d
-file path=usr/share/man/man7d/pcmcia.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/pcic.4d
+file path=usr/share/man/man4d/pcmcia.4d
 driver name=pcic class=pcmcia \
     alias=pciclass,060500 \
     alias=pciclass,060700
diff --git a/usr/src/pkg/manifests/driver-serial-usbftdi.p5m b/usr/src/pkg/manifests/driver-serial-usbftdi.p5m
index 34e242c92e..cfc397a047 100644
--- a/usr/src/pkg/manifests/driver-serial-usbftdi.p5m
+++ b/usr/src/pkg/manifests/driver-serial-usbftdi.p5m
@@ -41,8 +41,8 @@ file path=kernel/drv/$(ARCH64)/usbftdi group=sys
 file path=kernel/drv/usbftdi.conf group=sys \
     original_name=SUNWuftdi:kernel/drv/usbftdi.conf preserve=true
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/usbftdi.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/usbftdi.4d
 driver name=usbftdi perms="* 0666 root sys" \
     alias=usb403,6001 \
     alias=usb403,6014 \
diff --git a/usr/src/pkg/manifests/driver-serial-usbsacm.p5m b/usr/src/pkg/manifests/driver-serial-usbsacm.p5m
index a9adda2d8c..1777abc8fa 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsacm.p5m
+++ b/usr/src/pkg/manifests/driver-serial-usbsacm.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/usbsacm group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/usbsacm.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/usbsacm.4d
 driver name=usbsacm perms="* 0666 root sys" \
     alias=usbc88,17da \
     alias=usb1410,1110 \
diff --git a/usr/src/pkg/manifests/driver-serial-usbsksp.p5m b/usr/src/pkg/manifests/driver-serial-usbsksp.p5m
index 3cbfdb2d6e..376463ec34 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsksp.p5m
+++ b/usr/src/pkg/manifests/driver-serial-usbsksp.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/usbsksp group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/usbsksp.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/usbsksp.4d
 driver name=usbsksp perms="* 0666 root sys" \
     alias=usb6cd,11a \
     alias=usb6cd,121 \
diff --git a/usr/src/pkg/manifests/driver-serial-usbsprl.p5m b/usr/src/pkg/manifests/driver-serial-usbsprl.p5m
index 53cc372518..1f658c3ca1 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsprl.p5m
+++ b/usr/src/pkg/manifests/driver-serial-usbsprl.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/usbsprl group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/usbsprl.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/usbsprl.4d
 driver name=usbsprl perms="* 0666 root sys" \
     alias=usb557,2008 \
     alias=usb56e,5004 \
diff --git a/usr/src/pkg/manifests/driver-storage-aac.p5m b/usr/src/pkg/manifests/driver-storage-aac.p5m
index 0c39ae6542..f23c8f49a7 100644
--- a/usr/src/pkg/manifests/driver-storage-aac.p5m
+++ b/usr/src/pkg/manifests/driver-storage-aac.p5m
@@ -41,8 +41,8 @@ file path=kernel/drv/$(ARCH64)/aac group=sys
 file path=kernel/drv/aac.conf group=sys \
     original_name=SUNWaac:kernel/drv/aac.conf preserve=true
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/aac.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/aac.4d
 driver name=aac class=scsi \
     alias=pci1028,3 \
     alias=pci1028,a \
diff --git a/usr/src/pkg/manifests/driver-storage-ahci.p5m b/usr/src/pkg/manifests/driver-storage-ahci.p5m
index 81b253154d..28893961dd 100644
--- a/usr/src/pkg/manifests/driver-storage-ahci.p5m
+++ b/usr/src/pkg/manifests/driver-storage-ahci.p5m
@@ -44,8 +44,8 @@ file path=kernel/drv/$(ARCH64)/ahci group=sys
 dir  path=usr/lib/ahci
 file path=usr/lib/ahci/ahciem mode=0555
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ahci.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ahci.4d
 #
 # In general, we expect ahci devices to use the ahci class code.
 # However, there are a handful of Intel controller hubs which will
diff --git a/usr/src/pkg/manifests/driver-storage-amr.p5m b/usr/src/pkg/manifests/driver-storage-amr.p5m
index 449a205cd1..7a2dbca729 100644
--- a/usr/src/pkg/manifests/driver-storage-amr.p5m
+++ b/usr/src/pkg/manifests/driver-storage-amr.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/amr group=sys
 file path=kernel/drv/amr.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/amr.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/amr.4d
 driver name=amr class=scsi \
     alias=pci1000,532 \
     alias=pci1028,e \
diff --git a/usr/src/pkg/manifests/driver-storage-arcmsr.p5m b/usr/src/pkg/manifests/driver-storage-arcmsr.p5m
index ab686dd8cf..a8c0be3621 100644
--- a/usr/src/pkg/manifests/driver-storage-arcmsr.p5m
+++ b/usr/src/pkg/manifests/driver-storage-arcmsr.p5m
@@ -41,8 +41,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/arcmsr group=sys
 file path=kernel/drv/arcmsr.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/arcmsr.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/arcmsr.4d
 driver name=arcmsr perms="* 0600 root sys" class=scsi \
     alias=pci17d3,1110 \
     alias=pci17d3,1120 \
diff --git a/usr/src/pkg/manifests/driver-storage-ata.p5m b/usr/src/pkg/manifests/driver-storage-ata.p5m
index 3aaf6b04a3..8f52919e4a 100644
--- a/usr/src/pkg/manifests/driver-storage-ata.p5m
+++ b/usr/src/pkg/manifests/driver-storage-ata.p5m
@@ -55,8 +55,8 @@ dir  path=platform/i86xpv/kernel/drv/$(ARCH64) group=sys
 file path=platform/i86xpv/kernel/drv/$(ARCH64)/pci-ide group=sys
 file path=platform/i86xpv/kernel/drv/pci-ide.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ata.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ata.4d
 driver name=ata class=dada class=scsi alias=ide
 driver name=pci-ide
 legacy pkg=SUNWpsdir desc="Platform Support, ISA Bus Device Drivers, (Root)" \
diff --git a/usr/src/pkg/manifests/driver-storage-bcm_sata.p5m b/usr/src/pkg/manifests/driver-storage-bcm_sata.p5m
index 93bbeeef04..cc5b89e683 100644
--- a/usr/src/pkg/manifests/driver-storage-bcm_sata.p5m
+++ b/usr/src/pkg/manifests/driver-storage-bcm_sata.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/bcm_sata group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/bcm_sata.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/bcm_sata.4d
 driver name=bcm_sata perms="* 0644 root sys" class=scsi-self-identifying \
     alias=pci1166,24a
 legacy pkg=SUNWbcmsata desc="BroadCom ht1000 sata driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-blkdev.p5m b/usr/src/pkg/manifests/driver-storage-blkdev.p5m
index a37cd90bd8..cd1b97d340 100644
--- a/usr/src/pkg/manifests/driver-storage-blkdev.p5m
+++ b/usr/src/pkg/manifests/driver-storage-blkdev.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/blkdev group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/blkdev.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/blkdev.4d
 driver name=blkdev perms="* 0640 root root"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-storage-cpqary3.p5m b/usr/src/pkg/manifests/driver-storage-cpqary3.p5m
index 36f33d960c..6732b6192c 100644
--- a/usr/src/pkg/manifests/driver-storage-cpqary3.p5m
+++ b/usr/src/pkg/manifests/driver-storage-cpqary3.p5m
@@ -26,8 +26,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/cpqary3 group=sys
 file path=kernel/drv/cpqary3.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/cpqary3.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/cpqary3.4d
 driver name=cpqary3 class=scsi \
     alias=pci103c,1920 \
     alias=pci103c,1921 \
diff --git a/usr/src/pkg/manifests/driver-storage-mega_sas.p5m b/usr/src/pkg/manifests/driver-storage-mega_sas.p5m
index 35cad3b266..9959d1278c 100644
--- a/usr/src/pkg/manifests/driver-storage-mega_sas.p5m
+++ b/usr/src/pkg/manifests/driver-storage-mega_sas.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/mega_sas group=sys
 file path=kernel/drv/mega_sas.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/mega_sas.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/mega_sas.4d
 driver name=mega_sas class=scsi \
     alias=pci1000,57.8086.3002 \
     alias=pci1000,60.1000.1006 \
diff --git a/usr/src/pkg/manifests/driver-storage-mpt_sas.p5m b/usr/src/pkg/manifests/driver-storage-mpt_sas.p5m
index ab466dfb98..8b4762eb87 100644
--- a/usr/src/pkg/manifests/driver-storage-mpt_sas.p5m
+++ b/usr/src/pkg/manifests/driver-storage-mpt_sas.p5m
@@ -42,8 +42,8 @@ file path=kernel/drv/$(ARCH64)/mpt_sas group=sys
 file path=kernel/drv/mpt_sas.conf group=sys \
     original_name=SUNWmptsas:kernel/drv/mpt_sas.conf preserve=true
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/mpt_sas.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/mpt_sas.4d
 driver name=mpt_sas class=scsi-self-identifying \
     alias=pci1000,64 \
     alias=pci1000,70 \
diff --git a/usr/src/pkg/manifests/driver-storage-mr_sas.p5m b/usr/src/pkg/manifests/driver-storage-mr_sas.p5m
index aed758a2d5..bd8245393b 100644
--- a/usr/src/pkg/manifests/driver-storage-mr_sas.p5m
+++ b/usr/src/pkg/manifests/driver-storage-mr_sas.p5m
@@ -43,8 +43,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/mr_sas group=sys
 file path=kernel/drv/mr_sas.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/mr_sas.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/mr_sas.4d
 $(sparc_ONLY)driver name=mr_sas class=scsi-self-identifying \
     alias=pci1000,78 \
     alias=pci1000,79 \
diff --git a/usr/src/pkg/manifests/driver-storage-nv_sata.p5m b/usr/src/pkg/manifests/driver-storage-nv_sata.p5m
index c6a51088d7..78c1f6c45c 100644
--- a/usr/src/pkg/manifests/driver-storage-nv_sata.p5m
+++ b/usr/src/pkg/manifests/driver-storage-nv_sata.p5m
@@ -43,8 +43,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/nv_sata group=sys
 file path=kernel/drv/nv_sata.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/nv_sata.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/nv_sata.4d
 driver name=nv_sata perms="* 0644 root sys" class=scsi-self-identifying \
     alias=pci10de,36 \
     alias=pci10de,3e \
diff --git a/usr/src/pkg/manifests/driver-storage-nvme.p5m b/usr/src/pkg/manifests/driver-storage-nvme.p5m
index 7efb3dbce7..47cc6d5d3c 100644
--- a/usr/src/pkg/manifests/driver-storage-nvme.p5m
+++ b/usr/src/pkg/manifests/driver-storage-nvme.p5m
@@ -40,8 +40,8 @@ dir  path=usr/sbin
 file path=usr/sbin/nvmeadm mode=0555
 dir  path=usr/share
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/nvme.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/nvme.4d
 file path=usr/share/man/man8/nvmeadm.8
 driver name=nvme perms="* 0600 root sys" class=disk \
     alias=pciclass,010802 \
diff --git a/usr/src/pkg/manifests/driver-storage-scsa1394.p5m b/usr/src/pkg/manifests/driver-storage-scsa1394.p5m
index 675adb831f..f5ece890a2 100644
--- a/usr/src/pkg/manifests/driver-storage-scsa1394.p5m
+++ b/usr/src/pkg/manifests/driver-storage-scsa1394.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/scsa1394 group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/scsa1394.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/scsa1394.4d
 driver name=scsa1394 perms="* 0666 root sys" alias=firewire00609e,010483
 legacy pkg=SUNWscsa1394 desc="IEEE 1394 mass storage driver" \
     name="IEEE 1394 mass storage driver"
diff --git a/usr/src/pkg/manifests/driver-storage-sdcard.p5m b/usr/src/pkg/manifests/driver-storage-sdcard.p5m
index 884d9c5e71..d69a59056c 100644
--- a/usr/src/pkg/manifests/driver-storage-sdcard.p5m
+++ b/usr/src/pkg/manifests/driver-storage-sdcard.p5m
@@ -45,9 +45,9 @@ $(i386_ONLY)dir path=kernel/misc group=sys
 $(i386_ONLY)dir path=kernel/misc/$(ARCH64) group=sys
 $(i386_ONLY)file path=kernel/misc/$(ARCH64)/sda group=sys mode=0755
 $(i386_ONLY)dir path=usr/share/man
-$(i386_ONLY)dir path=usr/share/man/man7d
-$(i386_ONLY)file path=usr/share/man/man7d/sda.7d
-$(i386_ONLY)file path=usr/share/man/man7d/sdhost.7d
+$(i386_ONLY)dir path=usr/share/man/man4d
+$(i386_ONLY)file path=usr/share/man/man4d/sda.4d
+$(i386_ONLY)file path=usr/share/man/man4d/sdhost.4d
 $(i386_ONLY)driver name=sdhost perms="* 0644 root root" \
     alias=pciclass,080500 \
     alias=pciclass,080501
diff --git a/usr/src/pkg/manifests/driver-storage-ses.p5m b/usr/src/pkg/manifests/driver-storage-ses.p5m
index d36db5293b..37547fbaf5 100644
--- a/usr/src/pkg/manifests/driver-storage-ses.p5m
+++ b/usr/src/pkg/manifests/driver-storage-ses.p5m
@@ -40,8 +40,8 @@ dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/ses group=sys
 file path=kernel/drv/ses.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ses.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ses.4d
 driver name=ses perms="* 0666 bin bin" \
     alias=scsiclass,03S \
     alias=scsiclass,0d
diff --git a/usr/src/pkg/manifests/driver-storage-sf.p5m b/usr/src/pkg/manifests/driver-storage-sf.p5m
index 20f046c489..27e6ae786c 100644
--- a/usr/src/pkg/manifests/driver-storage-sf.p5m
+++ b/usr/src/pkg/manifests/driver-storage-sf.p5m
@@ -42,8 +42,8 @@ dir  path=platform/sun4u/kernel/drv/$(ARCH64) group=sys
 file path=platform/sun4u/kernel/drv/$(ARCH64)/sf group=sys
 file path=platform/sun4u/kernel/drv/sf.conf group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/sf.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/sf.4d
 driver name=sf
 legacy pkg=SUNWluxd.u arch=$(ARCH).sun4u \
     desc="Sun Enterprise Network Array sf Device Driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-si3124.p5m b/usr/src/pkg/manifests/driver-storage-si3124.p5m
index ecbc0c66f8..fa2af477d4 100644
--- a/usr/src/pkg/manifests/driver-storage-si3124.p5m
+++ b/usr/src/pkg/manifests/driver-storage-si3124.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/si3124 group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/si3124.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/si3124.4d
 driver name=si3124 perms="* 0644 root sys" class=scsi-self-identifying \
     alias=pci1095,3124 \
     alias=pci1095,3132 \
diff --git a/usr/src/pkg/manifests/driver-storage-skd.p5m b/usr/src/pkg/manifests/driver-storage-skd.p5m
index 0681840a20..781158f1e2 100644
--- a/usr/src/pkg/manifests/driver-storage-skd.p5m
+++ b/usr/src/pkg/manifests/driver-storage-skd.p5m
@@ -36,7 +36,7 @@ file path=kernel/drv/skd.conf group=sys
 dir  path=usr group=sys
 dir  path=usr/share
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/skd.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/skd.4d
 driver name=skd perms="* 0600 root sys" class=disk alias=pciex1b39,1
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-storage-ssd.p5m b/usr/src/pkg/manifests/driver-storage-ssd.p5m
index 7d8c4b171d..0d83219882 100644
--- a/usr/src/pkg/manifests/driver-storage-ssd.p5m
+++ b/usr/src/pkg/manifests/driver-storage-ssd.p5m
@@ -41,8 +41,8 @@ file path=kernel/drv/$(ARCH64)/ssd group=sys
 file path=kernel/drv/ssd.conf group=sys \
     original_name=SUNWssad:kernel/drv/ssd.conf preserve=true
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ssd.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ssd.4d
 driver name=ssd perms="* 0640 root sys" \
     alias=SUNW,ssd \
     alias=scsa,00.bfcp \
diff --git a/usr/src/pkg/manifests/driver-storage-vioblk.p5m b/usr/src/pkg/manifests/driver-storage-vioblk.p5m
index 8535bdc844..a39adba818 100644
--- a/usr/src/pkg/manifests/driver-storage-vioblk.p5m
+++ b/usr/src/pkg/manifests/driver-storage-vioblk.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/vioblk group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/vioblk.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/vioblk.4d
 driver name=vioblk perms="* 0666 root sys" clone_perms="vioblk 0666 root sys" \
     alias=pci1af4,1001
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-usb-ugen.p5m b/usr/src/pkg/manifests/driver-usb-ugen.p5m
index 88ffe650ff..6b80903ca3 100644
--- a/usr/src/pkg/manifests/driver-usb-ugen.p5m
+++ b/usr/src/pkg/manifests/driver-usb-ugen.p5m
@@ -39,8 +39,8 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/ugen group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ugen.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ugen.4d
 driver name=ugen perms="* 0644 root sys"
 legacy pkg=SUNWugen desc="UGEN (USB Generic Driver)" name="USB Generic Driver"
 license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-usb.p5m b/usr/src/pkg/manifests/driver-usb.p5m
index fc2cf12862..3267c7a9de 100644
--- a/usr/src/pkg/manifests/driver-usb.p5m
+++ b/usr/src/pkg/manifests/driver-usb.p5m
@@ -95,20 +95,20 @@ $(i386_ONLY)dir path=usr/lib/xhci group=sys
 $(i386_ONLY)file path=usr/lib/xhci/xhci_portsc group=sys mode=0555
 dir  path=usr/share
 dir  path=usr/share/man
-file path=usr/share/man/man7d/ehci.7d
-file path=usr/share/man/man7d/hid.7d
-file path=usr/share/man/man7d/hubd.7d
-file path=usr/share/man/man7d/ohci.7d
-file path=usr/share/man/man7d/scsa2usb.7d
-file path=usr/share/man/man7d/uhci.7d
-link path=usr/share/man/man7d/usb.7d target=usba.7d
-file path=usr/share/man/man7d/usb_ac.7d
-file path=usr/share/man/man7d/usb_as.7d
-file path=usr/share/man/man7d/usb_ia.7d
-file path=usr/share/man/man7d/usb_mid.7d
-file path=usr/share/man/man7d/usba.7d
-file path=usr/share/man/man7d/usbprn.7d
-$(i386_ONLY)file path=usr/share/man/man7d/xhci.7d
+file path=usr/share/man/man4d/ehci.4d
+file path=usr/share/man/man4d/hid.4d
+file path=usr/share/man/man4d/hubd.4d
+file path=usr/share/man/man4d/ohci.4d
+file path=usr/share/man/man4d/scsa2usb.4d
+file path=usr/share/man/man4d/uhci.4d
+link path=usr/share/man/man4d/usb.4d target=usba.4d
+file path=usr/share/man/man4d/usb_ac.4d
+file path=usr/share/man/man4d/usb_as.4d
+file path=usr/share/man/man4d/usb_ia.4d
+file path=usr/share/man/man4d/usb_mid.4d
+file path=usr/share/man/man4d/usba.4d
+file path=usr/share/man/man4d/usbprn.4d
+$(i386_ONLY)file path=usr/share/man/man4d/xhci.4d
 dir  path=usr/share/man/man7m
 file path=usr/share/man/man7m/usb_ah.7m
 file path=usr/share/man/man7m/usbkbm.7m
diff --git a/usr/src/pkg/manifests/network-iscsi-initiator.p5m b/usr/src/pkg/manifests/network-iscsi-initiator.p5m
index 2932c4d703..d73a3a7f78 100644
--- a/usr/src/pkg/manifests/network-iscsi-initiator.p5m
+++ b/usr/src/pkg/manifests/network-iscsi-initiator.p5m
@@ -53,8 +53,8 @@ dir  path=usr group=sys
 dir  path=usr/sbin
 file path=usr/sbin/iscsiadm mode=0555
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/iscsi.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/iscsi.4d
 dir  path=usr/share/man/man8
 file path=usr/share/man/man8/iscsiadm.8
 driver name=iscsi perms="* 0600 root sys" class=scsi-self-identify
diff --git a/usr/src/pkg/manifests/network-iscsi-iser.p5m b/usr/src/pkg/manifests/network-iscsi-iser.p5m
index 2ba4146555..b40257b240 100644
--- a/usr/src/pkg/manifests/network-iscsi-iser.p5m
+++ b/usr/src/pkg/manifests/network-iscsi-iser.p5m
@@ -52,8 +52,8 @@ dir  path=usr/lib/mdb/kvm group=sys
 dir  path=usr/lib/mdb/kvm/$(ARCH64) group=sys
 file path=usr/lib/mdb/kvm/$(ARCH64)/idm.so group=sys mode=0555
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/iser.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/iser.4d
 driver name=iser perms="* 0600 root sys"
 legacy pkg=SUNWiscsidmr desc="Sun iSCSI Data Mover (Root)" \
     name="Sun iSCSI Data Mover (Root)"
diff --git a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m
index f0bd5e56c3..ce8afb8df8 100644
--- a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m
+++ b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m
@@ -72,9 +72,9 @@ dir  path=usr/platform/sun4u group=sys
 dir  path=usr/platform/sun4u/lib
 file path=usr/platform/sun4u/lib/sckmd group=sys mode=0755
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/dm2s.7d
-file path=usr/share/man/man7d/oplkmdrv.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/dm2s.4d
+file path=usr/share/man/man4d/oplkmdrv.4d
 dir  path=usr/share/man/man8
 file path=usr/share/man/man8/prtdscp.8
 file path=usr/share/man/man8/sckmd.8
diff --git a/usr/src/pkg/manifests/system-kernel-dtrace-providers.p5m b/usr/src/pkg/manifests/system-kernel-dtrace-providers.p5m
index 702733b28c..ad2b71fc17 100644
--- a/usr/src/pkg/manifests/system-kernel-dtrace-providers.p5m
+++ b/usr/src/pkg/manifests/system-kernel-dtrace-providers.p5m
@@ -71,14 +71,14 @@ hardlink path=kernel/dtrace/$(ARCH64)/sdt \
 hardlink path=kernel/dtrace/$(ARCH64)/systrace \
     target=../../../kernel/drv/$(ARCH64)/systrace
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/dtrace.7d
-file path=usr/share/man/man7d/fasttrap.7d
-file path=usr/share/man/man7d/fbt.7d
-file path=usr/share/man/man7d/lockstat.7d
-file path=usr/share/man/man7d/profile.7d
-file path=usr/share/man/man7d/sdt.7d
-file path=usr/share/man/man7d/systrace.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/dtrace.4d
+file path=usr/share/man/man4d/fasttrap.4d
+file path=usr/share/man/man4d/fbt.4d
+file path=usr/share/man/man4d/lockstat.4d
+file path=usr/share/man/man4d/profile.4d
+file path=usr/share/man/man4d/sdt.4d
+file path=usr/share/man/man4d/systrace.4d
 driver name=dcpc
 driver name=dtrace perms="* 0666 root sys"
 driver name=fasttrap perms="fasttrap 0666 root sys"
diff --git a/usr/src/pkg/manifests/system-kernel-platform.p5m b/usr/src/pkg/manifests/system-kernel-platform.p5m
index a7318e04e4..8a5cb816b6 100644
--- a/usr/src/pkg/manifests/system-kernel-platform.p5m
+++ b/usr/src/pkg/manifests/system-kernel-platform.p5m
@@ -850,29 +850,29 @@ dir  path=usr/share/man/man4
 $(i386_ONLY)link path=usr/share/man/man4/isa.4 target=sysbus.4
 $(sparc_ONLY)file path=usr/share/man/man4/sbus.4
 $(i386_ONLY)file path=usr/share/man/man4/sysbus.4
-$(sparc_ONLY)dir path=usr/share/man/man7d
-$(sparc_ONLY)file path=usr/share/man/man7d/bbc_beep.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/dr.7d
-$(sparc_ONLY)link path=usr/share/man/man7d/drmach.7d target=dr.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/fd.7d
-link path=usr/share/man/man7d/fdc.7d target=fd.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/gpio_87317.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/grbeep.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/mc-opl.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/n2rng.7d
-$(i386_ONLY)file path=usr/share/man/man7d/npe.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/ntwdt.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/oplmsu.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/oplpanel.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/pcicmu.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/pcipsy.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/pcisch.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/smbus.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/su.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/todopl.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/tsalarm.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/zs.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/zsh.7d
+$(sparc_ONLY)dir path=usr/share/man/man4d
+$(sparc_ONLY)file path=usr/share/man/man4d/bbc_beep.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/dr.4d
+$(sparc_ONLY)link path=usr/share/man/man4d/drmach.4d target=dr.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/fd.4d
+link path=usr/share/man/man4d/fdc.4d target=fd.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/gpio_87317.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/grbeep.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/mc-opl.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/n2rng.4d
+$(i386_ONLY)file path=usr/share/man/man4d/npe.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/ntwdt.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/oplmsu.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/oplpanel.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/pcicmu.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/pcipsy.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/pcisch.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/smbus.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/su.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/todopl.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/tsalarm.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/zs.4d
+$(sparc_ONLY)file path=usr/share/man/man4d/zsh.4d
 $(sparc_ONLY)dir path=usr/share/man/man7m
 $(sparc_ONLY)driver name=ac
 $(i386_ONLY)driver name=acpinex alias=acpivirtnex
diff --git a/usr/src/pkg/manifests/system-kernel-power.p5m b/usr/src/pkg/manifests/system-kernel-power.p5m
index 18e57c6cb7..40154671b3 100644
--- a/usr/src/pkg/manifests/system-kernel-power.p5m
+++ b/usr/src/pkg/manifests/system-kernel-power.p5m
@@ -65,8 +65,8 @@ dir  path=usr/share/man/man1
 file path=usr/share/man/man1/sys-suspend.1
 dir  path=usr/share/man/man4
 file path=usr/share/man/man4/power.conf.4
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/pm.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/pm.4d
 dir  path=usr/share/man/man8
 file path=usr/share/man/man8/pmconfig.8
 file path=usr/share/man/man8/powerd.8
diff --git a/usr/src/pkg/manifests/system-kernel.man4d.inc b/usr/src/pkg/manifests/system-kernel.man4d.inc
new file mode 100644
index 0000000000..e53b000286
--- /dev/null
+++ b/usr/src/pkg/manifests/system-kernel.man4d.inc
@@ -0,0 +1,59 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet
+# at http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2011, Richard Lowe
+# Copyright 2016 Nexenta Systems, Inc.
+# Copyright 2019 Peter Tribble.
+# Copyright 2019 Joyent, Inc.
+#
+
+link path=usr/share/man/man4d/allkmem.4d target=mem.4d
+file path=usr/share/man/man4d/console.4d
+file path=usr/share/man/man4d/cpuid.4d
+file path=usr/share/man/man4d/devinfo.4d
+file path=usr/share/man/man4d/full.4d
+file path=usr/share/man/man4d/gld.4d
+file path=usr/share/man/man4d/ipnet.4d
+file path=usr/share/man/man4d/kmdb.4d
+link path=usr/share/man/man4d/kmem.4d target=mem.4d
+file path=usr/share/man/man4d/llc1.4d
+link path=usr/share/man/man4d/lo0.4d target=ipnet.4d
+file path=usr/share/man/man4d/lofi.4d
+file path=usr/share/man/man4d/log.4d
+file path=usr/share/man/man4d/mem.4d
+file path=usr/share/man/man4d/msglog.4d
+file path=usr/share/man/man4d/mt.4d
+file path=usr/share/man/man4d/null.4d
+file path=usr/share/man/man4d/nulldriver.4d
+file path=usr/share/man/man4d/openprom.4d
+file path=usr/share/man/man4d/physmem.4d
+file path=usr/share/man/man4d/poll.4d
+file path=usr/share/man/man4d/pty.4d
+file path=usr/share/man/man4d/ramdisk.4d
+file path=usr/share/man/man4d/random.4d
+file path=usr/share/man/man4d/sad.4d
+file path=usr/share/man/man4d/sata.4d
+file path=usr/share/man/man4d/sd.4d
+file path=usr/share/man/man4d/sgen.4d
+file path=usr/share/man/man4d/st.4d
+file path=usr/share/man/man4d/sysmsg.4d
+file path=usr/share/man/man4d/ticlts.4d
+link path=usr/share/man/man4d/ticots.4d target=ticlts.4d
+link path=usr/share/man/man4d/ticotsord.4d target=ticlts.4d
+file path=usr/share/man/man4d/tty.4d
+file path=usr/share/man/man4d/tzmon.4d
+file path=usr/share/man/man4d/ufm.4d
+link path=usr/share/man/man4d/urandom.4d target=random.4d
+file path=usr/share/man/man4d/virtualkm.4d
+file path=usr/share/man/man4d/vni.4d
+file path=usr/share/man/man4d/wscons.4d
+file path=usr/share/man/man4d/zero.4d
diff --git a/usr/src/pkg/manifests/system-kernel.man7d.inc b/usr/src/pkg/manifests/system-kernel.man7d.inc
deleted file mode 100644
index d9f243af5d..0000000000
--- a/usr/src/pkg/manifests/system-kernel.man7d.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet
-# at http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2011, Richard Lowe
-# Copyright 2016 Nexenta Systems, Inc.
-# Copyright 2019 Peter Tribble.
-# Copyright 2019 Joyent, Inc.
-#
-
-link path=usr/share/man/man7d/allkmem.7d target=mem.7d
-file path=usr/share/man/man7d/console.7d
-file path=usr/share/man/man7d/cpuid.7d
-file path=usr/share/man/man7d/devinfo.7d
-file path=usr/share/man/man7d/full.7d
-file path=usr/share/man/man7d/gld.7d
-file path=usr/share/man/man7d/ipnet.7d
-file path=usr/share/man/man7d/kmdb.7d
-link path=usr/share/man/man7d/kmem.7d target=mem.7d
-file path=usr/share/man/man7d/llc1.7d
-link path=usr/share/man/man7d/lo0.7d target=ipnet.7d
-file path=usr/share/man/man7d/lofi.7d
-file path=usr/share/man/man7d/log.7d
-file path=usr/share/man/man7d/mem.7d
-file path=usr/share/man/man7d/msglog.7d
-file path=usr/share/man/man7d/mt.7d
-file path=usr/share/man/man7d/null.7d
-file path=usr/share/man/man7d/nulldriver.7d
-file path=usr/share/man/man7d/openprom.7d
-file path=usr/share/man/man7d/physmem.7d
-file path=usr/share/man/man7d/poll.7d
-file path=usr/share/man/man7d/pty.7d
-file path=usr/share/man/man7d/ramdisk.7d
-file path=usr/share/man/man7d/random.7d
-file path=usr/share/man/man7d/sad.7d
-file path=usr/share/man/man7d/sata.7d
-file path=usr/share/man/man7d/sd.7d
-file path=usr/share/man/man7d/sgen.7d
-file path=usr/share/man/man7d/st.7d
-file path=usr/share/man/man7d/sysmsg.7d
-file path=usr/share/man/man7d/ticlts.7d
-link path=usr/share/man/man7d/ticots.7d target=ticlts.7d
-link path=usr/share/man/man7d/ticotsord.7d target=ticlts.7d
-file path=usr/share/man/man7d/tty.7d
-file path=usr/share/man/man7d/tzmon.7d
-file path=usr/share/man/man7d/ufm.7d
-link path=usr/share/man/man7d/urandom.7d target=random.7d
-file path=usr/share/man/man7d/virtualkm.7d
-file path=usr/share/man/man7d/vni.7d
-file path=usr/share/man/man7d/wscons.7d
-file path=usr/share/man/man7d/zero.7d
diff --git a/usr/src/pkg/manifests/system-kernel.p5m b/usr/src/pkg/manifests/system-kernel.p5m
index 1db549d193..6388baab32 100644
--- a/usr/src/pkg/manifests/system-kernel.p5m
+++ b/usr/src/pkg/manifests/system-kernel.p5m
@@ -39,9 +39,9 @@
 <include global_zone_only_component>
 <include system-kernel.man2.inc>
 <include system-kernel.man4.inc>
+<include system-kernel.man4d.inc>
 <include system-kernel.man5.inc>
 <include system-kernel.man7.inc>
-<include system-kernel.man7d.inc>
 <include system-kernel.man7fs.inc>
 <include system-kernel.man7m.inc>
 <include system-kernel.man7p.inc>
@@ -335,7 +335,7 @@ $(sparc_ONLY)file path=kernel/misc/$(ARCH64)/dada group=sys mode=0755
 link path=kernel/misc/$(ARCH64)/des target=../../../kernel/crypto/$(ARCH64)/des
 file path=kernel/misc/$(ARCH64)/dls group=sys mode=0755
 # Sadly vuid mouse support is in different packages on different platforms
-# While kstat(7D) is in SUNWcs, the structures are general
+# While kstat(4D) is in SUNWcs, the structures are general
 hardlink path=kernel/misc/$(ARCH64)/edonr \
     target=../../../kernel/crypto/$(ARCH64)/edonr
 file path=kernel/misc/$(ARCH64)/fssnap_if group=sys mode=0755
@@ -475,10 +475,10 @@ dir  path=usr/share/man
 dir  path=usr/share/man/man2
 dir  path=usr/share/man/man3
 dir  path=usr/share/man/man4
+dir  path=usr/share/man/man4d
+$(sparc_ONLY)file path=usr/share/man/man4d/dad.4d
+$(i386_ONLY)file path=usr/share/man/man4d/smbios.4d
 dir  path=usr/share/man/man5
-dir  path=usr/share/man/man7d
-$(sparc_ONLY)file path=usr/share/man/man7d/dad.7d
-$(i386_ONLY)file path=usr/share/man/man7d/smbios.7d
 dir  path=usr/share/man/man7fs
 dir  path=usr/share/man/man7m
 dir  path=usr/share/man/man7p
diff --git a/usr/src/pkg/manifests/system-ksensor.p5m b/usr/src/pkg/manifests/system-ksensor.p5m
index 659ba3574c..0156101a79 100644
--- a/usr/src/pkg/manifests/system-ksensor.p5m
+++ b/usr/src/pkg/manifests/system-ksensor.p5m
@@ -29,7 +29,7 @@ dir  path=usr/lib/devfsadm group=sys
 dir  path=usr/lib/devfsadm/linkmod group=sys
 file path=usr/lib/devfsadm/linkmod/SUNW_sensor_link.so group=sys
 dir  path=usr/share/man
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/ksensor.7d
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/ksensor.4d
 driver name=ksensor
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-zones.p5m b/usr/src/pkg/manifests/system-zones.p5m
index fe8b538409..0c59255d28 100644
--- a/usr/src/pkg/manifests/system-zones.p5m
+++ b/usr/src/pkg/manifests/system-zones.p5m
@@ -100,11 +100,11 @@ dir  path=usr/share/man
 dir  path=usr/share/man/man1
 file path=usr/share/man/man1/zlogin.1
 file path=usr/share/man/man1/zonestat.1
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/zcons.4d
 dir  path=usr/share/man/man5
 file path=usr/share/man/man5/brands.5
 file path=usr/share/man/man5/zones.5
-dir  path=usr/share/man/man7d
-file path=usr/share/man/man7d/zcons.7d
 dir  path=usr/share/man/man8
 file path=usr/share/man/man8/zoneadm.8
 file path=usr/share/man/man8/zoneadmd.8
diff --git a/usr/src/prototypes/prototype.man7d b/usr/src/prototypes/prototype.man4d
index f41cd2e465..038a827666 100644
--- a/usr/src/prototypes/prototype.man7d
+++ b/usr/src/prototypes/prototype.man4d
@@ -12,7 +12,7 @@
 .\" Copyright 2022 <contributor>
 .\"
 .Dd Month Day, Year
-.Dt DRIVERNAME 7D
+.Dt DRIVERNAME 4D
 .\" Here and in other places "DRIVERNAME" and "drivername" are place
 .\" holders that should be replaced with the name of the actual driver
 .\" that this is documenting.