summaryrefslogtreecommitdiff
path: root/usr/src/pkg/manifests
diff options
context:
space:
mode:
authorDan McDonald <danmcd@joyent.com>2022-03-15 12:07:15 -0400
committerGitHub <noreply@github.com>2022-03-15 12:07:15 -0400
commit83decd22b44019b0fe369224fb19e1ef21263ab6 (patch)
tree0bbbaea9d4231f77a406362904280d6ba53e1d55 /usr/src/pkg/manifests
parentad491f11d9af43fd3f0d6159c9e08112de475a54 (diff)
downloadillumos-joyent-83decd22b44019b0fe369224fb19e1ef21263ab6.tar.gz
OS-8361 IPD 4 (man page renumbering) tracking issue
Reviewed by: Brian Bennett <brian.bennett@joyent.com> Approved by: Brian Bennett <brian.bennett@joyent.com>
Diffstat (limited to 'usr/src/pkg/manifests')
-rw-r--r--usr/src/pkg/manifests/SUNWcs.man1m.inc296
-rw-r--r--usr/src/pkg/manifests/SUNWcs.man4.inc119
-rw-r--r--usr/src/pkg/manifests/SUNWcs.man4d.inc (renamed from usr/src/pkg/manifests/system-kernel.man1m.inc)7
-rw-r--r--usr/src/pkg/manifests/SUNWcs.man4fs.inc (renamed from usr/src/pkg/manifests/SUNWcs.man7fs.inc)2
-rw-r--r--usr/src/pkg/manifests/SUNWcs.man5.inc148
-rw-r--r--usr/src/pkg/manifests/SUNWcs.man7.inc67
-rw-r--r--usr/src/pkg/manifests/SUNWcs.man7d.inc17
-rw-r--r--usr/src/pkg/manifests/SUNWcs.man8.inc296
-rw-r--r--usr/src/pkg/manifests/SUNWcs.p5m14
-rw-r--r--usr/src/pkg/manifests/SUNWcsd.p5m4
-rw-r--r--usr/src/pkg/manifests/developer-acpi.p5m6
-rw-r--r--usr/src/pkg/manifests/developer-driver-ftsafe.p5m6
-rw-r--r--usr/src/pkg/manifests/developer-dtrace.p5m10
-rw-r--r--usr/src/pkg/manifests/developer-linker.p5m4
-rw-r--r--usr/src/pkg/manifests/diagnostic-cpu-counters.p5m4
-rw-r--r--usr/src/pkg/manifests/diagnostic-diskinfo.p5m4
-rw-r--r--usr/src/pkg/manifests/diagnostic-latencytop.p5m4
-rw-r--r--usr/src/pkg/manifests/diagnostic-powertop.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audio810.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiocmi.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiocmihd.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audioemu10k.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiohd.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audioixp.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiols.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiop16x.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiosolo.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiovia823x.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-audio.p5m22
-rw-r--r--usr/src/pkg/manifests/driver-cpu-amd-zen.p5m6
-rw-r--r--usr/src/pkg/manifests/driver-cpu-mc.p5m6
-rw-r--r--usr/src/pkg/manifests/driver-cpu-sensor.p5m10
-rw-r--r--usr/src/pkg/manifests/driver-crypto-dca.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-developer-amd-zen.p5m6
-rw-r--r--usr/src/pkg/manifests/driver-firewire.p5m10
-rw-r--r--usr/src/pkg/manifests/driver-graphics-av1394.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-graphics-usbvc.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-i86pc-platform.p5m10
-rw-r--r--usr/src/pkg/manifests/driver-ipmi.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-misc-ccid.p5m8
-rw-r--r--usr/src/pkg/manifests/driver-misc-virtio.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-afe.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-amd8111s.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-arn.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-atge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-ath.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-atu.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-bfe.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-bge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-bnxe.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-chxge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-dmfe.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-e1000g.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-elxl.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-ena.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-eri.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-fcip.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-fcoe.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-fcoei.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-fcoet.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-fcp.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-fp.p5m6
-rw-r--r--usr/src/pkg/manifests/driver-network-hermon.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-hme.p5m6
-rw-r--r--usr/src/pkg/manifests/driver-network-hxge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-i40e.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-ib.p5m16
-rw-r--r--usr/src/pkg/manifests/driver-network-ibdma.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-ibp.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-igb.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-iprb.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-ipw.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-iwh.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-iwi.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-iwn.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-ixgbe.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-mlxcx.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-mxfe.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-myri10ge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-ntxn.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-nxge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-pcn.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-platform.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-qede.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-qlc.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-ral.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-rge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-rtls.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-rtw.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-rum.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-rwd.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-rwn.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-sdp.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-sfe.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-sfxge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-socal.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-srpt.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-uath.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-ural.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-urtw.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-vioif.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-vr.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-wpi.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-xge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-yge.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-network-zyd.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-pcmcia.p5m6
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbftdi.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbsacm.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbsksp.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbsprl.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-aac.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-ahci.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-amr.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-arcmsr.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-ata.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-bcm_sata.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-blkdev.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-cpqary3.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-mega_sas.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-mpt_sas.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-mr_sas.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-nv_sata.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-nvme.p5m6
-rw-r--r--usr/src/pkg/manifests/driver-storage-scsa1394.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-sdcard.p5m6
-rw-r--r--usr/src/pkg/manifests/driver-storage-ses.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-sf.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-si3124.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-skd.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-ssd.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-storage-vioblk.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-usb-ugen.p5m4
-rw-r--r--usr/src/pkg/manifests/driver-usb.p5m36
-rw-r--r--usr/src/pkg/manifests/install-beadm.p5m4
-rw-r--r--usr/src/pkg/manifests/library-libtecla.p5m6
-rw-r--r--usr/src/pkg/manifests/library-security-tcp-wrapper.p5m18
-rw-r--r--usr/src/pkg/manifests/naming-ldap.p5m8
-rw-r--r--usr/src/pkg/manifests/network-ftp.p5m6
-rw-r--r--usr/src/pkg/manifests/network-ipd.p5m4
-rw-r--r--usr/src/pkg/manifests/network-ipfilter.p5m40
-rw-r--r--usr/src/pkg/manifests/network-iscsi-initiator.p5m8
-rw-r--r--usr/src/pkg/manifests/network-iscsi-iser.p5m4
-rw-r--r--usr/src/pkg/manifests/network-iscsi-target.p5m4
-rw-r--r--usr/src/pkg/manifests/package-svr4.p5m36
-rw-r--r--usr/src/pkg/manifests/print-lp-print-client-commands.p5m12
-rw-r--r--usr/src/pkg/manifests/print-lp-print-manager-legacy.p5m6
-rw-r--r--usr/src/pkg/manifests/print-lp.p5m30
-rw-r--r--usr/src/pkg/manifests/security-bart.p5m10
-rw-r--r--usr/src/pkg/manifests/service-fault-management.p5m10
-rw-r--r--usr/src/pkg/manifests/service-file-system-nfs.p5m18
-rw-r--r--usr/src/pkg/manifests/service-file-system-smb.p5m16
-rw-r--r--usr/src/pkg/manifests/service-hal.p5m24
-rw-r--r--usr/src/pkg/manifests/service-network-dns-mdns.p5m6
-rw-r--r--usr/src/pkg/manifests/service-network-legacy.p5m12
-rw-r--r--usr/src/pkg/manifests/service-network-network-clients.p5m12
-rw-r--r--usr/src/pkg/manifests/service-network-network-servers.p5m52
-rw-r--r--usr/src/pkg/manifests/service-network-nis.p5m34
-rw-r--r--usr/src/pkg/manifests/service-network-slp.p5m14
-rw-r--r--usr/src/pkg/manifests/service-network-smtp-sendmail.p5m34
-rw-r--r--usr/src/pkg/manifests/service-network-telnet.p5m6
-rw-r--r--usr/src/pkg/manifests/service-network-tftp.p5m6
-rw-r--r--usr/src/pkg/manifests/service-network-uucp.p5m20
-rw-r--r--usr/src/pkg/manifests/service-network-wpa.p5m4
-rw-r--r--usr/src/pkg/manifests/service-picl.p5m6
-rw-r--r--usr/src/pkg/manifests/service-resource-cap.p5m6
-rw-r--r--usr/src/pkg/manifests/service-resource-pools-poold.p5m4
-rw-r--r--usr/src/pkg/manifests/service-resource-pools.p5m10
-rw-r--r--usr/src/pkg/manifests/service-security-gss.p5m10
-rw-r--r--usr/src/pkg/manifests/service-security-kerberos-5.p5m10
-rw-r--r--usr/src/pkg/manifests/service-storage-isns.p5m6
-rw-r--r--usr/src/pkg/manifests/service-storage-media-volume-manager.p5m6
-rw-r--r--usr/src/pkg/manifests/service-storage-ndmp.p5m12
-rw-r--r--usr/src/pkg/manifests/service-storage-removable-media.p5m4
-rw-r--r--usr/src/pkg/manifests/service-storage-virus-scan.p5m6
-rw-r--r--usr/src/pkg/manifests/storage-mpathadm.p5m4
-rw-r--r--usr/src/pkg/manifests/storage-stmf.p5m6
-rw-r--r--usr/src/pkg/manifests/system-accounting-legacy.p5m76
-rw-r--r--usr/src/pkg/manifests/system-bhyve.p5m12
-rw-r--r--usr/src/pkg/manifests/system-boot-grub.p5m4
-rw-r--r--usr/src/pkg/manifests/system-boot-loader.p5m30
-rw-r--r--usr/src/pkg/manifests/system-boot-network.p5m20
-rw-r--r--usr/src/pkg/manifests/system-data-keyboard-keytables.p5m4
-rw-r--r--usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m6
-rw-r--r--usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m12
-rw-r--r--usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m4
-rw-r--r--usr/src/pkg/manifests/system-extended-system-utilities.p5m22
-rw-r--r--usr/src/pkg/manifests/system-file-system-autofs.p5m10
-rw-r--r--usr/src/pkg/manifests/system-file-system-nfs.p5m20
-rw-r--r--usr/src/pkg/manifests/system-file-system-smb.p5m18
-rw-r--r--usr/src/pkg/manifests/system-file-system-udfs.p5m16
-rw-r--r--usr/src/pkg/manifests/system-file-system-zfs.p5m16
-rw-r--r--usr/src/pkg/manifests/system-flash-fwflash.p5m4
-rw-r--r--usr/src/pkg/manifests/system-fru-id-platform.p5m4
-rw-r--r--usr/src/pkg/manifests/system-fru-id.p5m4
-rw-r--r--usr/src/pkg/manifests/system-header-header-audio.p5m4
-rw-r--r--usr/src/pkg/manifests/system-header.p5m44
-rw-r--r--usr/src/pkg/manifests/system-kernel-dtrace-providers.p5m16
-rw-r--r--usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.p5m4
-rw-r--r--usr/src/pkg/manifests/system-kernel-platform.p5m56
-rw-r--r--usr/src/pkg/manifests/system-kernel-power.p5m14
-rw-r--r--usr/src/pkg/manifests/system-kernel-suspend-resume.p5m4
-rw-r--r--usr/src/pkg/manifests/system-kernel.man4.inc17
-rw-r--r--usr/src/pkg/manifests/system-kernel.man4d.inc59
-rw-r--r--usr/src/pkg/manifests/system-kernel.man4fs.inc31
-rw-r--r--usr/src/pkg/manifests/system-kernel.man4m.inc32
-rw-r--r--usr/src/pkg/manifests/system-kernel.man4p.inc45
-rw-r--r--usr/src/pkg/manifests/system-kernel.man5.inc23
-rw-r--r--usr/src/pkg/manifests/system-kernel.man7.inc10
-rw-r--r--usr/src/pkg/manifests/system-kernel.man7d.inc59
-rw-r--r--usr/src/pkg/manifests/system-kernel.man7fs.inc31
-rw-r--r--usr/src/pkg/manifests/system-kernel.man7m.inc32
-rw-r--r--usr/src/pkg/manifests/system-kernel.man7p.inc45
-rw-r--r--usr/src/pkg/manifests/system-kernel.man8.inc (renamed from usr/src/pkg/manifests/system-library.man4.inc)5
-rw-r--r--usr/src/pkg/manifests/system-kernel.p5m30
-rw-r--r--usr/src/pkg/manifests/system-ksensor.p5m4
-rw-r--r--usr/src/pkg/manifests/system-ldoms.p5m8
-rw-r--r--usr/src/pkg/manifests/system-library-platform.p5m6
-rw-r--r--usr/src/pkg/manifests/system-library-policykit.p5m4
-rw-r--r--usr/src/pkg/manifests/system-library-security-gss-spnego.p5m4
-rw-r--r--usr/src/pkg/manifests/system-library-security-gss.p5m6
-rw-r--r--usr/src/pkg/manifests/system-library-security-libsasl.p5m4
-rw-r--r--usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.p5m4
-rw-r--r--usr/src/pkg/manifests/system-library-storage-libmpapi.p5m4
-rw-r--r--usr/src/pkg/manifests/system-library.man4p.inc (renamed from usr/src/pkg/manifests/system-library.man7p.inc)2
-rw-r--r--usr/src/pkg/manifests/system-library.man5.inc60
-rw-r--r--usr/src/pkg/manifests/system-library.man7.inc71
-rw-r--r--usr/src/pkg/manifests/system-library.p5m6
-rw-r--r--usr/src/pkg/manifests/system-man.p5m18
-rw-r--r--usr/src/pkg/manifests/system-management-pcitool.p5m4
-rw-r--r--usr/src/pkg/manifests/system-monitoring-arcstat.p5m4
-rw-r--r--usr/src/pkg/manifests/system-network-http-cache-accelerator.p5m16
-rw-r--r--usr/src/pkg/manifests/system-network-ipqos-ipqos-config.p5m16
-rw-r--r--usr/src/pkg/manifests/system-network-ipqos.p5m4
-rw-r--r--usr/src/pkg/manifests/system-network-mailwrapper.p5m8
-rw-r--r--usr/src/pkg/manifests/system-network-nis.p5m38
-rw-r--r--usr/src/pkg/manifests/system-network-overlay.p5m12
-rw-r--r--usr/src/pkg/manifests/system-network-ppp-pppdump.p5m4
-rw-r--r--usr/src/pkg/manifests/system-network-ppp-tunnel.p5m8
-rw-r--r--usr/src/pkg/manifests/system-network-ppp.p5m12
-rw-r--r--usr/src/pkg/manifests/system-network-routing.p5m20
-rw-r--r--usr/src/pkg/manifests/system-network-spdadm.p5m4
-rw-r--r--usr/src/pkg/manifests/system-network-udapl.p5m8
-rw-r--r--usr/src/pkg/manifests/system-network-wificonfig.p5m4
-rw-r--r--usr/src/pkg/manifests/system-network.p5m8
-rw-r--r--usr/src/pkg/manifests/system-scheduler-fss.p5m4
-rw-r--r--usr/src/pkg/manifests/system-security-kerberos-5.p5m42
-rw-r--r--usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.p5m6
-rw-r--r--usr/src/pkg/manifests/system-storage-luxadm.p5m4
-rw-r--r--usr/src/pkg/manifests/system-storage-sasinfo.p5m8
-rw-r--r--usr/src/pkg/manifests/system-trusted-global-zone.p5m2
-rw-r--r--usr/src/pkg/manifests/system-trusted.p5m26
-rw-r--r--usr/src/pkg/manifests/system-zones.p5m20
-rw-r--r--usr/src/pkg/manifests/text-doctools.p5m16
255 files changed, 1738 insertions, 1738 deletions
diff --git a/usr/src/pkg/manifests/SUNWcs.man1m.inc b/usr/src/pkg/manifests/SUNWcs.man1m.inc
deleted file mode 100644
index baaf2e336f..0000000000
--- a/usr/src/pkg/manifests/SUNWcs.man1m.inc
+++ /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 2015 Nexenta Systems, Inc. All rights reserved.
-# Copyright 2016 Toomas Soome <tsoome@me.com>
-# Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
-# Copyright (c) 2016 by Delphix. All rights reserved.
-# Copyright 2020 Joyent, Inc.
-#
-
-$(i386_ONLY) file path=usr/share/man/man1m/rdmsr.1m variant.opensolaris.zone=global
-file path=usr/share/man/man1m/6to4relay.1m
-file path=usr/share/man/man1m/Intro.1m
-file path=usr/share/man/man1m/acctadm.1m
-file path=usr/share/man/man1m/add_drv.1m
-file path=usr/share/man/man1m/addbadsec.1m
-file path=usr/share/man/man1m/arp.1m
-file path=usr/share/man/man1m/audit.1m
-file path=usr/share/man/man1m/audit_warn.1m
-file path=usr/share/man/man1m/auditconfig.1m
-file path=usr/share/man/man1m/auditd.1m
-file path=usr/share/man/man1m/auditrecord.1m
-file path=usr/share/man/man1m/auditreduce.1m
-file path=usr/share/man/man1m/auditstat.1m
-link path=usr/share/man/man1m/audlinks.1m target=devfsadm.1m
-file path=usr/share/man/man1m/autopush.1m
-file path=usr/share/man/man1m/bootadm.1m
-file path=usr/share/man/man1m/busstat.1m
-file path=usr/share/man/man1m/captoinfo.1m
-file path=usr/share/man/man1m/cfgadm.1m
-file path=usr/share/man/man1m/cfgadm_cardbus.1m
-file path=usr/share/man/man1m/cfgadm_fp.1m
-file path=usr/share/man/man1m/cfgadm_ib.1m
-file path=usr/share/man/man1m/cfgadm_pci.1m
-file path=usr/share/man/man1m/cfgadm_sata.1m
-file path=usr/share/man/man1m/cfgadm_sbd.1m
-file path=usr/share/man/man1m/cfgadm_scsi.1m
-file path=usr/share/man/man1m/cfgadm_usb.1m
-file path=usr/share/man/man1m/chroot.1m
-file path=usr/share/man/man1m/clear_locks.1m
-file path=usr/share/man/man1m/clinfo.1m
-file path=usr/share/man/man1m/clri.1m
-file path=usr/share/man/man1m/connstat.1m
-file path=usr/share/man/man1m/consadm.1m
-file path=usr/share/man/man1m/coreadm.1m
-file path=usr/share/man/man1m/cron.1m
-file path=usr/share/man/man1m/cryptoadm.1m
-link path=usr/share/man/man1m/dcopy.1m target=clri.1m
-file path=usr/share/man/man1m/dd.1m
-file path=usr/share/man/man1m/devattr.1m
-file path=usr/share/man/man1m/devfree.1m
-file path=usr/share/man/man1m/devfsadm.1m
-link path=usr/share/man/man1m/devfsadmd.1m target=devfsadm.1m
-file path=usr/share/man/man1m/devinfo.1m
-file path=usr/share/man/man1m/devlinks.1m
-file path=usr/share/man/man1m/devnm.1m
-file path=usr/share/man/man1m/devprop.1m
-file path=usr/share/man/man1m/devreserv.1m
-file path=usr/share/man/man1m/df.1m
-file path=usr/share/man/man1m/df_ufs.1m
-file path=usr/share/man/man1m/dfmounts.1m
-file path=usr/share/man/man1m/dfmounts_nfs.1m
-file path=usr/share/man/man1m/dfshares.1m
-file path=usr/share/man/man1m/dfshares_nfs.1m
-file path=usr/share/man/man1m/dhcpagent.1m
-file path=usr/share/man/man1m/disks.1m
-file path=usr/share/man/man1m/diskscan.1m
-file path=usr/share/man/man1m/dispadmin.1m
-file path=usr/share/man/man1m/dlmgmtd.1m
-file path=usr/share/man/man1m/dminfo.1m
-file path=usr/share/man/man1m/domainname.1m
-file path=usr/share/man/man1m/drvconfig.1m
-file path=usr/share/man/man1m/dumpadm.1m
-file path=usr/share/man/man1m/edquota.1m
-file path=usr/share/man/man1m/eeprom.1m
-file path=usr/share/man/man1m/embedded_su.1m
-file path=usr/share/man/man1m/fdetach.1m
-file path=usr/share/man/man1m/fdisk.1m
-file path=usr/share/man/man1m/ff.1m
-file path=usr/share/man/man1m/ff_ufs.1m
-file path=usr/share/man/man1m/fiocompress.1m
-file path=usr/share/man/man1m/fmthard.1m
-file path=usr/share/man/man1m/format.1m
-file path=usr/share/man/man1m/fsck.1m
-file path=usr/share/man/man1m/fsck_ufs.1m
-file path=usr/share/man/man1m/fsdb.1m
-file path=usr/share/man/man1m/fsdb_ufs.1m
-file path=usr/share/man/man1m/fsirand.1m
-file path=usr/share/man/man1m/fssnap.1m
-file path=usr/share/man/man1m/fssnap_ufs.1m
-file path=usr/share/man/man1m/fsstat.1m
-file path=usr/share/man/man1m/fstyp.1m
-file path=usr/share/man/man1m/fuser.1m
-file path=usr/share/man/man1m/getdev.1m
-file path=usr/share/man/man1m/getdevpolicy.1m
-file path=usr/share/man/man1m/getdgrp.1m
-file path=usr/share/man/man1m/getent.1m
-file path=usr/share/man/man1m/getty.1m
-file path=usr/share/man/man1m/getvol.1m
-file path=usr/share/man/man1m/groupadd.1m
-file path=usr/share/man/man1m/groupdel.1m
-file path=usr/share/man/man1m/groupmod.1m
-file path=usr/share/man/man1m/growfs.1m
-link path=usr/share/man/man1m/grpck.1m target=pwck.1m
-file path=usr/share/man/man1m/halt.1m
-file path=usr/share/man/man1m/hostconfig.1m
-file path=usr/share/man/man1m/hotplug.1m
-file path=usr/share/man/man1m/id.1m
-file path=usr/share/man/man1m/idmap.1m
-file path=usr/share/man/man1m/idmapd.1m
-file path=usr/share/man/man1m/if_mpadm.1m
-file path=usr/share/man/man1m/ifconfig.1m
-file path=usr/share/man/man1m/ifparse.1m
-file path=usr/share/man/man1m/ikeadm.1m
-file path=usr/share/man/man1m/ikecert.1m
-file path=usr/share/man/man1m/in.iked.1m
-file path=usr/share/man/man1m/in.mpathd.1m
-file path=usr/share/man/man1m/inetadm.1m
-file path=usr/share/man/man1m/inetconv.1m
-file path=usr/share/man/man1m/inetd.1m
-file path=usr/share/man/man1m/infocmp.1m
-file path=usr/share/man/man1m/init.1m
-file path=usr/share/man/man1m/install.1m
-file path=usr/share/man/man1m/installboot.1m
-file path=usr/share/man/man1m/installgrub.1m
-file path=usr/share/man/man1m/intrd.1m
-link path=usr/share/man/man1m/intro.1m target=Intro.1m
-file path=usr/share/man/man1m/iostat.1m
-file path=usr/share/man/man1m/ipaddrsel.1m
-file path=usr/share/man/man1m/ipmpstat.1m
-file path=usr/share/man/man1m/ipsecalgs.1m
-file path=usr/share/man/man1m/ipsecconf.1m
-file path=usr/share/man/man1m/ipseckey.1m
-file path=usr/share/man/man1m/keyserv.1m
-file path=usr/share/man/man1m/killall.1m
-file path=usr/share/man/man1m/ksslcfg.1m
-file path=usr/share/man/man1m/labelit.1m
-file path=usr/share/man/man1m/labelit_hsfs.1m
-file path=usr/share/man/man1m/labelit_ufs.1m
-file path=usr/share/man/man1m/link.1m
-file path=usr/share/man/man1m/listdgrp.1m
-file path=usr/share/man/man1m/listen.1m
-file path=usr/share/man/man1m/locator.1m
-file path=usr/share/man/man1m/lockfs.1m
-file path=usr/share/man/man1m/lofiadm.1m
-file path=usr/share/man/man1m/logadm.1m
-file path=usr/share/man/man1m/logins.1m
-file path=usr/share/man/man1m/mail.local.1m
-file path=usr/share/man/man1m/makedbm.1m
-file path=usr/share/man/man1m/mkdevalloc.1m
-file path=usr/share/man/man1m/mkdevmaps.1m
-file path=usr/share/man/man1m/mkfile.1m
-file path=usr/share/man/man1m/mkfs.1m
-file path=usr/share/man/man1m/mkfs_ufs.1m
-file path=usr/share/man/man1m/mknod.1m
-file path=usr/share/man/man1m/mkpwdict.1m
-file path=usr/share/man/man1m/modinfo.1m
-file path=usr/share/man/man1m/modload.1m
-file path=usr/share/man/man1m/modunload.1m
-file path=usr/share/man/man1m/mount.1m
-file path=usr/share/man/man1m/mount_hsfs.1m
-file path=usr/share/man/man1m/mount_tmpfs.1m
-file path=usr/share/man/man1m/mount_ufs.1m
-file path=usr/share/man/man1m/mountall.1m
-file path=usr/share/man/man1m/mpstat.1m
-file path=usr/share/man/man1m/msgid.1m
-file path=usr/share/man/man1m/mvdir.1m
-file path=usr/share/man/man1m/ncheck.1m
-file path=usr/share/man/man1m/ncheck_ufs.1m
-file path=usr/share/man/man1m/ndd.1m
-file path=usr/share/man/man1m/ndp.1m
-file path=usr/share/man/man1m/netstat.1m
-file path=usr/share/man/man1m/netstrategy.1m
-file path=usr/share/man/man1m/newfs.1m
-file path=usr/share/man/man1m/nlsadmin.1m
-file path=usr/share/man/man1m/nscd.1m
-file path=usr/share/man/man1m/nwamd.1m
-file path=usr/share/man/man1m/passmgmt.1m
-file path=usr/share/man/man1m/pbind.1m
-file path=usr/share/man/man1m/ping.1m
-file path=usr/share/man/man1m/pmadm.1m
-file path=usr/share/man/man1m/ports.1m
-link path=usr/share/man/man1m/poweroff.1m target=halt.1m
-file path=usr/share/man/man1m/praudit.1m
-file path=usr/share/man/man1m/prstat.1m
-file path=usr/share/man/man1m/prtconf.1m
-file path=usr/share/man/man1m/prtdiag.1m
-file path=usr/share/man/man1m/prtvtoc.1m
-file path=usr/share/man/man1m/psradm.1m
-file path=usr/share/man/man1m/psrinfo.1m
-file path=usr/share/man/man1m/psrset.1m
-file path=usr/share/man/man1m/putdev.1m
-file path=usr/share/man/man1m/putdgrp.1m
-file path=usr/share/man/man1m/pwck.1m
-file path=usr/share/man/man1m/pwconv.1m
-file path=usr/share/man/man1m/quot.1m
-file path=usr/share/man/man1m/quota.1m
-file path=usr/share/man/man1m/quotacheck.1m
-link path=usr/share/man/man1m/quotaoff.1m target=quotaon.1m
-file path=usr/share/man/man1m/quotaon.1m
-file path=usr/share/man/man1m/raidctl.1m
-file path=usr/share/man/man1m/ramdiskadm.1m
-file path=usr/share/man/man1m/rctladm.1m
-file path=usr/share/man/man1m/reboot.1m
-file path=usr/share/man/man1m/rem_drv.1m
-file path=usr/share/man/man1m/repquota.1m
-link path=usr/share/man/man1m/restricted_shell.1m target=rsh.1m
-file path=usr/share/man/man1m/roleadd.1m
-file path=usr/share/man/man1m/roledel.1m
-file path=usr/share/man/man1m/rolemod.1m
-file path=usr/share/man/man1m/root_archive.1m
-file path=usr/share/man/man1m/route.1m
-file path=usr/share/man/man1m/routeadm.1m
-file path=usr/share/man/man1m/rpcbind.1m
-file path=usr/share/man/man1m/rpcinfo.1m
-file path=usr/share/man/man1m/rsh.1m
-file path=usr/share/man/man1m/rtc.1m
-file path=usr/share/man/man1m/sac.1m
-file path=usr/share/man/man1m/sacadm.1m
-file path=usr/share/man/man1m/saf.1m
-file path=usr/share/man/man1m/savecore.1m
-file path=usr/share/man/man1m/setuname.1m
-file path=usr/share/man/man1m/share.1m
-file path=usr/share/man/man1m/share_nfs.1m
-file path=usr/share/man/man1m/shareall.1m
-file path=usr/share/man/man1m/sharectl.1m
-file path=usr/share/man/man1m/sharemgr.1m
-file path=usr/share/man/man1m/shutdown.1m
-file path=usr/share/man/man1m/smbios.1m
-file path=usr/share/man/man1m/soconfig.1m
-file path=usr/share/man/man1m/stmsboot.1m
-file path=usr/share/man/man1m/strace.1m
-file path=usr/share/man/man1m/strclean.1m
-file path=usr/share/man/man1m/strerr.1m
-file path=usr/share/man/man1m/sttydefs.1m
-file path=usr/share/man/man1m/su.1m
-file path=usr/share/man/man1m/sulogin.1m
-file path=usr/share/man/man1m/svc.configd.1m
-file path=usr/share/man/man1m/svc.ipfd.1m
-file path=usr/share/man/man1m/svc.startd.1m
-file path=usr/share/man/man1m/svcadm.1m
-file path=usr/share/man/man1m/svccfg.1m
-file path=usr/share/man/man1m/swap.1m
-file path=usr/share/man/man1m/sync.1m
-file path=usr/share/man/man1m/syncinit.1m
-file path=usr/share/man/man1m/syncloop.1m
-file path=usr/share/man/man1m/syncstat.1m
-file path=usr/share/man/man1m/sysdef.1m
-file path=usr/share/man/man1m/syseventadm.1m
-file path=usr/share/man/man1m/syseventconfd.1m
-file path=usr/share/man/man1m/syseventd.1m
-file path=usr/share/man/man1m/syslogd.1m
-file path=usr/share/man/man1m/tapes.1m
-link path=usr/share/man/man1m/telinit.1m target=init.1m
-file path=usr/share/man/man1m/tic.1m
-file path=usr/share/man/man1m/tpmadm.1m
-file path=usr/share/man/man1m/traceroute.1m
-file path=usr/share/man/man1m/trapstat.1m
-file path=usr/share/man/man1m/ttyadm.1m
-file path=usr/share/man/man1m/ttymon.1m
-file path=usr/share/man/man1m/tunefs.1m
-file path=usr/share/man/man1m/tzreload.1m
-file path=usr/share/man/man1m/tzselect.1m
-file path=usr/share/man/man1m/uadmin.1m
-file path=usr/share/man/man1m/ucodeadm.1m
-file path=usr/share/man/man1m/ufsdump.1m
-file path=usr/share/man/man1m/ufsrestore.1m
-link path=usr/share/man/man1m/umount.1m target=mount.1m
-link path=usr/share/man/man1m/umountall.1m target=mountall.1m
-link path=usr/share/man/man1m/unlink.1m target=link.1m
-file path=usr/share/man/man1m/unshare.1m
-file path=usr/share/man/man1m/unshare_nfs.1m
-link path=usr/share/man/man1m/unshareall.1m target=shareall.1m
-file path=usr/share/man/man1m/update_drv.1m
-file path=usr/share/man/man1m/useradd.1m
-file path=usr/share/man/man1m/userdel.1m
-file path=usr/share/man/man1m/usermod.1m
-file path=usr/share/man/man1m/utmpd.1m
-file path=usr/share/man/man1m/vmstat.1m
-file path=usr/share/man/man1m/volcopy.1m
-file path=usr/share/man/man1m/volcopy_ufs.1m
-file path=usr/share/man/man1m/wall.1m
-file path=usr/share/man/man1m/whodo.1m
-file path=usr/share/man/man1m/wracct.1m
-file path=usr/share/man/man1m/zdump.1m
-file path=usr/share/man/man1m/zic.1m
diff --git a/usr/src/pkg/manifests/SUNWcs.man4.inc b/usr/src/pkg/manifests/SUNWcs.man4.inc
deleted file mode 100644
index 0dd3795067..0000000000
--- a/usr/src/pkg/manifests/SUNWcs.man4.inc
+++ /dev/null
@@ -1,119 +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 2012 Nexenta Systems, Inc. All rights reserved.
-# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
-#
-
-file path=usr/share/man/man4/Intro.4
-link path=usr/share/man/man4/TIMEZONE.4 target=init.4
-file path=usr/share/man/man4/audit.log.4
-file path=usr/share/man/man4/audit_class.4
-file path=usr/share/man/man4/audit_event.4
-file path=usr/share/man/man4/auth_attr.4
-file path=usr/share/man/man4/contract.4
-file path=usr/share/man/man4/core.4
-file path=usr/share/man/man4/crypt.conf.4
-file path=usr/share/man/man4/crypto_certs.4
-file path=usr/share/man/man4/ctf.4
-file path=usr/share/man/man4/d_passwd.4
-file path=usr/share/man/man4/dacf.conf.4
-file path=usr/share/man/man4/default_fs.4
-file path=usr/share/man/man4/defaultrouter.4
-file path=usr/share/man/man4/device_allocate.4
-file path=usr/share/man/man4/device_contract.4
-file path=usr/share/man/man4/device_maps.4
-file path=usr/share/man/man4/devices.4
-link path=usr/share/man/man4/devid_cache.4 target=devices.4
-link path=usr/share/man/man4/devname_cache.4 target=devices.4
-file path=usr/share/man/man4/dfstab.4
-file path=usr/share/man/man4/dhcp_inittab.4
-file path=usr/share/man/man4/dialups.4
-link path=usr/share/man/man4/dumpdates.4 target=ufsdump.4
-file path=usr/share/man/man4/ethers.4
-file path=usr/share/man/man4/exec_attr.4
-link path=usr/share/man/man4/fbtab.4 target=logindevperm.4
-file path=usr/share/man/man4/format.dat.4
-link path=usr/share/man/man4/fs.4 target=default_fs.4
-file path=usr/share/man/man4/fspec.4
-file path=usr/share/man/man4/fstypes.4
-file path=usr/share/man/man4/ftpusers.4
-file path=usr/share/man/man4/fx_dptbl.4
-file path=usr/share/man/man4/group.4
-file path=usr/share/man/man4/hosts.4
-file path=usr/share/man/man4/ike.config.4
-file path=usr/share/man/man4/ike.preshared.4
-file path=usr/share/man/man4/inet_type.4
-file path=usr/share/man/man4/inetd.conf.4
-file path=usr/share/man/man4/init.4
-file path=usr/share/man/man4/init.d.4
-file path=usr/share/man/man4/inittab.4
-link path=usr/share/man/man4/intro.4 target=Intro.4
-file path=usr/share/man/man4/ipaddrsel.conf.4
-file path=usr/share/man/man4/ipnodes.4
-file path=usr/share/man/man4/issue.4
-file path=usr/share/man/man4/logadm.conf.4
-file path=usr/share/man/man4/logindevperm.4
-file path=usr/share/man/man4/loginlog.4
-file path=usr/share/man/man4/magic.4
-link path=usr/share/man/man4/mdi_ib_cache.4 target=devices.4
-link path=usr/share/man/man4/mdi_scsi_vhci_cache.4 target=devices.4
-file path=usr/share/man/man4/mnttab.4
-file path=usr/share/man/man4/ndpd.conf.4
-file path=usr/share/man/man4/netconfig.4
-file path=usr/share/man/man4/netgroup.4
-file path=usr/share/man/man4/netid.4
-file path=usr/share/man/man4/netmasks.4
-file path=usr/share/man/man4/networks.4
-file path=usr/share/man/man4/nodename.4
-file path=usr/share/man/man4/nologin.4
-file path=usr/share/man/man4/notrouter.4
-file path=usr/share/man/man4/nscd.conf.4
-file path=usr/share/man/man4/nsswitch.conf.4
-file path=usr/share/man/man4/packingrules.4
-file path=usr/share/man/man4/pam.conf.4
-file path=usr/share/man/man4/passwd.4
-link path=usr/share/man/man4/pci_unitaddr_persistent.4 target=devices.4
-file path=usr/share/man/man4/phones.4
-file path=usr/share/man/man4/policy.conf.4
-file path=usr/share/man/man4/prof_attr.4
-file path=usr/share/man/man4/profile.4
-file path=usr/share/man/man4/project.4
-file path=usr/share/man/man4/protocols.4
-file path=usr/share/man/man4/queuedefs.4
-file path=usr/share/man/man4/rcmscript.4
-file path=usr/share/man/man4/remote.4
-file path=usr/share/man/man4/rpc.4
-file path=usr/share/man/man4/rt_dptbl.4
-file path=usr/share/man/man4/service_bundle.4
-file path=usr/share/man/man4/service_provider.conf.4
-file path=usr/share/man/man4/services.4
-file path=usr/share/man/man4/shadow.4
-file path=usr/share/man/man4/sharetab.4
-file path=usr/share/man/man4/shells.4
-link path=usr/share/man/man4/snapshot_cache.4 target=devices.4
-file path=usr/share/man/man4/sulog.4
-file path=usr/share/man/man4/syslog.conf.4
-file path=usr/share/man/man4/term.4
-file path=usr/share/man/man4/terminfo.4
-file path=usr/share/man/man4/timezone.4
-file path=usr/share/man/man4/ttydefs.4
-file path=usr/share/man/man4/ttysrch.4
-file path=usr/share/man/man4/ufsdump.4
-file path=usr/share/man/man4/user_attr.4
-file path=usr/share/man/man4/utmp.4
-file path=usr/share/man/man4/utmpx.4
-file path=usr/share/man/man4/vfstab.4
-link path=usr/share/man/man4/wtmp.4 target=utmp.4
-link path=usr/share/man/man4/wtmpx.4 target=utmpx.4
-file path=usr/share/man/man4/zoneinfo.4
diff --git a/usr/src/pkg/manifests/system-kernel.man1m.inc b/usr/src/pkg/manifests/SUNWcs.man4d.inc
index 7e9272c6a3..bec335fafc 100644
--- a/usr/src/pkg/manifests/system-kernel.man1m.inc
+++ b/usr/src/pkg/manifests/SUNWcs.man4d.inc
@@ -11,6 +11,7 @@
# Copyright 2011, Richard Lowe
-file path=usr/share/man/man1m/boot.1m
-file path=usr/share/man/man1m/kadb.1m
-file path=usr/share/man/man1m/kernel.1m
+file path=usr/share/man/man4d/kstat.4d
+file path=usr/share/man/man4d/ksyms.4d
+file path=usr/share/man/man4d/ptm.4d
+link path=usr/share/man/man4d/pts.4d target=ptm.4d
diff --git a/usr/src/pkg/manifests/SUNWcs.man7fs.inc b/usr/src/pkg/manifests/SUNWcs.man4fs.inc
index 2d16a8da4e..8a619728f7 100644
--- a/usr/src/pkg/manifests/SUNWcs.man7fs.inc
+++ b/usr/src/pkg/manifests/SUNWcs.man4fs.inc
@@ -11,4 +11,4 @@
# Copyright 2011, Richard Lowe
-file path=usr/share/man/man7fs/pcfs.7fs
+file path=usr/share/man/man4fs/pcfs.4fs
diff --git a/usr/src/pkg/manifests/SUNWcs.man5.inc b/usr/src/pkg/manifests/SUNWcs.man5.inc
index f5355a53b5..30a90d4c92 100644
--- a/usr/src/pkg/manifests/SUNWcs.man5.inc
+++ b/usr/src/pkg/manifests/SUNWcs.man5.inc
@@ -12,56 +12,108 @@
#
# Copyright 2011, Richard Lowe
# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
#
-link path=usr/share/man/man5/ANSI.5 target=standards.5
-link path=usr/share/man/man5/C++.5 target=standards.5
-link path=usr/share/man/man5/C.5 target=standards.5
-link path=usr/share/man/man5/CSI.5 target=attributes.5
-link path=usr/share/man/man5/ISO.5 target=standards.5
file path=usr/share/man/man5/Intro.5
-link path=usr/share/man/man5/MT-Level.5 target=attributes.5
-link path=usr/share/man/man5/POSIX.1.5 target=standards.5
-link path=usr/share/man/man5/POSIX.2.5 target=standards.5
-link path=usr/share/man/man5/POSIX.5 target=standards.5
-link path=usr/share/man/man5/RBAC.5 target=rbac.5
-link path=usr/share/man/man5/SUS.5 target=standards.5
-link path=usr/share/man/man5/SUSv2.5 target=standards.5
-link path=usr/share/man/man5/SUSv3.5 target=standards.5
-link path=usr/share/man/man5/SVID.5 target=standards.5
-link path=usr/share/man/man5/SVID3.5 target=standards.5
-link path=usr/share/man/man5/XNS.5 target=standards.5
-link path=usr/share/man/man5/XNS4.5 target=standards.5
-link path=usr/share/man/man5/XNS5.5 target=standards.5
-link path=usr/share/man/man5/XPG.5 target=standards.5
-link path=usr/share/man/man5/XPG3.5 target=standards.5
-link path=usr/share/man/man5/XPG4.5 target=standards.5
-link path=usr/share/man/man5/XPG4v2.5 target=standards.5
-file path=usr/share/man/man5/acl.5
-file path=usr/share/man/man5/ad.5
-link path=usr/share/man/man5/architecture.5 target=attributes.5
-file path=usr/share/man/man5/ascii.5
-file path=usr/share/man/man5/attributes.5
-link path=usr/share/man/man5/availability.5 target=attributes.5
-file path=usr/share/man/man5/device_clean.5
-file path=usr/share/man/man5/dhcp.5
-file path=usr/share/man/man5/filesystem.5
-file path=usr/share/man/man5/formats.5
-file path=usr/share/man/man5/iconv.5
-file path=usr/share/man/man5/iconv_unicode.5
+link path=usr/share/man/man5/TIMEZONE.5 target=init.5
+file path=usr/share/man/man5/audit.log.5
+file path=usr/share/man/man5/audit_class.5
+file path=usr/share/man/man5/audit_event.5
+file path=usr/share/man/man5/auth_attr.5
+file path=usr/share/man/man5/contract.5
+file path=usr/share/man/man5/core.5
+file path=usr/share/man/man5/crypt.conf.5
+file path=usr/share/man/man5/crypto_certs.5
+file path=usr/share/man/man5/ctf.5
+file path=usr/share/man/man5/d_passwd.5
+file path=usr/share/man/man5/dacf.conf.5
+file path=usr/share/man/man5/default_fs.5
+file path=usr/share/man/man5/defaultrouter.5
+file path=usr/share/man/man5/device_allocate.5
+file path=usr/share/man/man5/device_contract.5
+file path=usr/share/man/man5/device_maps.5
+file path=usr/share/man/man5/devices.5
+link path=usr/share/man/man5/devid_cache.5 target=devices.5
+link path=usr/share/man/man5/devname_cache.5 target=devices.5
+file path=usr/share/man/man5/dfstab.5
+file path=usr/share/man/man5/dhcp_inittab.5
+file path=usr/share/man/man5/dialups.5
+link path=usr/share/man/man5/dumpdates.5 target=ufsdump.5
+file path=usr/share/man/man5/ethers.5
+file path=usr/share/man/man5/exec_attr.5
+link path=usr/share/man/man5/fbtab.5 target=logindevperm.5
+file path=usr/share/man/man5/format.dat.5
+link path=usr/share/man/man5/fs.5 target=default_fs.5
+file path=usr/share/man/man5/fspec.5
+file path=usr/share/man/man5/fstypes.5
+file path=usr/share/man/man5/ftpusers.5
+file path=usr/share/man/man5/fx_dptbl.5
+file path=usr/share/man/man5/group.5
+file path=usr/share/man/man5/hosts.5
+file path=usr/share/man/man5/ike.config.5
+file path=usr/share/man/man5/ike.preshared.5
+file path=usr/share/man/man5/inet_type.5
+file path=usr/share/man/man5/inetd.conf.5
+file path=usr/share/man/man5/init.5
+file path=usr/share/man/man5/init.d.5
+file path=usr/share/man/man5/inittab.5
link path=usr/share/man/man5/intro.5 target=Intro.5
-file path=usr/share/man/man5/privileges.5
-file path=usr/share/man/man5/rbac.5
-file path=usr/share/man/man5/resource_controls.5
-file path=usr/share/man/man5/security-flags.5
-file path=usr/share/man/man5/smf.5
-file path=usr/share/man/man5/smf_bootstrap.5
-file path=usr/share/man/man5/smf_method.5
-file path=usr/share/man/man5/smf_restarter.5
-file path=usr/share/man/man5/smf_security.5
-file path=usr/share/man/man5/smf_template.5
-link path=usr/share/man/man5/stability.5 target=attributes.5
-link path=usr/share/man/man5/standard.5 target=attributes.5
-file path=usr/share/man/man5/standards.5
-file path=usr/share/man/man5/sticky.5
+file path=usr/share/man/man5/ipaddrsel.conf.5
+file path=usr/share/man/man5/ipnodes.5
+file path=usr/share/man/man5/issue.5
+file path=usr/share/man/man5/logadm.conf.5
+file path=usr/share/man/man5/logindevperm.5
+file path=usr/share/man/man5/loginlog.5
+file path=usr/share/man/man5/magic.5
+link path=usr/share/man/man5/mdi_ib_cache.5 target=devices.5
+link path=usr/share/man/man5/mdi_scsi_vhci_cache.5 target=devices.5
+file path=usr/share/man/man5/mnttab.5
+file path=usr/share/man/man5/ndpd.conf.5
+file path=usr/share/man/man5/netconfig.5
+file path=usr/share/man/man5/netgroup.5
+file path=usr/share/man/man5/netid.5
+file path=usr/share/man/man5/netmasks.5
+file path=usr/share/man/man5/networks.5
+file path=usr/share/man/man5/nodename.5
+file path=usr/share/man/man5/nologin.5
+file path=usr/share/man/man5/notrouter.5
+file path=usr/share/man/man5/nscd.conf.5
+file path=usr/share/man/man5/nsswitch.conf.5
+file path=usr/share/man/man5/packingrules.5
+file path=usr/share/man/man5/pam.conf.5
+file path=usr/share/man/man5/passwd.5
+link path=usr/share/man/man5/pci_unitaddr_persistent.5 target=devices.5
+file path=usr/share/man/man5/phones.5
+file path=usr/share/man/man5/policy.conf.5
+file path=usr/share/man/man5/prof_attr.5
+file path=usr/share/man/man5/profile.5
+file path=usr/share/man/man5/project.5
+file path=usr/share/man/man5/protocols.5
+file path=usr/share/man/man5/queuedefs.5
+file path=usr/share/man/man5/rcmscript.5
+file path=usr/share/man/man5/remote.5
+file path=usr/share/man/man5/rpc.5
+file path=usr/share/man/man5/rt_dptbl.5
+file path=usr/share/man/man5/service_bundle.5
+file path=usr/share/man/man5/service_provider.conf.5
+file path=usr/share/man/man5/services.5
+file path=usr/share/man/man5/shadow.5
+file path=usr/share/man/man5/sharetab.5
+file path=usr/share/man/man5/shells.5
+link path=usr/share/man/man5/snapshot_cache.5 target=devices.5
+file path=usr/share/man/man5/sulog.5
+file path=usr/share/man/man5/syslog.conf.5
file path=usr/share/man/man5/term.5
+file path=usr/share/man/man5/terminfo.5
+file path=usr/share/man/man5/timezone.5
+file path=usr/share/man/man5/ttydefs.5
+file path=usr/share/man/man5/ttysrch.5
+file path=usr/share/man/man5/ufsdump.5
+file path=usr/share/man/man5/user_attr.5
+file path=usr/share/man/man5/utmp.5
+file path=usr/share/man/man5/utmpx.5
+file path=usr/share/man/man5/vfstab.5
+link path=usr/share/man/man5/wtmp.5 target=utmp.5
+link path=usr/share/man/man5/wtmpx.5 target=utmpx.5
+file path=usr/share/man/man5/zoneinfo.5
diff --git a/usr/src/pkg/manifests/SUNWcs.man7.inc b/usr/src/pkg/manifests/SUNWcs.man7.inc
new file mode 100644
index 0000000000..1e85800194
--- /dev/null
+++ b/usr/src/pkg/manifests/SUNWcs.man7.inc
@@ -0,0 +1,67 @@
+#
+# 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 2012 Nexenta Systems, Inc. All rights reserved.
+#
+
+link path=usr/share/man/man7/ANSI.7 target=standards.7
+link path=usr/share/man/man7/C++.7 target=standards.7
+link path=usr/share/man/man7/C.7 target=standards.7
+link path=usr/share/man/man7/CSI.7 target=attributes.7
+link path=usr/share/man/man7/ISO.7 target=standards.7
+file path=usr/share/man/man7/Intro.7
+link path=usr/share/man/man7/MT-Level.7 target=attributes.7
+link path=usr/share/man/man7/POSIX.1.7 target=standards.7
+link path=usr/share/man/man7/POSIX.2.7 target=standards.7
+link path=usr/share/man/man7/POSIX.7 target=standards.7
+link path=usr/share/man/man7/RBAC.7 target=rbac.7
+link path=usr/share/man/man7/SUS.7 target=standards.7
+link path=usr/share/man/man7/SUSv2.7 target=standards.7
+link path=usr/share/man/man7/SUSv3.7 target=standards.7
+link path=usr/share/man/man7/SVID.7 target=standards.7
+link path=usr/share/man/man7/SVID3.7 target=standards.7
+link path=usr/share/man/man7/XNS.7 target=standards.7
+link path=usr/share/man/man7/XNS4.7 target=standards.7
+link path=usr/share/man/man7/XNS5.7 target=standards.7
+link path=usr/share/man/man7/XPG.7 target=standards.7
+link path=usr/share/man/man7/XPG3.7 target=standards.7
+link path=usr/share/man/man7/XPG4.7 target=standards.7
+link path=usr/share/man/man7/XPG4v2.7 target=standards.7
+file path=usr/share/man/man7/acl.7
+file path=usr/share/man/man7/ad.7
+link path=usr/share/man/man7/architecture.7 target=attributes.7
+file path=usr/share/man/man7/ascii.7
+file path=usr/share/man/man7/attributes.7
+link path=usr/share/man/man7/availability.7 target=attributes.7
+file path=usr/share/man/man7/device_clean.7
+file path=usr/share/man/man7/dhcp.7
+file path=usr/share/man/man7/filesystem.7
+file path=usr/share/man/man7/formats.7
+file path=usr/share/man/man7/iconv.7
+file path=usr/share/man/man7/iconv_unicode.7
+link path=usr/share/man/man7/intro.7 target=Intro.7
+file path=usr/share/man/man7/privileges.7
+file path=usr/share/man/man7/rbac.7
+file path=usr/share/man/man7/resource_controls.7
+file path=usr/share/man/man7/security-flags.7
+file path=usr/share/man/man7/smf.7
+file path=usr/share/man/man7/smf_bootstrap.7
+file path=usr/share/man/man7/smf_method.7
+file path=usr/share/man/man7/smf_restarter.7
+file path=usr/share/man/man7/smf_security.7
+file path=usr/share/man/man7/smf_template.7
+link path=usr/share/man/man7/stability.7 target=attributes.7
+link path=usr/share/man/man7/standard.7 target=attributes.7
+file path=usr/share/man/man7/standards.7
+file path=usr/share/man/man7/sticky.7
+file path=usr/share/man/man7/term.7
diff --git a/usr/src/pkg/manifests/SUNWcs.man7d.inc b/usr/src/pkg/manifests/SUNWcs.man7d.inc
deleted file mode 100644
index 901eb05c4e..0000000000
--- a/usr/src/pkg/manifests/SUNWcs.man7d.inc
+++ /dev/null
@@ -1,17 +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
-
-file path=usr/share/man/man7d/kstat.7d
-file path=usr/share/man/man7d/ksyms.7d
-file path=usr/share/man/man7d/ptm.7d
-link path=usr/share/man/man7d/pts.7d target=ptm.7d
diff --git a/usr/src/pkg/manifests/SUNWcs.man8.inc b/usr/src/pkg/manifests/SUNWcs.man8.inc
new file mode 100644
index 0000000000..dd528d1b5c
--- /dev/null
+++ b/usr/src/pkg/manifests/SUNWcs.man8.inc
@@ -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 2015 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
+# Copyright (c) 2016 by Delphix. All rights reserved.
+# Copyright 2020 Joyent, Inc.
+#
+
+$(i386_ONLY) file path=usr/share/man/man8/rdmsr.8 variant.opensolaris.zone=global
+file path=usr/share/man/man8/6to4relay.8
+file path=usr/share/man/man8/Intro.8
+file path=usr/share/man/man8/acctadm.8
+file path=usr/share/man/man8/add_drv.8
+file path=usr/share/man/man8/addbadsec.8
+file path=usr/share/man/man8/arp.8
+file path=usr/share/man/man8/audit.8
+file path=usr/share/man/man8/audit_warn.8
+file path=usr/share/man/man8/auditconfig.8
+file path=usr/share/man/man8/auditd.8
+file path=usr/share/man/man8/auditrecord.8
+file path=usr/share/man/man8/auditreduce.8
+file path=usr/share/man/man8/auditstat.8
+link path=usr/share/man/man8/audlinks.8 target=devfsadm.8
+file path=usr/share/man/man8/autopush.8
+file path=usr/share/man/man8/bootadm.8
+file path=usr/share/man/man8/busstat.8
+file path=usr/share/man/man8/captoinfo.8
+file path=usr/share/man/man8/cfgadm.8
+file path=usr/share/man/man8/cfgadm_cardbus.8
+file path=usr/share/man/man8/cfgadm_fp.8
+file path=usr/share/man/man8/cfgadm_ib.8
+file path=usr/share/man/man8/cfgadm_pci.8
+file path=usr/share/man/man8/cfgadm_sata.8
+file path=usr/share/man/man8/cfgadm_sbd.8
+file path=usr/share/man/man8/cfgadm_scsi.8
+file path=usr/share/man/man8/cfgadm_usb.8
+file path=usr/share/man/man8/chroot.8
+file path=usr/share/man/man8/clear_locks.8
+file path=usr/share/man/man8/clinfo.8
+file path=usr/share/man/man8/clri.8
+file path=usr/share/man/man8/connstat.8
+file path=usr/share/man/man8/consadm.8
+file path=usr/share/man/man8/coreadm.8
+file path=usr/share/man/man8/cron.8
+file path=usr/share/man/man8/cryptoadm.8
+link path=usr/share/man/man8/dcopy.8 target=clri.8
+file path=usr/share/man/man8/dd.8
+file path=usr/share/man/man8/devattr.8
+file path=usr/share/man/man8/devfree.8
+file path=usr/share/man/man8/devfsadm.8
+link path=usr/share/man/man8/devfsadmd.8 target=devfsadm.8
+file path=usr/share/man/man8/devinfo.8
+file path=usr/share/man/man8/devlinks.8
+file path=usr/share/man/man8/devnm.8
+file path=usr/share/man/man8/devprop.8
+file path=usr/share/man/man8/devreserv.8
+file path=usr/share/man/man8/df.8
+file path=usr/share/man/man8/df_ufs.8
+file path=usr/share/man/man8/dfmounts.8
+file path=usr/share/man/man8/dfmounts_nfs.8
+file path=usr/share/man/man8/dfshares.8
+file path=usr/share/man/man8/dfshares_nfs.8
+file path=usr/share/man/man8/dhcpagent.8
+file path=usr/share/man/man8/disks.8
+file path=usr/share/man/man8/diskscan.8
+file path=usr/share/man/man8/dispadmin.8
+file path=usr/share/man/man8/dlmgmtd.8
+file path=usr/share/man/man8/dminfo.8
+file path=usr/share/man/man8/domainname.8
+file path=usr/share/man/man8/drvconfig.8
+file path=usr/share/man/man8/dumpadm.8
+file path=usr/share/man/man8/edquota.8
+file path=usr/share/man/man8/eeprom.8
+file path=usr/share/man/man8/embedded_su.8
+file path=usr/share/man/man8/fdetach.8
+file path=usr/share/man/man8/fdisk.8
+file path=usr/share/man/man8/ff.8
+file path=usr/share/man/man8/ff_ufs.8
+file path=usr/share/man/man8/fiocompress.8
+file path=usr/share/man/man8/fmthard.8
+file path=usr/share/man/man8/format.8
+file path=usr/share/man/man8/fsck.8
+file path=usr/share/man/man8/fsck_ufs.8
+file path=usr/share/man/man8/fsdb.8
+file path=usr/share/man/man8/fsdb_ufs.8
+file path=usr/share/man/man8/fsirand.8
+file path=usr/share/man/man8/fssnap.8
+file path=usr/share/man/man8/fssnap_ufs.8
+file path=usr/share/man/man8/fsstat.8
+file path=usr/share/man/man8/fstyp.8
+file path=usr/share/man/man8/fuser.8
+file path=usr/share/man/man8/getdev.8
+file path=usr/share/man/man8/getdevpolicy.8
+file path=usr/share/man/man8/getdgrp.8
+file path=usr/share/man/man8/getent.8
+file path=usr/share/man/man8/getty.8
+file path=usr/share/man/man8/getvol.8
+file path=usr/share/man/man8/groupadd.8
+file path=usr/share/man/man8/groupdel.8
+file path=usr/share/man/man8/groupmod.8
+file path=usr/share/man/man8/growfs.8
+link path=usr/share/man/man8/grpck.8 target=pwck.8
+file path=usr/share/man/man8/halt.8
+file path=usr/share/man/man8/hostconfig.8
+file path=usr/share/man/man8/hotplug.8
+file path=usr/share/man/man8/id.8
+file path=usr/share/man/man8/idmap.8
+file path=usr/share/man/man8/idmapd.8
+file path=usr/share/man/man8/if_mpadm.8
+file path=usr/share/man/man8/ifconfig.8
+file path=usr/share/man/man8/ifparse.8
+file path=usr/share/man/man8/ikeadm.8
+file path=usr/share/man/man8/ikecert.8
+file path=usr/share/man/man8/in.iked.8
+file path=usr/share/man/man8/in.mpathd.8
+file path=usr/share/man/man8/inetadm.8
+file path=usr/share/man/man8/inetconv.8
+file path=usr/share/man/man8/inetd.8
+file path=usr/share/man/man8/infocmp.8
+file path=usr/share/man/man8/init.8
+file path=usr/share/man/man8/install.8
+file path=usr/share/man/man8/installboot.8
+file path=usr/share/man/man8/installgrub.8
+file path=usr/share/man/man8/intrd.8
+link path=usr/share/man/man8/intro.8 target=Intro.8
+file path=usr/share/man/man8/iostat.8
+file path=usr/share/man/man8/ipaddrsel.8
+file path=usr/share/man/man8/ipmpstat.8
+file path=usr/share/man/man8/ipsecalgs.8
+file path=usr/share/man/man8/ipsecconf.8
+file path=usr/share/man/man8/ipseckey.8
+file path=usr/share/man/man8/keyserv.8
+file path=usr/share/man/man8/killall.8
+file path=usr/share/man/man8/ksslcfg.8
+file path=usr/share/man/man8/labelit.8
+file path=usr/share/man/man8/labelit_hsfs.8
+file path=usr/share/man/man8/labelit_ufs.8
+file path=usr/share/man/man8/link.8
+file path=usr/share/man/man8/listdgrp.8
+file path=usr/share/man/man8/listen.8
+file path=usr/share/man/man8/locator.8
+file path=usr/share/man/man8/lockfs.8
+file path=usr/share/man/man8/lofiadm.8
+file path=usr/share/man/man8/logadm.8
+file path=usr/share/man/man8/logins.8
+file path=usr/share/man/man8/mail.local.8
+file path=usr/share/man/man8/makedbm.8
+file path=usr/share/man/man8/mkdevalloc.8
+file path=usr/share/man/man8/mkdevmaps.8
+file path=usr/share/man/man8/mkfile.8
+file path=usr/share/man/man8/mkfs.8
+file path=usr/share/man/man8/mkfs_ufs.8
+file path=usr/share/man/man8/mknod.8
+file path=usr/share/man/man8/mkpwdict.8
+file path=usr/share/man/man8/modinfo.8
+file path=usr/share/man/man8/modload.8
+file path=usr/share/man/man8/modunload.8
+file path=usr/share/man/man8/mount.8
+file path=usr/share/man/man8/mount_hsfs.8
+file path=usr/share/man/man8/mount_tmpfs.8
+file path=usr/share/man/man8/mount_ufs.8
+file path=usr/share/man/man8/mountall.8
+file path=usr/share/man/man8/mpstat.8
+file path=usr/share/man/man8/msgid.8
+file path=usr/share/man/man8/mvdir.8
+file path=usr/share/man/man8/ncheck.8
+file path=usr/share/man/man8/ncheck_ufs.8
+file path=usr/share/man/man8/ndd.8
+file path=usr/share/man/man8/ndp.8
+file path=usr/share/man/man8/netstat.8
+file path=usr/share/man/man8/netstrategy.8
+file path=usr/share/man/man8/newfs.8
+file path=usr/share/man/man8/nlsadmin.8
+file path=usr/share/man/man8/nscd.8
+file path=usr/share/man/man8/nwamd.8
+file path=usr/share/man/man8/passmgmt.8
+file path=usr/share/man/man8/pbind.8
+file path=usr/share/man/man8/ping.8
+file path=usr/share/man/man8/pmadm.8
+file path=usr/share/man/man8/ports.8
+link path=usr/share/man/man8/poweroff.8 target=halt.8
+file path=usr/share/man/man8/praudit.8
+file path=usr/share/man/man8/prstat.8
+file path=usr/share/man/man8/prtconf.8
+file path=usr/share/man/man8/prtdiag.8
+file path=usr/share/man/man8/prtvtoc.8
+file path=usr/share/man/man8/psradm.8
+file path=usr/share/man/man8/psrinfo.8
+file path=usr/share/man/man8/psrset.8
+file path=usr/share/man/man8/putdev.8
+file path=usr/share/man/man8/putdgrp.8
+file path=usr/share/man/man8/pwck.8
+file path=usr/share/man/man8/pwconv.8
+file path=usr/share/man/man8/quot.8
+file path=usr/share/man/man8/quota.8
+file path=usr/share/man/man8/quotacheck.8
+link path=usr/share/man/man8/quotaoff.8 target=quotaon.8
+file path=usr/share/man/man8/quotaon.8
+file path=usr/share/man/man8/raidctl.8
+file path=usr/share/man/man8/ramdiskadm.8
+file path=usr/share/man/man8/rctladm.8
+file path=usr/share/man/man8/reboot.8
+file path=usr/share/man/man8/rem_drv.8
+file path=usr/share/man/man8/repquota.8
+link path=usr/share/man/man8/restricted_shell.8 target=rsh.8
+file path=usr/share/man/man8/roleadd.8
+file path=usr/share/man/man8/roledel.8
+file path=usr/share/man/man8/rolemod.8
+file path=usr/share/man/man8/root_archive.8
+file path=usr/share/man/man8/route.8
+file path=usr/share/man/man8/routeadm.8
+file path=usr/share/man/man8/rpcbind.8
+file path=usr/share/man/man8/rpcinfo.8
+file path=usr/share/man/man8/rsh.8
+file path=usr/share/man/man8/rtc.8
+file path=usr/share/man/man8/sac.8
+file path=usr/share/man/man8/sacadm.8
+file path=usr/share/man/man8/saf.8
+file path=usr/share/man/man8/savecore.8
+file path=usr/share/man/man8/setuname.8
+file path=usr/share/man/man8/share.8
+file path=usr/share/man/man8/share_nfs.8
+file path=usr/share/man/man8/shareall.8
+file path=usr/share/man/man8/sharectl.8
+file path=usr/share/man/man8/sharemgr.8
+file path=usr/share/man/man8/shutdown.8
+file path=usr/share/man/man8/smbios.8
+file path=usr/share/man/man8/soconfig.8
+file path=usr/share/man/man8/stmsboot.8
+file path=usr/share/man/man8/strace.8
+file path=usr/share/man/man8/strclean.8
+file path=usr/share/man/man8/strerr.8
+file path=usr/share/man/man8/sttydefs.8
+file path=usr/share/man/man8/su.8
+file path=usr/share/man/man8/sulogin.8
+file path=usr/share/man/man8/svc.configd.8
+file path=usr/share/man/man8/svc.ipfd.8
+file path=usr/share/man/man8/svc.startd.8
+file path=usr/share/man/man8/svcadm.8
+file path=usr/share/man/man8/svccfg.8
+file path=usr/share/man/man8/swap.8
+file path=usr/share/man/man8/sync.8
+file path=usr/share/man/man8/syncinit.8
+file path=usr/share/man/man8/syncloop.8
+file path=usr/share/man/man8/syncstat.8
+file path=usr/share/man/man8/sysdef.8
+file path=usr/share/man/man8/syseventadm.8
+file path=usr/share/man/man8/syseventconfd.8
+file path=usr/share/man/man8/syseventd.8
+file path=usr/share/man/man8/syslogd.8
+file path=usr/share/man/man8/tapes.8
+link path=usr/share/man/man8/telinit.8 target=init.8
+file path=usr/share/man/man8/tic.8
+file path=usr/share/man/man8/tpmadm.8
+file path=usr/share/man/man8/traceroute.8
+file path=usr/share/man/man8/trapstat.8
+file path=usr/share/man/man8/ttyadm.8
+file path=usr/share/man/man8/ttymon.8
+file path=usr/share/man/man8/tunefs.8
+file path=usr/share/man/man8/tzreload.8
+file path=usr/share/man/man8/tzselect.8
+file path=usr/share/man/man8/uadmin.8
+file path=usr/share/man/man8/ucodeadm.8
+file path=usr/share/man/man8/ufsdump.8
+file path=usr/share/man/man8/ufsrestore.8
+link path=usr/share/man/man8/umount.8 target=mount.8
+link path=usr/share/man/man8/umountall.8 target=mountall.8
+link path=usr/share/man/man8/unlink.8 target=link.8
+file path=usr/share/man/man8/unshare.8
+file path=usr/share/man/man8/unshare_nfs.8
+link path=usr/share/man/man8/unshareall.8 target=shareall.8
+file path=usr/share/man/man8/update_drv.8
+file path=usr/share/man/man8/useradd.8
+file path=usr/share/man/man8/userdel.8
+file path=usr/share/man/man8/usermod.8
+file path=usr/share/man/man8/utmpd.8
+file path=usr/share/man/man8/vmstat.8
+file path=usr/share/man/man8/volcopy.8
+file path=usr/share/man/man8/volcopy_ufs.8
+file path=usr/share/man/man8/wall.8
+file path=usr/share/man/man8/whodo.8
+file path=usr/share/man/man8/wracct.8
+file path=usr/share/man/man8/zdump.8
+file path=usr/share/man/man8/zic.8
diff --git a/usr/src/pkg/manifests/SUNWcs.p5m b/usr/src/pkg/manifests/SUNWcs.p5m
index a7406d7761..76e7943d1e 100644
--- a/usr/src/pkg/manifests/SUNWcs.p5m
+++ b/usr/src/pkg/manifests/SUNWcs.p5m
@@ -33,11 +33,11 @@
#
<include SUNWcs.man1.inc>
-<include SUNWcs.man1m.inc>
-<include SUNWcs.man4.inc>
+<include SUNWcs.man4d.inc>
+<include SUNWcs.man4fs.inc>
<include SUNWcs.man5.inc>
-<include SUNWcs.man7d.inc>
-<include SUNWcs.man7fs.inc>
+<include SUNWcs.man7.inc>
+<include SUNWcs.man8.inc>
set name=pkg.fmri value=pkg:/SUNWcs@$(PKGVERS)
set name=pkg.summary value="Core Solaris"
set name=pkg.description \
@@ -1547,11 +1547,11 @@ dir path=usr/share/lib/xml/style group=sys
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/man1m
dir path=usr/share/man/man4
+dir path=usr/share/man/man4d
+dir path=usr/share/man/man4fs
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
link path=usr/spool target=../var/spool
link path=usr/src target=./share/src
diff --git a/usr/src/pkg/manifests/SUNWcsd.p5m b/usr/src/pkg/manifests/SUNWcsd.p5m
index ba6b528f25..317f1e578d 100644
--- a/usr/src/pkg/manifests/SUNWcsd.p5m
+++ b/usr/src/pkg/manifests/SUNWcsd.p5m
@@ -76,8 +76,8 @@ file path=lib/svc/manifest/system/sysevent.xml group=sys mode=0444
dir path=lib/svc/method
file path=lib/svc/method/svc-syseventd mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/path_to_inst.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/path_to_inst.5
legacy pkg=SUNWcsd \
desc="core entries for /dev and /devices needed for the initial boot of Solaris" \
name="Core Solaris Devices"
diff --git a/usr/src/pkg/manifests/developer-acpi.p5m b/usr/src/pkg/manifests/developer-acpi.p5m
index cfb7452ca8..2bfa5c6eb5 100644
--- a/usr/src/pkg/manifests/developer-acpi.p5m
+++ b/usr/src/pkg/manifests/developer-acpi.p5m
@@ -21,7 +21,7 @@ set name=variant.arch value=i386
file path=usr/sbin/acpidump mode=0555
file path=usr/sbin/acpixtract mode=0555
file path=usr/sbin/iasl mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/acpidump.1m
-file path=usr/share/man/man1m/acpixtract.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/acpidump.8
+file path=usr/share/man/man8/acpixtract.8
depend type=require fmri=driver/x11/xsvc
diff --git a/usr/src/pkg/manifests/developer-driver-ftsafe.p5m b/usr/src/pkg/manifests/developer-driver-ftsafe.p5m
index da3ca4ea3b..59cd09eb62 100644
--- a/usr/src/pkg/manifests/developer-driver-ftsafe.p5m
+++ b/usr/src/pkg/manifests/developer-driver-ftsafe.p5m
@@ -40,9 +40,9 @@ file path=usr/lib/th_script mode=0555
dir path=usr/sbin
file path=usr/sbin/th_define mode=0555
file path=usr/sbin/th_manage mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/th_define.1m
-file path=usr/share/man/man1m/th_manage.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/th_define.8
+file path=usr/share/man/man8/th_manage.8
driver name=bofi perms="* 0600 bin bin"
legacy pkg=SUNWftdur desc="Driver Hardening Test Harness" \
name="ftSafe developer utilities package (Root)"
diff --git a/usr/src/pkg/manifests/developer-dtrace.p5m b/usr/src/pkg/manifests/developer-dtrace.p5m
index 23aec2e023..9c853d368f 100644
--- a/usr/src/pkg/manifests/developer-dtrace.p5m
+++ b/usr/src/pkg/manifests/developer-dtrace.p5m
@@ -211,13 +211,13 @@ dir path=usr/share
dir path=usr/share/lib
dir path=usr/share/lib/java group=sys
file path=usr/share/lib/java/dtrace.jar group=sys
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/dtrace.1m
-file path=usr/share/man/man1m/intrstat.1m
-file path=usr/share/man/man1m/lockstat.1m
-file path=usr/share/man/man1m/plockstat.1m
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libdtrace.3lib
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/dtrace.8
+file path=usr/share/man/man8/intrstat.8
+file path=usr/share/man/man8/lockstat.8
+file path=usr/share/man/man8/plockstat.8
legacy pkg=SUNWdtrc desc="Dynamic Tracing (DTrace) Clients" \
name="DTrace Clients"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/developer-linker.p5m b/usr/src/pkg/manifests/developer-linker.p5m
index c13a9d4e7d..795a5dabf0 100644
--- a/usr/src/pkg/manifests/developer-linker.p5m
+++ b/usr/src/pkg/manifests/developer-linker.p5m
@@ -125,8 +125,8 @@ file path=usr/share/man/man1/sotruss.1
file path=usr/share/man/man1/strings.1
file path=usr/share/man/man1/truss.1
file path=usr/share/man/man1/whocalls.1
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/a.out.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/a.out.5
legacy pkg=SUNWtoo \
desc="utilities for software development, including ld, ldd, od, and truss" \
name="Programming Tools"
diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m b/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m
index 4184e511f4..b9ef682e99 100644
--- a/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m
+++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m
@@ -155,8 +155,6 @@ dir path=usr/sbin
file path=usr/sbin/cpustat mode=0555
dir path=usr/share/man/man1
file path=usr/share/man/man1/cputrack.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/cpustat.1m
dir path=usr/share/man/man3cpc
$(i386_ONLY)file path=usr/share/man/man3cpc/amd_f17h_zen1_events.3cpc
$(i386_ONLY)file path=usr/share/man/man3cpc/amd_f17h_zen2_events.3cpc
@@ -270,6 +268,8 @@ $(i386_ONLY)file path=usr/share/man/man3cpc/wsm_ex_events.3cpc
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libcpc.3lib
file path=usr/share/man/man3lib/libpctx.3lib
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/cpustat.8
legacy pkg=SUNWcpcu desc="CPU Performance Counter libraries and utilities" \
name="CPU Performance Counter libraries and utilities"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/diagnostic-diskinfo.p5m b/usr/src/pkg/manifests/diagnostic-diskinfo.p5m
index 9dc4b370b7..fa36d419ee 100644
--- a/usr/src/pkg/manifests/diagnostic-diskinfo.p5m
+++ b/usr/src/pkg/manifests/diagnostic-diskinfo.p5m
@@ -28,6 +28,6 @@ set name=variant.arch value=$(ARCH)
dir path=usr group=sys
dir path=usr/bin
file path=usr/bin/diskinfo mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/diskinfo.1m mode=0444
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/diskinfo.8 mode=0444
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/diagnostic-latencytop.p5m b/usr/src/pkg/manifests/diagnostic-latencytop.p5m
index ad2b418f03..c17b942e47 100644
--- a/usr/src/pkg/manifests/diagnostic-latencytop.p5m
+++ b/usr/src/pkg/manifests/diagnostic-latencytop.p5m
@@ -36,8 +36,8 @@ $(i386_ONLY)file path=usr/bin/$(ARCH32)/latencytop mode=0555
dir path=usr/bin/$(ARCH64)
file path=usr/bin/$(ARCH64)/latencytop mode=0555
hardlink path=usr/bin/latencytop target=../../usr/lib/isaexec
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/latencytop.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/latencytop.8
legacy pkg=SUNWlatencytop desc="LatencyTOP tool" name="LatencyTOP tool"
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/diagnostic-powertop.p5m b/usr/src/pkg/manifests/diagnostic-powertop.p5m
index f20ba8b7be..44dee6f9d5 100644
--- a/usr/src/pkg/manifests/diagnostic-powertop.p5m
+++ b/usr/src/pkg/manifests/diagnostic-powertop.p5m
@@ -36,8 +36,8 @@ $(i386_ONLY)file path=usr/bin/$(ARCH32)/powertop mode=0555
dir path=usr/bin/$(ARCH64)
file path=usr/bin/$(ARCH64)/powertop mode=0555
hardlink path=usr/bin/powertop target=../../usr/lib/isaexec
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/powertop.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/powertop.8
legacy pkg=SUNWpowertop desc="PowerTOP tool" name="PowerTOP tool"
license usr/src/cmd/powertop/common/COPYING \
license=usr/src/cmd/powertop/common/COPYING
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..3e11fe7493 100644
--- a/usr/src/pkg/manifests/driver-audio.p5m
+++ b/usr/src/pkg/manifests/driver-audio.p5m
@@ -48,17 +48,17 @@ 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/man7i
-file path=usr/share/man/man7i/audio.7i
-file path=usr/share/man/man7i/dsp.7i
-file path=usr/share/man/man7i/mixer.7i
+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/man4i
+file path=usr/share/man/man4i/audio.4i
+file path=usr/share/man/man4i/dsp.4i
+file path=usr/share/man/man4i/mixer.4i
driver name=audio perms="* 0666 root sys"
driver name=audio1575 alias=pci10b9,5455
$(sparc_ONLY)driver name=audiocs alias=SUNW,CS4231
diff --git a/usr/src/pkg/manifests/driver-cpu-amd-zen.p5m b/usr/src/pkg/manifests/driver-cpu-amd-zen.p5m
index f2a3067374..a8500fac4f 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 7cf6cad363..b1f0f1a8e6 100644
--- a/usr/src/pkg/manifests/driver-misc-ccid.p5m
+++ b/usr/src/pkg/manifests/driver-misc-ccid.p5m
@@ -48,9 +48,9 @@ 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/man1m variant.opensolaris.zone=global
-file path=usr/share/man/man1m/ccidadm.1m variant.opensolaris.zone=global
-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
license lic_CDDL license=lic_CDDL
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..019f1281d1 100644
--- a/usr/src/pkg/manifests/driver-network-ib.p5m
+++ b/usr/src/pkg/manifests/driver-network-ib.p5m
@@ -48,14 +48,14 @@ file path=kernel/misc/$(ARCH64)/ibmf group=sys mode=0755
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/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
+file path=usr/share/man/man4/ibmf.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/man5
+file path=usr/share/man/man5/ib.5
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 5890751ca2..47cc6d5d3c 100644
--- a/usr/src/pkg/manifests/driver-storage-nvme.p5m
+++ b/usr/src/pkg/manifests/driver-storage-nvme.p5m
@@ -40,9 +40,9 @@ dir path=usr/sbin
file path=usr/sbin/nvmeadm mode=0555
dir path=usr/share
dir path=usr/share/man
-file path=usr/share/man/man1m/nvmeadm.1m
-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 \
alias=pciexclass,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..52553f1c18 100644
--- a/usr/src/pkg/manifests/driver-usb.p5m
+++ b/usr/src/pkg/manifests/driver-usb.p5m
@@ -95,24 +95,24 @@ $(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
-dir path=usr/share/man/man7m
-file path=usr/share/man/man7m/usb_ah.7m
-file path=usr/share/man/man7m/usbkbm.7m
-file path=usr/share/man/man7m/usbms.7m
+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/man4m
+file path=usr/share/man/man4m/usb_ah.4m
+file path=usr/share/man/man4m/usbkbm.4m
+file path=usr/share/man/man4m/usbms.4m
dir path=usr/share/man/man9e
file path=usr/share/man/man9e/usba_hcdi.9e
link path=usr/share/man/man9e/usba_hcdi_cb_close.9e target=usba_hcdi_cb_ops.9e
diff --git a/usr/src/pkg/manifests/install-beadm.p5m b/usr/src/pkg/manifests/install-beadm.p5m
index a706906894..623196c8dd 100644
--- a/usr/src/pkg/manifests/install-beadm.p5m
+++ b/usr/src/pkg/manifests/install-beadm.p5m
@@ -45,8 +45,8 @@ dir path=usr/sbin
link path=usr/sbin/beadm target=../../sbin/beadm
dir path=usr/share
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/beadm.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/beadm.8
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
$(python3_ONLY)depend type=conditional \
diff --git a/usr/src/pkg/manifests/library-libtecla.p5m b/usr/src/pkg/manifests/library-libtecla.p5m
index 2ff2f6699f..84b9ef7ad0 100644
--- a/usr/src/pkg/manifests/library-libtecla.p5m
+++ b/usr/src/pkg/manifests/library-libtecla.p5m
@@ -193,9 +193,9 @@ link path=usr/share/man/man3tecla/ppc_file_start.3tecla \
target=pca_lookup_file.3tecla
link path=usr/share/man/man3tecla/ppc_literal_escapes.3tecla \
target=pca_lookup_file.3tecla
-dir path=usr/share/man/man5
-file path=usr/share/man/man5/tecla.5
-link path=usr/share/man/man5/teclarc.5 target=tecla.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/tecla.7
+link path=usr/share/man/man7/teclarc.7 target=tecla.7
legacy pkg=SUNWtecla desc="Tecla command-line editing library" \
name="Tecla command-line editing library"
license usr/src/lib/libtecla/THIRDPARTYLICENSE \
diff --git a/usr/src/pkg/manifests/library-security-tcp-wrapper.p5m b/usr/src/pkg/manifests/library-security-tcp-wrapper.p5m
index c01b684968..009318f0bb 100644
--- a/usr/src/pkg/manifests/library-security-tcp-wrapper.p5m
+++ b/usr/src/pkg/manifests/library-security-tcp-wrapper.p5m
@@ -41,21 +41,21 @@ file path=usr/sbin/tcpdmatch mode=0555
file path=usr/sbin/try-from mode=0555
dir path=usr/share
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/tcpd.1m
-file path=usr/share/man/man1m/tcpdchk.1m
-file path=usr/share/man/man1m/tcpdmatch.1m
dir path=usr/share/man/man3
file path=usr/share/man/man3/hosts_access.3
link path=usr/share/man/man3/hosts_ctl.3 target=hosts_access.3
link path=usr/share/man/man3/libwrap.3 target=hosts_access.3
link path=usr/share/man/man3/request_init.3 target=hosts_access.3
link path=usr/share/man/man3/request_set.3 target=hosts_access.3
-dir path=usr/share/man/man4
-link path=usr/share/man/man4/hosts.allow.4 target=hosts_access.4
-link path=usr/share/man/man4/hosts.deny.4 target=hosts_access.4
-file path=usr/share/man/man4/hosts_access.4
-file path=usr/share/man/man4/hosts_options.4
+dir path=usr/share/man/man5
+link path=usr/share/man/man5/hosts.allow.5 target=hosts_access.5
+link path=usr/share/man/man5/hosts.deny.5 target=hosts_access.5
+file path=usr/share/man/man5/hosts_access.5
+file path=usr/share/man/man5/hosts_options.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/tcpd.8
+file path=usr/share/man/man8/tcpdchk.8
+file path=usr/share/man/man8/tcpdmatch.8
legacy pkg=SUNWtcpd \
desc="tcpd - access control facility for internet services" \
name="tcpd - access control facility for internet services"
diff --git a/usr/src/pkg/manifests/naming-ldap.p5m b/usr/src/pkg/manifests/naming-ldap.p5m
index 9434a34137..d28d66524f 100644
--- a/usr/src/pkg/manifests/naming-ldap.p5m
+++ b/usr/src/pkg/manifests/naming-ldap.p5m
@@ -46,10 +46,10 @@ file path=usr/share/man/man1/ldapdelete.1
file path=usr/share/man/man1/ldapmodify.1
file path=usr/share/man/man1/ldapmodrdn.1
file path=usr/share/man/man1/ldapsearch.1
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/ldapfilter.conf.4
-file path=usr/share/man/man4/ldapsearchprefs.conf.4
-file path=usr/share/man/man4/ldaptemplates.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/ldapfilter.conf.5
+file path=usr/share/man/man5/ldapsearchprefs.conf.5
+file path=usr/share/man/man5/ldaptemplates.conf.5
legacy pkg=SUNWlldap \
desc="Ldap libraries in for software development of dynamically linked executables" \
name="LDAP Libraries"
diff --git a/usr/src/pkg/manifests/network-ftp.p5m b/usr/src/pkg/manifests/network-ftp.p5m
index bc2d4e2d2f..5f12bdf3f8 100644
--- a/usr/src/pkg/manifests/network-ftp.p5m
+++ b/usr/src/pkg/manifests/network-ftp.p5m
@@ -41,9 +41,9 @@ file path=usr/bin/ftp mode=0555
dir path=usr/share/man
dir path=usr/share/man/man1
file path=usr/share/man/man1/ftp.1
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/ftp.4
-file path=usr/share/man/man4/netrc.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/ftp.5
+file path=usr/share/man/man5/netrc.5
legacy pkg=SUNWbip desc="Basic IP commands" name="Basic IP commands (Usr)"
legacy pkg=SUNWbipr desc="Basic IP commands (Root)" \
name="Basic IP commands (Root)"
diff --git a/usr/src/pkg/manifests/network-ipd.p5m b/usr/src/pkg/manifests/network-ipd.p5m
index 7b7c24d9be..9b16fbebed 100644
--- a/usr/src/pkg/manifests/network-ipd.p5m
+++ b/usr/src/pkg/manifests/network-ipd.p5m
@@ -35,8 +35,8 @@ link path=usr/lib/libipd.so target=libipd.so.1
file path=usr/lib/libipd.so.1
dir path=usr/sbin
file path=usr/sbin/ipdadm mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/ipdadm.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/ipdadm.8
driver name=ipd perms="* 0600 root sys"
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/network-ipfilter.p5m b/usr/src/pkg/manifests/network-ipfilter.p5m
index bd63749dfe..bd4ade3a10 100644
--- a/usr/src/pkg/manifests/network-ipfilter.p5m
+++ b/usr/src/pkg/manifests/network-ipfilter.p5m
@@ -107,26 +107,26 @@ file path=usr/share/ipfilter/examples/pool.conf
file path=usr/share/ipfilter/examples/server
file path=usr/share/ipfilter/examples/tcpstate
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/ipf.1m
-file path=usr/share/man/man1m/ipfs.1m
-file path=usr/share/man/man1m/ipfstat.1m
-file path=usr/share/man/man1m/ipmon.1m
-file path=usr/share/man/man1m/ipnat.1m
-file path=usr/share/man/man1m/ippool.1m
-file path=usr/share/man/man4/ipf.4
-link path=usr/share/man/man4/ipf.conf.4 target=./ipf.4
-link path=usr/share/man/man4/ipf6.conf.4 target=./ipf.4
-file path=usr/share/man/man4/ipmon.4
-link path=usr/share/man/man4/ipmon.conf.4 target=./ipmon.4
-file path=usr/share/man/man4/ipnat.4
-link path=usr/share/man/man4/ipnat.conf.4 target=./ipnat.4
-file path=usr/share/man/man4/ippool.4
-link path=usr/share/man/man4/ippool.conf.4 target=./ippool.4
-dir path=usr/share/man/man5
-file path=usr/share/man/man5/ipfilter.5
-dir path=usr/share/man/man7i
-file path=usr/share/man/man7i/ipnat.7i
+dir path=usr/share/man/man4i
+file path=usr/share/man/man4i/ipnat.4i
+file path=usr/share/man/man5/ipf.5
+link path=usr/share/man/man5/ipf.conf.5 target=./ipf.5
+link path=usr/share/man/man5/ipf6.conf.5 target=./ipf.5
+file path=usr/share/man/man5/ipmon.5
+link path=usr/share/man/man5/ipmon.conf.5 target=./ipmon.5
+file path=usr/share/man/man5/ipnat.5
+link path=usr/share/man/man5/ipnat.conf.5 target=./ipnat.5
+file path=usr/share/man/man5/ippool.5
+link path=usr/share/man/man5/ippool.conf.5 target=./ippool.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/ipfilter.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/ipf.8
+file path=usr/share/man/man8/ipfs.8
+file path=usr/share/man/man8/ipfstat.8
+file path=usr/share/man/man8/ipmon.8
+file path=usr/share/man/man8/ipnat.8
+file path=usr/share/man/man8/ippool.8
dir path=var group=sys
dir path=var/db group=sys
dir path=var/db/ipf group=sys
diff --git a/usr/src/pkg/manifests/network-iscsi-initiator.p5m b/usr/src/pkg/manifests/network-iscsi-initiator.p5m
index c8578a8da6..d73a3a7f78 100644
--- a/usr/src/pkg/manifests/network-iscsi-initiator.p5m
+++ b/usr/src/pkg/manifests/network-iscsi-initiator.p5m
@@ -53,10 +53,10 @@ 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/man1m
-file path=usr/share/man/man1m/iscsiadm.1m
-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
legacy pkg=SUNWiscsir desc="Sun iSCSI Device Driver" \
name="Sun iSCSI Device Driver (root)"
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/network-iscsi-target.p5m b/usr/src/pkg/manifests/network-iscsi-target.p5m
index 68f1415c87..b97ed39c7c 100644
--- a/usr/src/pkg/manifests/network-iscsi-target.p5m
+++ b/usr/src/pkg/manifests/network-iscsi-target.p5m
@@ -59,8 +59,6 @@ link path=usr/lib/libiscsit.so target=libiscsit.so.1
file path=usr/lib/libiscsit.so.1
dir path=usr/sbin
file path=usr/sbin/itadm mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/itadm.1m
dir path=usr/share/man/man3iscsit
link path=usr/share/man/man3iscsit/it_config_commit.3iscsit \
target=it_config_load.3iscsit
@@ -99,6 +97,8 @@ link path=usr/share/man/man3iscsit/it_tpgt_free.3iscsit \
target=it_tgt_create.3iscsit
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libiscsit.3lib
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/itadm.8
driver name=iscsit perms="* 0600 root sys"
legacy pkg=SUNWiscsitr desc="Sun iSCSI COMSTAR Port Provider" \
name="Sun iSCSI COMSTAR Port Provider (root)"
diff --git a/usr/src/pkg/manifests/package-svr4.p5m b/usr/src/pkg/manifests/package-svr4.p5m
index 7b5e348ad0..2c8ebb077f 100644
--- a/usr/src/pkg/manifests/package-svr4.p5m
+++ b/usr/src/pkg/manifests/package-svr4.p5m
@@ -82,24 +82,24 @@ file path=usr/share/man/man1/pkgmk.1
file path=usr/share/man/man1/pkgparam.1
file path=usr/share/man/man1/pkgproto.1
file path=usr/share/man/man1/pkgtrans.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/installf.1m
-file path=usr/share/man/man1m/pkgadd.1m
-file path=usr/share/man/man1m/pkgadm.1m
-file path=usr/share/man/man1m/pkgask.1m
-file path=usr/share/man/man1m/pkgchk.1m
-file path=usr/share/man/man1m/pkgrm.1m
-file path=usr/share/man/man1m/removef.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/admin.4
-file path=usr/share/man/man4/compver.4
-file path=usr/share/man/man4/contents.4
-file path=usr/share/man/man4/copyright.4
-file path=usr/share/man/man4/depend.4
-file path=usr/share/man/man4/pkginfo.4
-file path=usr/share/man/man4/pkgmap.4
-file path=usr/share/man/man4/prototype.4
-file path=usr/share/man/man4/space.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/admin.5
+file path=usr/share/man/man5/compver.5
+file path=usr/share/man/man5/contents.5
+file path=usr/share/man/man5/copyright.5
+file path=usr/share/man/man5/depend.5
+file path=usr/share/man/man5/pkginfo.5
+file path=usr/share/man/man5/pkgmap.5
+file path=usr/share/man/man5/prototype.5
+file path=usr/share/man/man5/space.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/installf.8
+file path=usr/share/man/man8/pkgadd.8
+file path=usr/share/man/man8/pkgadm.8
+file path=usr/share/man/man8/pkgask.8
+file path=usr/share/man/man8/pkgchk.8
+file path=usr/share/man/man8/pkgrm.8
+file path=usr/share/man/man8/removef.8
dir path=var group=sys
dir path=var/sadm group=sys
dir path=var/sadm/install
diff --git a/usr/src/pkg/manifests/print-lp-print-client-commands.p5m b/usr/src/pkg/manifests/print-lp-print-client-commands.p5m
index b070436d24..e069247a9d 100644
--- a/usr/src/pkg/manifests/print-lp-print-client-commands.p5m
+++ b/usr/src/pkg/manifests/print-lp-print-client-commands.p5m
@@ -69,12 +69,12 @@ link path=usr/share/man/man1/disable.1 target=enable.1
file path=usr/share/man/man1/enable.1
file path=usr/share/man/man1/lp.1
file path=usr/share/man/man1/lpstat.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/accept.1m
-file path=usr/share/man/man1m/lpadmin.1m
-file path=usr/share/man/man1m/lpmove.1m
-file path=usr/share/man/man1m/print-service.1m
-link path=usr/share/man/man1m/reject.1m target=accept.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/accept.8
+file path=usr/share/man/man8/lpadmin.8
+file path=usr/share/man/man8/lpmove.8
+file path=usr/share/man/man8/print-service.8
+link path=usr/share/man/man8/reject.8 target=accept.8
legacy pkg=SUNWpcu \
desc="client configuration files and utilities for the print service" \
name="Solaris Print - Client, (usr)" version=13.1,REV=2009.11.11
diff --git a/usr/src/pkg/manifests/print-lp-print-manager-legacy.p5m b/usr/src/pkg/manifests/print-lp-print-manager-legacy.p5m
index 45514b7e9a..8acbee8d89 100644
--- a/usr/src/pkg/manifests/print-lp-print-manager-legacy.p5m
+++ b/usr/src/pkg/manifests/print-lp-print-manager-legacy.p5m
@@ -62,9 +62,9 @@ file path=usr/sadm/admin/printmgr/lib/libpmgr.so.1 group=lp
dir path=usr/sbin
file path=usr/sbin/ppdmgr group=lp mode=0555
link path=usr/sbin/printmgr target=../../usr/sadm/admin/bin/printmgr
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/ppdmgr.1m
-file path=usr/share/man/man1m/printmgr.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/ppdmgr.8
+file path=usr/share/man/man8/printmgr.8
dir path=var group=sys
dir path=var/lp owner=lp group=lp mode=0775
dir path=var/lp/ppd group=lp
diff --git a/usr/src/pkg/manifests/print-lp.p5m b/usr/src/pkg/manifests/print-lp.p5m
index 61fbccc07d..c11e818704 100644
--- a/usr/src/pkg/manifests/print-lp.p5m
+++ b/usr/src/pkg/manifests/print-lp.p5m
@@ -124,21 +124,21 @@ file path=usr/sbin/lpsystem group=lp mode=0555
file path=usr/sbin/lpusers group=lp mode=0555
dir path=usr/share
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/conv_lp.1m
-file path=usr/share/man/man1m/conv_lpd.1m
-file path=usr/share/man/man1m/in.lpd.1m
-file path=usr/share/man/man1m/lpfilter.1m
-file path=usr/share/man/man1m/lpforms.1m
-file path=usr/share/man/man1m/lpget.1m
-file path=usr/share/man/man1m/lpsched.1m
-file path=usr/share/man/man1m/lpset.1m
-file path=usr/share/man/man1m/lpshut.1m
-file path=usr/share/man/man1m/lpsystem.1m
-file path=usr/share/man/man1m/lpusers.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/printers.4
-file path=usr/share/man/man4/printers.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/printers.5
+file path=usr/share/man/man5/printers.conf.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/conv_lp.8
+file path=usr/share/man/man8/conv_lpd.8
+file path=usr/share/man/man8/in.lpd.8
+file path=usr/share/man/man8/lpfilter.8
+file path=usr/share/man/man8/lpforms.8
+file path=usr/share/man/man8/lpget.8
+file path=usr/share/man/man8/lpsched.8
+file path=usr/share/man/man8/lpset.8
+file path=usr/share/man/man8/lpshut.8
+file path=usr/share/man/man8/lpsystem.8
+file path=usr/share/man/man8/lpusers.8
dir path=var group=sys
dir path=var/lp owner=lp group=lp mode=0775
dir path=var/lp/logs owner=lp group=lp mode=0775
diff --git a/usr/src/pkg/manifests/security-bart.p5m b/usr/src/pkg/manifests/security-bart.p5m
index a69e4fc0a4..91a67b6e57 100644
--- a/usr/src/pkg/manifests/security-bart.p5m
+++ b/usr/src/pkg/manifests/security-bart.p5m
@@ -33,11 +33,11 @@ dir path=usr group=sys
dir path=usr/bin
file path=usr/bin/bart mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/bart.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/bart_manifest.4
-file path=usr/share/man/man4/bart_rules.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/bart_manifest.5
+file path=usr/share/man/man5/bart_rules.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/bart.8
legacy pkg=SUNWbart desc="Basic Audit Reporting Tool (BART)" \
name="Basic Audit Reporting Tool"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/service-fault-management.p5m b/usr/src/pkg/manifests/service-fault-management.p5m
index 73d9be2a2f..1debb139d6 100644
--- a/usr/src/pkg/manifests/service-fault-management.p5m
+++ b/usr/src/pkg/manifests/service-fault-management.p5m
@@ -1004,11 +1004,11 @@ file path=usr/share/lib/xml/dtd/digraph-topology.dtd.1 \
variant.opensolaris.zone=__NODEFAULT
file path=usr/share/lib/xml/dtd/topology.dtd.1 \
variant.opensolaris.zone=__NODEFAULT
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/fmadm.1m
-file path=usr/share/man/man1m/fmd.1m
-file path=usr/share/man/man1m/fmdump.1m
-file path=usr/share/man/man1m/fmstat.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/fmadm.8
+file path=usr/share/man/man8/fmd.8
+file path=usr/share/man/man8/fmdump.8
+file path=usr/share/man/man8/fmstat.8
dir path=var/fm group=sys variant.opensolaris.zone=__NODEFAULT
dir path=var/fm/fmd group=sys variant.opensolaris.zone=__NODEFAULT
dir path=var/fm/fmd/ckpt group=sys variant.opensolaris.zone=__NODEFAULT
diff --git a/usr/src/pkg/manifests/service-file-system-nfs.p5m b/usr/src/pkg/manifests/service-file-system-nfs.p5m
index fdd63c3330..5cbed5291b 100644
--- a/usr/src/pkg/manifests/service-file-system-nfs.p5m
+++ b/usr/src/pkg/manifests/service-file-system-nfs.p5m
@@ -76,15 +76,15 @@ dir path=usr/sbin
file path=usr/sbin/exportfs mode=0555
file path=usr/sbin/nfsref mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/mountd.1m
-file path=usr/share/man/man1m/nfsd.1m
-file path=usr/share/man/man1m/nfslogd.1m
-file path=usr/share/man/man1m/rquotad.1m
-file path=usr/share/man/man4/nfslog.conf.4
-file path=usr/share/man/man4/rmtab.4
-dir path=usr/share/man/man5
-file path=usr/share/man/man5/nfssec.5
+file path=usr/share/man/man5/nfslog.conf.5
+file path=usr/share/man/man5/rmtab.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/nfssec.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/mountd.8
+file path=usr/share/man/man8/nfsd.8
+file path=usr/share/man/man8/nfslogd.8
+file path=usr/share/man/man8/rquotad.8
legacy pkg=SUNWnfsskr \
desc="Network File System (NFS) server kernel support (Root)" \
name="Network File System (NFS) server kernel support (Root)"
diff --git a/usr/src/pkg/manifests/service-file-system-smb.p5m b/usr/src/pkg/manifests/service-file-system-smb.p5m
index e87ab1d009..8340ef7bbc 100644
--- a/usr/src/pkg/manifests/service-file-system-smb.p5m
+++ b/usr/src/pkg/manifests/service-file-system-smb.p5m
@@ -85,15 +85,15 @@ dir path=usr/sbin
file path=usr/sbin/smbadm mode=0555
file path=usr/sbin/smbstat mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/smbadm.1m
-file path=usr/share/man/man1m/smbd.1m
-file path=usr/share/man/man1m/smbstat.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/smb.4
-file path=usr/share/man/man4/smbautohome.4
dir path=usr/share/man/man5
-file path=usr/share/man/man5/pam_smb_passwd.5
+file path=usr/share/man/man5/smb.5
+file path=usr/share/man/man5/smbautohome.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/pam_smb_passwd.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/smbadm.8
+file path=usr/share/man/man8/smbd.8
+file path=usr/share/man/man8/smbstat.8
dir path=var group=sys
dir path=var/smb group=sys
dir path=var/smb/cvol group=sys
diff --git a/usr/src/pkg/manifests/service-hal.p5m b/usr/src/pkg/manifests/service-hal.p5m
index 0153e15d13..ba25407088 100644
--- a/usr/src/pkg/manifests/service-hal.p5m
+++ b/usr/src/pkg/manifests/service-hal.p5m
@@ -169,19 +169,19 @@ dir path=usr/share/lib/xml group=sys
dir path=usr/share/lib/xml/dtd group=sys
file path=usr/share/lib/xml/dtd/fdi.dtd.1
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/hal-device.1m
-file path=usr/share/man/man1m/hal-fdi-validate.1m
-link path=usr/share/man/man1m/hal-find-by-capability.1m target=hal-find.1m
-link path=usr/share/man/man1m/hal-find-by-property.1m target=hal-find.1m
-file path=usr/share/man/man1m/hal-find.1m
-file path=usr/share/man/man1m/hal-get-property.1m
-link path=usr/share/man/man1m/hal-set-property.1m target=hal-get-property.1m
-file path=usr/share/man/man1m/hald.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/fdi.4
dir path=usr/share/man/man5
-file path=usr/share/man/man5/hal.5
+file path=usr/share/man/man5/fdi.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/hal.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/hal-device.8
+file path=usr/share/man/man8/hal-fdi-validate.8
+link path=usr/share/man/man8/hal-find-by-capability.8 target=hal-find.8
+link path=usr/share/man/man8/hal-find-by-property.8 target=hal-find.8
+file path=usr/share/man/man8/hal-find.8
+file path=usr/share/man/man8/hal-get-property.8
+link path=usr/share/man/man8/hal-set-property.8 target=hal-get-property.8
+file path=usr/share/man/man8/hald.8
legacy pkg=SUNWhal desc="Hardware Abstraction Layer, HAL (freedesktop.org)" \
name="Hardware Abstraction Layer"
legacy pkg=SUNWhalr \
diff --git a/usr/src/pkg/manifests/service-network-dns-mdns.p5m b/usr/src/pkg/manifests/service-network-dns-mdns.p5m
index 701554dd97..7e65735763 100644
--- a/usr/src/pkg/manifests/service-network-dns-mdns.p5m
+++ b/usr/src/pkg/manifests/service-network-dns-mdns.p5m
@@ -54,9 +54,6 @@ file path=usr/lib/libdns_sd.so.1
file path=usr/lib/nss_mdns.so.1
dir path=usr/share
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/dns-sd.1m
-file path=usr/share/man/man1m/mdnsd.1m
dir path=usr/share/man/man3dns_sd
link path=usr/share/man/man3dns_sd/DNSServiceAddRecord.3dns_sd \
target=DNSServiceCreateConnection.3dns_sd
@@ -98,6 +95,9 @@ link path=usr/share/man/man3dns_sd/TXTRecordSetValue.3dns_sd \
target=TXTRecordCreate.3dns_sd
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libdns_sd.3lib
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/dns-sd.8
+file path=usr/share/man/man8/mdnsd.8
legacy pkg=SUNWdsdr \
desc="Root components for Multicast DNS daemon and service discovery support" \
name="Multicast DNS and Service Discovery (Root)"
diff --git a/usr/src/pkg/manifests/service-network-legacy.p5m b/usr/src/pkg/manifests/service-network-legacy.p5m
index 5484ea0600..0220a6f1f3 100644
--- a/usr/src/pkg/manifests/service-network-legacy.p5m
+++ b/usr/src/pkg/manifests/service-network-legacy.p5m
@@ -47,12 +47,12 @@ file path=usr/lib/inet/in.daytimed mode=0555
file path=usr/lib/inet/in.discardd mode=0555
file path=usr/lib/inet/in.echod mode=0555
file path=usr/lib/inet/in.timed mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/in.chargend.1m
-file path=usr/share/man/man1m/in.daytimed.1m
-file path=usr/share/man/man1m/in.discardd.1m
-file path=usr/share/man/man1m/in.echod.1m
-file path=usr/share/man/man1m/in.timed.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/in.chargend.8
+file path=usr/share/man/man8/in.daytimed.8
+file path=usr/share/man/man8/in.discardd.8
+file path=usr/share/man/man8/in.echod.8
+file path=usr/share/man/man8/in.timed.8
legacy pkg=SUNWcnsr \
desc="Common Network Services (Root): time, daytime, echo, discard, chargen" \
name="Common Network Services (Root): time, daytime, echo, discard, chargen"
diff --git a/usr/src/pkg/manifests/service-network-network-clients.p5m b/usr/src/pkg/manifests/service-network-network-clients.p5m
index fb4b7b186a..86d7c7e7cd 100644
--- a/usr/src/pkg/manifests/service-network-network-clients.p5m
+++ b/usr/src/pkg/manifests/service-network-network-clients.p5m
@@ -62,12 +62,12 @@ file path=usr/share/man/man1/rup.1
file path=usr/share/man/man1/ruptime.1
file path=usr/share/man/man1/rusers.1
file path=usr/share/man/man1/whois.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/rdate.1m
-file path=usr/share/man/man1m/rmt.1m
-file path=usr/share/man/man1m/rwall.1m
-file path=usr/share/man/man1m/snoop.1m
-file path=usr/share/man/man1m/spray.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/rdate.8
+file path=usr/share/man/man8/rmt.8
+file path=usr/share/man/man8/rwall.8
+file path=usr/share/man/man8/snoop.8
+file path=usr/share/man/man8/spray.8
legacy pkg=SUNWrcmdc \
desc="Remote Network Client Commands (rsh, rlogin, rcp, rsh, ...)" \
name="Remote Network Client Commands"
diff --git a/usr/src/pkg/manifests/service-network-network-servers.p5m b/usr/src/pkg/manifests/service-network-network-servers.p5m
index 6b9f82a09e..886db4212b 100644
--- a/usr/src/pkg/manifests/service-network-network-servers.p5m
+++ b/usr/src/pkg/manifests/service-network-network-servers.p5m
@@ -75,32 +75,32 @@ dir path=usr/share/man/man1
file path=usr/share/man/man1/finger.1
file path=usr/share/man/man1/rwho.1
file path=usr/share/man/man1/talk.1
-dir path=usr/share/man/man1m
-link path=usr/share/man/man1m/comsat.1m target=in.comsat.1m
-link path=usr/share/man/man1m/fingerd.1m target=in.fingerd.1m
-file path=usr/share/man/man1m/in.comsat.1m
-file path=usr/share/man/man1m/in.fingerd.1m
-file path=usr/share/man/man1m/in.rexecd.1m
-file path=usr/share/man/man1m/in.rlogind.1m
-file path=usr/share/man/man1m/in.rshd.1m
-file path=usr/share/man/man1m/in.rwhod.1m
-file path=usr/share/man/man1m/in.talkd.1m
-link path=usr/share/man/man1m/rexecd.1m target=in.rexecd.1m
-link path=usr/share/man/man1m/rlogind.1m target=in.rlogind.1m
-file path=usr/share/man/man1m/rpc.rstatd.1m
-file path=usr/share/man/man1m/rpc.rusersd.1m
-file path=usr/share/man/man1m/rpc.rwalld.1m
-file path=usr/share/man/man1m/rpc.sprayd.1m
-link path=usr/share/man/man1m/rshd.1m target=in.rshd.1m
-link path=usr/share/man/man1m/rstatd.1m target=rpc.rstatd.1m
-link path=usr/share/man/man1m/rusersd.1m target=rpc.rusersd.1m
-link path=usr/share/man/man1m/rwalld.1m target=rpc.rwalld.1m
-link path=usr/share/man/man1m/rwhod.1m target=in.rwhod.1m
-link path=usr/share/man/man1m/sprayd.1m target=rpc.sprayd.1m
-link path=usr/share/man/man1m/talkd.1m target=in.talkd.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/hosts.equiv.4
-link path=usr/share/man/man4/rhosts.4 target=hosts.equiv.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/hosts.equiv.5
+link path=usr/share/man/man5/rhosts.5 target=hosts.equiv.5
+dir path=usr/share/man/man8
+link path=usr/share/man/man8/comsat.8 target=in.comsat.8
+link path=usr/share/man/man8/fingerd.8 target=in.fingerd.8
+file path=usr/share/man/man8/in.comsat.8
+file path=usr/share/man/man8/in.fingerd.8
+file path=usr/share/man/man8/in.rexecd.8
+file path=usr/share/man/man8/in.rlogind.8
+file path=usr/share/man/man8/in.rshd.8
+file path=usr/share/man/man8/in.rwhod.8
+file path=usr/share/man/man8/in.talkd.8
+link path=usr/share/man/man8/rexecd.8 target=in.rexecd.8
+link path=usr/share/man/man8/rlogind.8 target=in.rlogind.8
+file path=usr/share/man/man8/rpc.rstatd.8
+file path=usr/share/man/man8/rpc.rusersd.8
+file path=usr/share/man/man8/rpc.rwalld.8
+file path=usr/share/man/man8/rpc.sprayd.8
+link path=usr/share/man/man8/rshd.8 target=in.rshd.8
+link path=usr/share/man/man8/rstatd.8 target=rpc.rstatd.8
+link path=usr/share/man/man8/rusersd.8 target=rpc.rusersd.8
+link path=usr/share/man/man8/rwalld.8 target=rpc.rwalld.8
+link path=usr/share/man/man8/rwhod.8 target=in.rwhod.8
+link path=usr/share/man/man8/sprayd.8 target=rpc.sprayd.8
+link path=usr/share/man/man8/talkd.8 target=in.talkd.8
legacy pkg=SUNWrcmdr desc="Remote Network Server Commands (Root)" \
name="Remote Network Server Commands (Root)"
legacy pkg=SUNWrcmds \
diff --git a/usr/src/pkg/manifests/service-network-nis.p5m b/usr/src/pkg/manifests/service-network-nis.p5m
index 3f79fee832..dab50e8f88 100644
--- a/usr/src/pkg/manifests/service-network-nis.p5m
+++ b/usr/src/pkg/manifests/service-network-nis.p5m
@@ -66,23 +66,23 @@ file path=usr/lib/netsvc/yp/ypxfrd mode=0555
dir path=usr/sbin
file path=usr/sbin/mknetid mode=0555
file path=usr/sbin/revnetgroup mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/inityp2l.1m
-file path=usr/share/man/man1m/rpc.yppasswdd.1m
-file path=usr/share/man/man1m/rpc.ypupdated.1m
-file path=usr/share/man/man1m/ypmake.1m
-file path=usr/share/man/man1m/ypmap2src.1m
-link path=usr/share/man/man1m/yppasswdd.1m target=rpc.yppasswdd.1m
-file path=usr/share/man/man1m/yppush.1m
-file path=usr/share/man/man1m/ypserv.1m
-link path=usr/share/man/man1m/ypupdated.1m target=rpc.ypupdated.1m
-link path=usr/share/man/man1m/ypxfrd.1m target=ypserv.1m
-file path=usr/share/man/man4/NISLDAPmapping.4
-file path=usr/share/man/man4/securenets.4
-file path=usr/share/man/man4/updaters.4
-file path=usr/share/man/man4/ypfiles.4
-file path=usr/share/man/man4/yppasswdd.4
-file path=usr/share/man/man4/ypserv.4
+file path=usr/share/man/man5/NISLDAPmapping.5
+file path=usr/share/man/man5/securenets.5
+file path=usr/share/man/man5/updaters.5
+file path=usr/share/man/man5/ypfiles.5
+file path=usr/share/man/man5/yppasswdd.5
+file path=usr/share/man/man5/ypserv.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/inityp2l.8
+file path=usr/share/man/man8/rpc.yppasswdd.8
+file path=usr/share/man/man8/rpc.ypupdated.8
+file path=usr/share/man/man8/ypmake.8
+file path=usr/share/man/man8/ypmap2src.8
+link path=usr/share/man/man8/yppasswdd.8 target=rpc.yppasswdd.8
+file path=usr/share/man/man8/yppush.8
+file path=usr/share/man/man8/ypserv.8
+link path=usr/share/man/man8/ypupdated.8 target=rpc.ypupdated.8
+link path=usr/share/man/man8/ypxfrd.8 target=ypserv.8
dir path=var group=sys
dir path=var/yp
file path=var/yp/Makefile mode=0555 original_name=SUNWyp:var/yp/Makefile \
diff --git a/usr/src/pkg/manifests/service-network-slp.p5m b/usr/src/pkg/manifests/service-network-slp.p5m
index 4d6aefacaf..28250b2b31 100644
--- a/usr/src/pkg/manifests/service-network-slp.p5m
+++ b/usr/src/pkg/manifests/service-network-slp.p5m
@@ -58,8 +58,6 @@ dir path=usr/share/lib/slp
file path=usr/share/lib/slp/slp.jar group=sys
file path=usr/share/lib/slp/slpd.jar group=sys mode=0600
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/slpd.1m
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libslp.3lib
dir path=usr/share/man/man3slp
@@ -81,11 +79,13 @@ file path=usr/share/man/man3slp/SLPSetProperty.3slp
file path=usr/share/man/man3slp/SLPUnescape.3slp
file path=usr/share/man/man3slp/slp_api.3slp
file path=usr/share/man/man3slp/slp_strerror.3slp
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/slp.conf.4
-file path=usr/share/man/man4/slpd.reg.4
-dir path=usr/share/man/man7p
-file path=usr/share/man/man7p/slp.7p
+dir path=usr/share/man/man4p
+file path=usr/share/man/man4p/slp.4p
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/slp.conf.5
+file path=usr/share/man/man5/slpd.reg.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/slpd.8
legacy pkg=SUNWslpr \
desc="Root filesystem portion of the Service Location Protocol (SLP) framework. Includes the SLP configuration file and start scripts for the SLP daemon." \
name="SLP, (Root)"
diff --git a/usr/src/pkg/manifests/service-network-smtp-sendmail.p5m b/usr/src/pkg/manifests/service-network-smtp-sendmail.p5m
index 1e5f0bc521..e19cedb1a5 100644
--- a/usr/src/pkg/manifests/service-network-smtp-sendmail.p5m
+++ b/usr/src/pkg/manifests/service-network-smtp-sendmail.p5m
@@ -208,23 +208,23 @@ file path=usr/share/man/man1/mconnect.1
file path=usr/share/man/man1/praliases.1
file path=usr/share/man/man1/sendmail-mailq.1
file path=usr/share/man/man1/vacation.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/check-hostname.1m
-file path=usr/share/man/man1m/check-permissions.1m
-file path=usr/share/man/man1m/editmap.1m
-file path=usr/share/man/man1m/etrn.1m
-file path=usr/share/man/man1m/makemap.1m
-file path=usr/share/man/man1m/newaliases.1m
-file path=usr/share/man/man1m/sendmail.1m
-file path=usr/share/man/man1m/smrsh.1m
-dir path=usr/share/man/man4
-link path=usr/share/man/man4/addresses.4 target=aliases.4
-file path=usr/share/man/man4/alias.4
-file path=usr/share/man/man4/aliases.4
-link path=usr/share/man/man4/forward.4 target=aliases.4
-file path=usr/share/man/man4/sendmail.4
-link path=usr/share/man/man4/sendmail.cf.4 target=sendmail.4
-link path=usr/share/man/man4/submit.cf.4 target=sendmail.4
+dir path=usr/share/man/man5
+link path=usr/share/man/man5/addresses.5 target=aliases.5
+file path=usr/share/man/man5/alias.5
+file path=usr/share/man/man5/aliases.5
+link path=usr/share/man/man5/forward.5 target=aliases.5
+file path=usr/share/man/man5/sendmail.5
+link path=usr/share/man/man5/sendmail.cf.5 target=sendmail.5
+link path=usr/share/man/man5/submit.cf.5 target=sendmail.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/check-hostname.8
+file path=usr/share/man/man8/check-permissions.8
+file path=usr/share/man/man8/editmap.8
+file path=usr/share/man/man8/etrn.8
+file path=usr/share/man/man8/makemap.8
+file path=usr/share/man/man8/newaliases.8
+file path=usr/share/man/man8/sendmail.8
+file path=usr/share/man/man8/smrsh.8
dir path=var group=sys
dir path=var/adm group=sys mode=0775
dir path=var/adm/sm.bin group=sys
diff --git a/usr/src/pkg/manifests/service-network-telnet.p5m b/usr/src/pkg/manifests/service-network-telnet.p5m
index 631f23a68a..16a6aebf4d 100644
--- a/usr/src/pkg/manifests/service-network-telnet.p5m
+++ b/usr/src/pkg/manifests/service-network-telnet.p5m
@@ -41,9 +41,9 @@ file path=lib/svc/manifest/network/telnet.xml group=sys mode=0444
dir path=usr group=sys
dir path=usr/sbin
file path=usr/sbin/in.telnetd mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/in.telnetd.1m
-link path=usr/share/man/man1m/telnetd.1m target=in.telnetd.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/in.telnetd.8
+link path=usr/share/man/man8/telnetd.8 target=in.telnetd.8
legacy pkg=SUNWtnetd desc="Telnet Server Daemon (Usr)" \
name="Telnet Server Daemon (Usr)"
legacy pkg=SUNWtnetr desc="Telnet Server Daemon (Root)" \
diff --git a/usr/src/pkg/manifests/service-network-tftp.p5m b/usr/src/pkg/manifests/service-network-tftp.p5m
index 261c278d5b..70d0c4a880 100644
--- a/usr/src/pkg/manifests/service-network-tftp.p5m
+++ b/usr/src/pkg/manifests/service-network-tftp.p5m
@@ -42,9 +42,9 @@ dir path=usr/sbin
file path=usr/sbin/in.tftpd mode=0555
dir path=usr/share/man/man1
file path=usr/share/man/man1/tftp.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/in.tftpd.1m
-link path=usr/share/man/man1m/tftpd.1m target=in.tftpd.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/in.tftpd.8
+link path=usr/share/man/man8/tftpd.8 target=in.tftpd.8
legacy pkg=SUNWtftp desc="Trivial File Transfer Server" \
name="Trivial File Transfer Server"
legacy pkg=SUNWtftpr desc="Trivial File Transfer Server (Root)" \
diff --git a/usr/src/pkg/manifests/service-network-uucp.p5m b/usr/src/pkg/manifests/service-network-uucp.p5m
index b65e1830d9..ab1a68be6e 100644
--- a/usr/src/pkg/manifests/service-network-uucp.p5m
+++ b/usr/src/pkg/manifests/service-network-uucp.p5m
@@ -107,16 +107,16 @@ link path=usr/share/man/man1c/uupick.1c target=uuto.1c
file path=usr/share/man/man1c/uustat.1c
file path=usr/share/man/man1c/uuto.1c
file path=usr/share/man/man1c/uux.1c
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/Uutry.1m
-file path=usr/share/man/man1m/in.uucpd.1m
-file path=usr/share/man/man1m/uucheck.1m
-file path=usr/share/man/man1m/uucico.1m
-file path=usr/share/man/man1m/uucleanup.1m
-link path=usr/share/man/man1m/uucpd.1m target=in.uucpd.1m
-file path=usr/share/man/man1m/uusched.1m
-link path=usr/share/man/man1m/uutry.1m target=Uutry.1m
-file path=usr/share/man/man1m/uuxqt.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/Uutry.8
+file path=usr/share/man/man8/in.uucpd.8
+file path=usr/share/man/man8/uucheck.8
+file path=usr/share/man/man8/uucico.8
+file path=usr/share/man/man8/uucleanup.8
+link path=usr/share/man/man8/uucpd.8 target=in.uucpd.8
+file path=usr/share/man/man8/uusched.8
+link path=usr/share/man/man8/uutry.8 target=Uutry.8
+file path=usr/share/man/man8/uuxqt.8
dir path=var group=sys
dir path=var/spool
dir path=var/spool/uucp owner=uucp group=uucp
diff --git a/usr/src/pkg/manifests/service-network-wpa.p5m b/usr/src/pkg/manifests/service-network-wpa.p5m
index d82ebe060a..644f18c7e6 100644
--- a/usr/src/pkg/manifests/service-network-wpa.p5m
+++ b/usr/src/pkg/manifests/service-network-wpa.p5m
@@ -38,8 +38,8 @@ dir path=usr group=sys
dir path=usr/lib
dir path=usr/lib/inet
file path=usr/lib/inet/wpad mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/wpad.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/wpad.8
legacy pkg=SUNWwpar \
desc="The service implements the IEEE802.11i (WPA/WPA2) specification." \
name="Wireless WPA Supplicant, (Root)"
diff --git a/usr/src/pkg/manifests/service-picl.p5m b/usr/src/pkg/manifests/service-picl.p5m
index a51f349062..0463084783 100644
--- a/usr/src/pkg/manifests/service-picl.p5m
+++ b/usr/src/pkg/manifests/service-picl.p5m
@@ -781,9 +781,6 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libsnmpplugin.so.1 \
dir path=usr/sbin
file path=usr/sbin/prtpicl mode=0755
$(sparc_ONLY)dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/picld.1m
-file path=usr/share/man/man1m/prtpicl.1m
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libpicl.3lib
file path=usr/share/man/man3lib/libpicltree.3lib
@@ -858,6 +855,9 @@ file path=usr/share/man/man3picltree/ptree_update_propval.3picltree
link path=usr/share/man/man3picltree/ptree_update_propval_by_name.3picltree \
target=ptree_update_propval.3picltree
file path=usr/share/man/man3picltree/ptree_walk_tree_by_class.3picltree
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/picld.8
+file path=usr/share/man/man8/prtpicl.8
legacy pkg=SUNWpiclr desc="PICL Framework init scripts" \
name="PICL Framework (Root)"
legacy pkg=SUNWpiclu \
diff --git a/usr/src/pkg/manifests/service-resource-cap.p5m b/usr/src/pkg/manifests/service-resource-cap.p5m
index fa249da074..4af49b7b79 100644
--- a/usr/src/pkg/manifests/service-resource-cap.p5m
+++ b/usr/src/pkg/manifests/service-resource-cap.p5m
@@ -45,9 +45,9 @@ dir path=usr/sbin
file path=usr/sbin/rcapadm mode=0555
dir path=usr/share/man/man1
file path=usr/share/man/man1/rcapstat.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/rcapadm.1m
-file path=usr/share/man/man1m/rcapd.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/rcapadm.8
+file path=usr/share/man/man8/rcapd.8
legacy pkg=SUNWrcapr desc="Solaris Resource Capping Daemon (Root)" \
name="Solaris Resource Capping Daemon (Root)"
legacy pkg=SUNWrcapu desc="Solaris Resource Capping Daemon (Usr)" \
diff --git a/usr/src/pkg/manifests/service-resource-pools-poold.p5m b/usr/src/pkg/manifests/service-resource-pools-poold.p5m
index 82d4704704..a95a0835a6 100644
--- a/usr/src/pkg/manifests/service-resource-pools-poold.p5m
+++ b/usr/src/pkg/manifests/service-resource-pools-poold.p5m
@@ -50,8 +50,8 @@ link path=usr/lib/pool/libjsyslog.so target=./libjsyslog.so.1
file path=usr/lib/pool/libjsyslog.so.1
file path=usr/lib/pool/poold mode=0555
file path=usr/lib/pool/poold.properties mode=0444
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/poold.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/poold.8
legacy pkg=SUNWpoold desc="core software for dynamic resource pools" \
name="Dynamic Resource Pools"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/service-resource-pools.p5m b/usr/src/pkg/manifests/service-resource-pools.p5m
index 6275964012..b7d28efb39 100644
--- a/usr/src/pkg/manifests/service-resource-pools.p5m
+++ b/usr/src/pkg/manifests/service-resource-pools.p5m
@@ -67,11 +67,6 @@ dir path=usr/share/lib/xml group=sys
dir path=usr/share/lib/xml/dtd group=sys
file path=usr/share/lib/xml/dtd/rm_pool.dtd.1
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/pooladm.1m
-file path=usr/share/man/man1m/poolbind.1m
-file path=usr/share/man/man1m/poolcfg.1m
-file path=usr/share/man/man1m/poolstat.1m
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libpool.3lib
dir path=usr/share/man/man3pool
@@ -197,6 +192,11 @@ link path=usr/share/man/man3pool/pool_walk_properties.3pool \
target=pool_get_property.3pool
link path=usr/share/man/man3pool/pool_walk_resources.3pool \
target=pool_walk_components.3pool
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/pooladm.8
+file path=usr/share/man/man8/poolbind.8
+file path=usr/share/man/man8/poolcfg.8
+file path=usr/share/man/man8/poolstat.8
dir path=var group=sys variant.opensolaris.zone=global
dir path=var/adm/pool group=sys variant.opensolaris.zone=global
dir path=var/log/pool group=sys variant.opensolaris.zone=global
diff --git a/usr/src/pkg/manifests/service-security-gss.p5m b/usr/src/pkg/manifests/service-security-gss.p5m
index 8b895a7db2..cd5c25da5a 100644
--- a/usr/src/pkg/manifests/service-security-gss.p5m
+++ b/usr/src/pkg/manifests/service-security-gss.p5m
@@ -44,12 +44,12 @@ dir path=lib/svc/manifest/network group=sys
dir path=lib/svc/manifest/network/rpc group=sys
file path=lib/svc/manifest/network/rpc/gss.xml group=sys mode=0444
dir path=usr/share/man
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/gsscred.conf.4
-file path=usr/share/man/man4/mech.4
-link path=usr/share/man/man4/qop.4 target=mech.4
dir path=usr/share/man/man5
-file path=usr/share/man/man5/gss_auth_rules.5
+file path=usr/share/man/man5/gsscred.conf.5
+file path=usr/share/man/man5/mech.5
+link path=usr/share/man/man5/qop.5 target=mech.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/gss_auth_rules.7
legacy pkg=SUNWgssc \
desc="Generic Security Service Application Program Interface, Version 2 - config" \
name="GSSAPI CONFIG V2"
diff --git a/usr/src/pkg/manifests/service-security-kerberos-5.p5m b/usr/src/pkg/manifests/service-security-kerberos-5.p5m
index 8d03edefac..0e8f4bd205 100644
--- a/usr/src/pkg/manifests/service-security-kerberos-5.p5m
+++ b/usr/src/pkg/manifests/service-security-kerberos-5.p5m
@@ -94,13 +94,13 @@ file path=usr/share/man/man1/klist.1
file path=usr/share/man/man1/kpasswd.1
file path=usr/share/man/man1/krb5-config.1
file path=usr/share/man/man1/ktutil.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/ktkt_warnd.1m
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libkrb5.3lib
-dir path=usr/share/man/man5
-file path=usr/share/man/man5/pam_krb5.5
-file path=usr/share/man/man5/pam_krb5_migrate.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/pam_krb5.7
+file path=usr/share/man/man7/pam_krb5_migrate.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/ktkt_warnd.8
dir path=var group=sys
dir path=var/krb5 group=sys
dir path=var/krb5/rcache group=sys mode=1777
diff --git a/usr/src/pkg/manifests/service-storage-isns.p5m b/usr/src/pkg/manifests/service-storage-isns.p5m
index 0c26b77aec..ad746f7e3f 100644
--- a/usr/src/pkg/manifests/service-storage-isns.p5m
+++ b/usr/src/pkg/manifests/service-storage-isns.p5m
@@ -38,9 +38,9 @@ dir path=usr group=sys
dir path=usr/sbin
file path=usr/sbin/isns mode=0555
file path=usr/sbin/isnsadm mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/isns.1m
-file path=usr/share/man/man1m/isnsadm.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/isns.8
+file path=usr/share/man/man8/isnsadm.8
legacy pkg=SUNWisns desc="Solaris internet Storage Name Service(iSNS) Server" \
name="Solaris iSNS Server"
legacy pkg=SUNWisnsadm desc="Solaris iSNS Server Administration Utility" \
diff --git a/usr/src/pkg/manifests/service-storage-media-volume-manager.p5m b/usr/src/pkg/manifests/service-storage-media-volume-manager.p5m
index 2295c03b63..2b2befea71 100644
--- a/usr/src/pkg/manifests/service-storage-media-volume-manager.p5m
+++ b/usr/src/pkg/manifests/service-storage-media-volume-manager.p5m
@@ -56,9 +56,9 @@ file path=usr/share/man/man1/rmmount.1
link path=usr/share/man/man1/rmumount.1 target=rmmount.1
file path=usr/share/man/man1/volcheck.1
file path=usr/share/man/man1/volrmmount.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/rmmount.1m
-file path=usr/share/man/man1m/rmvolmgr.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/rmmount.8
+file path=usr/share/man/man8/rmvolmgr.8
legacy pkg=SUNWrmvolmgr desc="Non-graphical removable volume manager" \
name="Removable volume manager"
legacy pkg=SUNWrmvolmgrr desc="Non-graphical removable volume manager (Root)" \
diff --git a/usr/src/pkg/manifests/service-storage-ndmp.p5m b/usr/src/pkg/manifests/service-storage-ndmp.p5m
index 35fa0aac79..444d246e2f 100644
--- a/usr/src/pkg/manifests/service-storage-ndmp.p5m
+++ b/usr/src/pkg/manifests/service-storage-ndmp.p5m
@@ -58,12 +58,12 @@ dir path=usr/sbin
file path=usr/sbin/ndmpadm mode=0555
file path=usr/sbin/ndmpstat mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/ndmpadm.1m
-file path=usr/share/man/man1m/ndmpd.1m
-file path=usr/share/man/man1m/ndmpstat.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/ndmp.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/ndmp.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/ndmpadm.8
+file path=usr/share/man/man8/ndmpd.8
+file path=usr/share/man/man8/ndmpstat.8
legacy pkg=SUNWndmpr \
desc="Network Data Management Protocol Service (root components)" \
name="Network Data Management Protocol Service (Root)"
diff --git a/usr/src/pkg/manifests/service-storage-removable-media.p5m b/usr/src/pkg/manifests/service-storage-removable-media.p5m
index 228e77bd06..dd4099fb7e 100644
--- a/usr/src/pkg/manifests/service-storage-removable-media.p5m
+++ b/usr/src/pkg/manifests/service-storage-removable-media.p5m
@@ -53,8 +53,8 @@ file path=usr/lib/smedia/rpc.smserverd mode=0555
file path=usr/lib/smedia/sm_blkdev.so.1 mode=0555
file path=usr/lib/smedia/sm_fd.so.1 mode=0555
file path=usr/lib/smedia/sm_scsi.so.1 mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/rpc.smserverd.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/rpc.smserverd.8
legacy pkg=SUNWsmedia desc="Storage media management library" \
name="Storage media management library"
legacy pkg=SUNWsmediar desc="Storage media management library (Root)" \
diff --git a/usr/src/pkg/manifests/service-storage-virus-scan.p5m b/usr/src/pkg/manifests/service-storage-virus-scan.p5m
index 1bee3e7914..2953e4198b 100644
--- a/usr/src/pkg/manifests/service-storage-virus-scan.p5m
+++ b/usr/src/pkg/manifests/service-storage-virus-scan.p5m
@@ -50,9 +50,9 @@ file path=usr/lib/vscan/libvscan.so.1
file path=usr/lib/vscan/vscand mode=0555
dir path=usr/sbin
file path=usr/sbin/vscanadm mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/vscanadm.1m
-file path=usr/share/man/man1m/vscand.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/vscanadm.8
+file path=usr/share/man/man8/vscand.8
driver name=vscan perms="* 0640 root sys"
legacy pkg=SUNWvscankr desc="Virus Scan Service Kernel Root Components" \
name="Virus Scan Service Kernel (Root)"
diff --git a/usr/src/pkg/manifests/storage-mpathadm.p5m b/usr/src/pkg/manifests/storage-mpathadm.p5m
index 26a63efea2..5c45e7013a 100644
--- a/usr/src/pkg/manifests/storage-mpathadm.p5m
+++ b/usr/src/pkg/manifests/storage-mpathadm.p5m
@@ -39,8 +39,8 @@ set name=variant.arch value=$(ARCH)
dir path=usr group=sys
dir path=usr/sbin
file path=usr/sbin/mpathadm mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/mpathadm.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/mpathadm.8
legacy pkg=SUNWmpathadm \
desc="Path Administration Utility for a Solaris Multipathing device" \
name="Solaris Multipathing CLI"
diff --git a/usr/src/pkg/manifests/storage-stmf.p5m b/usr/src/pkg/manifests/storage-stmf.p5m
index 89afa3f8c4..31530ee6f8 100644
--- a/usr/src/pkg/manifests/storage-stmf.p5m
+++ b/usr/src/pkg/manifests/storage-stmf.p5m
@@ -94,9 +94,6 @@ dir path=usr/sbin
file path=usr/sbin/sbdadm mode=0555
file path=usr/sbin/stmfadm mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/sbdadm.1m
-file path=usr/share/man/man1m/stmfadm.1m
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libstmf.3lib
dir path=usr/share/man/man3stmf
@@ -144,6 +141,9 @@ file path=usr/share/man/man3stmf/stmfSetLuProp.3stmf
file path=usr/share/man/man3stmf/stmfSetPersistMethod.3stmf
file path=usr/share/man/man3stmf/stmfSetProviderData.3stmf
file path=usr/share/man/man3stmf/stmfSetProviderDataProt.3stmf
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/sbdadm.8
+file path=usr/share/man/man8/stmfadm.8
driver name=fct perms="* 0666 root sys"
driver name=pppt perms="* 0666 root sys"
driver name=qlt perms="* 0666 root sys"
diff --git a/usr/src/pkg/manifests/system-accounting-legacy.p5m b/usr/src/pkg/manifests/system-accounting-legacy.p5m
index 163d525287..fffab7fa19 100644
--- a/usr/src/pkg/manifests/system-accounting-legacy.p5m
+++ b/usr/src/pkg/manifests/system-accounting-legacy.p5m
@@ -96,44 +96,44 @@ dir path=usr/share/man/man1
file path=usr/share/man/man1/acctcom.1
file path=usr/share/man/man1/sar.1
file path=usr/share/man/man1/timex.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/acct.1m
-file path=usr/share/man/man1m/acctcms.1m
-file path=usr/share/man/man1m/acctcon.1m
-link path=usr/share/man/man1m/acctcon1.1m target=acctcon.1m
-link path=usr/share/man/man1m/acctcon2.1m target=acctcon.1m
-link path=usr/share/man/man1m/acctdisk.1m target=acct.1m
-link path=usr/share/man/man1m/acctdusg.1m target=acct.1m
-file path=usr/share/man/man1m/acctmerg.1m
-link path=usr/share/man/man1m/accton.1m target=acct.1m
-file path=usr/share/man/man1m/acctprc.1m
-link path=usr/share/man/man1m/acctprc1.1m target=acctprc.1m
-link path=usr/share/man/man1m/acctprc2.1m target=acctprc.1m
-file path=usr/share/man/man1m/acctsh.1m
-link path=usr/share/man/man1m/acctwtmp.1m target=acct.1m
-link path=usr/share/man/man1m/chargefee.1m target=acctsh.1m
-link path=usr/share/man/man1m/ckpacct.1m target=acctsh.1m
-link path=usr/share/man/man1m/closewtmp.1m target=acct.1m
-link path=usr/share/man/man1m/dodisk.1m target=acctsh.1m
-file path=usr/share/man/man1m/fwtmp.1m
-link path=usr/share/man/man1m/lastlogin.1m target=acctsh.1m
-link path=usr/share/man/man1m/monacct.1m target=acctsh.1m
-link path=usr/share/man/man1m/nulladm.1m target=acctsh.1m
-link path=usr/share/man/man1m/prctmp.1m target=acctsh.1m
-link path=usr/share/man/man1m/prdaily.1m target=acctsh.1m
-link path=usr/share/man/man1m/prtacct.1m target=acctsh.1m
-file path=usr/share/man/man1m/runacct.1m
-link path=usr/share/man/man1m/sa1.1m target=sar.1m
-link path=usr/share/man/man1m/sa2.1m target=sar.1m
-link path=usr/share/man/man1m/sadc.1m target=sar.1m
-file path=usr/share/man/man1m/sar.1m
-link path=usr/share/man/man1m/shutacct.1m target=acctsh.1m
-link path=usr/share/man/man1m/startup.1m target=acctsh.1m
-link path=usr/share/man/man1m/turnacct.1m target=acctsh.1m
-link path=usr/share/man/man1m/utmp2wtmp.1m target=acct.1m
-link path=usr/share/man/man1m/wtmpfix.1m target=fwtmp.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/holidays.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/holidays.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/acct.8
+file path=usr/share/man/man8/acctcms.8
+file path=usr/share/man/man8/acctcon.8
+link path=usr/share/man/man8/acctcon1.8 target=acctcon.8
+link path=usr/share/man/man8/acctcon2.8 target=acctcon.8
+link path=usr/share/man/man8/acctdisk.8 target=acct.8
+link path=usr/share/man/man8/acctdusg.8 target=acct.8
+file path=usr/share/man/man8/acctmerg.8
+link path=usr/share/man/man8/accton.8 target=acct.8
+file path=usr/share/man/man8/acctprc.8
+link path=usr/share/man/man8/acctprc1.8 target=acctprc.8
+link path=usr/share/man/man8/acctprc2.8 target=acctprc.8
+file path=usr/share/man/man8/acctsh.8
+link path=usr/share/man/man8/acctwtmp.8 target=acct.8
+link path=usr/share/man/man8/chargefee.8 target=acctsh.8
+link path=usr/share/man/man8/ckpacct.8 target=acctsh.8
+link path=usr/share/man/man8/closewtmp.8 target=acct.8
+link path=usr/share/man/man8/dodisk.8 target=acctsh.8
+file path=usr/share/man/man8/fwtmp.8
+link path=usr/share/man/man8/lastlogin.8 target=acctsh.8
+link path=usr/share/man/man8/monacct.8 target=acctsh.8
+link path=usr/share/man/man8/nulladm.8 target=acctsh.8
+link path=usr/share/man/man8/prctmp.8 target=acctsh.8
+link path=usr/share/man/man8/prdaily.8 target=acctsh.8
+link path=usr/share/man/man8/prtacct.8 target=acctsh.8
+file path=usr/share/man/man8/runacct.8
+link path=usr/share/man/man8/sa1.8 target=sar.8
+link path=usr/share/man/man8/sa2.8 target=sar.8
+link path=usr/share/man/man8/sadc.8 target=sar.8
+file path=usr/share/man/man8/sar.8
+link path=usr/share/man/man8/shutacct.8 target=acctsh.8
+link path=usr/share/man/man8/startup.8 target=acctsh.8
+link path=usr/share/man/man8/turnacct.8 target=acctsh.8
+link path=usr/share/man/man8/utmp2wtmp.8 target=acct.8
+link path=usr/share/man/man8/wtmpfix.8 target=fwtmp.8
dir path=var group=sys
dir path=var/adm group=sys mode=0775
dir path=var/adm/acct owner=adm group=adm mode=0775
diff --git a/usr/src/pkg/manifests/system-bhyve.p5m b/usr/src/pkg/manifests/system-bhyve.p5m
index 469f846704..5753e38b69 100644
--- a/usr/src/pkg/manifests/system-bhyve.p5m
+++ b/usr/src/pkg/manifests/system-bhyve.p5m
@@ -47,12 +47,12 @@ file path=usr/sbin/bhyvectl mode=0555
file path=usr/sbin/pptadm mode=0555
dir path=usr/share
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/bhyve.1m
-file path=usr/share/man/man1m/bhyvectl.1m
-file path=usr/share/man/man1m/pptadm.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/bhyve_config.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/bhyve_config.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/bhyve.8
+file path=usr/share/man/man8/bhyvectl.8
+file path=usr/share/man/man8/pptadm.8
driver name=ppt
driver name=viona
driver name=vmm
diff --git a/usr/src/pkg/manifests/system-boot-grub.p5m b/usr/src/pkg/manifests/system-boot-grub.p5m
index 22201868ee..e785bf632b 100644
--- a/usr/src/pkg/manifests/system-boot-grub.p5m
+++ b/usr/src/pkg/manifests/system-boot-grub.p5m
@@ -70,8 +70,8 @@ dir path=lib
link path=lib/libgrubmgmt.so target=libgrubmgmt.so.1
file path=lib/libgrubmgmt.so.1
dir path=usr/share/man
-dir path=usr/share/man/man5
-file path=usr/share/man/man5/grub.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/grub.7
$(i386_ONLY)legacy pkg=SUNWgrub desc="Multiboot Boot Loader" \
name="GNU GRUB - GNU GRand Unified Bootloader"
legacy pkg=SUNWgrubr desc="GRUB libraries" name="GRUB (Root)"
diff --git a/usr/src/pkg/manifests/system-boot-loader.p5m b/usr/src/pkg/manifests/system-boot-loader.p5m
index 5f3c85b199..72bb3f6329 100644
--- a/usr/src/pkg/manifests/system-boot-loader.p5m
+++ b/usr/src/pkg/manifests/system-boot-loader.p5m
@@ -80,22 +80,22 @@ $(i386_ONLY)file path=boot/pmbr group=sys mode=0444
$(i386_ONLY)file path=boot/pxeboot group=sys mode=0444
$(i386_ONLY)dir path=usr/share/man
$(i386_ONLY)dir path=usr/share/man/man3
-$(i386_ONLY)dir path=usr/share/man/man4
-$(i386_ONLY)file path=usr/share/man/man4/loader.conf.4
$(i386_ONLY)dir path=usr/share/man/man5
-$(i386_ONLY)file path=usr/share/man/man5/beastie.4th.5
-$(i386_ONLY)file path=usr/share/man/man5/brand.4th.5
-$(i386_ONLY)file path=usr/share/man/man5/check-password.4th.5
-$(i386_ONLY)file path=usr/share/man/man5/color.4th.5
-$(i386_ONLY)file path=usr/share/man/man5/delay.4th.5
-$(i386_ONLY)file path=usr/share/man/man5/gptzfsboot.5
-$(i386_ONLY)file path=usr/share/man/man5/isoboot.5
-$(i386_ONLY)file path=usr/share/man/man5/loader.4th.5
-$(i386_ONLY)file path=usr/share/man/man5/loader.5
-$(i386_ONLY)file path=usr/share/man/man5/menu.4th.5
-$(i386_ONLY)file path=usr/share/man/man5/menusets.4th.5
-$(i386_ONLY)file path=usr/share/man/man5/pxeboot.5
-$(i386_ONLY)file path=usr/share/man/man5/version.4th.5
+$(i386_ONLY)file path=usr/share/man/man5/loader.conf.5
+$(i386_ONLY)dir path=usr/share/man/man7
+$(i386_ONLY)file path=usr/share/man/man7/beastie.4th.7
+$(i386_ONLY)file path=usr/share/man/man7/brand.4th.7
+$(i386_ONLY)file path=usr/share/man/man7/check-password.4th.7
+$(i386_ONLY)file path=usr/share/man/man7/color.4th.7
+$(i386_ONLY)file path=usr/share/man/man7/delay.4th.7
+$(i386_ONLY)file path=usr/share/man/man7/gptzfsboot.7
+$(i386_ONLY)file path=usr/share/man/man7/isoboot.7
+$(i386_ONLY)file path=usr/share/man/man7/loader.4th.7
+$(i386_ONLY)file path=usr/share/man/man7/loader.7
+$(i386_ONLY)file path=usr/share/man/man7/menu.4th.7
+$(i386_ONLY)file path=usr/share/man/man7/menusets.4th.7
+$(i386_ONLY)file path=usr/share/man/man7/pxeboot.7
+$(i386_ONLY)file path=usr/share/man/man7/version.4th.7
license lic_CDDL license=lic_CDDL
$(i386_ONLY)license usr/src/boot/COPYRIGHT license=usr/src/boot/COPYRIGHT
$(i386_ONLY)license usr/src/boot/common/linenoise/LICENSE \
diff --git a/usr/src/pkg/manifests/system-boot-network.p5m b/usr/src/pkg/manifests/system-boot-network.p5m
index 492b84c971..7f757d4861 100644
--- a/usr/src/pkg/manifests/system-boot-network.p5m
+++ b/usr/src/pkg/manifests/system-boot-network.p5m
@@ -41,16 +41,16 @@ dir path=usr/sbin
file path=usr/sbin/in.rarpd mode=0555
file path=usr/sbin/rpc.bootparamd mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-link path=usr/share/man/man1m/bootparamd.1m target=rpc.bootparamd.1m
-file path=usr/share/man/man1m/in.rarpd.1m
-link path=usr/share/man/man1m/rarpd.1m target=in.rarpd.1m
-file path=usr/share/man/man1m/rpc.bootparamd.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/bootparams.4
-dir path=usr/share/man/man7p
-link path=usr/share/man/man7p/RARP.7p target=rarp.7p
-file path=usr/share/man/man7p/rarp.7p
+dir path=usr/share/man/man4p
+link path=usr/share/man/man4p/RARP.4p target=rarp.4p
+file path=usr/share/man/man4p/rarp.4p
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/bootparams.5
+dir path=usr/share/man/man8
+link path=usr/share/man/man8/bootparamd.8 target=rpc.bootparamd.8
+file path=usr/share/man/man8/in.rarpd.8
+link path=usr/share/man/man8/rarpd.8 target=in.rarpd.8
+file path=usr/share/man/man8/rpc.bootparamd.8
legacy pkg=SUNWbsr desc="Boot Server daemons (Root)" \
name="Boot Server daemons (Root)"
legacy pkg=SUNWbsu desc="Boot Server daemons (Usr)" \
diff --git a/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m b/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m
index 32bc023c96..3000d49d7e 100644
--- a/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m
+++ b/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m
@@ -680,8 +680,8 @@ $(sparc_ONLY)hardlink path=usr/share/lib/keytables/us_5 \
$(sparc_ONLY)hardlink path=usr/share/lib/keytables/us_hobo \
target=../../../../usr/share/lib/keytables/type_4/us_hobo
dir path=usr/share/man
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/keytables.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/keytables.5
legacy pkg=SUNWkey \
desc="Configuration tables that specify keyboard attributes such as localized meanings for individual keys" \
name="Keyboard configuration tables"
diff --git a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m
index 7b997b3cd1..a2fba8533d 100644
--- a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m
+++ b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m
@@ -53,9 +53,9 @@ dir path=usr/platform/SUNW,SPARC-Enterprise group=sys
dir path=usr/platform/SUNW,SPARC-Enterprise/lib
dir path=usr/platform/SUNW,SPARC-Enterprise/lib/$(ARCH64)
file path=usr/platform/SUNW,SPARC-Enterprise/lib/$(ARCH64)/oplhpd mode=0755
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/dcs.1m
-file path=usr/share/man/man1m/oplhpd.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/dcs.8
+file path=usr/share/man/man8/oplhpd.8
legacy pkg=SUNWdcsr desc="Domain Configuration Server, (Root)" \
name="Domain Configuration Server, (Root)"
legacy pkg=SUNWdcsu desc="Domain Configuration Server" \
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 92317831cd..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,12 +72,12 @@ 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/man1m
-file path=usr/share/man/man1m/prtdscp.1m
-file path=usr/share/man/man1m/sckmd.1m
-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
driver name=dm2s
driver name=oplkmdrv
legacy pkg=SUNWdscpr.u arch=$(ARCH).sun4u \
diff --git a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m
index aac44008df..70b78bf70d 100644
--- a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m
+++ b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m
@@ -89,8 +89,8 @@ link path=usr/lib/efcode/$(ARCH64)/lfc_sun4v_pciex.so target=lfc_upa_pci.so
file path=usr/lib/efcode/$(ARCH64)/lfc_upa.so
file path=usr/lib/efcode/$(ARCH64)/lfc_upa_pci.so
file path=usr/lib/efcode/efcode.sh mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/efdaemon.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/efdaemon.8
driver name=fcode
legacy pkg=SUNWefc.u arch=$(ARCH).sun4u \
desc="Embedded FCode Interpreter Drivers" \
diff --git a/usr/src/pkg/manifests/system-extended-system-utilities.p5m b/usr/src/pkg/manifests/system-extended-system-utilities.p5m
index 5fa4728b9f..7aeaf41252 100644
--- a/usr/src/pkg/manifests/system-extended-system-utilities.p5m
+++ b/usr/src/pkg/manifests/system-extended-system-utilities.p5m
@@ -268,17 +268,17 @@ file path=usr/share/man/man1/unix2dos.1
link path=usr/share/man/man1/unpack.1 target=pack.1
file path=usr/share/man/man1/yes.1
link path=usr/share/man/man1/zcat.1 target=compress.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/adbgen.1m
-file path=usr/share/man/man1m/dmesg.1m
-file path=usr/share/man/man1m/fsck_pcfs.1m
-file path=usr/share/man/man1m/kstat.1m
-file path=usr/share/man/man1m/mkfifo.1m
-file path=usr/share/man/man1m/mkfs_pcfs.1m
-file path=usr/share/man/man1m/mount_pcfs.1m
-file path=usr/share/man/man1m/projadd.1m
-file path=usr/share/man/man1m/projdel.1m
-file path=usr/share/man/man1m/projmod.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/adbgen.8
+file path=usr/share/man/man8/dmesg.8
+file path=usr/share/man/man8/fsck_pcfs.8
+file path=usr/share/man/man8/kstat.8
+file path=usr/share/man/man8/mkfifo.8
+file path=usr/share/man/man8/mkfs_pcfs.8
+file path=usr/share/man/man8/mount_pcfs.8
+file path=usr/share/man/man8/projadd.8
+file path=usr/share/man/man8/projdel.8
+file path=usr/share/man/man8/projmod.8
legacy pkg=SUNWesu \
desc="additional UNIX system utilities, including awk, bc, cal, compress, diff, dos2unix, last, rup, sort, spell, uniq, and uuencode" \
name="Extended System Utilities"
diff --git a/usr/src/pkg/manifests/system-file-system-autofs.p5m b/usr/src/pkg/manifests/system-file-system-autofs.p5m
index 63a635f32f..d169fe7ee4 100644
--- a/usr/src/pkg/manifests/system-file-system-autofs.p5m
+++ b/usr/src/pkg/manifests/system-file-system-autofs.p5m
@@ -61,11 +61,11 @@ file path=usr/lib/fs/autofs/unshare mode=0555
dir path=usr/sbin
link path=usr/sbin/automount target=../lib/fs/autofs/automount
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/automount.1m
-file path=usr/share/man/man1m/automountd.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/autofs.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/autofs.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/automount.8
+file path=usr/share/man/man8/automountd.8
legacy pkg=SUNWatfsr \
desc="configuration and start-up files for the AutoFS filesystem" \
name="AutoFS, (Root)"
diff --git a/usr/src/pkg/manifests/system-file-system-nfs.p5m b/usr/src/pkg/manifests/system-file-system-nfs.p5m
index 4da15bab09..1b2a811d76 100644
--- a/usr/src/pkg/manifests/system-file-system-nfs.p5m
+++ b/usr/src/pkg/manifests/system-file-system-nfs.p5m
@@ -87,16 +87,16 @@ dir path=usr/sbin
link path=usr/sbin/showmount target=../lib/fs/nfs/showmount
dir path=usr/share/man
dir path=usr/share/man/man1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/mount_nfs.1m
-file path=usr/share/man/man1m/nfs4cbd.1m
-file path=usr/share/man/man1m/nfsmapid.1m
-file path=usr/share/man/man1m/nfsstat.1m
-file path=usr/share/man/man1m/showmount.1m
-file path=usr/share/man/man1m/statd.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/nfs.4
-file path=usr/share/man/man4/nfssec.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/nfs.5
+file path=usr/share/man/man5/nfssec.conf.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/mount_nfs.8
+file path=usr/share/man/man8/nfs4cbd.8
+file path=usr/share/man/man8/nfsmapid.8
+file path=usr/share/man/man8/nfsstat.8
+file path=usr/share/man/man8/showmount.8
+file path=usr/share/man/man8/statd.8
dir path=var group=sys
dir path=var/nfs
dir path=var/nfs/v4_oldstate owner=daemon group=daemon
diff --git a/usr/src/pkg/manifests/system-file-system-smb.p5m b/usr/src/pkg/manifests/system-file-system-smb.p5m
index f62246159f..fb3703ec4f 100644
--- a/usr/src/pkg/manifests/system-file-system-smb.p5m
+++ b/usr/src/pkg/manifests/system-file-system-smb.p5m
@@ -88,16 +88,16 @@ file path=usr/lib/smbfs/smbiod-svc mode=0555
dir path=usr/share/man
dir path=usr/share/man/man1
file path=usr/share/man/man1/smbutil.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/mount_smbfs.1m
-file path=usr/share/man/man1m/smbiod.1m
-link path=usr/share/man/man1m/umount_smbfs.1m target=mount_smbfs.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/nsmbrc.4
+dir path=usr/share/man/man4fs
+file path=usr/share/man/man4fs/smbfs.4fs
dir path=usr/share/man/man5
-file path=usr/share/man/man5/pam_smbfs_login.5
-dir path=usr/share/man/man7fs
-file path=usr/share/man/man7fs/smbfs.7fs
+file path=usr/share/man/man5/nsmbrc.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/pam_smbfs_login.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/mount_smbfs.8
+file path=usr/share/man/man8/smbiod.8
+link path=usr/share/man/man8/umount_smbfs.8 target=mount_smbfs.8
driver name=nsmb perms="* 0666 root sys"
legacy pkg=SUNWsmbfskr desc="SMB/CIFS File System client support (Kernel)" \
name="SMB/CIFS File System client support (Kernel)"
diff --git a/usr/src/pkg/manifests/system-file-system-udfs.p5m b/usr/src/pkg/manifests/system-file-system-udfs.p5m
index 9cfcb5d12d..0d79cc010f 100644
--- a/usr/src/pkg/manifests/system-file-system-udfs.p5m
+++ b/usr/src/pkg/manifests/system-file-system-udfs.p5m
@@ -44,14 +44,14 @@ file path=usr/lib/fs/udfs/labelit mode=0555
file path=usr/lib/fs/udfs/mkfs mode=0555
file path=usr/lib/fs/udfs/mount mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/fsck_udfs.1m
-file path=usr/share/man/man1m/fsdb_udfs.1m
-file path=usr/share/man/man1m/labelit_udfs.1m
-file path=usr/share/man/man1m/mkfs_udfs.1m
-file path=usr/share/man/man1m/mount_udfs.1m
-dir path=usr/share/man/man7fs
-file path=usr/share/man/man7fs/udfs.7fs
+dir path=usr/share/man/man4fs
+file path=usr/share/man/man4fs/udfs.4fs
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/fsck_udfs.8
+file path=usr/share/man/man8/fsdb_udfs.8
+file path=usr/share/man/man8/labelit_udfs.8
+file path=usr/share/man/man8/mkfs_udfs.8
+file path=usr/share/man/man8/mount_udfs.8
legacy pkg=SUNWudf desc="Universal Disk Format 1.50 File System, (Usr)" \
name="Universal Disk Format 1.50, (Usr)"
legacy pkg=SUNWudfr desc="Universal Disk Format 1.50 File System" \
diff --git a/usr/src/pkg/manifests/system-file-system-zfs.p5m b/usr/src/pkg/manifests/system-file-system-zfs.p5m
index 65de299b35..111fe6b028 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs.p5m
+++ b/usr/src/pkg/manifests/system-file-system-zfs.p5m
@@ -137,14 +137,14 @@ file path=usr/sbin/zdb mode=0555
link path=usr/sbin/zfs target=../../sbin/zfs
link path=usr/sbin/zpool target=../../sbin/zpool
file path=usr/sbin/zstreamdump mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/zdb.1m
-file path=usr/share/man/man1m/zfs-program.1m
-file path=usr/share/man/man1m/zfs.1m
-file path=usr/share/man/man1m/zpool.1m
-file path=usr/share/man/man1m/zstreamdump.1m
-file path=usr/share/man/man1m/ztest.1m
-file path=usr/share/man/man5/zpool-features.5
+file path=usr/share/man/man7/zpool-features.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/zdb.8
+file path=usr/share/man/man8/zfs-program.8
+file path=usr/share/man/man8/zfs.8
+file path=usr/share/man/man8/zpool.8
+file path=usr/share/man/man8/zstreamdump.8
+file path=usr/share/man/man8/ztest.8
driver name=zfs perms="* 0600 root sys" perms="zfs 0666 root sys"
legacy pkg=SUNWzfskr desc="ZFS kernel root components" name="ZFS Kernel (Root)"
legacy pkg=SUNWzfsr desc="ZFS root components" name="ZFS (Root)"
diff --git a/usr/src/pkg/manifests/system-flash-fwflash.p5m b/usr/src/pkg/manifests/system-flash-fwflash.p5m
index af21df6047..fcb604ac50 100644
--- a/usr/src/pkg/manifests/system-flash-fwflash.p5m
+++ b/usr/src/pkg/manifests/system-flash-fwflash.p5m
@@ -57,8 +57,8 @@ link path=usr/lib/fwflash/verify/sgen-SUN.so target=ses-SUN.so
file path=usr/lib/fwflash/verify/tavor-MELLANOX.so
dir path=usr/sbin
file path=usr/sbin/fwflash mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/fwflash.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/fwflash.8
legacy pkg=SUNWfwflash desc="Sun Firmware Flash Update Tool (fwflash)" \
name="Sun Firmware Flash Update Tool (fwflash)"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-fru-id-platform.p5m b/usr/src/pkg/manifests/system-fru-id-platform.p5m
index 1e173de45f..a2da60fbbb 100644
--- a/usr/src/pkg/manifests/system-fru-id-platform.p5m
+++ b/usr/src/pkg/manifests/system-fru-id-platform.p5m
@@ -189,8 +189,8 @@ $(sparc_ONLY)file path=usr/platform/sun4u/lib/picl/plugins/libpiclfrudata.so.1 \
group=sys
$(sparc_ONLY)dir path=usr/platform/sun4u/sbin
$(sparc_ONLY)file path=usr/platform/sun4u/sbin/fruadm group=sys mode=0755
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/fruadm.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/fruadm.8
$(i386_ONLY)legacy pkg=SUNWfruip.i arch=$(ARCH).i86pc \
desc="FRU ID platform data module and access library" \
name="FRU ID Platform Modules (Usr)"
diff --git a/usr/src/pkg/manifests/system-fru-id.p5m b/usr/src/pkg/manifests/system-fru-id.p5m
index a4759644d4..f8a86734dd 100644
--- a/usr/src/pkg/manifests/system-fru-id.p5m
+++ b/usr/src/pkg/manifests/system-fru-id.p5m
@@ -60,8 +60,8 @@ link path=usr/lib/libnvfru.so target=./libnvfru.so.1
file path=usr/lib/libnvfru.so.1
$(sparc_ONLY)dir path=usr/sbin
$(sparc_ONLY)file path=usr/sbin/prtfru mode=0755
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/prtfru.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/prtfru.8
legacy pkg=SUNWfruid desc="FRU ID prtfru command and libfru library" \
name="FRU ID Utility and Library (Usr)"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-header-header-audio.p5m b/usr/src/pkg/manifests/system-header-header-audio.p5m
index d68f8d29ba..98df48a497 100644
--- a/usr/src/pkg/manifests/system-header-header-audio.p5m
+++ b/usr/src/pkg/manifests/system-header-header-audio.p5m
@@ -45,8 +45,8 @@ file path=usr/include/sys/audioio.h
file path=usr/include/sys/mixer.h
file path=usr/include/sys/soundcard.h
dir path=usr/share/man
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/au.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/au.5
legacy pkg=SUNWaudh \
desc="SunOS C/C++ header files for audio drivers and applications" \
name="Audio Header Files"
diff --git a/usr/src/pkg/manifests/system-header.p5m b/usr/src/pkg/manifests/system-header.p5m
index e18093e96d..dc5c9d094b 100644
--- a/usr/src/pkg/manifests/system-header.p5m
+++ b/usr/src/pkg/manifests/system-header.p5m
@@ -2172,29 +2172,29 @@ link path=usr/share/man/man3head/wordexp.3head target=wordexp.h.3head
file path=usr/share/man/man3head/wordexp.h.3head
link path=usr/share/man/man3head/xlocale.3head target=xlocale.h.3head
file path=usr/share/man/man3head/xlocale.h.3head
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/note.4
+dir path=usr/share/man/man4i
+file path=usr/share/man/man4i/cdio.4i
+file path=usr/share/man/man4i/dkio.4i
+file path=usr/share/man/man4i/fbio.4i
+file path=usr/share/man/man4i/fdio.4i
+file path=usr/share/man/man4i/hdio.4i
+file path=usr/share/man/man4i/iec61883.4i
+file path=usr/share/man/man4i/mhd.4i
+file path=usr/share/man/man4i/mtio.4i
+file path=usr/share/man/man4i/prnio.4i
+file path=usr/share/man/man4i/quotactl.4i
+file path=usr/share/man/man4i/sesio.4i
+file path=usr/share/man/man4i/sockio.4i
+file path=usr/share/man/man4i/streamio.4i
+file path=usr/share/man/man4i/termio.4i
+file path=usr/share/man/man4i/termiox.4i
+file path=usr/share/man/man4i/uscsi.4i
+file path=usr/share/man/man4i/visual_io.4i
+file path=usr/share/man/man4i/vt.4i
dir path=usr/share/man/man5
-file path=usr/share/man/man5/prof.5
-dir path=usr/share/man/man7i
-file path=usr/share/man/man7i/cdio.7i
-file path=usr/share/man/man7i/dkio.7i
-file path=usr/share/man/man7i/fbio.7i
-file path=usr/share/man/man7i/fdio.7i
-file path=usr/share/man/man7i/hdio.7i
-file path=usr/share/man/man7i/iec61883.7i
-file path=usr/share/man/man7i/mhd.7i
-file path=usr/share/man/man7i/mtio.7i
-file path=usr/share/man/man7i/prnio.7i
-file path=usr/share/man/man7i/quotactl.7i
-file path=usr/share/man/man7i/sesio.7i
-file path=usr/share/man/man7i/sockio.7i
-file path=usr/share/man/man7i/streamio.7i
-file path=usr/share/man/man7i/termio.7i
-file path=usr/share/man/man7i/termiox.7i
-file path=usr/share/man/man7i/uscsi.7i
-file path=usr/share/man/man7i/visual_io.7i
-file path=usr/share/man/man7i/vt.7i
+file path=usr/share/man/man5/note.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/prof.7
dir path=usr/share/src group=sys
dir path=usr/share/src/uts
$(i386_ONLY)dir path=usr/share/src/uts/i86pc
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-dynamic-reconfiguration-sun-fire-880.p5m b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.p5m
index 41d057b8ab..e0d9a68877 100644
--- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.p5m
+++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.p5m
@@ -53,8 +53,8 @@ dir path=usr/platform/SUNW,Sun-Fire-V890 group=sys
dir path=usr/platform/SUNW,Sun-Fire-V890/lib
link path=usr/platform/SUNW,Sun-Fire-V890/lib/sf880drd \
target=../../SUNW,Sun-Fire-880/lib/sf880drd
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/sf880drd.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/sf880drd.8
legacy pkg=SUNWsfdr.u arch=$(ARCH).sun4u desc="Sun Fire 880 DR Daemon" \
name="Sun Fire 880 DR Daemon"
legacy pkg=SUNWsfdrr.u arch=$(ARCH).sun4u \
diff --git a/usr/src/pkg/manifests/system-kernel-platform.p5m b/usr/src/pkg/manifests/system-kernel-platform.p5m
index 094eb360db..f6380db53d 100644
--- a/usr/src/pkg/manifests/system-kernel-platform.p5m
+++ b/usr/src/pkg/manifests/system-kernel-platform.p5m
@@ -848,34 +848,34 @@ $(sparc_ONLY)dir path=platform/sun4v/kernel/sys group=sys
$(sparc_ONLY)dir path=platform/sun4v/kernel/sys/$(ARCH64) group=sys
$(sparc_ONLY)link path=platform/sun4v/kernel/unix target=$(ARCH64)/unix
$(sparc_ONLY)dir path=usr/share/man
-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/man7m
+$(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
+dir path=usr/share/man/man5
+$(i386_ONLY)link path=usr/share/man/man5/isa.5 target=sysbus.5
+$(sparc_ONLY)file path=usr/share/man/man5/sbus.5
+$(i386_ONLY)file path=usr/share/man/man5/sysbus.5
+$(sparc_ONLY)dir path=usr/share/man/man5m
$(sparc_ONLY)driver name=ac
$(i386_ONLY)driver name=acpinex alias=acpivirtnex
$(i386_ONLY)driver name=acpippm
diff --git a/usr/src/pkg/manifests/system-kernel-power.p5m b/usr/src/pkg/manifests/system-kernel-power.p5m
index 34fe2e82d3..f7c4f4b68f 100644
--- a/usr/src/pkg/manifests/system-kernel-power.p5m
+++ b/usr/src/pkg/manifests/system-kernel-power.p5m
@@ -63,13 +63,13 @@ file path=usr/sbin/pmconfig mode=4555
dir path=usr/share/man
dir path=usr/share/man/man1
file path=usr/share/man/man1/sys-suspend.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/pmconfig.1m
-file path=usr/share/man/man1m/powerd.1m
-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/man5
+file path=usr/share/man/man5/power.conf.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/pmconfig.8
+file path=usr/share/man/man8/powerd.8
driver name=pm perms="* 0666 root sys"
legacy pkg=SUNWpmr desc="Power Management config file and rc script" \
name="Power Management config file and rc script"
diff --git a/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m b/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m
index 28e0fae6f7..5469230ad8 100644
--- a/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m
+++ b/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m
@@ -58,8 +58,8 @@ $(sparc_ONLY)dir path=platform/sun4u/kernel/misc/$(ARCH64) group=sys
$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/cpr group=sys \
mode=0755
dir path=usr/share/man
-dir path=usr/share/man/man7
-file path=usr/share/man/man7/cpr.7
+dir path=usr/share/man/man4
+file path=usr/share/man/man4/cpr.4
$(i386_ONLY)driver name=srn
$(i386_ONLY)legacy pkg=SUNWcpr.i arch=$(ARCH).i86pc \
desc="Suspend, Resume package" name="Suspend, Resume package"
diff --git a/usr/src/pkg/manifests/system-kernel.man4.inc b/usr/src/pkg/manifests/system-kernel.man4.inc
index 6aee43bcb1..185f5a8164 100644
--- a/usr/src/pkg/manifests/system-kernel.man4.inc
+++ b/usr/src/pkg/manifests/system-kernel.man4.inc
@@ -14,18 +14,5 @@
# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
#
-file path=usr/share/man/man4/cardbus.4
-link path=usr/share/man/man4/dir.4 target=dir_ufs.4
-file path=usr/share/man/man4/dir_ufs.4
-file path=usr/share/man/man4/driver.conf.4
-file path=usr/share/man/man4/pci.4
-link path=usr/share/man/man4/pcie.4 target=pci.4
-file path=usr/share/man/man4/priv_names.4
-file path=usr/share/man/man4/proc.4
-file path=usr/share/man/man4/process.4
-file path=usr/share/man/man4/pseudo.4
-file path=usr/share/man/man4/scsi.4
-file path=usr/share/man/man4/sock2path.d.4
-file path=usr/share/man/man4/system.4
-file path=usr/share/man/man4/tnf_kernel_probes.4
-file path=usr/share/man/man4/ts_dptbl.4
+file path=usr/share/man/man4/Intro.4
+link path=usr/share/man/man4/intro.4 target=Intro.4
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.man4fs.inc b/usr/src/pkg/manifests/system-kernel.man4fs.inc
new file mode 100644
index 0000000000..904d4e913c
--- /dev/null
+++ b/usr/src/pkg/manifests/system-kernel.man4fs.inc
@@ -0,0 +1,31 @@
+#
+# 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 2012 Nexenta Systems, Inc. All rights reserved.
+#
+
+file path=usr/share/man/man4fs/bootfs.4fs
+file path=usr/share/man/man4fs/ctfs.4fs
+file path=usr/share/man/man4fs/dcfs.4fs
+file path=usr/share/man/man4fs/dev.4fs
+file path=usr/share/man/man4fs/devfs.4fs
+file path=usr/share/man/man4fs/fd.4fs
+file path=usr/share/man/man4fs/hsfs.4fs
+file path=usr/share/man/man4fs/lofs.4fs
+file path=usr/share/man/man4fs/objfs.4fs
+file path=usr/share/man/man4fs/sharefs.4fs
+link path=usr/share/man/man4fs/stderr.4fs target=fd.4fs
+link path=usr/share/man/man4fs/stdin.4fs target=fd.4fs
+link path=usr/share/man/man4fs/stdout.4fs target=fd.4fs
+file path=usr/share/man/man4fs/tmpfs.4fs
+file path=usr/share/man/man4fs/ufs.4fs
diff --git a/usr/src/pkg/manifests/system-kernel.man4m.inc b/usr/src/pkg/manifests/system-kernel.man4m.inc
new file mode 100644
index 0000000000..70d284e344
--- /dev/null
+++ b/usr/src/pkg/manifests/system-kernel.man4m.inc
@@ -0,0 +1,32 @@
+#
+# 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 2012 Nexenta Systems, Inc. All rights reserved.
+#
+
+file path=usr/share/man/man4m/bufmod.4m
+file path=usr/share/man/man4m/connld.4m
+file path=usr/share/man/man4m/ldterm.4m
+file path=usr/share/man/man4m/pckt.4m
+file path=usr/share/man/man4m/pfmod.4m
+file path=usr/share/man/man4m/pipemod.4m
+file path=usr/share/man/man4m/ptem.4m
+file path=usr/share/man/man4m/timod.4m
+file path=usr/share/man/man4m/tirdwr.4m
+file path=usr/share/man/man4m/ttcompat.4m
+link path=usr/share/man/man4m/vuid2ps2.4m target=vuidmice.4m
+link path=usr/share/man/man4m/vuid3ps2.4m target=vuidmice.4m
+link path=usr/share/man/man4m/vuidm3p.4m target=vuidmice.4m
+link path=usr/share/man/man4m/vuidm4p.4m target=vuidmice.4m
+link path=usr/share/man/man4m/vuidm5p.4m target=vuidmice.4m
+file path=usr/share/man/man4m/vuidmice.4m
diff --git a/usr/src/pkg/manifests/system-kernel.man4p.inc b/usr/src/pkg/manifests/system-kernel.man4p.inc
new file mode 100644
index 0000000000..5a4a6dce90
--- /dev/null
+++ b/usr/src/pkg/manifests/system-kernel.man4p.inc
@@ -0,0 +1,45 @@
+#
+# 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 2012 Nexenta Systems, Inc. All rights reserved.
+#
+
+link path=usr/share/man/man4p/AH.4p target=ipsecah.4p
+link path=usr/share/man/man4p/ARP.4p target=arp.4p
+link path=usr/share/man/man4p/ESP.4p target=ipsecesp.4p
+link path=usr/share/man/man4p/ICMP.4p target=icmp.4p
+link path=usr/share/man/man4p/IP.4p target=ip.4p
+link path=usr/share/man/man4p/NDP.4p target=ndp.4p
+link path=usr/share/man/man4p/SCTP.4p target=sctp.4p
+link path=usr/share/man/man4p/TCP.4p target=tcp.4p
+link path=usr/share/man/man4p/UDP.4p target=udp.4p
+file path=usr/share/man/man4p/arp.4p
+file path=usr/share/man/man4p/dlpi.4p
+file path=usr/share/man/man4p/icmp.4p
+file path=usr/share/man/man4p/icmp6.4p
+link path=usr/share/man/man4p/if.4p target=if_tcp.4p
+file path=usr/share/man/man4p/if_tcp.4p
+file path=usr/share/man/man4p/inet.4p
+file path=usr/share/man/man4p/inet6.4p
+file path=usr/share/man/man4p/ip.4p
+file path=usr/share/man/man4p/ip6.4p
+file path=usr/share/man/man4p/ipsec.4p
+file path=usr/share/man/man4p/ipsecah.4p
+file path=usr/share/man/man4p/ipsecesp.4p
+file path=usr/share/man/man4p/ndp.4p
+file path=usr/share/man/man4p/pf_key.4p
+file path=usr/share/man/man4p/route.4p
+file path=usr/share/man/man4p/routing.4p
+file path=usr/share/man/man4p/sctp.4p
+file path=usr/share/man/man4p/tcp.4p
+file path=usr/share/man/man4p/udp.4p
diff --git a/usr/src/pkg/manifests/system-kernel.man5.inc b/usr/src/pkg/manifests/system-kernel.man5.inc
index 090344a9c3..695417c8fc 100644
--- a/usr/src/pkg/manifests/system-kernel.man5.inc
+++ b/usr/src/pkg/manifests/system-kernel.man5.inc
@@ -9,10 +9,23 @@
# at http://www.illumos.org/license/CDDL.
#
+#
# Copyright 2011, Richard Lowe
-# Copyright 2014 Garrett D'Amore <garrett@damore.org>
+# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+#
-file path=usr/share/man/man5/epoll.5
-file path=usr/share/man/man5/fsattr.5
-file path=usr/share/man/man5/ieee802.11.5
-file path=usr/share/man/man5/ieee802.3.5
+file path=usr/share/man/man5/cardbus.5
+link path=usr/share/man/man5/dir.5 target=dir_ufs.5
+file path=usr/share/man/man5/dir_ufs.5
+file path=usr/share/man/man5/driver.conf.5
+file path=usr/share/man/man5/pci.5
+link path=usr/share/man/man5/pcie.5 target=pci.5
+file path=usr/share/man/man5/priv_names.5
+file path=usr/share/man/man5/proc.5
+file path=usr/share/man/man5/process.5
+file path=usr/share/man/man5/pseudo.5
+file path=usr/share/man/man5/scsi.5
+file path=usr/share/man/man5/sock2path.d.5
+file path=usr/share/man/man5/system.5
+file path=usr/share/man/man5/tnf_kernel_probes.5
+file path=usr/share/man/man5/ts_dptbl.5
diff --git a/usr/src/pkg/manifests/system-kernel.man7.inc b/usr/src/pkg/manifests/system-kernel.man7.inc
index 64d5ee6f24..ca2226004a 100644
--- a/usr/src/pkg/manifests/system-kernel.man7.inc
+++ b/usr/src/pkg/manifests/system-kernel.man7.inc
@@ -9,10 +9,10 @@
# at http://www.illumos.org/license/CDDL.
#
-#
# Copyright 2011, Richard Lowe
-# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
-#
+# Copyright 2014 Garrett D'Amore <garrett@damore.org>
-file path=usr/share/man/man7/Intro.7
-link path=usr/share/man/man7/intro.7 target=Intro.7
+file path=usr/share/man/man7/epoll.7
+file path=usr/share/man/man7/fsattr.7
+file path=usr/share/man/man7/ieee802.11.7
+file path=usr/share/man/man7/ieee802.3.7
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.man7fs.inc b/usr/src/pkg/manifests/system-kernel.man7fs.inc
deleted file mode 100644
index c11e5f486f..0000000000
--- a/usr/src/pkg/manifests/system-kernel.man7fs.inc
+++ /dev/null
@@ -1,31 +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 2012 Nexenta Systems, Inc. All rights reserved.
-#
-
-file path=usr/share/man/man7fs/bootfs.7fs
-file path=usr/share/man/man7fs/ctfs.7fs
-file path=usr/share/man/man7fs/dcfs.7fs
-file path=usr/share/man/man7fs/dev.7fs
-file path=usr/share/man/man7fs/devfs.7fs
-file path=usr/share/man/man7fs/fd.7fs
-file path=usr/share/man/man7fs/hsfs.7fs
-file path=usr/share/man/man7fs/lofs.7fs
-file path=usr/share/man/man7fs/objfs.7fs
-file path=usr/share/man/man7fs/sharefs.7fs
-link path=usr/share/man/man7fs/stderr.7fs target=fd.7fs
-link path=usr/share/man/man7fs/stdin.7fs target=fd.7fs
-link path=usr/share/man/man7fs/stdout.7fs target=fd.7fs
-file path=usr/share/man/man7fs/tmpfs.7fs
-file path=usr/share/man/man7fs/ufs.7fs
diff --git a/usr/src/pkg/manifests/system-kernel.man7m.inc b/usr/src/pkg/manifests/system-kernel.man7m.inc
deleted file mode 100644
index d000b8418c..0000000000
--- a/usr/src/pkg/manifests/system-kernel.man7m.inc
+++ /dev/null
@@ -1,32 +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 2012 Nexenta Systems, Inc. All rights reserved.
-#
-
-file path=usr/share/man/man7m/bufmod.7m
-file path=usr/share/man/man7m/connld.7m
-file path=usr/share/man/man7m/ldterm.7m
-file path=usr/share/man/man7m/pckt.7m
-file path=usr/share/man/man7m/pfmod.7m
-file path=usr/share/man/man7m/pipemod.7m
-file path=usr/share/man/man7m/ptem.7m
-file path=usr/share/man/man7m/timod.7m
-file path=usr/share/man/man7m/tirdwr.7m
-file path=usr/share/man/man7m/ttcompat.7m
-link path=usr/share/man/man7m/vuid2ps2.7m target=vuidmice.7m
-link path=usr/share/man/man7m/vuid3ps2.7m target=vuidmice.7m
-link path=usr/share/man/man7m/vuidm3p.7m target=vuidmice.7m
-link path=usr/share/man/man7m/vuidm4p.7m target=vuidmice.7m
-link path=usr/share/man/man7m/vuidm5p.7m target=vuidmice.7m
-file path=usr/share/man/man7m/vuidmice.7m
diff --git a/usr/src/pkg/manifests/system-kernel.man7p.inc b/usr/src/pkg/manifests/system-kernel.man7p.inc
deleted file mode 100644
index e636c8cd96..0000000000
--- a/usr/src/pkg/manifests/system-kernel.man7p.inc
+++ /dev/null
@@ -1,45 +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 2012 Nexenta Systems, Inc. All rights reserved.
-#
-
-link path=usr/share/man/man7p/AH.7p target=ipsecah.7p
-link path=usr/share/man/man7p/ARP.7p target=arp.7p
-link path=usr/share/man/man7p/ESP.7p target=ipsecesp.7p
-link path=usr/share/man/man7p/ICMP.7p target=icmp.7p
-link path=usr/share/man/man7p/IP.7p target=ip.7p
-link path=usr/share/man/man7p/NDP.7p target=ndp.7p
-link path=usr/share/man/man7p/SCTP.7p target=sctp.7p
-link path=usr/share/man/man7p/TCP.7p target=tcp.7p
-link path=usr/share/man/man7p/UDP.7p target=udp.7p
-file path=usr/share/man/man7p/arp.7p
-file path=usr/share/man/man7p/dlpi.7p
-file path=usr/share/man/man7p/icmp.7p
-file path=usr/share/man/man7p/icmp6.7p
-link path=usr/share/man/man7p/if.7p target=if_tcp.7p
-file path=usr/share/man/man7p/if_tcp.7p
-file path=usr/share/man/man7p/inet.7p
-file path=usr/share/man/man7p/inet6.7p
-file path=usr/share/man/man7p/ip.7p
-file path=usr/share/man/man7p/ip6.7p
-file path=usr/share/man/man7p/ipsec.7p
-file path=usr/share/man/man7p/ipsecah.7p
-file path=usr/share/man/man7p/ipsecesp.7p
-file path=usr/share/man/man7p/ndp.7p
-file path=usr/share/man/man7p/pf_key.7p
-file path=usr/share/man/man7p/route.7p
-file path=usr/share/man/man7p/routing.7p
-file path=usr/share/man/man7p/sctp.7p
-file path=usr/share/man/man7p/tcp.7p
-file path=usr/share/man/man7p/udp.7p
diff --git a/usr/src/pkg/manifests/system-library.man4.inc b/usr/src/pkg/manifests/system-kernel.man8.inc
index e9e72778ac..efaa533c68 100644
--- a/usr/src/pkg/manifests/system-library.man4.inc
+++ b/usr/src/pkg/manifests/system-kernel.man8.inc
@@ -11,5 +11,6 @@
# Copyright 2011, Richard Lowe
-file path=usr/share/man/man4/nss.4
-file path=usr/share/man/man4/resolv.conf.4
+file path=usr/share/man/man8/boot.8
+file path=usr/share/man/man8/kadb.8
+file path=usr/share/man/man8/kernel.8
diff --git a/usr/src/pkg/manifests/system-kernel.p5m b/usr/src/pkg/manifests/system-kernel.p5m
index 375e5ecc76..ad90b0329a 100644
--- a/usr/src/pkg/manifests/system-kernel.p5m
+++ b/usr/src/pkg/manifests/system-kernel.p5m
@@ -37,15 +37,15 @@
# information about overriding the defaults.
#
<include global_zone_only_component>
-<include system-kernel.man1m.inc>
<include system-kernel.man2.inc>
<include system-kernel.man4.inc>
+<include system-kernel.man4d.inc>
+<include system-kernel.man4fs.inc>
+<include system-kernel.man4m.inc>
+<include system-kernel.man4p.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>
+<include system-kernel.man8.inc>
<include system-kernel.man9.inc>
<include system-kernel.man9e.inc>
<include system-kernel.man9f.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
@@ -472,19 +472,19 @@ dir path=usr/kernel/drv/$(ARCH64) group=sys
file path=usr/kernel/drv/$(ARCH64)/signalfd group=sys
file path=usr/kernel/drv/signalfd.conf group=sys
dir path=usr/share/man
-dir path=usr/share/man/man1m
-$(sparc_ONLY)file path=usr/share/man/man1m/monitor.1m
-$(sparc_ONLY)file path=usr/share/man/man1m/obpsym.1m
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/man4fs
+dir path=usr/share/man/man4m
+dir path=usr/share/man/man4p
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
+dir path=usr/share/man/man8
+$(sparc_ONLY)file path=usr/share/man/man8/monitor.8
+$(sparc_ONLY)file path=usr/share/man/man8/obpsym.8
dir path=usr/share/man/man9
dir path=usr/share/man/man9e
dir path=usr/share/man/man9f
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-ldoms.p5m b/usr/src/pkg/manifests/system-ldoms.p5m
index 5b5fc0e2c0..ff5baafb62 100644
--- a/usr/src/pkg/manifests/system-ldoms.p5m
+++ b/usr/src/pkg/manifests/system-ldoms.p5m
@@ -89,10 +89,10 @@ file path=usr/lib/libpri.so.1
dir path=usr/lib/rcm
dir path=usr/lib/rcm/scripts
file path=usr/lib/rcm/scripts/SUNW,vdevices.pl mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/drd.1m
-file path=usr/share/man/man1m/ldmad.1m
-file path=usr/share/man/man1m/vntsd.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/drd.8
+file path=usr/share/man/man8/ldmad.8
+file path=usr/share/man/man8/vntsd.8
driver name=cnex alias=SUNW,sun4v-channel-devices
driver name=drctl
driver name=ds_pri
diff --git a/usr/src/pkg/manifests/system-library-platform.p5m b/usr/src/pkg/manifests/system-library-platform.p5m
index 09c449c977..9e05b15766 100644
--- a/usr/src/pkg/manifests/system-library-platform.p5m
+++ b/usr/src/pkg/manifests/system-library-platform.p5m
@@ -479,11 +479,11 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/libtsalarm.so.1
$(sparc_ONLY)dir path=usr/platform/sun4v/sbin
$(sparc_ONLY)file path=usr/platform/sun4v/sbin/device_remap mode=0544
$(sparc_ONLY)file path=usr/platform/sun4v/sbin/prtdiag group=sys mode=2755
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/device_remap.1m
-file path=usr/share/man/man1m/scadm.1m
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libtsalarm.3lib
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/device_remap.8
+file path=usr/share/man/man8/scadm.8
$(i386_ONLY)legacy pkg=SUNWkvm.i arch=$(ARCH).i86pc \
desc="core software for a specific hardware platform group" \
name="Core Architecture, (Kvm)"
diff --git a/usr/src/pkg/manifests/system-library-policykit.p5m b/usr/src/pkg/manifests/system-library-policykit.p5m
index 7f8f3fc062..691daa70bb 100644
--- a/usr/src/pkg/manifests/system-library-policykit.p5m
+++ b/usr/src/pkg/manifests/system-library-policykit.p5m
@@ -40,8 +40,8 @@ dir path=usr/lib/pkgconfig group=other
file path=usr/lib/pkgconfig/polkit.pc
dir path=usr/sbin
file path=usr/sbin/polkit-is-privileged mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/polkit-is-privileged.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/polkit-is-privileged.8
legacy pkg=SUNWpolkit \
desc="Toolkit for controlling privileges (freedesktop.org)" name=PolicyKit
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-library-security-gss-spnego.p5m b/usr/src/pkg/manifests/system-library-security-gss-spnego.p5m
index 549102adc5..3bfc85ed8d 100644
--- a/usr/src/pkg/manifests/system-library-security-gss-spnego.p5m
+++ b/usr/src/pkg/manifests/system-library-security-gss-spnego.p5m
@@ -36,8 +36,8 @@ file path=usr/lib/$(ARCH64)/gss/mech_spnego.so.1
dir path=usr/lib/gss
file path=usr/lib/gss/mech_spnego.so.1
dir path=usr/share/man
-dir path=usr/share/man/man5
-file path=usr/share/man/man5/mech_spnego.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/mech_spnego.7
legacy pkg=SUNWspnego desc="SPNEGO GSS-API Mechanism" \
name="SPNEGO GSS-API Mechanism"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-library-security-gss.p5m b/usr/src/pkg/manifests/system-library-security-gss.p5m
index 6d21f3ec7b..2edb624a58 100644
--- a/usr/src/pkg/manifests/system-library-security-gss.p5m
+++ b/usr/src/pkg/manifests/system-library-security-gss.p5m
@@ -46,9 +46,6 @@ file path=usr/lib/sasl/$(ARCH64)/gssapi.so.1
file path=usr/lib/sasl/gssapi.so.1
dir path=usr/sbin
file path=usr/sbin/gsscred group=sys mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/gsscred.1m
-file path=usr/share/man/man1m/gssd.1m
dir path=usr/share/man/man3gss
file path=usr/share/man/man3gss/gss_accept_sec_context.3gss
file path=usr/share/man/man3gss/gss_acquire_cred.3gss
@@ -90,6 +87,9 @@ file path=usr/share/man/man3gss/gss_wrap.3gss
file path=usr/share/man/man3gss/gss_wrap_size_limit.3gss
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libgss.3lib
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/gsscred.8
+file path=usr/share/man/man8/gssd.8
legacy pkg=SUNWgss \
desc="Generic Security Service Application Program Interface, Version 2 - user" \
name="GSSAPI V2"
diff --git a/usr/src/pkg/manifests/system-library-security-libsasl.p5m b/usr/src/pkg/manifests/system-library-security-libsasl.p5m
index e27beaec54..7e7105d011 100644
--- a/usr/src/pkg/manifests/system-library-security-libsasl.p5m
+++ b/usr/src/pkg/manifests/system-library-security-libsasl.p5m
@@ -118,8 +118,8 @@ file path=usr/share/man/man3sasl/sasl_setprop.3sasl
file path=usr/share/man/man3sasl/sasl_utf8verify.3sasl
file path=usr/share/man/man3sasl/sasl_verifyfile_t.3sasl
file path=usr/share/man/man3sasl/sasl_version.3sasl
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/sasl_appname.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/sasl_appname.conf.5
legacy pkg=SUNWlibsasl \
desc="Simple Authentication and Security Layer (SASL) v2 shared library and plugins" \
name="Simple Authentication and Security Layer (SASL) v2 shared library and plugins"
diff --git a/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.p5m b/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.p5m
index 905c4bce61..2438023d6d 100644
--- a/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.p5m
+++ b/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.p5m
@@ -43,8 +43,8 @@ file path=usr/lib/$(ARCH64)/libHBAAPI.so.1
link path=usr/lib/libHBAAPI.so target=libHBAAPI.so.1
file path=usr/lib/libHBAAPI.so.1
dir path=usr/share/man
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/hba.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/hba.conf.5
legacy pkg=SUNWcfcl \
desc="Common Fibre Channel HBA API Library based on the T11 FC-MI specification" \
name="Common Fibre Channel HBA API Library (Usr)"
diff --git a/usr/src/pkg/manifests/system-library-storage-libmpapi.p5m b/usr/src/pkg/manifests/system-library-storage-libmpapi.p5m
index f20dc0e2d6..2bb3d3d821 100644
--- a/usr/src/pkg/manifests/system-library-storage-libmpapi.p5m
+++ b/usr/src/pkg/manifests/system-library-storage-libmpapi.p5m
@@ -94,8 +94,8 @@ file path=usr/share/man/man3mpapi/MP_SetProbingPollingRate.3mpapi
file path=usr/share/man/man3mpapi/MP_SetProprietaryProperties.3mpapi
file path=usr/share/man/man3mpapi/MP_SetTPGAccess.3mpapi
file path=usr/share/man/man3mpapi/Sun_MP_SendScsiCmd.3mpapi
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/mpapi.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/mpapi.conf.5
legacy pkg=SUNWmpapi desc="Common Library based on SNIA MP API specification" \
name="SNIA Multipath Management API Common Library"
legacy pkg=SUNWmpapir \
diff --git a/usr/src/pkg/manifests/system-library.man7p.inc b/usr/src/pkg/manifests/system-library.man4p.inc
index 410c3307c7..27ae3383ca 100644
--- a/usr/src/pkg/manifests/system-library.man7p.inc
+++ b/usr/src/pkg/manifests/system-library.man4p.inc
@@ -11,4 +11,4 @@
# Copyright 2011, Richard Lowe
-file path=usr/share/man/man7p/sip.7p
+file path=usr/share/man/man4p/sip.4p
diff --git a/usr/src/pkg/manifests/system-library.man5.inc b/usr/src/pkg/manifests/system-library.man5.inc
index 25f7ae96a1..e30abf7fe9 100644
--- a/usr/src/pkg/manifests/system-library.man5.inc
+++ b/usr/src/pkg/manifests/system-library.man5.inc
@@ -9,63 +9,7 @@
# at http://www.illumos.org/license/CDDL.
#
-#
# Copyright 2011, Richard Lowe
-# Copyright 2014 Nexenta Systems, Inc.
-#
-link path=usr/share/man/man5/advance.5 target=regexp.5
-file path=usr/share/man/man5/audit_binfile.5
-file path=usr/share/man/man5/audit_remote.5
-file path=usr/share/man/man5/audit_syslog.5
-file path=usr/share/man/man5/byteorder.5
-file path=usr/share/man/man5/cancellation.5
-file path=usr/share/man/man5/charmap.5
-link path=usr/share/man/man5/compile.5 target=regexp.5
-file path=usr/share/man/man5/condition.5
-file path=usr/share/man/man5/crypt_bsdbf.5
-file path=usr/share/man/man5/crypt_bsdmd5.5
-file path=usr/share/man/man5/crypt_sha256.5
-file path=usr/share/man/man5/crypt_sha512.5
-file path=usr/share/man/man5/crypt_sunmd5.5
-file path=usr/share/man/man5/crypt_unix.5
-link path=usr/share/man/man5/endian.5 target=byteorder.5
-file path=usr/share/man/man5/environ.5
-file path=usr/share/man/man5/eventfd.5
-file path=usr/share/man/man5/extendedFILE.5
-file path=usr/share/man/man5/fnmatch.5
-file path=usr/share/man/man5/isalist.5
-file path=usr/share/man/man5/largefile.5
-file path=usr/share/man/man5/lf64.5
-file path=usr/share/man/man5/lfcompile.5
-file path=usr/share/man/man5/lfcompile64.5
-file path=usr/share/man/man5/locale.5
-file path=usr/share/man/man5/mutex.5
-file path=usr/share/man/man5/pam_allow.5
-file path=usr/share/man/man5/pam_authtok_check.5
-file path=usr/share/man/man5/pam_authtok_get.5
-file path=usr/share/man/man5/pam_authtok_store.5
-file path=usr/share/man/man5/pam_deny.5
-file path=usr/share/man/man5/pam_dhkeys.5
-file path=usr/share/man/man5/pam_dial_auth.5
-file path=usr/share/man/man5/pam_ldap.5
-file path=usr/share/man/man5/pam_list.5
-file path=usr/share/man/man5/pam_passwd_auth.5
-file path=usr/share/man/man5/pam_rhosts_auth.5
-file path=usr/share/man/man5/pam_roles.5
-file path=usr/share/man/man5/pam_sample.5
-file path=usr/share/man/man5/pam_timestamp.5
-file path=usr/share/man/man5/pam_tsol_account.5
-file path=usr/share/man/man5/pam_unix_account.5
-file path=usr/share/man/man5/pam_unix_auth.5
-file path=usr/share/man/man5/pam_unix_cred.5
-file path=usr/share/man/man5/pam_unix_session.5
-file path=usr/share/man/man5/pkcs11_kernel.5
-file path=usr/share/man/man5/pkcs11_softtoken.5
-file path=usr/share/man/man5/pkcs11_tpm.5
-link path=usr/share/man/man5/pthreads.5 target=threads.5
-file path=usr/share/man/man5/regex.5
-file path=usr/share/man/man5/regexp.5
-link path=usr/share/man/man5/step.5 target=regexp.5
-file path=usr/share/man/man5/threads.5
-file path=usr/share/man/man5/timerfd.5
+file path=usr/share/man/man5/nss.5
+file path=usr/share/man/man5/resolv.conf.5
diff --git a/usr/src/pkg/manifests/system-library.man7.inc b/usr/src/pkg/manifests/system-library.man7.inc
new file mode 100644
index 0000000000..fd0cbaca66
--- /dev/null
+++ b/usr/src/pkg/manifests/system-library.man7.inc
@@ -0,0 +1,71 @@
+#
+# 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 2014 Nexenta Systems, Inc.
+#
+
+link path=usr/share/man/man7/advance.7 target=regexp.7
+file path=usr/share/man/man7/audit_binfile.7
+file path=usr/share/man/man7/audit_remote.7
+file path=usr/share/man/man7/audit_syslog.7
+file path=usr/share/man/man7/byteorder.7
+file path=usr/share/man/man7/cancellation.7
+file path=usr/share/man/man7/charmap.7
+link path=usr/share/man/man7/compile.7 target=regexp.7
+file path=usr/share/man/man7/condition.7
+file path=usr/share/man/man7/crypt_bsdbf.7
+file path=usr/share/man/man7/crypt_bsdmd5.7
+file path=usr/share/man/man7/crypt_sha256.7
+file path=usr/share/man/man7/crypt_sha512.7
+file path=usr/share/man/man7/crypt_sunmd5.7
+file path=usr/share/man/man7/crypt_unix.7
+link path=usr/share/man/man7/endian.7 target=byteorder.7
+file path=usr/share/man/man7/environ.7
+file path=usr/share/man/man7/eventfd.7
+file path=usr/share/man/man7/extendedFILE.7
+file path=usr/share/man/man7/fnmatch.7
+file path=usr/share/man/man7/isalist.7
+file path=usr/share/man/man7/largefile.7
+file path=usr/share/man/man7/lf64.7
+file path=usr/share/man/man7/lfcompile.7
+file path=usr/share/man/man7/lfcompile64.7
+file path=usr/share/man/man7/locale.7
+file path=usr/share/man/man7/mutex.7
+file path=usr/share/man/man7/pam_allow.7
+file path=usr/share/man/man7/pam_authtok_check.7
+file path=usr/share/man/man7/pam_authtok_get.7
+file path=usr/share/man/man7/pam_authtok_store.7
+file path=usr/share/man/man7/pam_deny.7
+file path=usr/share/man/man7/pam_dhkeys.7
+file path=usr/share/man/man7/pam_dial_auth.7
+file path=usr/share/man/man7/pam_ldap.7
+file path=usr/share/man/man7/pam_list.7
+file path=usr/share/man/man7/pam_passwd_auth.7
+file path=usr/share/man/man7/pam_rhosts_auth.7
+file path=usr/share/man/man7/pam_roles.7
+file path=usr/share/man/man7/pam_sample.7
+file path=usr/share/man/man7/pam_timestamp.7
+file path=usr/share/man/man7/pam_tsol_account.7
+file path=usr/share/man/man7/pam_unix_account.7
+file path=usr/share/man/man7/pam_unix_auth.7
+file path=usr/share/man/man7/pam_unix_cred.7
+file path=usr/share/man/man7/pam_unix_session.7
+file path=usr/share/man/man7/pkcs11_kernel.7
+file path=usr/share/man/man7/pkcs11_softtoken.7
+file path=usr/share/man/man7/pkcs11_tpm.7
+link path=usr/share/man/man7/pthreads.7 target=threads.7
+file path=usr/share/man/man7/regex.7
+file path=usr/share/man/man7/regexp.7
+link path=usr/share/man/man7/step.7 target=regexp.7
+file path=usr/share/man/man7/threads.7
+file path=usr/share/man/man7/timerfd.7
diff --git a/usr/src/pkg/manifests/system-library.p5m b/usr/src/pkg/manifests/system-library.p5m
index c133104787..9474855821 100644
--- a/usr/src/pkg/manifests/system-library.p5m
+++ b/usr/src/pkg/manifests/system-library.p5m
@@ -73,9 +73,9 @@
<include system-library.man3volmgt.inc>
<include system-library.man3xcurses.inc>
<include system-library.man3xnet.inc>
-<include system-library.man4.inc>
+<include system-library.man4p.inc>
<include system-library.man5.inc>
-<include system-library.man7p.inc>
+<include system-library.man7.inc>
set name=pkg.fmri value=pkg:/system/library@$(PKGVERS)
set name=pkg.summary value="Core Solaris, (Shared Libs)"
set name=pkg.description \
@@ -1223,8 +1223,8 @@ dir path=usr/share/man/man3uuid
dir path=usr/share/man/man3volmgt
dir path=usr/share/man/man3xcurses
dir path=usr/share/man/man3xnet
+dir path=usr/share/man/man4p
dir path=usr/share/man/man5
-dir path=usr/share/man/man7p
dir path=usr/xpg4
dir path=usr/xpg4/lib
dir path=usr/xpg4/lib/$(ARCH64)
diff --git a/usr/src/pkg/manifests/system-man.p5m b/usr/src/pkg/manifests/system-man.p5m
index 83f8dba15a..bf90842710 100644
--- a/usr/src/pkg/manifests/system-man.p5m
+++ b/usr/src/pkg/manifests/system-man.p5m
@@ -43,15 +43,15 @@ file path=usr/share/man/man1/apropos.1
file path=usr/share/man/man1/man.1
file path=usr/share/man/man1/mandoc.1
link path=usr/share/man/man1/whatis.1 target=apropos.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/catman.1m
-dir path=usr/share/man/man5
-file path=usr/share/man/man5/eqn.5
-file path=usr/share/man/man5/man.5
-file path=usr/share/man/man5/mandoc_char.5
-file path=usr/share/man/man5/mandoc_roff.5
-file path=usr/share/man/man5/mdoc.5
-file path=usr/share/man/man5/tbl.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/eqn.7
+file path=usr/share/man/man7/man.7
+file path=usr/share/man/man7/mandoc_char.7
+file path=usr/share/man/man7/mandoc_roff.7
+file path=usr/share/man/man7/mdoc.7
+file path=usr/share/man/man7/tbl.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/catman.8
license lic_CDDL license=lic_CDDL
license usr/src/cmd/man/THIRDPARTYLICENSE \
license=usr/src/cmd/man/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/system-management-pcitool.p5m b/usr/src/pkg/manifests/system-management-pcitool.p5m
index 94987d567b..24b53d27aa 100644
--- a/usr/src/pkg/manifests/system-management-pcitool.p5m
+++ b/usr/src/pkg/manifests/system-management-pcitool.p5m
@@ -41,8 +41,8 @@ dir path=usr/sbin
file path=usr/sbin/pcitool mode=0555
dir path=usr/share
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/pcitool.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/pcitool.8
legacy pkg=SUNWio-tools \
desc="Administrative tools to modify the pci/pcie fabric" \
name="Administrative tools to modify the pci/pcie fabric"
diff --git a/usr/src/pkg/manifests/system-monitoring-arcstat.p5m b/usr/src/pkg/manifests/system-monitoring-arcstat.p5m
index 44b0ef87b0..bf0fa2c6a1 100644
--- a/usr/src/pkg/manifests/system-monitoring-arcstat.p5m
+++ b/usr/src/pkg/manifests/system-monitoring-arcstat.p5m
@@ -22,6 +22,6 @@ dir path=usr/bin
file path=usr/bin/arcstat mode=0555
dir path=usr/share
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/arcstat.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/arcstat.8
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-network-http-cache-accelerator.p5m b/usr/src/pkg/manifests/system-network-http-cache-accelerator.p5m
index e2b1c6e355..d91d4af8f3 100644
--- a/usr/src/pkg/manifests/system-network-http-cache-accelerator.p5m
+++ b/usr/src/pkg/manifests/system-network-http-cache-accelerator.p5m
@@ -89,14 +89,14 @@ file path=usr/share/man/man1/nca.1
file path=usr/share/man/man1/ncab2clf.1
file path=usr/share/man/man1/ncakmod.1
link path=usr/share/man/man1/snca.1 target=nca.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/ncaconfd.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/nca.if.4
-file path=usr/share/man/man4/ncad_addr.4
-file path=usr/share/man/man4/ncakmod.conf.4
-file path=usr/share/man/man4/ncalogd.conf.4
-file path=usr/share/man/man4/ncaport.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/nca.if.5
+file path=usr/share/man/man5/ncad_addr.5
+file path=usr/share/man/man5/ncakmod.conf.5
+file path=usr/share/man/man5/ncalogd.conf.5
+file path=usr/share/man/man5/ncaport.conf.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/ncaconfd.8
driver name=nca
legacy pkg=SUNWncar \
desc="core components to enable the network cache and accelerator" \
diff --git a/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.p5m b/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.p5m
index e34f200ffc..13bcb2657f 100644
--- a/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.p5m
+++ b/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.p5m
@@ -48,14 +48,14 @@ file path=kernel/ipp/$(ARCH64)/flowacct group=sys mode=0755
file path=kernel/ipp/$(ARCH64)/tokenmt group=sys mode=0755
file path=kernel/ipp/$(ARCH64)/tswtclmt group=sys mode=0755
dir path=usr/share/man
-dir path=usr/share/man/man7ipp
-file path=usr/share/man/man7ipp/dlcosmk.7ipp
-file path=usr/share/man/man7ipp/dscpmk.7ipp
-file path=usr/share/man/man7ipp/flowacct.7ipp
-file path=usr/share/man/man7ipp/ipgpc.7ipp
-file path=usr/share/man/man7ipp/ipqos.7ipp
-file path=usr/share/man/man7ipp/tokenmt.7ipp
-file path=usr/share/man/man7ipp/tswtclmt.7ipp
+dir path=usr/share/man/man4ipp
+file path=usr/share/man/man4ipp/dlcosmk.4ipp
+file path=usr/share/man/man4ipp/dscpmk.4ipp
+file path=usr/share/man/man4ipp/flowacct.4ipp
+file path=usr/share/man/man4ipp/ipgpc.4ipp
+file path=usr/share/man/man4ipp/ipqos.4ipp
+file path=usr/share/man/man4ipp/tokenmt.4ipp
+file path=usr/share/man/man4ipp/tswtclmt.4ipp
legacy pkg=SUNWqos desc="Solaris IP Quality of Service (Root)" \
name="IP QoS, (Root)"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-network-ipqos.p5m b/usr/src/pkg/manifests/system-network-ipqos.p5m
index 78bdfb6bae..74cdd9192e 100644
--- a/usr/src/pkg/manifests/system-network-ipqos.p5m
+++ b/usr/src/pkg/manifests/system-network-ipqos.p5m
@@ -55,8 +55,8 @@ file path=usr/lib/ipqosconf/tokenmt.types mode=0444
file path=usr/lib/ipqosconf/tswtclmt.types mode=0444
dir path=usr/sbin
file path=usr/sbin/ipqosconf mode=0755
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/ipqosconf.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/ipqosconf.8
legacy pkg=SUNWqosu desc="Solaris IP Quality of Service (Usr)" \
name="IP QoS, (Usr)"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-network-mailwrapper.p5m b/usr/src/pkg/manifests/system-network-mailwrapper.p5m
index d7501c918e..4db0e35731 100644
--- a/usr/src/pkg/manifests/system-network-mailwrapper.p5m
+++ b/usr/src/pkg/manifests/system-network-mailwrapper.p5m
@@ -36,10 +36,10 @@ link path=usr/sbin/newaliases target=../lib/mailwrapper mediator=mta \
link path=usr/sbin/sendmail target=../lib/mailwrapper mediator=mta \
mediator-implementation=mailwrapper
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/mailwrapper.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/mailer.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/mailer.conf.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/mailwrapper.8
license usr/src/cmd/mailwrapper/THIRDPARTYLICENSE \
license=usr/src/cmd/mailwrapper/THIRDPARTYLICENSE
depend type=require fmri=service/network/smtp/sendmail
diff --git a/usr/src/pkg/manifests/system-network-nis.p5m b/usr/src/pkg/manifests/system-network-nis.p5m
index 0a85825c4b..3d4ad03af7 100644
--- a/usr/src/pkg/manifests/system-network-nis.p5m
+++ b/usr/src/pkg/manifests/system-network-nis.p5m
@@ -79,25 +79,25 @@ file path=usr/share/man/man1/ypcat.1
file path=usr/share/man/man1/ypmatch.1
file path=usr/share/man/man1/yppasswd.1
file path=usr/share/man/man1/ypwhich.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/idsconfig.1m
-file path=usr/share/man/man1m/ldap_cachemgr.1m
-file path=usr/share/man/man1m/ldapaddent.1m
-file path=usr/share/man/man1m/ldapclient.1m
-file path=usr/share/man/man1m/newkey.1m
-file path=usr/share/man/man1m/ypbind.1m
-file path=usr/share/man/man1m/ypinit.1m
-file path=usr/share/man/man1m/yppoll.1m
-file path=usr/share/man/man1m/ypset.1m
-file path=usr/share/man/man1m/ypstart.1m
-link path=usr/share/man/man1m/ypstop.1m target=ypstart.1m
-file path=usr/share/man/man1m/ypxfr.1m
-link path=usr/share/man/man1m/ypxfr_1perday.1m target=ypxfr.1m
-link path=usr/share/man/man1m/ypxfr_1perhour.1m target=ypxfr.1m
-link path=usr/share/man/man1m/ypxfr_2perday.1m target=ypxfr.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/defaultdomain.4
-file path=usr/share/man/man4/publickey.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/defaultdomain.5
+file path=usr/share/man/man5/publickey.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/idsconfig.8
+file path=usr/share/man/man8/ldap_cachemgr.8
+file path=usr/share/man/man8/ldapaddent.8
+file path=usr/share/man/man8/ldapclient.8
+file path=usr/share/man/man8/newkey.8
+file path=usr/share/man/man8/ypbind.8
+file path=usr/share/man/man8/ypinit.8
+file path=usr/share/man/man8/yppoll.8
+file path=usr/share/man/man8/ypset.8
+file path=usr/share/man/man8/ypstart.8
+link path=usr/share/man/man8/ypstop.8 target=ypstart.8
+file path=usr/share/man/man8/ypxfr.8
+link path=usr/share/man/man8/ypxfr_1perday.8 target=ypxfr.8
+link path=usr/share/man/man8/ypxfr_1perhour.8 target=ypxfr.8
+link path=usr/share/man/man8/ypxfr_2perday.8 target=ypxfr.8
dir path=var group=sys
dir path=var/ldap group=sys
dir path=var/yp
diff --git a/usr/src/pkg/manifests/system-network-overlay.p5m b/usr/src/pkg/manifests/system-network-overlay.p5m
index 8cdbd10775..ce24882834 100644
--- a/usr/src/pkg/manifests/system-network-overlay.p5m
+++ b/usr/src/pkg/manifests/system-network-overlay.p5m
@@ -51,12 +51,12 @@ link path=usr/lib/varpd/libvarpd_files.so target=libvarpd_files.so.1
file path=usr/lib/varpd/libvarpd_files.so.1
file path=usr/lib/varpd/varpd mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/overlay_files.4
+dir path=usr/share/man/man4p
+link path=usr/share/man/man4p/VXLAN.4p target=vxlan.4p
+file path=usr/share/man/man4p/vxlan.4p mode=0444
dir path=usr/share/man/man5
-file path=usr/share/man/man5/overlay.5
-dir path=usr/share/man/man7p
-link path=usr/share/man/man7p/VXLAN.7p target=vxlan.7p
-file usr/share/man/man7p/vxlan.7p path=usr/share/man/man7p/vxlan.7p mode=0444
+file path=usr/share/man/man5/overlay_files.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/overlay.7
driver name=overlay
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-network-ppp-pppdump.p5m b/usr/src/pkg/manifests/system-network-ppp-pppdump.p5m
index a0af439544..6820d7e82a 100644
--- a/usr/src/pkg/manifests/system-network-ppp-pppdump.p5m
+++ b/usr/src/pkg/manifests/system-network-ppp-pppdump.p5m
@@ -38,8 +38,8 @@ file path=usr/lib/inet/ppp/minconn.so mode=0544
file path=usr/lib/inet/ppp/passprompt.so mode=0544
dir path=usr/share
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/pppdump.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/pppdump.8
legacy pkg=SUNWpppg desc="Optional GNU utilities for use with PPP" \
name="GNU utilities for PPP"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-network-ppp-tunnel.p5m b/usr/src/pkg/manifests/system-network-ppp-tunnel.p5m
index 67d943843e..4d754a6dc2 100644
--- a/usr/src/pkg/manifests/system-network-ppp-tunnel.p5m
+++ b/usr/src/pkg/manifests/system-network-ppp-tunnel.p5m
@@ -37,10 +37,10 @@ file path=usr/lib/inet/pppoec mode=0555
file path=usr/lib/inet/pppoed mode=0555
dir path=usr/sbin
file path=usr/sbin/sppptun mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/pppoec.1m
-file path=usr/share/man/man1m/pppoed.1m
-file path=usr/share/man/man1m/sppptun.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/pppoec.8
+file path=usr/share/man/man8/pppoed.8
+file path=usr/share/man/man8/sppptun.8
legacy pkg=SUNWpppdt desc="Extensions implementing PPP tunneling protocols" \
name="Solaris PPP Tunneling"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-network-ppp.p5m b/usr/src/pkg/manifests/system-network-ppp.p5m
index bd17ed1bf9..b52adb8490 100644
--- a/usr/src/pkg/manifests/system-network-ppp.p5m
+++ b/usr/src/pkg/manifests/system-network-ppp.p5m
@@ -74,12 +74,12 @@ hardlink path=usr/kernel/strmod/$(ARCH64)/sppptun \
dir path=usr/sbin
file path=usr/sbin/asppp2pppd mode=0550
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/chat.1m
-file path=usr/share/man/man1m/pppd.1m
-file path=usr/share/man/man1m/pppstats.1m
-dir path=usr/share/man/man7m
-file path=usr/share/man/man7m/sppptun.7m
+dir path=usr/share/man/man4m
+file path=usr/share/man/man4m/sppptun.4m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/chat.8
+file path=usr/share/man/man8/pppd.8
+file path=usr/share/man/man8/pppstats.8
driver name=sppp
driver name=sppptun
legacy pkg=SUNWpppd \
diff --git a/usr/src/pkg/manifests/system-network-routing.p5m b/usr/src/pkg/manifests/system-network-routing.p5m
index 1c14680a53..972f81adeb 100644
--- a/usr/src/pkg/manifests/system-network-routing.p5m
+++ b/usr/src/pkg/manifests/system-network-routing.p5m
@@ -53,16 +53,16 @@ file path=usr/sbin/in.rdisc mode=0555
file path=usr/sbin/in.routed mode=0555
file path=usr/sbin/rtquery mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/in.ndpd.1m
-file path=usr/share/man/man1m/in.rdisc.1m
-file path=usr/share/man/man1m/in.ripngd.1m
-file path=usr/share/man/man1m/in.routed.1m
-link path=usr/share/man/man1m/rdisc.1m target=in.rdisc.1m
-link path=usr/share/man/man1m/routed.1m target=in.routed.1m
-file path=usr/share/man/man1m/rtquery.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/gateways.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/gateways.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/in.ndpd.8
+file path=usr/share/man/man8/in.rdisc.8
+file path=usr/share/man/man8/in.ripngd.8
+file path=usr/share/man/man8/in.routed.8
+link path=usr/share/man/man8/rdisc.8 target=in.rdisc.8
+link path=usr/share/man/man8/routed.8 target=in.routed.8
+file path=usr/share/man/man8/rtquery.8
legacy pkg=SUNWroute desc="Network Routing daemons/commands (Usr)" \
name="Network Routing daemons/commands (Usr)"
legacy pkg=SUNWroutr desc="Network Routing daemons/commands (Root)" \
diff --git a/usr/src/pkg/manifests/system-network-spdadm.p5m b/usr/src/pkg/manifests/system-network-spdadm.p5m
index 202aa5d7fc..5bda03ee75 100644
--- a/usr/src/pkg/manifests/system-network-spdadm.p5m
+++ b/usr/src/pkg/manifests/system-network-spdadm.p5m
@@ -41,8 +41,8 @@ dir path=usr/lib/rcm/scripts
file path=usr/lib/rcm/scripts/SUNW,ibsdpu.sh mode=0555
dir path=usr/sbin
file path=usr/sbin/sdpadm mode=0555
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/sdpadm.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/sdpadm.8
legacy pkg=SUNWibsdpu desc="Sun InfiniBand Sockets Direct Protocol Admin" \
name="Sun InfiniBand pseudo Sockets Direct Protocol Admin"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-network-udapl.p5m b/usr/src/pkg/manifests/system-network-udapl.p5m
index 98945e844b..485fed6dc9 100644
--- a/usr/src/pkg/manifests/system-network-udapl.p5m
+++ b/usr/src/pkg/manifests/system-network-udapl.p5m
@@ -50,8 +50,6 @@ file path=usr/lib/libdat.so.1
dir path=usr/sbin
file path=usr/sbin/datadm mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/datadm.1m
dir path=usr/share/man/man3dat
file path=usr/share/man/man3dat/dat_cno_create.3dat
file path=usr/share/man/man3dat/dat_cno_free.3dat
@@ -128,8 +126,10 @@ file path=usr/share/man/man3dat/dat_srq_set_lw.3dat
file path=usr/share/man/man3dat/dat_strerror.3dat
dir path=usr/share/man/man3lib
file path=usr/share/man/man3lib/libdat.3lib
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/dat.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/dat.conf.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/datadm.8
legacy pkg=SUNWudaplr desc="DAT static registry file" \
name="Sun User Direct Access Programming Library (Root)"
legacy pkg=SUNWudaplu desc="Sun DAT registry library and datadm" \
diff --git a/usr/src/pkg/manifests/system-network-wificonfig.p5m b/usr/src/pkg/manifests/system-network-wificonfig.p5m
index d9d85020bc..497a8e64ce 100644
--- a/usr/src/pkg/manifests/system-network-wificonfig.p5m
+++ b/usr/src/pkg/manifests/system-network-wificonfig.p5m
@@ -34,8 +34,8 @@ file path=sbin/wificonfig mode=4755
dir path=usr group=sys
dir path=usr/sbin
link path=usr/sbin/wificonfig target=../../sbin/wificonfig
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/wificonfig.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/wificonfig.8
legacy pkg=SUNWwlanr desc="wifi config tool binaries" name="wifi config tool"
legacy pkg=SUNWwlanu desc="wifi config tool" name="wifi config tool"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-network.p5m b/usr/src/pkg/manifests/system-network.p5m
index 69bfc0f363..cfe8ac1500 100644
--- a/usr/src/pkg/manifests/system-network.p5m
+++ b/usr/src/pkg/manifests/system-network.p5m
@@ -85,10 +85,10 @@ file path=usr/lib/dl/dlrecv mode=0555
file path=usr/lib/dl/dlsend mode=0555
file path=usr/lib/dl/dltraninfo mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/dladm.1m
-file path=usr/share/man/man1m/flowadm.1m
-file path=usr/share/man/man1m/ipadm.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/dladm.8
+file path=usr/share/man/man8/flowadm.8
+file path=usr/share/man/man8/ipadm.8
group groupname=netadm gid=65
user username=dladm ftpuser=false gcos-field="Datalink Admin" group=netadm \
uid=15
diff --git a/usr/src/pkg/manifests/system-scheduler-fss.p5m b/usr/src/pkg/manifests/system-scheduler-fss.p5m
index 39d4d72e75..0369584bfa 100644
--- a/usr/src/pkg/manifests/system-scheduler-fss.p5m
+++ b/usr/src/pkg/manifests/system-scheduler-fss.p5m
@@ -39,8 +39,8 @@ dir path=usr/lib/class/FSS
file path=usr/lib/class/FSS/FSSdispadmin mode=0555
file path=usr/lib/class/FSS/FSSpriocntl mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man7
-file path=usr/share/man/man7/FSS.7
+dir path=usr/share/man/man4
+file path=usr/share/man/man4/FSS.4
legacy pkg=SUNWfss desc="core software for the fair share scheduler" \
name="Fair Share Scheduler"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-security-kerberos-5.p5m b/usr/src/pkg/manifests/system-security-kerberos-5.p5m
index 8ee7a52924..fa943d74ad 100644
--- a/usr/src/pkg/manifests/system-security-kerberos-5.p5m
+++ b/usr/src/pkg/manifests/system-security-kerberos-5.p5m
@@ -91,28 +91,28 @@ dir path=usr/share/lib
dir path=usr/share/lib/ldif group=sys
file path=usr/share/lib/ldif/kerberos.ldif
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/k5srvutil.1m
-file path=usr/share/man/man1m/kadmin.1m
-link path=usr/share/man/man1m/kadmin.local.1m target=kadmin.1m
-file path=usr/share/man/man1m/kadmind.1m
-file path=usr/share/man/man1m/kclient.1m
-file path=usr/share/man/man1m/kdb5_ldap_util.1m
-file path=usr/share/man/man1m/kdb5_util.1m
-file path=usr/share/man/man1m/kdcmgr.1m
-file path=usr/share/man/man1m/kprop.1m
-file path=usr/share/man/man1m/kpropd.1m
-file path=usr/share/man/man1m/kproplog.1m
-file path=usr/share/man/man1m/krb5kdc.1m
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/kadm5.acl.4
-file path=usr/share/man/man4/kdc.conf.4
-file path=usr/share/man/man4/krb5.conf.4
-file path=usr/share/man/man4/warn.conf.4
dir path=usr/share/man/man5
-file path=usr/share/man/man5/kerberos.5
-file path=usr/share/man/man5/krb5_auth_rules.5
-file path=usr/share/man/man5/krb5envvar.5
+file path=usr/share/man/man5/kadm5.acl.5
+file path=usr/share/man/man5/kdc.conf.5
+file path=usr/share/man/man5/krb5.conf.5
+file path=usr/share/man/man5/warn.conf.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/kerberos.7
+file path=usr/share/man/man7/krb5_auth_rules.7
+file path=usr/share/man/man7/krb5envvar.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/k5srvutil.8
+file path=usr/share/man/man8/kadmin.8
+link path=usr/share/man/man8/kadmin.local.8 target=kadmin.8
+file path=usr/share/man/man8/kadmind.8
+file path=usr/share/man/man8/kclient.8
+file path=usr/share/man/man8/kdb5_ldap_util.8
+file path=usr/share/man/man8/kdb5_util.8
+file path=usr/share/man/man8/kdcmgr.8
+file path=usr/share/man/man8/kprop.8
+file path=usr/share/man/man8/kpropd.8
+file path=usr/share/man/man8/kproplog.8
+file path=usr/share/man/man8/krb5kdc.8
dir path=var group=sys
dir path=var/krb5 group=sys
legacy pkg=SUNWkdcr desc="Kerberos V5 KDC (root)" name="Kerberos V5 KDC (root)"
diff --git a/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.p5m b/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.p5m
index 061d3175a9..a583e27142 100644
--- a/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.p5m
+++ b/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.p5m
@@ -49,9 +49,9 @@ dir path=usr group=sys
dir path=usr/sbin
hardlink path=usr/sbin/fcadm target=../../usr/sbin/fcinfo
file path=usr/sbin/fcinfo mode=0555
-dir path=usr/share/man/man1m
-link path=usr/share/man/man1m/fcadm.1m target=fcinfo.1m
-file path=usr/share/man/man1m/fcinfo.1m
+dir path=usr/share/man/man8
+link path=usr/share/man/man8/fcadm.8 target=fcinfo.8
+file path=usr/share/man/man8/fcinfo.8
legacy pkg=SUNWfcprt desc="Utility for Fibre Channel Host Bus Adapters" \
name="Fibre Channel HBA Port utility"
legacy pkg=SUNWfcprtr \
diff --git a/usr/src/pkg/manifests/system-storage-luxadm.p5m b/usr/src/pkg/manifests/system-storage-luxadm.p5m
index 6f53351126..f85ffd7630 100644
--- a/usr/src/pkg/manifests/system-storage-luxadm.p5m
+++ b/usr/src/pkg/manifests/system-storage-luxadm.p5m
@@ -39,8 +39,8 @@ $(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/a5k_g_fc_i18n_cat
$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/ibfirmware
dir path=usr/sbin
file path=usr/sbin/luxadm mode=0555 variant.opensolaris.zone=global
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/luxadm.1m
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/luxadm.8
legacy pkg=SUNWluxop \
desc="Sun Enterprise Network Array firmware and utilities" \
name="Sun Enterprise Network Array firmware and utilities"
diff --git a/usr/src/pkg/manifests/system-storage-sasinfo.p5m b/usr/src/pkg/manifests/system-storage-sasinfo.p5m
index 7285e8220a..c1af6c5aa5 100644
--- a/usr/src/pkg/manifests/system-storage-sasinfo.p5m
+++ b/usr/src/pkg/manifests/system-storage-sasinfo.p5m
@@ -57,8 +57,6 @@ file path=usr/lib/libsun_sas.so.1
dir path=usr/sbin
file path=usr/sbin/sasinfo mode=0555
dir path=usr/share/man
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/sasinfo.1m
dir path=usr/share/man/man3lib
link path=usr/share/man/man3lib/SMHBA_GetAdapterAttributes.3lib \
target=libSMHBAAPI.3lib
@@ -127,8 +125,10 @@ link path=usr/share/man/man3lib/SMHBA_SetPersistentBinding.3lib \
target=libSMHBAAPI.3lib
file path=usr/share/man/man3lib/libSMHBAAPI.3lib
link path=usr/share/man/man3lib/libsmhbaapi.3lib target=libSMHBAAPI.3lib
-dir path=usr/share/man/man4
-file path=usr/share/man/man4/smhba.conf.4
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/smhba.conf.5
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/sasinfo.8
legacy pkg=SUNWsmhba desc="T11 Storage Management HBA API Libraries and CLI" \
name="SM-HBA Libraries and CLI"
legacy pkg=SUNWsmhbar \
diff --git a/usr/src/pkg/manifests/system-trusted-global-zone.p5m b/usr/src/pkg/manifests/system-trusted-global-zone.p5m
index 9a313c1ec5..4124162515 100644
--- a/usr/src/pkg/manifests/system-trusted-global-zone.p5m
+++ b/usr/src/pkg/manifests/system-trusted-global-zone.p5m
@@ -77,7 +77,7 @@ dir path=lib/svc/method
file path=lib/svc/method/svc-labeld mode=0555
file path=lib/svc/method/svc-tnctl mode=0555
file path=lib/svc/method/svc-tnd mode=0555
-dir path=usr/share/man/man1m
+dir path=usr/share/man/man8
dir path=var group=sys
dir path=var/tsol group=sys
dir path=var/tsol/doors group=sys
diff --git a/usr/src/pkg/manifests/system-trusted.p5m b/usr/src/pkg/manifests/system-trusted.p5m
index 45443f2d75..55289977a6 100644
--- a/usr/src/pkg/manifests/system-trusted.p5m
+++ b/usr/src/pkg/manifests/system-trusted.p5m
@@ -123,19 +123,19 @@ file path=usr/share/man/man1/getlabel.1
file path=usr/share/man/man1/getzonepath.1
file path=usr/share/man/man1/plabel.1
file path=usr/share/man/man1/setlabel.1
-dir path=usr/share/man/man1m
-file path=usr/share/man/man1m/add_allocatable.1m
-file path=usr/share/man/man1m/atohexlabel.1m
-file path=usr/share/man/man1m/hextoalabel.1m
-file path=usr/share/man/man1m/remove_allocatable.1m
-file path=usr/share/man/man1m/tnchkdb.1m
-file path=usr/share/man/man1m/tnctl.1m
-file path=usr/share/man/man1m/tnd.1m
-file path=usr/share/man/man1m/tninfo.1m
-file path=usr/share/man/man1m/txzonemgr.1m
-file path=usr/share/man/man1m/updatehome.1m
-dir path=usr/share/man/man5
-file path=usr/share/man/man5/trusted_extensions.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/trusted_extensions.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/add_allocatable.8
+file path=usr/share/man/man8/atohexlabel.8
+file path=usr/share/man/man8/hextoalabel.8
+file path=usr/share/man/man8/remove_allocatable.8
+file path=usr/share/man/man8/tnchkdb.8
+file path=usr/share/man/man8/tnctl.8
+file path=usr/share/man/man8/tnd.8
+file path=usr/share/man/man8/tninfo.8
+file path=usr/share/man/man8/txzonemgr.8
+file path=usr/share/man/man8/updatehome.8
legacy pkg=SUNWtsr desc="Solaris Trusted Extensions, (Root)" \
name="Trusted Extensions, (Root)"
legacy pkg=SUNWtsu desc="Solaris Trusted Extensions, (Usr)" \
diff --git a/usr/src/pkg/manifests/system-zones.p5m b/usr/src/pkg/manifests/system-zones.p5m
index f122d03231..affc079a1c 100644
--- a/usr/src/pkg/manifests/system-zones.p5m
+++ b/usr/src/pkg/manifests/system-zones.p5m
@@ -100,16 +100,16 @@ 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/man1m
-file path=usr/share/man/man1m/zoneadm.1m
-file path=usr/share/man/man1m/zoneadmd.1m
-file path=usr/share/man/man1m/zonecfg.1m
-file path=usr/share/man/man1m/zonestatd.1m
-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/man4d
+file path=usr/share/man/man4d/zcons.4d
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/brands.7
+file path=usr/share/man/man7/zones.7
+dir path=usr/share/man/man8
+file path=usr/share/man/man8/zoneadm.8
+file path=usr/share/man/man8/zoneadmd.8
+file path=usr/share/man/man8/zonecfg.8
+file path=usr/share/man/man8/zonestatd.8
driver name=zcons
legacy pkg=SUNWzoner desc="Solaris Zones Configuration Files" \
name="Solaris Zones (Root)"
diff --git a/usr/src/pkg/manifests/text-doctools.p5m b/usr/src/pkg/manifests/text-doctools.p5m
index 3a8ff07452..b0cdb4be35 100644
--- a/usr/src/pkg/manifests/text-doctools.p5m
+++ b/usr/src/pkg/manifests/text-doctools.p5m
@@ -316,14 +316,14 @@ file path=usr/share/man/man1/tbl.1
file path=usr/share/man/man1/troff.1
file path=usr/share/man/man1/ul.1
file path=usr/share/man/man1/vgrind.1
-dir path=usr/share/man/man1m
-dir path=usr/share/man/man5
-file path=usr/share/man/man5/eqnchar.5
-file path=usr/share/man/man5/mansun.5
-file path=usr/share/man/man5/me.5
-file path=usr/share/man/man5/mm.5
-file path=usr/share/man/man5/ms.5
-file path=usr/share/man/man5/vgrindefs.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/eqnchar.7
+file path=usr/share/man/man7/mansun.7
+file path=usr/share/man/man7/me.7
+file path=usr/share/man/man7/mm.7
+file path=usr/share/man/man7/ms.7
+file path=usr/share/man/man7/vgrindefs.7
+dir path=usr/share/man/man8
legacy pkg=SUNWdoc \
desc="utilities and fonts for development, display, and production of documentation such as manual pages (nroff/troff)" \
name="Documentation Tools"