manual: move mdoc xrefs of section 1M to section 8

120 files changed, 674 insertions, 675 deletions

diff --git a/usr/src/man/man1/apropos.1 b/usr/src/man/man1/apropos.1
index 8edb11ba22..805a4e36b1 100644
--- a/usr/src/man/man1/apropos.1
+++ b/usr/src/man/man1/apropos.1
@@ -130,4 +130,4 @@ Enabled.
 .Nm Committed .
 .Sh SEE ALSO
 .Xr man 1 ,
-.Xr catman 1M
+.Xr catman 8
diff --git a/usr/src/man/man1/kbd.1 b/usr/src/man/man1/kbd.1
index c0b753a7ca..40990a901f 100644
--- a/usr/src/man/man1/kbd.1
+++ b/usr/src/man/man1/kbd.1
@@ -98,7 +98,7 @@ to the
 .Pa /etc/ppp/options
 file or any of the other configuration files used for the connection.
 See
-.Xr pppd 1M .
+.Xr pppd 8 .
 .Pp
 SLIP has no comparable capability, and must not be used if the Alternate Break
 sequence is in use.
@@ -361,9 +361,6 @@ The following example sets the keyboard beeper frequency:
 .Sh SEE ALSO
 .Xr loadkeys 1 ,
 .Xr svcs 1 ,
-.Xr kadb 1M ,
-.Xr pppd 1M ,
-.Xr svcadm 1M ,
 .Xr keytables 4 ,
 .Xr attributes 5 ,
 .Xr smf 5 ,
@@ -371,7 +368,10 @@ The following example sets the keyboard beeper frequency:
 .Xr se 7D ,
 .Xr virtualkm 7D ,
 .Xr zs 7D ,
-.Xr kb 7M
+.Xr kb 7M ,
+.Xr kadb 8 ,
+.Xr pppd 8 ,
+.Xr svcadm 8
 .Sh NOTES
 Some server systems have key switches with a
 .Sy secure
@@ -398,9 +398,9 @@ under the service identifier:
 .Pp
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using
-.Xr svcadm 1M .
+.Xr svcadm 8 .
 Use
-.Xr svccfg 1M
+.Xr svccfg 8
 to make configuration changes and to view configuration information for this
 service.
 The service's status can be queried using the
diff --git a/usr/src/man/man1/kvmstat.1 b/usr/src/man/man1/kvmstat.1
index fa1bd7a12a..ce91168617 100644
--- a/usr/src/man/man1/kvmstat.1
+++ b/usr/src/man/man1/kvmstat.1
@@ -113,6 +113,6 @@ The arguments are
 while the output format is
 .Sy Not an interface .
 .Sh SEE ALSO
-.Xr iostat 1M ,
-.Xr mpstat 1M ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr iostat 8 ,
+.Xr mpstat 8
diff --git a/usr/src/man/man1/vtfontcvt.1 b/usr/src/man/man1/vtfontcvt.1
index e81073207f..18cc63054b 100644
--- a/usr/src/man/man1/vtfontcvt.1
+++ b/usr/src/man/man1/vtfontcvt.1
@@ -84,4 +84,4 @@ Font width is set automatically for HEX files that have a
 comment before any font data.
 .El
 .Sh SEE ALSO
-.Xr consadm 1M
+.Xr consadm 8
diff --git a/usr/src/man/man1/zonestat.1 b/usr/src/man/man1/zonestat.1
index 505a4449c8..e4c33ccf3f 100644
--- a/usr/src/man/man1/zonestat.1
+++ b/usr/src/man/man1/zonestat.1
@@ -288,7 +288,7 @@ An interval of
 .Em default
 will use the configured interval of the zones
 monitoring service - see
-.Xr zonestatd 1m .
+.Xr zonestatd 8 .
 .Pp
 Interval is required.
 An interval of zero is not permitted.
@@ -471,15 +471,15 @@ zones, will be reported as used by
 .Em system .
 .Sh SEE ALSO
 .Xr date 1 ,
-.Xr pooladm 1m ,
-.Xr poolcfg 1m ,
-.Xr prctl 1m ,
-.Xr rcapadm 1m ,
-.Xr zoneadm 1m ,
-.Xr zonecfg 1m ,
-.Xr zonestatd 1m ,
 .Xr libzonestat 3lib ,
 .Xr timezone 4 ,
 .Xr privileges 5 ,
 .Xr resource_controls 5 ,
-.Xr zones 5
+.Xr zones 5 ,
+.Xr pooladm 8 ,
+.Xr poolcfg 8 ,
+.Xr prctl 8 ,
+.Xr rcapadm 8 ,
+.Xr zoneadm 8 ,
+.Xr zonecfg 8 ,
+.Xr zonestatd 8
diff --git a/usr/src/man/man2/upanic.2 b/usr/src/man/man2/upanic.2
index 351b7939d0..b51a2d760a 100644
--- a/usr/src/man/man2/upanic.2
+++ b/usr/src/man/man2/upanic.2
@@ -31,7 +31,7 @@ system call terminates the calling process and generates a core file in
 the process, subject to the current core file settings as described in
 .Xr core 4
 and controlled by
-.Xr coreadm 1M .
+.Xr coreadm 8 .
 .Pp
 Unlike
 .Xr abort 3C ,
@@ -89,7 +89,6 @@ It always terminates the process.
 .Sh SEE ALSO
 .Xr elfdump 1 ,
 .Xr mdb 1 ,
-.Xr coreadm 1M ,
-.Xr abort 3 ,
 .Xr upanic.h 3HEAD ,
-.Xr core 4
+.Xr core 4 ,
+.Xr coreadm 8
diff --git a/usr/src/man/man3c/get_nprocs.3c b/usr/src/man/man3c/get_nprocs.3c
index 9b5df526df..a40afc4e80 100644
--- a/usr/src/man/man3c/get_nprocs.3c
+++ b/usr/src/man/man3c/get_nprocs.3c
@@ -53,8 +53,8 @@ configured.
 .Sy MT-Safe ,
 .Sy Async-Signal-Safe
 .Sh SEE ALSO
-.Xr psrinfo 1M ,
 .Xr processor_info 2 ,
 .Xr sysconf 3C ,
 .Xr attributes 5 ,
-.Xr standards 5
+.Xr standards 5 ,
+.Xr psrinfo 8
diff --git a/usr/src/man/man3cpc/cpc.3cpc b/usr/src/man/man3cpc/cpc.3cpc
index 2011cfad39..c6617deedd 100644
--- a/usr/src/man/man3cpc/cpc.3cpc
+++ b/usr/src/man/man3cpc/cpc.3cpc
@@ -216,7 +216,6 @@ that consume
 handles.
 .Sh SEE ALSO
 .Xr cputrack 1 ,
-.Xr cpustat 1M ,
 .Xr cpc_bind_curlwp 3CPC ,
 .Xr cpc_buf_create 3CPC ,
 .Xr cpc_enable 3CPC ,
@@ -228,4 +227,5 @@ handles.
 .Xr pctx_capture 3CPC ,
 .Xr pctx_set_events 3CPC ,
 .Xr libcpc 3LIB ,
-.Xr proc 4
+.Xr proc 4 ,
+.Xr cpustat 8
diff --git a/usr/src/man/man3lib/libpkcs11.3lib b/usr/src/man/man3lib/libpkcs11.3lib
index ac77c1b3a4..5a430afa66 100644
--- a/usr/src/man/man3lib/libpkcs11.3lib
+++ b/usr/src/man/man3lib/libpkcs11.3lib
@@ -35,7 +35,7 @@ When available, the meta slot is always the first slot provided by
 The meta slot feature can be configured either system-wide or by individual
 users.
 System-wide configuration for meta slot features is done with the
-.Xr cryptoadm 1M
+.Xr cryptoadm 8
 utility.
 User configuration for meta slot features is performed with environment
 variables.
@@ -93,7 +93,7 @@ All of its functionality can be used with the meta slot.
 .Lp
 This library filters the list of mechanisms available from plug-ins based on
 the policy set by
-.Xr cryptoadm 1M .
+.Xr cryptoadm 8 .
 .Lp
 This library provides entry points for all PKCS#11 v2.40 functions.
 See the PKCS#11 v2.40 specifications at
@@ -105,9 +105,9 @@ by the
 .Sy pkcs11conf
 class action
 script during execution of
-.Xr pkgadd 1M .
+.Xr pkgadd 8 .
 The available mechanisms are administered by the
-.Xr cryptoadm 1M
+.Xr cryptoadm 8
 utility.
 .Lp
 Plug-ins must have all of their library dependencies specified, including
@@ -209,14 +209,14 @@ The PKCS#11 Standard functions are MT-Safe with exceptions.
 See Section 2.5.3 of PKCS#11 Cryptographic Token Usage Guide v2.40 and
 Section 5.1.5 of PKCS#11 Cryptographic Token Interface Base Standard v2.40
 .Sh SEE ALSO
-.Xr cryptoadm 1M ,
-.Xr pkgadd 1M ,
 .Xr Intro 3 ,
 .Xr syslog 3C ,
 .Xr SUNW_C_GetMechSession 3EXT ,
 .Xr attributes 5  ,
 .Xr pkcs11_kernel 5 ,
-.Xr pkcs11_softtoken 5
+.Xr pkcs11_softtoken 5 ,
+.Xr cryptoadm 8 ,
+.Xr pkgadd 8
 .Rs
 .%T "PKCS#11 Cryptographic Token Interface Base Specification v2.40 Plus Errata 01"
 .%U http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/errata01/os/pkcs11-base-v2.40-errata01-os.html
diff --git a/usr/src/man/man3lib/libproc.3lib b/usr/src/man/man3lib/libproc.3lib
index 3ae126d1f7..23effa6c5e 100644
--- a/usr/src/man/man3lib/libproc.3lib
+++ b/usr/src/man/man3lib/libproc.3lib
@@ -86,7 +86,7 @@ The
 library has the ability to open and interpret core files produced by
 processes on the system.
 Process core dump generation is controlled by the
-.Xr coreadm 1M
+.Xr coreadm 8
 command.
 In addition, the library has the ability to understand and interpret core dumps
 generated by Linux kernel and can provide a subset of its functionality on such
@@ -472,13 +472,13 @@ and
 to describe and control the types of content that get included.
 Various content types may be included together through a bitwise-inclusive-OR.
 The default system core contents are controlled with the
-.Xr coreadm 1M
+.Xr coreadm 8
 tool.
 The following table lists the current set of core contents in the system, though
 the set may increase over time.
 The string after the macro is the human readable string that corresponds with
 the constant and is used by
-.Xr coreadm 1M ,
+.Xr coreadm 8 ,
 .Xr proc_content2str 3PROC ,
 and
 .Xr proc_str2content 3PROC .
@@ -1101,7 +1101,6 @@ changes may occur which break both source and binary compatibility.
 .Xr mdb 1 ,
 .Xr proc 1 ,
 .Xr ps 1 ,
-.Xr coreadm 1M ,
 .Xr exec 2 ,
 .Xr fcntl 2 ,
 .Xr stat 2 ,
@@ -1112,7 +1111,8 @@ changes may occur which break both source and binary compatibility.
 .Xr proc 4 ,
 .Xr attributes 5 ,
 .Xr environ 5 ,
-.Xr privileges 5
+.Xr privileges 5 ,
+.Xr coreadm 8
 .Pp
 .Rs
 .%T Linkers and Libraries Guide
diff --git a/usr/src/man/man3proc/Pcontent.3proc b/usr/src/man/man3proc/Pcontent.3proc
index 88d1708b6b..298e9280d7 100644
--- a/usr/src/man/man3proc/Pcontent.3proc
+++ b/usr/src/man/man3proc/Pcontent.3proc
@@ -40,7 +40,7 @@ Handles that refer to ELF objects, obtained through
 .Xr Pgrab_file 3PROC ,
 will not have information such as a stack available.
 The content of core files is controlled by
-.Xr coreadm 1M .
+.Xr coreadm 8 .
 .Pp
 The symbols that may be returned are listed in the
 .Sy core_content_t
diff --git a/usr/src/man/man3proc/Pgcore.3proc b/usr/src/man/man3proc/Pgcore.3proc
index 732331b7ff..c62afcfe01 100644
--- a/usr/src/man/man3proc/Pgcore.3proc
+++ b/usr/src/man/man3proc/Pgcore.3proc
@@ -107,8 +107,8 @@ See
 in
 .Xr libproc 3LIB .
 .Sh SEE ALSO
-.Xr coreadm 1M ,
 .Xr libproc 3LIB ,
 .Xr Pstop 3PROC ,
 .Xr core 4 ,
-.Xr proc 4
+.Xr proc 4 ,
+.Xr coreadm 8
diff --git a/usr/src/man/man3proc/proc_content2str.3proc b/usr/src/man/man3proc/proc_content2str.3proc
index 4b01158d95..118627804d 100644
--- a/usr/src/man/man3proc/proc_content2str.3proc
+++ b/usr/src/man/man3proc/proc_content2str.3proc
@@ -85,6 +85,6 @@ will be returned to indicate an unknown string.
 .Sh MT-LEVEL
 .Sy MT-Safe
 .Sh SEE ALSO
-.Xr coreadm 1M ,
 .Xr libproc 3LIB ,
-.Xr proc 4
+.Xr proc 4 ,
+.Xr coreadm 8
diff --git a/usr/src/man/man3proc/proc_lwp_in_set.3proc b/usr/src/man/man3proc/proc_lwp_in_set.3proc
index bea97c1a71..b0ac1806bf 100644
--- a/usr/src/man/man3proc/proc_lwp_in_set.3proc
+++ b/usr/src/man/man3proc/proc_lwp_in_set.3proc
@@ -40,7 +40,7 @@ whether a thread is in a range.
 A thread range is a series of one or more series of range identifiers
 which describe a collection of threads.
 These are often used by programs such as
-.Xr pbind 1M ,
+.Xr pbind 8 ,
 .Xr pstack 1 ,
 .Xr prun 1 ,
 .Xr pstop 1 ,
diff --git a/usr/src/man/man3socket/sockaddr.3socket b/usr/src/man/man3socket/sockaddr.3socket
index 3d5af60020..fad33ce1af 100644
--- a/usr/src/man/man3socket/sockaddr.3socket
+++ b/usr/src/man/man3socket/sockaddr.3socket
@@ -350,7 +350,7 @@ is non-zero this refers to the interface identifier that corresponds to
 the
 .Sy struct sockaddr_dl .
 This identifier is the same identifier that's shown by tools like
-.Xr ifconfig 1M
+.Xr ifconfig 8
 and used in the SIOC* set of socket ioctls.
 The member
 .Em sdl_type
@@ -435,7 +435,7 @@ The member
 .Em sll_ifindex
 is the interface's index.
 It is used as an identifier in various ioctls and included in the output of
-.Xr ifconfig 1M .
+.Xr ifconfig 8 .
 When calling
 .Xr bind 3SOCKET
 it should be filled in with the index that corresponds to the interface
diff --git a/usr/src/man/man3sysevent/sysevents.3sysevent b/usr/src/man/man3sysevent/sysevents.3sysevent
index c609802f40..4e531b3e9e 100644
--- a/usr/src/man/man3sysevent/sysevents.3sysevent
+++ b/usr/src/man/man3sysevent/sysevents.3sysevent
@@ -44,7 +44,7 @@ Most system events are currently logged to the FMA information log which
 can be retrieved with the
 .Ar -I
 option to the
-.Xr fmdump 1M
+.Xr fmdump 8
 command.
 .Sh EVENTS
 This section contains a list of some of the events that are generated by
@@ -60,7 +60,7 @@ The following events belong to the class
 .Bl -tag -width Dv
 .It Dv ESC_DATALINK_LINK_STATE
 This event fires any time a data link
-.Pq see Xr dladm 1M
+.Pq see Xr dladm 8
 changes its state.
 This may occur because a physical cable was inserted or removed from a
 network adapter or because something has changed on a virtual adapter
diff --git a/usr/src/man/man4/FSS.4 b/usr/src/man/man4/FSS.4
index 370199253c..9de1c320b1 100644
--- a/usr/src/man/man4/FSS.4
+++ b/usr/src/man/man4/FSS.4
@@ -177,7 +177,7 @@ command, as shown in the following example:
 .Ed
 .Sh CONFIGURING SCHEDULER WITH DISPADMIN
 You can use the
-.Xr dispadmin 1M
+.Xr dispadmin 8
 command to examine and tune the FSS
 scheduler's time quantum value.
 Time quantum is the amount of time that a
@@ -204,7 +204,7 @@ Thus, by
 default, the QUANTUM value represents the time quantum in milliseconds.
 .Pp
 If you change the RES value using
-.Xr dispadmin 1M
+.Xr dispadmin 8
 with the
 .Fl r
 option, you also change the QUANTUM value.
@@ -217,15 +217,15 @@ You can use the
 option to change the time quantum value.
 Note that such changes are not preserved across reboot.
 Please refer to the
-.Xr dispadmin 1M
+.Xr dispadmin 8
 man page for additional information.
 .Sh SEE ALSO
 .Xr prctl 1 ,
 .Xr priocntl 1 ,
-.Xr dispadmin 1M ,
-.Xr psrset 1M ,
 .Xr priocntl 2 ,
 .Xr project 4 ,
-.Xr resource_controls 5
+.Xr resource_controls 5 ,
+.Xr dispadmin 8 ,
+.Xr psrset 8
 .Pp
 .%T System Administration Guide: Virtualization Using the Solaris Operating System
diff --git a/usr/src/man/man4/Intro.4 b/usr/src/man/man4/Intro.4
index a37f917a2c..70ecbd3639 100644
--- a/usr/src/man/man4/Intro.4
+++ b/usr/src/man/man4/Intro.4
@@ -99,9 +99,9 @@ option.
 Some driver configuration files may contain user configurable properties.
 Changes in a driver's configuration file will not take effect until the system
 is rebooted or the driver has been removed and re-added (see
-.Xr rem_drv 1M
+.Xr rem_drv 8
 and
-.Xr add_drv 1M ) .
+.Xr add_drv 8 ) .
 .It Pq Sy 7FS
 This section describes the programmatic interface for several file systems
 supported by SunOS.
@@ -186,8 +186,6 @@ The Internet Control Message Protocol (ICMP); see
 .El
 .El
 .Sh SEE ALSO
-.Xr add_drv 1M ,
-.Xr rem_drv 1M ,
 .Xr ioctl 2 ,
 .Xr Intro 3 ,
 .Xr socket 3SOCKET ,
@@ -200,7 +198,9 @@ The Internet Control Message Protocol (ICMP); see
 .Xr inet 7P ,
 .Xr ip 7P ,
 .Xr tcp 7P ,
-.Xr udp 7P
+.Xr udp 7P ,
+.Xr add_drv 8 ,
+.Xr rem_drv 8
 .Pp
 .%T System Administration Guide: IP Services
 .Pp
diff --git a/usr/src/man/man4/cpr.4 b/usr/src/man/man4/cpr.4
index bfe559876e..90401b6104 100644
--- a/usr/src/man/man4/cpr.4
+++ b/usr/src/man/man4/cpr.4
@@ -43,7 +43,7 @@ When the system is suspended, the entire system
 state is preserved in non-volatile storage until a resume operation is
 conducted.
 .Pp
-.Xr pmconfig 1M
+.Xr pmconfig 8
 and
 .Xr power.conf 4
 are used to configure the suspend-resume feature.
@@ -96,11 +96,11 @@ those applications that do not will likely fail.
 .Sh INTERFACE STABILITY
 Unstable
 .Sh SEE ALSO
-.Xr pmconfig 1M ,
-.Xr uadmin 1M ,
 .Xr uadmin 2 ,
 .Xr power.conf 4 ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr pmconfig 8 ,
+.Xr uadmin 8
 .Pp
 .%T Writing Device Drivers
 .Sh NOTES
diff --git a/usr/src/man/man4d/afe.4d b/usr/src/man/man4d/afe.4d
index f4b411077d..b851f239c3 100644
--- a/usr/src/man/man4d/afe.4d
+++ b/usr/src/man/man4d/afe.4d
@@ -44,7 +44,7 @@ Most of them also support flow control.
 The device driver supports the
 .Xr ieee802.3 5
 properties, which can be configured with
-.Xr dladm 1M .
+.Xr dladm 8 .
 .
 .\" The driver also has a "forcefiber" driver.conf setting, but this is for
 .\" very very obscure hardware, and we are not documenting this option
@@ -56,11 +56,11 @@ properties, which can be configured with
 Special character device.
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr ifconfig 1M ,
 .Xr pci 4 ,
 .Xr ieee802.3 5 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr ifconfig 8
 .Rs
 .%T IEEE 802.3: Ethernet
 .%Q IEEE Standards Association
diff --git a/usr/src/man/man4d/amdnbtemp.4d b/usr/src/man/man4d/amdnbtemp.4d
index 80b73777bc..d20ef88bb5 100644
--- a/usr/src/man/man4d/amdnbtemp.4d
+++ b/usr/src/man/man4d/amdnbtemp.4d
@@ -64,8 +64,8 @@ processors, the
 .Xr smntemp 7D
 driver provides access to the temperature sensors.
 .Sh SEE ALSO
-.Xr fmadm 1M ,
-.Xr smntemp 7D
+.Xr smntemp 7D ,
+.Xr fmadm 8
 .Rs
 .%A AMD
 .%B BIOS and Kernel Developer’s Guide (BKDG) for AMD Family 16h Models 00h-0Fh Processors
diff --git a/usr/src/man/man4d/blkdev.4d b/usr/src/man/man4d/blkdev.4d
index 4a67668da9..77da416957 100644
--- a/usr/src/man/man4d/blkdev.4d
+++ b/usr/src/man/man4d/blkdev.4d
@@ -72,11 +72,11 @@ See
 .
 .Sh SEE ALSO
 .Xr rmformat 1 ,
-.Xr devinfo 1M ,
-.Xr fdisk 1M ,
-.Xr mount 1M ,
-.Xr umount 1M ,
 .Xr sd 7D ,
 .Xr pcfs 7FS ,
 .Xr zfs 7FS ,
-.Xr dkio 7I
+.Xr dkio 7I ,
+.Xr devinfo 8 ,
+.Xr fdisk 8 ,
+.Xr mount 8 ,
+.Xr umount 8
diff --git a/usr/src/man/man4d/ccid.4d b/usr/src/man/man4d/ccid.4d
index 9031256e82..622d37109e 100644
--- a/usr/src/man/man4d/ccid.4d
+++ b/usr/src/man/man4d/ccid.4d
@@ -36,7 +36,7 @@ plugged into a reader.
 The driver also provides interfaces to obtain status information, the
 ATR (answer to reset), and obtain exclusive access to the device.
 In addition, the system exposes control of CCID devices through
-.Xr cfgadm 1M .
+.Xr cfgadm 8 .
 .Ss Supported Devices
 The CCID specification allows for readers to come in different flavors.
 These different flavors support different communication protocols and
@@ -92,7 +92,7 @@ To deal with this, symlinks based on other properties will be provided
 (for example, the USB serial number).
 .Pp
 All of the CCID devices in the system can also be listed by using the
-.Xr ccidadm 1M
+.Xr ccidadm 8
 command.
 .Ss I/O Model
 To send and receive responses to commands, a program must open up the
@@ -536,14 +536,14 @@ No transaction is active.
 The CCID reader has been disconnected.
 .El
 .Sh SEE ALSO
-.Xr ccidadm 1M ,
-.Xr cfgadm 1M ,
 .Xr close 2 ,
 .Xr ioctl 2 ,
 .Xr open 2 ,
 .Xr poll 2 ,
 .Xr read 2 ,
-.Xr write 2
+.Xr write 2 ,
+.Xr ccidadm 8 ,
+.Xr cfgadm 8
 .Rs
 .%T Universal Serial Bus Device Class: Smart Card CCID
 .%O Revision 1.1
diff --git a/usr/src/man/man4d/coretemp.4d b/usr/src/man/man4d/coretemp.4d
index 99d720d64f..79a479d4e8 100644
--- a/usr/src/man/man4d/coretemp.4d
+++ b/usr/src/man/man4d/coretemp.4d
@@ -41,7 +41,7 @@ subject to change without notice, and should not be used directly.
 Raw temperature information can be dumped through the FMA developer
 utility fmtopo.
 .Sh SEE ALSO
-.Xr fmadm 1M
+.Xr fmadm 8
 .Rs
 .%A Intel Corporation
 .%B Intel 64 and IA-32 Architectures Software Developer's Manual
diff --git a/usr/src/man/man4d/e1000g.4d b/usr/src/man/man4d/e1000g.4d
index a11afcb9d3..245ca6b20b 100644
--- a/usr/src/man/man4d/e1000g.4d
+++ b/usr/src/man/man4d/e1000g.4d
@@ -47,7 +47,7 @@ which is documented in
 provides a more usable interface on top of that.
 .Pp
 For administrative control, the device can be manipulated through the
-.Xr dladm 1M
+.Xr dladm 8
 utility.
 .Pp
 The following Ethernet controllers are supported by this driver:
@@ -194,7 +194,7 @@ file contains some user configurable parameters, the format of which
 is documented in
 .Xr driver.conf 4 .
 Generally, the use of
-.Xr dladm 1M
+.Xr dladm 8
 is recommended over editing the configuration file.
 .Sh FILES
 .Bl -tag -width Pa
@@ -206,8 +206,8 @@ Device driver (SPARC)
 Driver configuration file
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
 .Xr libdlpi 3LIB ,
 .Xr driver.conf 4 ,
 .Xr igb 7D ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8
diff --git a/usr/src/man/man4d/elxl.4d b/usr/src/man/man4d/elxl.4d
index d6c295e371..455989b4b2 100644
--- a/usr/src/man/man4d/elxl.4d
+++ b/usr/src/man/man4d/elxl.4d
@@ -48,11 +48,11 @@ They also support full size MTUs (1500 bytes), even when used with VLANs.
 The device driver supports the
 .Xr ieee802.3 5
 properties, which can be configured with
-.Xr dladm 1M .
+.Xr dladm 8 .
 .Lp
 In addition, for devices with multiple external media ports, the driver
 supports a driver-specific
-.Xr dladm 1M
+.Xr dladm 8
 property called
 .Sy media ,
 which can take one of the following values, depending on the available
@@ -84,7 +84,7 @@ Media Independent Interface (MII), also 100BASE-TX
 The specific media options available can be queried with the
 device-specific
 .Sy available_media
-.Xr dladm 1M
+.Xr dladm 8
 property.
 .Sh FILES
 .Bl -tag -width /dev/elxl
@@ -92,11 +92,11 @@ property.
 Special character device.
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr ifconfig 1M ,
 .Xr pci 4 ,
 .Xr ieee802.3 5 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr ifconfig 8
 .Rs
 .%T IEEE 802.3: Ethernet
 .%Q IEEE Standards Association
diff --git a/usr/src/man/man4d/ena.4d b/usr/src/man/man4d/ena.4d
index 6bc1699b42..8c87c8f599 100644
--- a/usr/src/man/man4d/ena.4d
+++ b/usr/src/man/man4d/ena.4d
@@ -129,7 +129,7 @@ are considered
 .Sy Evolving
 and may change in the future.
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr snoop 1M ,
 .Xr driver.conf 4 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr snoop 8
diff --git a/usr/src/man/man4d/i40e.4d b/usr/src/man/man4d/i40e.4d
index 4a36026fe8..eb22ba7d97 100644
--- a/usr/src/man/man4d/i40e.4d
+++ b/usr/src/man/man4d/i40e.4d
@@ -40,7 +40,7 @@ of frames, it supports the following features:
 Jumbo frames up to 9710 bytes.
 .It
 Promiscuous access via
-.Xr snoop 1M and
+.Xr snoop 8 and
 .Xr dlpi 7P
 .It
 IPv4 Checksum Offload
@@ -86,20 +86,20 @@ At this time, the driver requires the use of auto-negotiation.
 The
 .Nm
 driver is managed by the
-.Xr dladm 1M
+.Xr dladm 8
 utility.
-.Xr dladm 1M
+.Xr dladm 8
 is the preferred interface for setting all properties.
 While
 .Xr driver.conf 4
 based configuration is possible,
-.Xr dladm 1M
+.Xr dladm 8
 is recommended.
 The
 .Nm
 driver may be joined into an aggregation based on the link aggregation
 control protocol (LACP) through
-.Xr dladm 1M .
+.Xr dladm 8 .
 .Sh PROPERTIES
 The device supports the following properties which may be tuned through
 its driver.conf file,
@@ -110,11 +110,11 @@ binding to it.
 This happens when an IP interfaces is plumbed or another
 .Xr dlpi 7P
 consumer such as
-.Xr snoop 1M
+.Xr snoop 8
 or an LLDP daemon is started.
 .Pp
 Some properties may be tuned at runtime with the
-.Xr dladm 1M
+.Xr dladm 8
 utility.
 Properties that can be will have the name of the dladm property called out
 explicitly.
@@ -329,7 +329,7 @@ Device driver (x86)
 Driver configuration file
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr snoop 1M ,
 .Xr driver.conf 4 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr snoop 8
diff --git a/usr/src/man/man4d/igb.4d b/usr/src/man/man4d/igb.4d
index f3fcb429fb..3850890351 100644
--- a/usr/src/man/man4d/igb.4d
+++ b/usr/src/man/man4d/igb.4d
@@ -64,7 +64,7 @@ Support for multiple hardware rings, enabling receive-side steering
 and multiple MAC address filters.
 .It
 Promiscuous access via
-.Xr snoop 1M
+.Xr snoop 8
 and
 .Xr dlpi 7P .
 .It
@@ -99,11 +99,11 @@ By default, the device will use auto-negotiation and prefer the highest
 compatible speed.
 The advertised speeds and broader configuration can be observed and
 modified with
-.Xr dladm 1M .
+.Xr dladm 8 .
 While
 .Xr driver.conf 4
 based configuration is possible, it is recommended that
-.Xr dladm 1M
+.Xr dladm 8
 is used wherever possible.
 .Sh FILES
 .Bl -tag -width Pa
@@ -118,9 +118,9 @@ SPARC device driver
 Configuration file.
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
 .Xr libdlpi 3LIB ,
 .Xr driver.conf 4 ,
 .Xr e1000g 7D ,
 .Xr dlpi 7P ,
+.Xr dladm 8 ,
 .Xr mac 9E
diff --git a/usr/src/man/man4d/imc.4d b/usr/src/man/man4d/imc.4d
index d1da2da485..695d5fd1d5 100644
--- a/usr/src/man/man4d/imc.4d
+++ b/usr/src/man/man4d/imc.4d
@@ -98,6 +98,6 @@ systems.
 Driver configuration file.
 .El
 .Sh SEE ALSO
-.Xr fmadm 1M ,
-.Xr fmdump 1M ,
-.Xr imcstub 7D
+.Xr imcstub 7D ,
+.Xr fmadm 8 ,
+.Xr fmdump 8
diff --git a/usr/src/man/man4d/iprb.4d b/usr/src/man/man4d/iprb.4d
index 986d687add..89ea88e374 100644
--- a/usr/src/man/man4d/iprb.4d
+++ b/usr/src/man/man4d/iprb.4d
@@ -47,7 +47,7 @@ Some of them also support flow control.
 The device driver supports the
 .Xr ieee802.3 5
 properties, which can be configured with
-.Xr dladm 1M .
+.Xr dladm 8 .
 .
 .Sh FILES
 .Bl -tag -width /dev/iprb
@@ -55,11 +55,11 @@ properties, which can be configured with
 Special character device.
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr ifconfig 1M ,
 .Xr pci 4 ,
 .Xr ieee802.3 5 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr ifconfig 8
 .Rs
 .%T IEEE 802.3: Ethernet
 .%Q IEEE Standards Association
diff --git a/usr/src/man/man4d/iwn.4d b/usr/src/man/man4d/iwn.4d
index b4048f169a..dccd54c07e 100644
--- a/usr/src/man/man4d/iwn.4d
+++ b/usr/src/man/man4d/iwn.4d
@@ -52,8 +52,8 @@ Special character device.
 firmware files
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr wificonfig 1M
+.Xr dladm 8 ,
+.Xr wificonfig 8
 .Pp
 .Em 802.11 - Wireless LAN Media  Access Control  and  Physical Layer
 Specification- IEEE, 2001
diff --git a/usr/src/man/man4d/ksensor.4d b/usr/src/man/man4d/ksensor.4d
index 4f4a99d41e..61c6270105 100644
--- a/usr/src/man/man4d/ksensor.4d
+++ b/usr/src/man/man4d/ksensor.4d
@@ -38,4 +38,4 @@ subject to change without notice, and should not be used directly.
 Sensor information can be dumped through the FMA developer utility
 .Sy fmtopo .
 .Sh SEE ALSO
-.Xr fmadm 1M
+.Xr fmadm 8
diff --git a/usr/src/man/man4d/mlxcx.4d b/usr/src/man/man4d/mlxcx.4d
index bf7f39d353..b02f7f4ad9 100644
--- a/usr/src/man/man4d/mlxcx.4d
+++ b/usr/src/man/man4d/mlxcx.4d
@@ -38,7 +38,7 @@ Group support with VLAN and MAC steering to avoid software classification
 when using VNICs.
 .It
 Promiscuous access via
-.Xr snoop 1M and
+.Xr snoop 8 and
 .Xr dlpi 7P
 .It
 LED control
@@ -361,7 +361,7 @@ Device driver (x86)
 Driver configuration file containing user-configurable options
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr snoop 1M ,
 .Xr driver.conf 4 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr snoop 8
diff --git a/usr/src/man/man4d/mxfe.4d b/usr/src/man/man4d/mxfe.4d
index 72b62122a7..cba5056972 100644
--- a/usr/src/man/man4d/mxfe.4d
+++ b/usr/src/man/man4d/mxfe.4d
@@ -44,18 +44,18 @@ They also support full size MTUs (1500 bytes), even when used with VLANs.
 The device driver supports the
 .Xr ieee802.3 5
 properties, which can be configured with
-.Xr dladm 1M .
+.Xr dladm 8 .
 .Sh FILES
 .Bl -tag -width /dev/mxfe
 .It Pa /dev/mxfe
 Special character device.
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr ifconfig 1M ,
 .Xr pci 4 ,
 .Xr ieee802.3 5 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr ifconfig 8
 .Rs
 .%T IEEE 802.3: Ethernet
 .%Q IEEE Standards Association
diff --git a/usr/src/man/man4d/pchtemp.4d b/usr/src/man/man4d/pchtemp.4d
index 23d382239f..937a9d2fa5 100644
--- a/usr/src/man/man4d/pchtemp.4d
+++ b/usr/src/man/man4d/pchtemp.4d
@@ -65,7 +65,7 @@ Raw temperature information can be dumped through the FMA developer
 utility
 .Sy fmtopo .
 .Sh SEE ALSO
-.Xr fmadm 1M
+.Xr fmadm 8
 .Rs
 .%A Intel Corporation
 .%B Intel 300 Series and Intel C240 Series Chipset Family Platform Controller Hub
diff --git a/usr/src/man/man4d/qede.4d b/usr/src/man/man4d/qede.4d
index eca2bedfbe..3d1197838b 100644
--- a/usr/src/man/man4d/qede.4d
+++ b/usr/src/man/man4d/qede.4d
@@ -41,7 +41,7 @@ interfaces.
 The primary methods of configuration are via modification of the
 .Pa /kernel/drv/qede.conf
 file or execution of the
-.Xr dladm 1M
+.Xr dladm 8
 utility.
 There are many configuration items available and all are thoroughly
 documented in the
@@ -52,18 +52,18 @@ reloaded or the system rebooted.
 In order to reload the driver with new configuration changes all
 .Nm qede
 interfaces must be first unplumbed and then the
-.Xr update_drv 1M
+.Xr update_drv 8
 tool must be executed.
 For the configuration items that do not require a driver reload the
-.Xr dladm 1M
+.Xr dladm 8
 tool can be used to dynamically change the option.
 Use of
-.Xr dladm 1M
+.Xr dladm 8
 is the preferred method.
 .Sh DEBUGGING
 .Ss kstat
 There are many statistics exposed via
-.Xr kstat 1M
+.Xr kstat 8
 by the
 .Nm
 driver.
@@ -94,7 +94,7 @@ To get a list of all the individual statistics in these groups run:
 # kstat -m qede -i 0 -l
 .Ed
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr ifconfig 1M ,
 .Xr driver.conf 4 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr ifconfig 8
diff --git a/usr/src/man/man4d/rtls.4d b/usr/src/man/man4d/rtls.4d
index 31ffb46b4b..8c6a02fb6a 100644
--- a/usr/src/man/man4d/rtls.4d
+++ b/usr/src/man/man4d/rtls.4d
@@ -43,7 +43,7 @@ They also support full size MTUs (1500 bytes), even when used with VLANs.
 The device driver supports the
 .Xr ieee802.3 5
 properties, which can be configured with
-.Xr dladm 1M .
+.Xr dladm 8 .
 .
 .Sh FILES
 .Bl -tag -width /dev/rtls
@@ -51,11 +51,11 @@ properties, which can be configured with
 Special character device.
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr ifconfig 1M ,
 .Xr pci 4 ,
 .Xr ieee802.3 5 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr ifconfig 8
 .Rs
 .%T IEEE 802.3: Ethernet
 .%Q IEEE Standards Association
diff --git a/usr/src/man/man4d/sfxge.4d b/usr/src/man/man4d/sfxge.4d
index 03187fa26d..e547faf07f 100644
--- a/usr/src/man/man4d/sfxge.4d
+++ b/usr/src/man/man4d/sfxge.4d
@@ -33,7 +33,7 @@ the tag, if present.
 The device driver supports the
 .Xr ieee802.3 5
 properties, which can be configured with
-.Xr dladm 1M .
+.Xr dladm 8 .
 .Sh FILES
 .Bl -tag -width /dev/sfxge
 .It Pa /dev/sfxge
@@ -41,11 +41,11 @@ Special character device.
 .El
 .
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr ifconfig 1M ,
 .Xr pci 4 ,
 .Xr ieee802.3 5 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr ifconfig 8
 .Rs
 .%T IEEE 802.3: Ethernet
 .%Q IEEE Standards Association
diff --git a/usr/src/man/man4d/smntemp.4d b/usr/src/man/man4d/smntemp.4d
index 14e9070b59..570b1fe378 100644
--- a/usr/src/man/man4d/smntemp.4d
+++ b/usr/src/man/man4d/smntemp.4d
@@ -46,9 +46,9 @@ subject to change without notice, and should not be used directly.
 Raw temperature information can be dumped through the FMA developer
 utility fmtopo.
 .Sh SEE ALSO
-.Xr fmadm 1M ,
 .Xr amdnbtemp 7D ,
-.Xr amdzen 7D
+.Xr amdzen 7D ,
+.Xr fmadm 8
 .Rs
 .%A AMD
 .%B Open-Source Register Reference For AMD Family 17h Processors Models 00h-2Fh
diff --git a/usr/src/man/man4d/ufm.4d b/usr/src/man/man4d/ufm.4d
index 99d6a8c699..82b91ebbf0 100644
--- a/usr/src/man/man4d/ufm.4d
+++ b/usr/src/man/man4d/ufm.4d
@@ -32,7 +32,7 @@ via a private ioctl interface.
 .Pp
 The UFM interfaces described below are used in the implementation of the
 system through tools such as
-.Xr fwflash 1M
+.Xr fwflash 8
 or as part of the fault management architecture.
 .Sh FILES
 .Bl -tag -width Pa
diff --git a/usr/src/man/man4d/usba.4d b/usr/src/man/man4d/usba.4d
index fcf142fad1..1eab2f6a79 100644
--- a/usr/src/man/man4d/usba.4d
+++ b/usr/src/man/man4d/usba.4d
@@ -103,7 +103,6 @@ They are formatted in the following manner:
 Driver is incompatible with USBA framework.
 .El
 .Sh SEE ALSO
-.Xr cfgadm_usb 1M ,
 .Xr attributes 5 ,
 .Xr ehci 7D ,
 .Xr hid 7D ,
@@ -124,6 +123,7 @@ Driver is incompatible with USBA framework.
 .Xr usbvc 7D ,
 .Xr virtualkm 7D ,
 .Xr xhci 7D ,
+.Xr cfgadm_usb 8 ,
 .Xr Intro 9F ,
 .Xr Intro 9S
 .Pp
diff --git a/usr/src/man/man4d/vioblk.4d b/usr/src/man/man4d/vioblk.4d
index 3497a3347c..650a3cb99b 100644
--- a/usr/src/man/man4d/vioblk.4d
+++ b/usr/src/man/man4d/vioblk.4d
@@ -58,11 +58,11 @@ Because the driver leverages the
 .Xr blkdev 7D
 framework, most standard disk manipulation utilities will function such
 as
-.Xr diskinfo 1M
+.Xr diskinfo 8
 for discovering devices,
-.Xr format 1M
+.Xr format 8
 for manipulating partition tables,
-.Xr iostat 1M
+.Xr iostat 8
 for seeing device I/O statistics, and a subset of the
 .Xr dkio 7I
 ioctl requests to retrieve information about the device.
@@ -81,10 +81,10 @@ Character device minor node.
 x86 device driver.
 .El
 .Sh SEE ALSO
-.Xr diskinfo 1M ,
 .Xr blkdev 7D ,
 .Xr virtio 7D ,
-.Xr dkio 7I
+.Xr dkio 7I ,
+.Xr diskinfo 8
 .Rs
 .%T Virtual I/O Device (VIRTIO) Version 1.1
 .%D April, 2019
diff --git a/usr/src/man/man4d/vioif.4d b/usr/src/man/man4d/vioif.4d
index d560b15d98..f966699181 100644
--- a/usr/src/man/man4d/vioif.4d
+++ b/usr/src/man/man4d/vioif.4d
@@ -59,7 +59,7 @@ and be found in the file system at
 The networking devices created by the
 .Nm
 driver can be controlled through
-.Xr dladm 1M .
+.Xr dladm 8 .
 There is no
 .Xr driver.conf 4
 file for
@@ -79,10 +79,10 @@ special character device.
 x86 device driver.
 .El
 .Sh SEE ALSO
-.Xr dladm 1M ,
 .Xr libdlpi 3LIB ,
 .Xr virtio 7D ,
 .Xr dlpi 7P ,
+.Xr dladm 8 ,
 .Xr mac 9E
 .Rs
 .%T Virtual I/O Device (VIRTIO) Version 1.1
diff --git a/usr/src/man/man4d/xhci.4d b/usr/src/man/man4d/xhci.4d
index 2d72b6bf1a..8545775e15 100644
--- a/usr/src/man/man4d/xhci.4d
+++ b/usr/src/man/man4d/xhci.4d
@@ -40,15 +40,15 @@ Administrators do not interact with the
 .Nm
 driver directly.
 USB devices are managed with
-.Xr cfgadm 1M .
+.Xr cfgadm 8 .
 See
-.Xr cfgadm_usb 1M
+.Xr cfgadm_usb 8
 for more information on how to specifically manage USB devices and how
 they are laid out in the system.
-.Xr cfgadm 1M
+.Xr cfgadm 8
 is only used to manage devices at a USB level.
 For example, a USB NIC would still be managed with
-.Xr dladm 1M
+.Xr dladm 8
 at a networking level.
 .Pp
 On some x86 systems USB ports may be routed to either an instance of the
@@ -100,9 +100,9 @@ Device driver (x86)
 Driver configuration file
 .El
 .Sh SEE ALSO
-.Xr cfgadm 1M ,
-.Xr cfgadm_usb 1M ,
-.Xr dladm 1M ,
 .Xr driver.conf 4 ,
 .Xr ehci 7D ,
-.Xr usba 7D
+.Xr usba 7D ,
+.Xr cfgadm 8 ,
+.Xr cfgadm_usb 8 ,
+.Xr dladm 8
diff --git a/usr/src/man/man4fs/bootfs.4fs b/usr/src/man/man4fs/bootfs.4fs
index 4cd001c2c1..1a8943c407 100644
--- a/usr/src/man/man4fs/bootfs.4fs
+++ b/usr/src/man/man4fs/bootfs.4fs
@@ -80,5 +80,5 @@ displayed in the file system.
 This information is provided for informational purposes only, it is not
 to be construed as a stable interface.
 .Sh SEE ALSO
-.Xr kstat 1M ,
-.Xr loader 5
+.Xr loader 5 ,
+.Xr kstat 8
diff --git a/usr/src/man/man4fs/dcfs.4fs b/usr/src/man/man4fs/dcfs.4fs
index 0fbaca15c3..d62e7ab676 100644
--- a/usr/src/man/man4fs/dcfs.4fs
+++ b/usr/src/man/man4fs/dcfs.4fs
@@ -38,11 +38,11 @@ when reading or booting from the archive.
 .Sh INTERFACE STABILITY
 .Sy Uncommitted
 .Sh SEE ALSO
-.Xr boot 1M ,
-.Xr bootadm 1M ,
-.Xr fiocompress 1M ,
 .Xr attributes 5 ,
-.Xr ufs 7FS
+.Xr ufs 7FS ,
+.Xr boot 8 ,
+.Xr bootadm 8 ,
+.Xr fiocompress 8
 .Sh NOTES
 The
 .Nm
diff --git a/usr/src/man/man4fs/dev.4fs b/usr/src/man/man4fs/dev.4fs
index 9a8c81a00b..8ceaeefdd2 100644
--- a/usr/src/man/man4fs/dev.4fs
+++ b/usr/src/man/man4fs/dev.4fs
@@ -44,7 +44,7 @@ may have unique operational semantics.
 Most of the common device names under
 .Pa /dev
 are created automatically by
-.Xr devfsadm 1M
+.Xr devfsadm 8
 Others, such as
 .Pa /dev/pts ,
 .Pa /dev/net ,
@@ -52,12 +52,12 @@ and
 .Pa /dev/zvol
 are dynamic and reflect the operational state of the system.
 You can manually generate device names for newly attached hardware by invoking
-.Xr devfsadm 1M
+.Xr devfsadm 8
 or implicitly, by indirectly causing a lookup or readdir operation in the
 filesystem to occur.
 For example, you can discover a disk that was attached when the system was
 powered down (and generate a name for that device) by invoking
-.Xr format 1M .
+.Xr format 8 .
 .Pp
 In a non-global zone, the
 .Nm
@@ -74,9 +74,9 @@ Mount point for the
 filesystem in the global zone and non-global zones.
 .El
 .Sh SEE ALSO
-.Xr devfsadm 1M ,
-.Xr format 1M ,
-.Xr devfs 7FS
+.Xr devfs 7FS ,
+.Xr devfsadm 8 ,
+.Xr format 8
 .Sh NOTES
 The global
 .Pa /dev
diff --git a/usr/src/man/man4fs/devfs.4fs b/usr/src/man/man4fs/devfs.4fs
index 818c47f6bf..3cf404c6da 100644
--- a/usr/src/man/man4fs/devfs.4fs
+++ b/usr/src/man/man4fs/devfs.4fs
@@ -49,7 +49,7 @@ The system may be configured to include a device in one of two ways:
 By means of dynamic reconfiguration
 .Pq DR ,
 using, for example,
-.Xr cfgadm 1M .
+.Xr cfgadm 8 .
 Several different hardware buses such as PCIe and USB automatically discover and
 enumerate devices that they encounter.
 .It
@@ -58,7 +58,7 @@ For devices driven by
 enumeration, edit the
 .Pa driver.conf
 file to add a new entry, then use
-.Xr update_drv 1M
+.Xr update_drv 8
 to cause the system to re-read the
 .Pa driver.conf
 file and thereby enumerate the instance.
@@ -94,8 +94,8 @@ Mount point for
 file system in the global zone.
 .El
 .Sh SEE ALSO
-.Xr devfsadm 1M ,
 .Xr vfstab 4 ,
+.Xr devfsadm 8 ,
 .Xr attach 9E
 .Sh NOTES
 The
diff --git a/usr/src/man/man4fs/hsfs.4fs b/usr/src/man/man4fs/hsfs.4fs
index bf9b413664..e8b730409c 100644
--- a/usr/src/man/man4fs/hsfs.4fs
+++ b/usr/src/man/man4fs/hsfs.4fs
@@ -121,9 +121,9 @@ Conversion of uppercase to lowercase characters may be disabled by using the
 .Fl o
 .Ar nomaplcase
 option to
-.Xr mount 1M .
+.Xr mount 8 .
 See
-.Xr mount_hsfs 1M .
+.Xr mount_hsfs 8 .
 .Pp
 If the CD-ROM contains Rock Ridge, ISO 9660 version 2 or Joliet extensions, the
 file names and directory names may contain any character supported under
@@ -200,9 +200,9 @@ See
 .Xr system 4 .
 .El
 .Sh SEE ALSO
-.Xr mount 1M ,
-.Xr mount_hsfs 1M ,
-.Xr vfstab 4
+.Xr vfstab 4 ,
+.Xr mount 8 ,
+.Xr mount_hsfs 8
 .Pp
 .Rs
 .%A N. V. Phillips
@@ -243,10 +243,10 @@ Use of the
 .Fl o
 .Ar notraildot
 option to
-.Xr mount 1M
+.Xr mount 8
 makes it optional to specify the trailing dot.
 See
-.Xr mount_hsfs 1M .
+.Xr mount_hsfs 8 .
 .Sh NOTES
 No translation of any sort is done on the contents of High Sierra or ISO 9660
 format CD-ROMs; only directory and file names are subject to interpretation by
diff --git a/usr/src/man/man4fs/lofs.4fs b/usr/src/man/man4fs/lofs.4fs
index c24b8a349e..9b6c956cde 100644
--- a/usr/src/man/man4fs/lofs.4fs
+++ b/usr/src/man/man4fs/lofs.4fs
@@ -106,13 +106,13 @@ file systems are mounted using:
 mount -F lofs /tmp /mnt
 .Ed
 .Sh SEE ALSO
-.Xr lofiadm 1M ,
-.Xr mount 1M ,
 .Xr chroot 2 ,
 .Xr mount 2 ,
 .Xr sysfs 2 ,
 .Xr vfstab 4 ,
-.Xr lofi 7D
+.Xr lofi 7D ,
+.Xr lofiadm 8 ,
+.Xr mount 8
 .Sh NOTES
 All access to entries in
 .Nm
@@ -122,7 +122,7 @@ If a mount point is made available in multiple locations via
 and is busy in any of those locations, an attempt to mount a file system at that
 mount point fails unless the overlay flag is specified.
 See
-.Xr mount 1M .
+.Xr mount 8 .
 Examples of a mount point being busy within a
 .Nm
 mount include having a file system mounted on it or it being a processes'
diff --git a/usr/src/man/man4fs/pcfs.4fs b/usr/src/man/man4fs/pcfs.4fs
index f9e4a897f9..60a9bd83c9 100644
--- a/usr/src/man/man4fs/pcfs.4fs
+++ b/usr/src/man/man4fs/pcfs.4fs
@@ -58,7 +58,7 @@ supports FAT12 (floppies) and FAT16 and FAT32 file systems.
 file systems can be force umounted using the
 .Fl -f
 argument to
-.Xr umount 1M .
+.Xr umount 8 .
 .Pp
 The
 .Nm
@@ -83,7 +83,7 @@ Mount options can be passed to
 .Nm
 using the optptr and optlen arguments.
 See
-.Xr mount_pcfs 1M
+.Xr mount_pcfs 8
 for a list of mount options supported by
 .Nm
 .Pp
@@ -108,7 +108,7 @@ timestamps.
 You can override this behavior using the
 .Ar noclamptime
 mount option, as described in
-.Xr mount_pcfs 1M .
+.Xr mount_pcfs 8 .
 .Pp
 Timestamps on FAT formatted media are recorded in local time.
 If the recording and receiving systems use different timezones, the
@@ -121,7 +121,7 @@ of timestamps as read from a FAT formatted medium in a given timezone
 .Pq that of the recorder .
 By default, the local timezone of the receiver is used.
 See
-.Xr mount_pcfs 1M
+.Xr mount_pcfs 8
 for details.
 .Pp
 The root directory of a FAT formatted medium has no timestamps and
@@ -462,12 +462,12 @@ result in the more descriptive short names:
 .Xr fdformat 1 ,
 .Xr unix2dos 1 ,
 .Xr volcheck 1 ,
-.Xr mount 1M ,
-.Xr mount_pcfs 1M ,
-.Xr umount 1M ,
 .Xr ctime 3C ,
 .Xr vfstab 4 ,
-.Xr environ 5
+.Xr environ 5 ,
+.Xr mount 8 ,
+.Xr mount_pcfs 8 ,
+.Xr umount 8
 .Sh WARNINGS
 Do not physically eject a FAT floppy while the device is mounted as
 .Nm
diff --git a/usr/src/man/man4fs/sharefs.4fs b/usr/src/man/man4fs/sharefs.4fs
index c5935bc822..d705c0b03f 100644
--- a/usr/src/man/man4fs/sharefs.4fs
+++ b/usr/src/man/man4fs/sharefs.4fs
@@ -39,11 +39,11 @@ File contents are described in
 .Xr sharetab 4 .
 .Pp
 File contents can be modified as a result of
-.Xr share 1M ,
-.Xr sharectl 1M ,
-.Xr sharemgr 1M ,
+.Xr share 8 ,
+.Xr sharectl 8 ,
+.Xr sharemgr 8 ,
 and changing properties of a
-.Xr zfs 1M
+.Xr zfs 8
 data set.
 .Pp
 The module may not be unloaded dynamically by the kernel.
@@ -53,9 +53,9 @@ The module may not be unloaded dynamically by the kernel.
 System record of shared file systems.
 .El
 .Sh SEE ALSO
-.Xr share 1M ,
-.Xr sharectl 1M ,
-.Xr sharemgr 1M ,
-.Xr zfs 1M ,
 .Xr sharetab 4 ,
-.Xr zones 5
+.Xr zones 5 ,
+.Xr share 8 ,
+.Xr sharectl 8 ,
+.Xr sharemgr 8 ,
+.Xr zfs 8
diff --git a/usr/src/man/man4fs/smbfs.4fs b/usr/src/man/man4fs/smbfs.4fs
index 008132c166..3860121413 100644
--- a/usr/src/man/man4fs/smbfs.4fs
+++ b/usr/src/man/man4fs/smbfs.4fs
@@ -131,7 +131,7 @@ to prevent Unix users from using each others' Windows credentials.
 See the
 .Ar dirperms
 option to
-.Xr mount_smbfs 1M
+.Xr mount_smbfs 8
 for details regarding how to control
 .Nm
 mount point permissions.
@@ -145,6 +145,6 @@ concern, such as for public read-only resources.
 .Sy Uncommitted
 .Sh SEE ALSO
 .Xr smbutil 1 ,
-.Xr mount_smbfs 1M ,
 .Xr nsmbrc 4 ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr mount_smbfs 8
diff --git a/usr/src/man/man4fs/tmpfs.4fs b/usr/src/man/man4fs/tmpfs.4fs
index abe1da4671..44a775814a 100644
--- a/usr/src/man/man4fs/tmpfs.4fs
+++ b/usr/src/man/man4fs/tmpfs.4fs
@@ -100,7 +100,7 @@ for example, running out of space on
 .Nm
 .Pc
 can allocate more swap space by using the
-.Xr swap 1M
+.Xr swap 8
 command.
 .Pp
 Another constraint is that the number of files available in a
@@ -127,7 +127,7 @@ An additional mount option can be specified to control the size of an individual
 .Nm
 file system.
 See
-.Xr mount_tmpfs 1M
+.Xr mount_tmpfs 8
 for more details.
 .Sh DIAGNOSTICS
 If
@@ -143,7 +143,7 @@ is attempting to write more than it is allowed, or if currently executing
 programs are using a lot of memory.
 To make more space available, remove unnecessary files, exit from some programs,
 or allocate more swap space using
-.Xr swap 1M .
+.Xr swap 8 .
 .It "directory: File system full, memory allocation failed"
 .Nm
 ran out of physical memory while attempting to create a new file or
@@ -151,14 +151,14 @@ directory.
 Remove unnecessary files or directories or install more physical memory.
 .El
 .Sh SEE ALSO
-.Xr df 1M ,
-.Xr mount 1M ,
-.Xr mount_tmpfs 1M ,
-.Xr swap 1M ,
 .Xr mmap 2 ,
 .Xr mount 2 ,
 .Xr umount 2 ,
-.Xr vfstab 4
+.Xr vfstab 4 ,
+.Xr df 8 ,
+.Xr mount 8 ,
+.Xr mount_tmpfs 8 ,
+.Xr swap 8
 .Sh WARNINGS
 Files and directories on a
 .Nm
@@ -181,7 +181,7 @@ to a
 .Nm
 file is not supported.
 .Pp
-.Xr df 1M
+.Xr df 8
 output is of limited accuracy since a
 .Nm
 file system size
diff --git a/usr/src/man/man4fs/udfs.4fs b/usr/src/man/man4fs/udfs.4fs
index b05de884d8..1240b80539 100644
--- a/usr/src/man/man4fs/udfs.4fs
+++ b/usr/src/man/man4fs/udfs.4fs
@@ -74,9 +74,9 @@ The
 file system also supports regular files, directories, and symbolic links, as
 well as device nodes such as block, character, FIFO, and Socket.
 .Sh SEE ALSO
-.Xr mount 1M ,
-.Xr mount_udfs 1M ,
-.Xr vfstab 4
+.Xr vfstab 4 ,
+.Xr mount 8 ,
+.Xr mount_udfs 8
 .Sh NOTES
 Invalid characters such as
 .Dq \e0
diff --git a/usr/src/man/man4fs/ufs.4fs b/usr/src/man/man4fs/ufs.4fs
index dd5dc97a5a..2c6eaca517 100644
--- a/usr/src/man/man4fs/ufs.4fs
+++ b/usr/src/man/man4fs/ufs.4fs
@@ -187,7 +187,7 @@ The log size may be larger (up to a maximum of 512 Mbytes), depending upon the
 number of cylinder groups present in the file system.
 The log is continually flushed as it fills up.
 The log is also flushed when the file system is unmounted or as a result of a
-.Xr lockfs 1M
+.Xr lockfs 8
 command.
 .Ss Mounting UFS File Systems
 You can mount a UFS file system in various ways using syntax similar to the
@@ -195,7 +195,7 @@ following:
 .Bl -enum
 .It
 Use
-.Xr mount 1M
+.Xr mount 8
 from the command line:
 .Bd -literal -offset indent
 # mount -F ufs /dev/dsk/c0t0d0s7 /export/home
@@ -210,44 +210,44 @@ file to mount the file system at boot time:
 .El
 .Pp
 For more information on mounting UFS file systems, see
-.Xr mount_ufs 1M .
+.Xr mount_ufs 8 .
 .Sh INTERFACE STABILITY
 .Sy Uncomitted
 .Sh SEE ALSO
-.Xr df 1M ,
-.Xr fsck 1M ,
-.Xr fsck_ufs 1M ,
-.Xr fstyp 1M ,
-.Xr lockfs 1M ,
-.Xr mkfs_ufs 1M ,
-.Xr newfs 1M ,
-.Xr tunefs 1M ,
-.Xr ufsdump 1M ,
-.Xr ufsrestore 1M ,
 .Xr mount 2 ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr df 8 ,
+.Xr fsck 8 ,
+.Xr fsck_ufs 8 ,
+.Xr fstyp 8 ,
+.Xr lockfs 8 ,
+.Xr mkfs_ufs 8 ,
+.Xr newfs 8 ,
+.Xr tunefs 8 ,
+.Xr ufsdump 8 ,
+.Xr ufsrestore 8
 .Sh NOTES
 For information about internal UFS structures, see
-.Xr newfs 1M
+.Xr newfs 8
 and
-.Xr mkfs_ufs 1M .
+.Xr mkfs_ufs 8 .
 For information about dumping and restoring file systems, see
-.Xr ufsdump 1M ,
-.Xr ufsrestore 1M ,
+.Xr ufsdump 8 ,
+.Xr ufsrestore 8 ,
 and
 .Pa /usr/include/protocols/dumprestore.h .
 If you experience difficulty in allocating space on the ufs filesystem, it may
 be due to fragmentation.
 Fragmentation can occur when you do not have sufficient free blocks to satisfy
 an allocation request even though
-.Xr df 1M
+.Xr df 8
 indicates that enough free space is available.
 (This may occur because df only uses the available fragment count to calculate
 available space, but the file system requires contiguous sets of fragments for
 most allocations).
 If you suspect that you have exhausted contiguous fragments on your file system,
 you can use the
-.Xr fstyp 1M
+.Xr fstyp 8
 utility with the
 .Fl v
 option.
@@ -259,11 +259,11 @@ and
 .Pq (number of fragments free)
 fields.
 On unmounted filesystems, you can use
-.Xr fsck 1M
+.Xr fsck 8
 and observe the last line of output, which reports, among other items, the
 number of fragments and the degree of fragmentation.
 To correct a fragmentation problem, run
-.Xr ufsdump 1M
+.Xr ufsdump 8
 and
-.Xr ufsrestore 1M
+.Xr ufsrestore 8
 on the ufs filesystem.
diff --git a/usr/src/man/man4i/dkio.4i b/usr/src/man/man4i/dkio.4i
index 916f5b1461..43340f4ee0 100644
--- a/usr/src/man/man4i/dkio.4i
+++ b/usr/src/man/man4i/dkio.4i
@@ -766,9 +766,9 @@ forces the driver to re-examine the alternates slice and
 rebuild the internal bad block map accordingly.
 It should be used whenever the
 alternates slice is changed by any method other than the
-.Xr addbadsec 1M
+.Xr addbadsec 8
 or
-.Xr format 1M
+.Xr format 8
 utilities.
 .Dv DKIOCADDBAD
 can only be used for software
@@ -830,15 +830,15 @@ Any modification to any of the logical partitions results in the
 recreation of all logical device nodes.
 .El
 .Sh SEE ALSO
-.Xr addbadsec 1M ,
-.Xr fdisk 1M ,
-.Xr format 1M ,
 .Xr ioctl 2 ,
 .Xr cmdk 7D ,
 .Xr sd 7D ,
 .Xr cdio 7I ,
 .Xr fdio 7I ,
-.Xr hdio 7I
+.Xr hdio 7I ,
+.Xr addbadsec 8 ,
+.Xr fdisk 8 ,
+.Xr format 8
 .Sh NOTES
 Blocksize information provided in
 .Dv DKIOCGMEDIAINFO
diff --git a/usr/src/man/man4i/ipnat.4i b/usr/src/man/man4i/ipnat.4i
index e75b555ab4..ff3b7452c9 100644
--- a/usr/src/man/man4i/ipnat.4i
+++ b/usr/src/man/man4i/ipnat.4i
@@ -163,7 +163,7 @@ typedef struct natlookup {
 .It Dv SIOCSTPUT
 Move a NAT mapping structure from user space into the kernel.
 This ioctl is used by
-.Xr ipfs 1M
+.Xr ipfs 8
 to restore NAT sessions saved in
 .Pa /var/db/ipf/ipnat.ipf .
 The
@@ -430,7 +430,7 @@ before issuing a
 .Sh INTERFACE STABILITY
 Committed
 .Sh SEE ALSO
-.Xr ipfs 1M ,
-.Xr ipnat 1M ,
 .Xr ioctl 2 ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr ipfs 8 ,
+.Xr ipnat 8
diff --git a/usr/src/man/man4i/mtio.4i b/usr/src/man/man4i/mtio.4i
index b03fe5a8fa..6df8e28247 100644
--- a/usr/src/man/man4i/mtio.4i
+++ b/usr/src/man/man4i/mtio.4i
@@ -1135,7 +1135,7 @@ Tape Positioning and Tape Drives
 Suppose you have written three files to the non-rewinding 1/2\(dq tape device,
 .Pa /dev/rmt/0ln ,
 and that you want to go back and
-.Xr dd 1M
+.Xr dd 8
 the second file off the tape.
 The commands to do this are:
 .Bd -literal -offset 2n
@@ -1178,13 +1178,13 @@ ioctl(fd, MTIOCGETDRIVETYPE, &mtreq);
 .Sh SEE ALSO
 .Xr mt 1 ,
 .Xr tar 1 ,
-.Xr dd 1M ,
 .Xr open 2 ,
 .Xr read 2 ,
 .Xr write 2 ,
 .Xr aioread 3C ,
 .Xr aiowrite 3C ,
 .Xr ar.h 3HEAD ,
-.Xr st 7D
+.Xr st 7D ,
+.Xr dd 8
 .Pp
 .%T 1/4 Inch Tape Drive Tutorial
diff --git a/usr/src/man/man4i/quotactl.4i b/usr/src/man/man4i/quotactl.4i
index c1abb45cab..47ede04ec9 100644
--- a/usr/src/man/man4i/quotactl.4i
+++ b/usr/src/man/man4i/quotactl.4i
@@ -212,11 +212,11 @@ file pointed to by
 .Fa addr .
 .El
 .Sh SEE ALSO
-.Xr quota 1M ,
-.Xr quotacheck 1M ,
-.Xr quotaon 1M ,
 .Xr getrlimit 2 ,
-.Xr mount 2
+.Xr mount 2 ,
+.Xr quota 8 ,
+.Xr quotacheck 8 ,
+.Xr quotaon 8
 .Sh BUGS
 There should be some way to integrate this call with the resource limit
 interface provided by
diff --git a/usr/src/man/man4i/termio.4i b/usr/src/man/man4i/termio.4i
index ce9ed83c96..4e351e18a6 100644
--- a/usr/src/man/man4i/termio.4i
+++ b/usr/src/man/man4i/termio.4i
@@ -605,7 +605,7 @@ Processes with a handler will output status information when they receive
 .Dv SIGINFO ,
 for
 example,
-.Xr dd 1M .
+.Xr dd 8 .
 If a process does not have a
 .Dv SIGINFO
 handler, the
diff --git a/usr/src/man/man4p/ndp.4p b/usr/src/man/man4p/ndp.4p
index 44e0d1c879..98d6581afa 100644
--- a/usr/src/man/man4p/ndp.4p
+++ b/usr/src/man/man4p/ndp.4p
@@ -39,7 +39,7 @@ like
 for IPv4.
 NDP is also responsible for spreading information about the network gateway and
 how hosts should configure themselves
-.Pq see Xr in.ndpd 1M for more on how this happens .
+.Pq see Xr in.ndpd 8 for more on how this happens .
 .Sh APPLICATION PROGRAMMING INTERFACE
 The operating system provides several ioctls to help manipulate the mappings
 obtained through NDP.
@@ -339,11 +339,11 @@ int main(int argc, char *argv[]) {
 }
 .Ed
 .Sh SEE ALSO
-.Xr ifconfig 1M ,
-.Xr in.ndpd 1M ,
-.Xr ndp 1M ,
 .Xr sockaddr_in6 3SOCKET ,
-.Xr privileges 5
+.Xr privileges 5 ,
+.Xr ifconfig 8 ,
+.Xr in.ndpd 8 ,
+.Xr ndp 8
 .Rs
 .%A Narten, T.
 .%A Nordmark, E.
diff --git a/usr/src/man/man4p/tcp.4p b/usr/src/man/man4p/tcp.4p
index 82634af954..de4fa9f331 100644
--- a/usr/src/man/man4p/tcp.4p
+++ b/usr/src/man/man4p/tcp.4p
@@ -277,7 +277,7 @@ The operating system also provides alternative algorithms that may be more
 appropriate for your application, including the CUBIC congestion control
 algorithm described in RFC 8312.
 These can be configured system-wide using
-.Xr ipadm 1M ,
+.Xr ipadm 8 ,
 or on a per-connection basis with the TCP-level socket option
 .Dv TCP_CONGESTION ,
 whose argument is the name of the algorithm to use
@@ -376,7 +376,7 @@ has been made, it is too late to increase the send or receive window beyond the
 default TCP limit of 64K.
 .It
 For all applications, use
-.Xr ndd 1M
+.Xr ndd 8
 to modify the configuration parameter
 .Cm tcp_wscale_always .
 If
@@ -825,8 +825,6 @@ The system ran out of memory for internal data structures.
 .El
 .Sh SEE ALSO
 .Xr svcs 1 ,
-.Xr ndd 1M ,
-.Xr svcadm 1M ,
 .Xr ioctl 2 ,
 .Xr read 2 ,
 .Xr write 2 ,
@@ -841,7 +839,9 @@ The system ran out of memory for internal data structures.
 .Xr inet 7P ,
 .Xr inet6 7P ,
 .Xr ip 7P ,
-.Xr ip6 7P
+.Xr ip6 7P ,
+.Xr ndd 8 ,
+.Xr svcadm 8
 .Rs
 .%A "K. Ramakrishnan"
 .%A "S. Floyd"
@@ -891,7 +891,7 @@ under the service identifier
 .Pp
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using
-.Xr svcadm 1M .
+.Xr svcadm 8 .
 The service's
 status can be queried using the
 .Xr svcs 1
diff --git a/usr/src/man/man5/autofs.5 b/usr/src/man/man5/autofs.5
index 0a426822f6..d59127eda7 100644
--- a/usr/src/man/man5/autofs.5
+++ b/usr/src/man/man5/autofs.5
@@ -26,14 +26,14 @@
 .Nd automount configuration properties
 .Sh DESCRIPTION
 The behavior of the
-.Xr automount 1M
+.Xr automount 8
 command and the
-.Xr automountd 1M
+.Xr automountd 8
 daemon is controlled by property values that are stored in the Service
 Management Facility,
 .Xr smf 5 .
 The
-.Xr sharectl 1M
+.Xr sharectl 8
 command should be used to query or change values for these properties.
 .Pp
 Changes made to
@@ -43,7 +43,7 @@ property values on an
 or
 .Nm automountd
 command line override the values set using
-.Xr sharectl 1M .
+.Xr sharectl 8 .
 .Pp
 The following list describes the properties:
 .Bl -tag -width Ds
@@ -107,7 +107,7 @@ VAR1=val1,VAR2=val2\e,val3
 .Ed
 .El
 .Sh SEE ALSO
-.Xr automount 1M ,
-.Xr automountd 1M ,
-.Xr sharectl 1M ,
-.Xr smf 5
+.Xr smf 5 ,
+.Xr automount 8 ,
+.Xr automountd 8 ,
+.Xr sharectl 8
diff --git a/usr/src/man/man5/bhyve_config.5 b/usr/src/man/man5/bhyve_config.5
index b7ec9c9df2..d56053679d 100644
--- a/usr/src/man/man5/bhyve_config.5
+++ b/usr/src/man/man5/bhyve_config.5
@@ -32,15 +32,15 @@
 .Nm bhyve_config
 .Nd "bhyve configuration variables"
 .Sh DESCRIPTION
-.Xr bhyve 1M
+.Xr bhyve 8
 uses a hierarchical tree of configuration variables to describe global and
 per-device settings.
 Internal nodes in this tree do not have a value,
 only leaf nodes have values.
 This manual describes the configuration variables understood by
-.Xr bhyve 1M .
+.Xr bhyve 8 .
 If additional variables are defined,
-.Xr bhyve 1M
+.Xr bhyve 8
 will ignore them and will not emit errors for unknown variables.
 However, these additional variables can be referenced by other
 variables as described below.
@@ -146,7 +146,7 @@ Use MSI-X interrupts for PCI VirtIO devices.
 If set to false, MSI interrupts are used instead.
 .It Va config.dump Ta bool Ta false Ta
 If this value is set to true then, after parsing command line options,
-.Xr bhyve 1M
+.Xr bhyve 8
 will write all of its configuration variables to
 .Dv stdout
 and exit.
@@ -309,7 +309,7 @@ Backend device for the serial port.
 Either the pathname of a character device or
 .Dq stdio
 to use standard input and output of the
-.Xr bhyve 1M
+.Xr bhyve 8
 process.
 .El
 .Ss Host Bridge Settings
@@ -390,7 +390,7 @@ UNIX socket to listen on for VNC connections.
 .It Va vga Ta string Ta io Ta
 VGA configuration.
 More details are provided in
-.Xr bhyve 1M .
+.Xr bhyve 8 .
 .It Va w Ta integer Ta 1024 Ta
 Frame buffer width in pixels.
 .It Va h Ta integer Ta 768 Ta
@@ -515,6 +515,6 @@ The name of the port exposed to the guest.
 The path of a UNIX domain socket providing the host connection for the port.
 .El
 .Sh SEE ALSO
-.Xr bhyve 1M ,
 .Xr strtoul 3C ,
-.Xr getaddrinfo 3SOCKET
+.Xr getaddrinfo 3SOCKET ,
+.Xr bhyve 8
diff --git a/usr/src/man/man5/core.5 b/usr/src/man/man5/core.5
index c22fb28fa0..0b76aa02e3 100644
--- a/usr/src/man/man5/core.5
+++ b/usr/src/man/man5/core.5
@@ -53,7 +53,7 @@ abnormally terminating process, using a global core file name pattern and a
 per-process core file name pattern.
 These patterns are expanded to determine the pathname of the resulting core
 files, and can be configured by
-.Xr coreadm 1M .
+.Xr coreadm 8 .
 By default, the global core file pattern is disabled and not used, and the
 per-process core file pattern is set to
 .Sy core .
@@ -122,7 +122,7 @@ effective group ID is different from its real group ID.
 Similarly, set-user-ID and set-group-ID programs do not produce core files as
 this could potentially compromise system security.
 These processes can be explicitly granted permission to produce core files using
-.Xr coreadm 1M ,
+.Xr coreadm 8 ,
 at the risk of exposing secure information.
 .El
 .Pp
@@ -144,7 +144,7 @@ field in the file header has type
 The program header contains an entry for every segment that was part of the
 process address space, including shared library segments.
 The contents of the mappings specified by
-.Xr coreadm 1M
+.Xr coreadm 8
 are also part of the core image.
 Each program header has its
 .Fa p_memsz
@@ -162,7 +162,7 @@ is
 A mapping's data can be excluded due to the core file content settings
 .Po
 see
-.Xr coreadm 1M
+.Xr coreadm 8
 .Pc ,
 due to a failure, or due to a signal received after core dump initiation but
 before its completion.
@@ -414,7 +414,7 @@ structure is defined in
 This optional entry indicates which parts of the process image are specified
 to be included in the core file.
 See
-.Xr coreadm 1M .
+.Xr coreadm 8 .
 .It Vt prsecflags_t
 .Fa n_type :
 .Dv NT_SECFLAGS .
@@ -546,7 +546,7 @@ entry for more details.
 .El
 .Pp
 Depending on the
-.Xr coreadm 1M
+.Xr coreadm 8
 settings, the section header of an ELF core file can contain entries for CTF,
 DWARF debug information, symbol table, and string table sections.
 The
@@ -566,7 +566,6 @@ see
 .Xr mdb 1 ,
 .Xr proc 1 ,
 .Xr ps 1 ,
-.Xr coreadm 1M ,
 .Xr getrlimit 2 ,
 .Xr setrlimit 2 ,
 .Xr setuid 2 ,
@@ -580,4 +579,5 @@ see
 .Xr a.out 4 ,
 .Xr proc 4 ,
 .Xr security-flags 5 ,
-.Xr zones 5
+.Xr zones 5 ,
+.Xr coreadm 8
diff --git a/usr/src/man/man5/ctf.5 b/usr/src/man/man5/ctf.5
index 774063fc39..82845a85a2 100644
--- a/usr/src/man/man5/ctf.5
+++ b/usr/src/man/man5/ctf.5
@@ -58,7 +58,7 @@ data is consumed by multiple programs.
 It can be used by the modular debugger,
 .Xr mdb 1 ,
 as well as by
-.Xr dtrace 1M .
+.Xr dtrace 8 .
 Programmatic access to
 .Nm
 data can be obtained through
@@ -1209,7 +1209,7 @@ The section should have a link set to the symbol table and its address
 alignment must be 4.
 .Sh SEE ALSO
 .Xr mdb 1 ,
-.Xr dtrace 1M ,
 .Xr gelf 3ELF ,
 .Xr libelf 3LIB ,
-.Xr a.out 4
+.Xr a.out 4 ,
+.Xr dtrace 8
diff --git a/usr/src/man/man5/init.5 b/usr/src/man/man5/init.5
index 80309ab975..77a2fdfb20 100644
--- a/usr/src/man/man5/init.5
+++ b/usr/src/man/man5/init.5
@@ -45,11 +45,11 @@ and
 .Pp
 It can also be used to set any additional environment variables which should be
 present in all processes started by
-.Xr init 1M
+.Xr init 8
 or
-.Xr svc.startd 1M ,
+.Xr svc.startd 8 ,
 and in any
-.Xr zoneadmd 1M
+.Xr zoneadmd 8
 daemons started automatically to support zone operations.
 .Pp
 The format of the file is a set of tokens of the form:
@@ -90,7 +90,7 @@ If the
 .Ev CMASK
 variable is specified, it is not passed to the environment but the value is
 used to set the initial umask that
-.Xr init 1M
+.Xr init 8
 uses and that every other process inherits.
 The
 .Ev CMASK
@@ -102,7 +102,7 @@ A sequence of valid octal digits followed by other trailing characters will be
 treated as if the trailing characters were not present.
 .Pp
 For
-.Xr init 1M ,
+.Xr init 8 ,
 the number of environment variables that can be set is limited to 20.
 .Pp
 .Pa /etc/TIMEZONE
@@ -111,12 +111,12 @@ is a symbolic link to
 This link exists for compatibility with legacy software, is obsolete, and may
 be removed in a future release.
 .Sh SEE ALSO
-.Xr init 1M ,
-.Xr rtc 1M ,
-.Xr svc.startd 1M ,
-.Xr zoneadmd 1M ,
 .Xr ctime 3C ,
-.Xr environ 5
+.Xr environ 5 ,
+.Xr init 8 ,
+.Xr rtc 8 ,
+.Xr svc.startd 8 ,
+.Xr zoneadmd 8
 .Sh NOTES
 When changing the
 .Ev TZ
@@ -137,5 +137,5 @@ is the same name as the
 variable setting.
 .Pp
 See
-.Xr rtc 1M
+.Xr rtc 8
 for more information.
diff --git a/usr/src/man/man5/loader.conf.5 b/usr/src/man/man5/loader.conf.5
index 2da21a54d5..b568942a94 100644
--- a/usr/src/man/man5/loader.conf.5
+++ b/usr/src/man/man5/loader.conf.5
@@ -70,7 +70,7 @@ The configuration variables are read from the following files:
 .Bl -tag -width Ar
 .It Ar /boot/solaris/bootenv.rc
 Managed by the
-.Xr eeprom 1M
+.Xr eeprom 8
 command.
 .It Ar /boot/defaults/loader.conf
 Loader defaults provided by the operating system.
@@ -87,7 +87,7 @@ TFTP does not provide the directory list.
 .It Ar /boot/transient.conf
 Configuration file for transient boot.
 This file is created by the
-.Xr reboot 1M
+.Xr reboot 8
 command and is automatically removed when system is reaching the multi-user
 run level.
 .El
@@ -235,10 +235,10 @@ If set to
 the beastie boot menu will be displayed without ANSI coloring.
 .El
 .Sh SEE ALSO
-.Xr boot 1M ,
-.Xr eeprom 1M ,
 .Xr loader 5 ,
-.Xr loader.4th 5
+.Xr loader.4th 5 ,
+.Xr boot 8 ,
+.Xr eeprom 8
 .Sh NOTES
 The
 .Xr loader 5
diff --git a/usr/src/man/man5/mailer.conf.5 b/usr/src/man/man5/mailer.conf.5
index b80510a597..a02833ae5d 100644
--- a/usr/src/man/man5/mailer.conf.5
+++ b/usr/src/man/man5/mailer.conf.5
@@ -37,7 +37,7 @@
 .Sh NAME
 .Nm mailer.conf
 .Nd configuration file for
-.Xr mailwrapper 1M
+.Xr mailwrapper 8
 .Sh DESCRIPTION
 The file
 .Pa /etc/mailer.conf
@@ -50,13 +50,13 @@ contains a series of lines of the form
 The first word of each line is the
 .Ar name
 of a program invoking
-.Xr mailwrapper 1M .
+.Xr mailwrapper 8 .
 (For example, on a typical system
 .Pa /usr/lib/sendmail
 would be a symbolic link to
-.Xr mailwrapper 1M ,
+.Xr mailwrapper 8 ,
 as would
-.Xr newaliases 1M
+.Xr newaliases 8
 and
 .Xr mailq 1 .
 Thus,
@@ -76,7 +76,7 @@ The further
 if any, are passed to the
 .Ar program ,
 followed by the arguments
-.Xr mailwrapper 1M
+.Xr mailwrapper 8
 was called with.
 .Pp
 The file may also contain comment lines, denoted by a
@@ -88,7 +88,7 @@ mark in the first column of any line.
 This example shows how to set up
 .Nm
 to invoke the traditional
-.Xr sendmail 1M
+.Xr sendmail 8
 program:
 .Bd -literal -offset indent
 # Execute the "real" sendmail program located in
@@ -100,8 +100,8 @@ newaliases	/usr/lib/smtp/sendmail/sendmail
 .Sh SEE ALSO
 .Xr mail 1 ,
 .Xr mailq 1 ,
-.Xr mailwrapper 1M ,
-.Xr newaliases 1M ,
-.Xr sendmail 1M
+.Xr mailwrapper 8 ,
+.Xr newaliases 8 ,
+.Xr sendmail 8
 .Sh AUTHORS
 .An Perry E. Metzger Aq perry@piermont.com
diff --git a/usr/src/man/man5/nfs.5 b/usr/src/man/man5/nfs.5
index 601299d002..6e24bf3ed4 100644
--- a/usr/src/man/man5/nfs.5
+++ b/usr/src/man/man5/nfs.5
@@ -28,17 +28,17 @@
 .Nd NFS configuration properties
 .Sh DESCRIPTION
 The behavior of the
-.Xr nfsd 1M ,
-.Xr nfsmapid 1M ,
-.Xr lockd 1M ,
+.Xr nfsd 8 ,
+.Xr nfsmapid 8 ,
+.Xr lockd 8 ,
 and
-.Xr mountd 1M
+.Xr mountd 8
 daemons and
-.Xr mount_nfs 1M
+.Xr mount_nfs 8
 command is controlled by property values that are stored in the Service
 Management Facility, smf(5).
 The
-.Xr sharectl 1M
+.Xr sharectl 8
 command should be used to query or change values for these properties.
 .Pp
 Changes made to
@@ -50,7 +50,7 @@ property values on the
 or
 .Nm mount_nfs
 command line override the values set using
-.Xr sharectl 1M .
+.Xr sharectl 8 .
 .Pp
 The following list describes the properties:
 .Bl -tag -width Ds
@@ -70,7 +70,7 @@ while default maximum is
 You can override this range on a per-mount basis by using the
 .Fl o Sy vers Ns =
 option to
-.Xr mount_nfs 1M .
+.Xr mount_nfs 8 .
 .It Xo
 .Sy server_versmin Ns = Ns Ar num
 .br
@@ -207,13 +207,13 @@ which means it should use a default binding.
 As described above, the setting for
 .Sy nfsmapid_domain
 overrides the domain used by
-.Xr nfsmapid 1M
+.Xr nfsmapid 8
 for building and comparing outbound and inbound attribute strings, respectively.
 This setting overrides any other mechanism for setting the NFSv4 domain.
 In the absence of a
 .Sy nfsmapid_domain
 setting, the
-.Xr nfsmapid 1M
+.Xr nfsmapid 8
 daemon determines the NFSv4 domain as follows:
 .Bl -bullet
 .It
@@ -245,7 +245,7 @@ exists,
 .Nm nfsmapid
 falls back on using the configured domain name
 .Po see
-.Xr domainname 1M
+.Xr domainname 8
 .Pc ,
 which is returned with the leading domain suffix removed.
 For example, for
@@ -308,12 +308,12 @@ Delegated ZFS datasets to a zone are shareable, as well as lofs-remounted
 directories.
 The zone must have sys_nfs privileges; most brands grant this already.
 .Sh SEE ALSO
-.Xr lockd 1M ,
-.Xr mount_nfs 1M ,
-.Xr mountd 1M ,
-.Xr nfsd 1M ,
-.Xr nfsmapid 1M ,
-.Xr sharectl 1M ,
 .Xr brands 5 ,
 .Xr smf 5 ,
-.Xr zones 5
+.Xr zones 5 ,
+.Xr lockd 8 ,
+.Xr mount_nfs 8 ,
+.Xr mountd 8 ,
+.Xr nfsd 8 ,
+.Xr nfsmapid 8 ,
+.Xr sharectl 8
diff --git a/usr/src/man/man5/proc.5 b/usr/src/man/man5/proc.5
index 2853432a69..cdb1f71ad5 100644
--- a/usr/src/man/man5/proc.5
+++ b/usr/src/man/man5/proc.5
@@ -3119,7 +3119,6 @@ See
 .Sh SEE ALSO
 .Xr ls 1 ,
 .Xr ps 1 ,
-.Xr chroot 1M ,
 .Xr alarm 2 ,
 .Xr brk 2 ,
 .Xr chdir 2 ,
@@ -3168,7 +3167,8 @@ See
 .Xr process 4 ,
 .Xr lfcompile 5 ,
 .Xr privileges 5 ,
-.Xr security-flags 5
+.Xr security-flags 5 ,
+.Xr chroot 8
 .Sh NOTES
 Descriptions of structures in this document include only interesting structure
 elements, not filler and padding fields, and may show elements out of order for
diff --git a/usr/src/man/man5/vfstab.5 b/usr/src/man/man5/vfstab.5
index 3c1f8a6755..c540f1aca8 100644
--- a/usr/src/man/man5/vfstab.5
+++ b/usr/src/man/man5/vfstab.5
@@ -45,11 +45,11 @@ the default mount directory
 the name of the file system type
 .Pq Em FS type ,
 the number used by
-.Xr fsck 1M
+.Xr fsck 8
 to decide whether to check the file system automatically
 .Pq Em fsck pass ,
 whether the file system should be mounted automatically by
-.Xr mountall 1M
+.Xr mountall 8
 .Pq Em mount at boot ,
 and the file system mount options
 .Pq Em mount options .
@@ -122,9 +122,9 @@ The following is an example for a UFS file system in which logging is enabled:
 .Ed
 .Pp
 See
-.Xr mount_nfs 1M
+.Xr mount_nfs 8
 for a description of NFS mount options and
-.Xr mount_ufs 1M
+.Xr mount_ufs 8
 for a description of UFS options.
 .Pp
 .Sy Example 2
@@ -170,7 +170,7 @@ example above
 .Pc
 for a pcfs logical drive.
 See
-.Xr mount_pcfs 1M
+.Xr mount_pcfs 8
 for syntax for pcfs logical drives and for pcfs-specific mount options.
 .Pp
 .Sy Example 3
@@ -186,11 +186,11 @@ See
 .Xr lofs 7FS
 for an overview of the loopback file system.
 .Sh SEE ALSO
-.Xr fsck 1M ,
-.Xr mount 1M ,
-.Xr mount_hsfs 1M ,
-.Xr mount_nfs 1M ,
-.Xr mount_tmpfs 1M ,
-.Xr mount_ufs 1M ,
-.Xr swap 1M ,
-.Xr getvfsent 3C
+.Xr getvfsent 3C ,
+.Xr fsck 8 ,
+.Xr mount 8 ,
+.Xr mount_hsfs 8 ,
+.Xr mount_nfs 8 ,
+.Xr mount_tmpfs 8 ,
+.Xr mount_ufs 8 ,
+.Xr swap 8
diff --git a/usr/src/man/man7/gptzfsboot.7 b/usr/src/man/man7/gptzfsboot.7
index 242b4d6022..db1f9210eb 100644
--- a/usr/src/man/man7/gptzfsboot.7
+++ b/usr/src/man/man7/gptzfsboot.7
@@ -38,7 +38,7 @@ is installed in a
 or
 .Cm boot
 partition of a disk with
-.Xr installboot 1M .
+.Xr installboot 8 .
 .Ss IMPLEMENTATION NOTES
 The GPT standard allows a variable number of partitions, but
 .Nm
@@ -60,7 +60,7 @@ Currently GPT and MBR partition schemes are supported.
 The default boot partition is recorded into
 .Nm
 binary by
-.Xr installboot 1M
+.Xr installboot 8
 and the default boot file system is determined at run time.
 .Nm
 does support booting from the
@@ -117,7 +117,7 @@ can be used to list the content of named directory and
 command can be used to query information about discovered devices.
 The output format for ZFS pools is similar to that of
 .Cm zpool status
-.Pq see Xr zpool 1M .
+.Pq see Xr zpool 8 .
 .Pp
 The configured or automatically determined ZFS boot filesystem is
 stored in the
@@ -175,7 +175,7 @@ is installed in combination with a
 .Dq protective MBR
 .Po
 see
-.Xr installboot 1M
+.Xr installboot 8
 .Pc .
 To install
 .Nm
@@ -186,6 +186,6 @@ drive:
 installboot /boot/pmbr /boot/gptzfsboot /dev/rdsk/c0t0d0s0
 .Ed
 .Sh SEE ALSO
-.Xr installboot 1M ,
-.Xr zpool 1M ,
-.Xr loader 5
+.Xr loader 5 ,
+.Xr installboot 8 ,
+.Xr zpool 8
diff --git a/usr/src/man/man7/ieee802.3.7 b/usr/src/man/man7/ieee802.3.7
index 1be71350bb..6dd6545f27 100644
--- a/usr/src/man/man7/ieee802.3.7
+++ b/usr/src/man/man7/ieee802.3.7
@@ -40,23 +40,23 @@ See the device driver's documentation for those specific details.
 .
 .Lp
 Values that are statistics are visible
-.Xr kstat 1M ,
+.Xr kstat 8 ,
 whereas properties are visible using the
-.Xr dladm 1M
+.Xr dladm 8
 .Sy show-linkprop
 subcommand.
 Tunables are properties that can be changed using the
-.Xr dladm 1M
+.Xr dladm 8
 .Sy set-linkprop
 subcommand.
 A more useful summary of current operational state can be seen with the
-.Xr dladm 1M
+.Xr dladm 8
 .Sy show-ether
 subcommand.
 .
 .Ss Statistics
 The following statistics are accessible with
-.Xr kstat 1M .
+.Xr kstat 8 .
 Note that some statistics are available in both 32- and 64-bit counters,
 in which case the name of the 64 bit statistic will be the same as the
 32-bit, but with
@@ -292,11 +292,11 @@ Values are as follows:
 .El
 .Ss Properties
 The following parameters are accessible with
-.Xr dladm 1M .
+.Xr dladm 8 .
 Some of these are normally read-only.
 Other properties that are not specific to IEEE 802.3 / Ethernet links are also
 available via
-.Xr dladm 1M ,
+.Xr dladm 8 ,
 and are documented in its man page rather than here.
 .
 .Bl -tag -width adv_1000hdx_cap
@@ -389,7 +389,7 @@ Advertisement of these modes can be enabled or disabled by setting the
 appropriate
 .Sy en_
 property in
-.Xr dladm 1M .
+.Xr dladm 8 .
 .Lp
 Auto-negotiation may also be disabled, by setting the
 .Sy adv_autoneg_cap
@@ -467,13 +467,13 @@ property refers to the link layer property.
 It may be necessary to configure upper layer protocols such as IP to use a
 different size when this changes.
 See
-.Xr ifconfig 1M .
+.Xr ifconfig 8 .
 .
 .Ss Virtual LANs
 Most devices support virtual LANs (and also priority control tagging) though
 the use of a 4-byte tag inserted between the frame header and payload.
 The details of configuration of this are covered in the
-.Xr dladm 1M
+.Xr dladm 8
 manual.
 .
 .Ss Data Link Provider Interface (DLPI) Details
@@ -506,19 +506,19 @@ Ethernet drivers on the support both DLPI style 1 and style 2 operation.
 Additionally, it is possible to configure provide
 .Dq vanity
 names to interfaces using the
-.Xr dladm 1M
+.Xr dladm 8
 .Sy rename-link
 subcommand.
 Such vanity names are only accessible using DLPI style 1.
 .Sh NOTES
 There may be other mechanisms available to configure link layer properties.
 Historically the
-.Xr ndd 1M
+.Xr ndd 8
 command, and
 .Xr driver.conf 4
 files could be used to do this.
 These methods are deprecated in favor of
-.Xr dladm 1M
+.Xr dladm 8
 properties.
 .
 .Sh INTERFACE STABILITY
@@ -531,14 +531,14 @@ and some devices may support additional statistics and properties.
 The DLPI and IEEE 802.3 itself are
 .Sy Standard .
 .Sh SEE ALSO
-.Xr dladm 1M ,
-.Xr ifconfig 1M ,
-.Xr kstat 1M ,
-.Xr ndd 1M ,
-.Xr netstat 1M ,
 .Xr libdlpi 3LIB ,
 .Xr driver.conf 4 ,
-.Xr dlpi 7P
+.Xr dlpi 7P ,
+.Xr dladm 8 ,
+.Xr ifconfig 8 ,
+.Xr kstat 8 ,
+.Xr ndd 8 ,
+.Xr netstat 8
 .Rs
 .%T IEEE 802.3: Ethernet
 .%Q IEEE Standards Association
diff --git a/usr/src/man/man7/isoboot.7 b/usr/src/man/man7/isoboot.7
index fd0a5d74fb..152e9e4b1a 100644
--- a/usr/src/man/man7/isoboot.7
+++ b/usr/src/man/man7/isoboot.7
@@ -36,7 +36,7 @@ been written to a USB flash drive or other HDD-like device.
 is installed in a
 .Cm x86 Boot
 partition with
-.Xr installboot 1M .
+.Xr installboot 8 .
 .Sh IMPLEMENTATION NOTES
 The El Torito standard for bootable CDs provides a 32KB "System Area"
 at the beginning of an image.
@@ -57,7 +57,7 @@ seeks to read the primary illumos
 .Xr loader 5
 from there.
 .Sh SEE ALSO
-.Xr installboot 1M
+.Xr installboot 8
 .Sh HISTORY
 .Nm
 appeared in FreeBSD 12.0.
diff --git a/usr/src/man/man7/loader.7 b/usr/src/man/man7/loader.7
index 2865f9a5de..a217b36b41 100644
--- a/usr/src/man/man7/loader.7
+++ b/usr/src/man/man7/loader.7
@@ -329,7 +329,7 @@ refers to a device specification:
 where
 .Pa pool/filesystem
 is a ZFS filesystem name as described in
-.Xr zfs 1M .
+.Xr zfs 8 .
 .Ss Builtin Environment Variables
 The
 .Nm
@@ -400,32 +400,32 @@ will engage interactive mode only if
 has failed for some reason.
 .It Va boot_ask
 Will set
-.Xr kernel 1M
+.Xr kernel 8
 .Fl a
 option.
 .It Va boot_debug
 Will set
-.Xr kernel 1M
+.Xr kernel 8
 .Fl d
 option.
 .It Va boot_kmdb
 Will set
-.Xr kernel 1M
+.Xr kernel 8
 .Fl k
 option.
 .It Va boot_reconfigure
 Will set
-.Xr kernel 1M
+.Xr kernel 8
 .Fl r
 option.
 .It Va boot_single
 Will set
-.Xr kernel 1M
+.Xr kernel 8
 .Fl s
 option.
 .It Va boot_verbose
 Will set
-.Xr kernel 1M
+.Xr kernel 8
 .Fl v
 option.
 .It Va boot-args
@@ -445,7 +445,7 @@ Defines the current console or consoles.
 Multiple consoles may be specified.
 In that case, the first listed console will become the default console for
 the
-.Xr kernel 1M .
+.Xr kernel 8 .
 .It Va currdev
 Selects the default device.
 Syntax for devices is odd.
@@ -472,7 +472,7 @@ is unset, the default prompt is
 .Ql > .
 .It Va os_console
 If set, the value is used to set
-.Xr kernel 1M
+.Xr kernel 8
 .Va console
 property.
 .El
@@ -871,9 +871,9 @@ The reason is, the beadm or menu selection will also instruct loader to clean up
 the currently set configuration and load configuration from the new boot
 environment.
 .Sh SEE ALSO
-.Xr boot 1M ,
 .Xr btxld 1onbld ,
-.Xr loader.conf 4
+.Xr loader.conf 4 ,
+.Xr boot 8
 .Sh STANDARDS
 For the purposes of ANS Forth compliance, loader is an
 .Bf Em
diff --git a/usr/src/man/man7/menu.4th.7 b/usr/src/man/man7/menu.4th.7
index 7ce66f0369..d022439431 100644
--- a/usr/src/man/man7/menu.4th.7
+++ b/usr/src/man/man7/menu.4th.7
@@ -212,7 +212,7 @@ When set to a number
 .Dq Li x
 associated with a given menuitem, that menuitem will allow to select
 acpi-user-options
-.Pq see Xr eeprom 1M .
+.Pq see Xr eeprom 8 .
 .It Va menu_options
 When set to a number
 .Dq Li x ,
@@ -300,8 +300,8 @@ set menu_reboot
 menu-display
 .Ed
 .Sh SEE ALSO
-.Xr eeprom 1M ,
 .Xr loader.conf 4 ,
 .Xr beastie.4th 5 ,
 .Xr loader 5 ,
-.Xr loader.4th 5
+.Xr loader.4th 5 ,
+.Xr eeprom 8
diff --git a/usr/src/man/man7/pam_timestamp.7 b/usr/src/man/man7/pam_timestamp.7
index 7b743b5f69..e7bb69235c 100644
--- a/usr/src/man/man7/pam_timestamp.7
+++ b/usr/src/man/man7/pam_timestamp.7
@@ -83,7 +83,7 @@ or timestamp file is expired or corrupt.
 The following example is a
 .Xr pam.conf 4
 fragment that illustrates default settings for allowing
-.Xr su 1M
+.Xr su 8
 authentication:
 .Bd -literal -offset indent
 su  auth required	pam_unix_cred.so.1
@@ -105,9 +105,9 @@ su  auth required	pam_unix_auth.so.1
 .Sh MT LEVEL
 .Sy MT-Safe .
 .Sh SEE ALSO
-.Xr su 1M ,
 .Xr syslog 3C ,
 .Xr pam 3PAM ,
 .Xr pam_sm_authenticate 3PAM ,
 .Xr pam_sm_setcred 3PAM ,
-.Xr pam.conf 4
+.Xr pam.conf 4 ,
+.Xr su 8
diff --git a/usr/src/man/man8/acpidump.8 b/usr/src/man/man8/acpidump.8
index 6cdda1ab7a..627c3de42a 100644
--- a/usr/src/man/man8/acpidump.8
+++ b/usr/src/man/man8/acpidump.8
@@ -31,7 +31,7 @@ The
 utility is used to dump the system's Advanced Configuration and Power Interface
 (ACPI) tables that are provided by system firmware.
 The dumped tables can be used by other utilities, such as
-.Xr acpixtract 1M
+.Xr acpixtract 8
 or
 .Sy iasl .
 .Sh OPTIONS
@@ -72,7 +72,7 @@ Dump all ACPI Tables
 .Pp
 The following example dumps all of the ACPI tables from the system.
 This can then be used with
-.Xr acpixtract 1M
+.Xr acpixtract 8
 and the iasl utility to decode the ACPI tables from the system.
 In this example, all of the tables are written to the file
 .Pa acpi.out .
@@ -80,4 +80,4 @@ In this example, all of the tables are written to the file
 # acpidump -o acpi.dat
 .Ed
 .Sh SEE ALSO
-.Xr acpixtract 1M
+.Xr acpixtract 8
diff --git a/usr/src/man/man8/acpixtract.8 b/usr/src/man/man8/acpixtract.8
index 65c4f9f426..76fd0150e7 100644
--- a/usr/src/man/man8/acpixtract.8
+++ b/usr/src/man/man8/acpixtract.8
@@ -27,7 +27,7 @@ The
 utility extracts the binary data from a dump of the system's Advanced
 Configuration and Power Interface (ACPI) tables.
 The dump is usually obtained via the
-.Xr acpidump 1M
+.Xr acpidump 8
 command.
 The resulting binary file(s) are represented in the ACPI
 .Sy ASL
@@ -67,7 +67,7 @@ Extract all ACPI tables
 The following example extracts all of the individual ACPI tables from a
 previously created dump of the ACPI tables from a running system.
 Such a dump can be created with the
-.Xr acpidump 1M
+.Xr acpidump 8
 utility.
 Extracted tables can then be inspected or disassembled by the
 iasl utility on any platform.
@@ -110,4 +110,4 @@ Acpi table [EINJ] -     336 bytes written to einj.dat
 28 binary ACPI tables extracted
 .Ed
 .Sh SEE ALSO
-.Xr acpidump 1M
+.Xr acpidump 8
diff --git a/usr/src/man/man8/automount.8 b/usr/src/man/man8/automount.8
index e907c78069..38b701fe8f 100644
--- a/usr/src/man/man8/automount.8
+++ b/usr/src/man/man8/automount.8
@@ -36,13 +36,13 @@ utility installs
 .Nm autofs
 mount points and associates an automount map with each mount point.
 It starts the
-.Xr automountd 1M
+.Xr automountd 8
 daemon if it finds any non-trivial entries in either local or distributed
 automount maps and if the daemon is not already running.
 The
 .Nm autofs
 file system monitors attempts to access directories within it and notifies the
-.Xr automountd 1M
+.Xr automountd 8
 daemon.
 The daemon uses the map to locate a file system, which it then mounts at the
 point of reference within the
@@ -200,7 +200,7 @@ options, and
 .Ar location
 specifies a file system from which the directory may be mounted.
 In the case of a simple NFS mount, the options that can be used are specified in
-.Xr mount_nfs 1M ,
+.Xr mount_nfs 8 ,
 and
 .Ar location
 takes the form:
@@ -644,14 +644,14 @@ See
 .Xr ls 1 ,
 .Xr svcs 1 ,
 .Xr uname 1 ,
-.Xr automountd 1M ,
-.Xr mount 1M ,
-.Xr mount_nfs 1M ,
-.Xr svcadm 1M ,
 .Xr autofs 4 ,
 .Xr attributes 5 ,
 .Xr nfssec 5 ,
-.Xr smf 5
+.Xr smf 5 ,
+.Xr automountd 8 ,
+.Xr mount 8 ,
+.Xr mount_nfs 8 ,
+.Xr svcadm 8
 .Sh NOTES
 .Nm autofs
 mount points must not be hierarchically related.
@@ -702,7 +702,7 @@ retries.
 Note that this is significantly different from the default
 .Pq 10000
 for the
-.Xr mount_nfs 1M
+.Xr mount_nfs 8
 utility.
 .Pp
 The Network Information Service
@@ -722,7 +722,7 @@ svc:/system/filesystem/autofs:default
 .Pp
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using
-.Xr svcadm 1M .
+.Xr svcadm 8 .
 The service's status can be queried using the
 .Xr svcs 1
 command.
diff --git a/usr/src/man/man8/automountd.8 b/usr/src/man/man8/automountd.8
index 1ca7faca00..c6652e0ef6 100644
--- a/usr/src/man/man8/automountd.8
+++ b/usr/src/man/man8/automountd.8
@@ -36,7 +36,7 @@ is an RPC server that answers file system mount and unmount requests from the
 file system.
 It uses local files or name service maps to locate file systems to be mounted.
 These maps are described with the
-.Xr automount 1M
+.Xr automount 8
 command.
 .Pp
 If
@@ -45,12 +45,12 @@ finds any non-trivial entries in either the local or distributed automount maps
 and if the daemon is not running already, the
 .Nm
 daemon is automatically invoked by
-.Xr automount 1M .
+.Xr automount 8 .
 .Nm
 enables the svc:/network/nfs/nlockmgr service
-.Pq Xr lockd 1M ,
+.Pq Xr lockd 8 ,
 and the svc:/network/nfs/status service
-.Pq Xr statd 1M ,
+.Pq Xr statd 8 ,
 if NFS mounts need to be done.
 .Sh OPTIONS
 The following options are supported:
@@ -92,12 +92,12 @@ Master map for automounter.
 .El
 .Sh SEE ALSO
 .Xr svcs 1 ,
-.Xr automount 1M ,
-.Xr svcadm 1M ,
 .Xr autofs 4 ,
 .Xr attributes 5 ,
 .Xr largefile 5 ,
-.Xr smf 5
+.Xr smf 5 ,
+.Xr automount 8 ,
+.Xr svcadm 8
 .Sh NOTES
 The
 .Nm
@@ -110,11 +110,11 @@ svc:/system/filesystem/autofs
 .Pp
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using
-.Xr svcadm 1M .
+.Xr svcadm 8 .
 The service's status can be queried using
 .Xr svcs 1 .
 If it is disabled, it is enabled by
-.Xr automount 1M
+.Xr automount 8
 unless the
 .Sy application Ns / Ns Sy auto_enable
 property is set to
diff --git a/usr/src/man/man8/bhyve.8 b/usr/src/man/man8/bhyve.8
index e38d368e8b..0ad81e20e7 100644
--- a/usr/src/man/man8/bhyve.8
+++ b/usr/src/man/man8/bhyve.8
@@ -805,8 +805,8 @@ bhyve -c 2 -m 4G -w -H \e
    uefivm
 .Ed
 .Sh SEE ALSO
-.Xr bhyvectl 1M ,
 .Xr bhyve_config 4 ,
+.Xr bhyvectl 8
 .Pp
 .Rs
 .%A Intel
diff --git a/usr/src/man/man8/bhyvectl.8 b/usr/src/man/man8/bhyvectl.8
index 82d63e148c..730f46109b 100644
--- a/usr/src/man/man8/bhyvectl.8
+++ b/usr/src/man/man8/bhyvectl.8
@@ -45,7 +45,7 @@
 The
 .Nm
 command is a control utility for active
-.Xr bhyve 1M
+.Xr bhyve 8
 virtual machine instances.
 .Pp
 .Em Note :
@@ -82,4 +82,4 @@ Destroy the VM called fbsd10:
 .Pp
 .Dl "bhyvectl --vm=fbsd10 --destroy"
 .Sh SEE ALSO
-.Xr bhyve 1M
+.Xr bhyve 8
diff --git a/usr/src/man/man8/ccidadm.8 b/usr/src/man/man8/ccidadm.8
index 9503ae6e67..d513591a31 100644
--- a/usr/src/man/man8/ccidadm.8
+++ b/usr/src/man/man8/ccidadm.8
@@ -186,5 +186,5 @@ is
 .Sy Not-an-Interface
 and may change any time.
 .Sh SEE ALSO
-.Xr cfgadm 1M ,
-.Xr ccid 7D
+.Xr ccid 7D ,
+.Xr cfgadm 8
diff --git a/usr/src/man/man8/connstat.8 b/usr/src/man/man8/connstat.8
index 3d6510a743..686f3c4648 100644
--- a/usr/src/man/man8/connstat.8
+++ b/usr/src/man/man8/connstat.8
@@ -379,7 +379,7 @@ when not using the
 .Fl P
 option and diagnostic messages are not.
 .Sh SEE ALSO
-.Xr netstat 1M
+.Xr netstat 8
 .Rs
 .%A J. Postel
 .%B Transmission Control Protocol, STD 7, RFC 793
diff --git a/usr/src/man/man8/diskinfo.8 b/usr/src/man/man8/diskinfo.8
index 9f8a51dc9c..019362734a 100644
--- a/usr/src/man/man8/diskinfo.8
+++ b/usr/src/man/man8/diskinfo.8
@@ -49,7 +49,7 @@ the fields provided indicate the base name of the device in the
 .Pa /dev/dsk
 directory, the disk's vendor and product identification strings, the serial
 number of the device, whether the device is faulty as diagnosed by
-.Xr fmd 1M ,
+.Xr fmd 8 ,
 whether the locate or identification indicator is on for the device
 .Pq if one is present ,
 and the chassis and bay number containing the disk if known.
@@ -103,7 +103,7 @@ The base name of the device node within the
 directory.
 The names of partitions and/or slices, if any, are derived from this name as
 described by
-.Xr prtvtoc 1M .
+.Xr prtvtoc 8 .
 .Pp
 This field is available in all output modes.
 .It Sy FLRS
@@ -186,6 +186,6 @@ The vendor identification string reported by the device.
 This field is available in all output modes.
 .El
 .Sh SEE ALSO
-.Xr fmd 1M ,
-.Xr prtvtoc 1M ,
-.Xr sd 7D
+.Xr sd 7D ,
+.Xr fmd 8 ,
+.Xr prtvtoc 8
diff --git a/usr/src/man/man8/dns-sd.8 b/usr/src/man/man8/dns-sd.8
index 8b4a63dbb7..6a41e72525 100644
--- a/usr/src/man/man8/dns-sd.8
+++ b/usr/src/man/man8/dns-sd.8
@@ -59,9 +59,9 @@
 The
 .Nm
 command is a network diagnostic tool, much like
-.Xr ping 1M
+.Xr ping 8
 or
-.Xr traceroute 1M .
+.Xr traceroute 8 .
 However, unlike those tools, most of its functionality is not implemented in the
 .Nm
 executable itself, but in library code that is available to any application.
@@ -269,7 +269,7 @@ You can also query for a unicast name like www.apple.com and monitor its status.
 .Sh INTERFACE STABILITY
 .Sy Volatile .
 .Sh SEE ALSO
-.Xr mdnsd 1M ,
-.Xr ping 1M ,
-.Xr traceroute 1M ,
-.Xr resolv.conf 4
+.Xr resolv.conf 4 ,
+.Xr mdnsd 8 ,
+.Xr ping 8 ,
+.Xr traceroute 8
diff --git a/usr/src/man/man8/hotplug.8 b/usr/src/man/man8/hotplug.8
index bc1934995a..10ef153470 100644
--- a/usr/src/man/man8/hotplug.8
+++ b/usr/src/man/man8/hotplug.8
@@ -269,17 +269,17 @@ ERROR: there are no connections to display.
 .Pp
 If this error message is seen, note that the system might still have other I/O
 devices that support hotplugging, through the
-.Xr cfgadm 1M
+.Xr cfgadm 8
 command instead of
 .Nm .
 .Sh INTERFACE STABILITY
 .Sy Committed
 .Sh SEE ALSO
-.Xr cfgadm 1M ,
-.Xr hotplugd 1M ,
 .Xr getsubopt 3C ,
 .Xr rcmscript 4 ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr cfgadm 8 ,
+.Xr hotplugd 8
 .Sh NOTES
 The
 .Nm
@@ -291,7 +291,7 @@ must be enabled as a prerequisite for using the
 .Nm
 command.
 See
-.Xr hotplugd 1M .
+.Xr hotplugd 8 .
 .Pp
 The authorization
 .Pa solaris.hotplug.modify
diff --git a/usr/src/man/man8/installboot.8 b/usr/src/man/man8/installboot.8
index 6e330e54a3..8a69a128ec 100644
--- a/usr/src/man/man8/installboot.8
+++ b/usr/src/man/man8/installboot.8
@@ -51,7 +51,7 @@ raw-device
 .Ar raw-device attach-raw-device
 .Sh DESCRIPTION
 The
-.Xr boot 1M
+.Xr boot 8
 boot program is loaded from disk and is responsible of loading kernel and its
 support files from specific file system.
 .Pp
@@ -115,7 +115,7 @@ The boot partition must use following GPT UUID:
 which is provided by
 .Qq boot
 tag in
-.Xr format 1M
+.Xr format 8
 partition menu.
 .El
 .Pp
@@ -221,13 +221,13 @@ The following command installs loader stage files and master boot record:
 .Sh INTERFACE STABILITY
 .Sy Uncommitted
 .Sh SEE ALSO
-.Xr boot 1M ,
-.Xr bootadm 1M ,
-.Xr fdisk 1M ,
-.Xr fmthard 1M ,
-.Xr format 1M ,
-.Xr kernel 1M ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr boot 8 ,
+.Xr bootadm 8 ,
+.Xr fdisk 8 ,
+.Xr fmthard 8 ,
+.Xr format 8 ,
+.Xr kernel 8
 .Sh WARNINGS
 Installing
 .Sy stage1
diff --git a/usr/src/man/man8/ipadm.8 b/usr/src/man/man8/ipadm.8
index cf97f26021..fffe7968c0 100644
--- a/usr/src/man/man8/ipadm.8
+++ b/usr/src/man/man8/ipadm.8
@@ -179,9 +179,9 @@
 The
 .Nm
 command is a stable replacement for the
-.Xr ifconfig 1M
+.Xr ifconfig 8
 and
-.Xr ndd 1M
+.Xr ndd 8
 commands.
 It is used to create IP interfaces and to configure IP addresses on those
 interfaces.
@@ -607,7 +607,7 @@ DNS labels, or by appending to
 the DNS domain name value configured in
 .Pa /etc/default/dhcpagent
 for
-.Xr dhcpagent 1m .
+.Xr dhcpagent 8 .
 N.b. that the DHCP server implementation ultimately determines whether and
 how the client-sent FQDN is used.
 .It Fl t Ns \&, Ns Fl -temporary
@@ -836,7 +836,7 @@ Packets can be transmitted
 .Pq Cm on Ns / Ns Cm off .
 .It Cm zone
 The zone the addrobj is in (temporary-only--use
-.Xr zonecfg 1M
+.Xr zonecfg 8
 to make persistent).
 .El
 .It Fl t Ns \&, Ns Fl -temporary
@@ -1048,14 +1048,14 @@ subcommand for the list of property names.
 .El
 .El
 .Sh SEE ALSO
-.Xr arp 1M ,
-.Xr cfgadm 1M ,
-.Xr dhcpagent 1M ,
-.Xr dladm 1M ,
-.Xr if_mpadm 1M ,
-.Xr ifconfig 1M ,
-.Xr ndd 1M ,
-.Xr zonecfg 1M ,
 .Xr nodename 4 ,
 .Xr nsswitch.conf 4 ,
-.Xr dhcp 5
+.Xr dhcp 5 ,
+.Xr arp 8 ,
+.Xr cfgadm 8 ,
+.Xr dhcpagent 8 ,
+.Xr dladm 8 ,
+.Xr if_mpadm 8 ,
+.Xr ifconfig 8 ,
+.Xr ndd 8 ,
+.Xr zonecfg 8
diff --git a/usr/src/man/man8/lofiadm.8 b/usr/src/man/man8/lofiadm.8
index b75ff3b95a..a702b50f1e 100644
--- a/usr/src/man/man8/lofiadm.8
+++ b/usr/src/man/man8/lofiadm.8
@@ -67,9 +67,9 @@ floppy or
 image), because the block device can then be used with the normal system
 utilities for mounting, checking or repairing filesystems.
 See
-.Xr fsck 1M
+.Xr fsck 8
 and
-.Xr mount 1M .
+.Xr mount 8 .
 .Pp
 Use
 .Nm
@@ -96,8 +96,8 @@ directories for partitions or slices.
 .Pp
 Before using these devices, users should create or verify
 partitioning by using partition management tools such as
-.Xr format 1M and
-.Xr fdisk 1M .
+.Xr format 8 and
+.Xr fdisk 8 .
 Once the device has been appropriately partitioned, the labeled
 device can be used as normal disk to create and mount file systems and to store
 data.
@@ -343,7 +343,7 @@ command:
 .Ed
 .Pp
 Use the
-.Xr mount 1M
+.Xr mount 8
 command to mount the image:
 .Bd -literal
 # mount -F hsfs -o ro /dev/lofi/1 /mnt
@@ -577,15 +577,15 @@ mount: /dev/lofi/1 is not this fstype
 .Ed
 .El
 .Sh SEE ALSO
-.Xr fdisk 1M ,
-.Xr format 1M ,
-.Xr fsck 1M ,
-.Xr mount 1M ,
-.Xr mount_ufs 1M ,
-.Xr newfs 1M ,
 .Xr attributes 5 ,
 .Xr lofi 7D ,
-.Xr lofs 7FS
+.Xr lofs 7FS ,
+.Xr fdisk 8 ,
+.Xr format 8 ,
+.Xr fsck 8 ,
+.Xr mount 8 ,
+.Xr mount_ufs 8 ,
+.Xr newfs 8
 .Sh NOTES
 Just as you would not directly access a disk device that has mounted file
 systems, you should not access a file associated with a block device except
@@ -632,7 +632,7 @@ for
 For compatibility purposes, a raw device is also exported along with the block
 device.
 For example,
-.Xr newfs 1M
+.Xr newfs 8
 requires one.
 .Pp
 The output of
diff --git a/usr/src/man/man8/mailwrapper.8 b/usr/src/man/man8/mailwrapper.8
index 97874781ec..0fa01931cb 100644
--- a/usr/src/man/man8/mailwrapper.8
+++ b/usr/src/man/man8/mailwrapper.8
@@ -43,11 +43,11 @@ See below.
 .Sh DESCRIPTION
 At one time, the only Mail Transfer Agent (MTA) software easily available
 was
-.Xr sendmail 1M .
+.Xr sendmail 8 .
 As a result of this, most Mail User Agents (MUAs) such as
 .Xr mail 1
 had the path and calling conventions expected by
-.Xr sendmail 1M
+.Xr sendmail 8
 compiled in.
 .Pp
 Times have changed, however.
@@ -60,17 +60,17 @@ It would be difficult to modify all MUA software typically available
 on a system, so most of the authors of alternative MTAs have written
 their front end message submission programs so that they use the same
 calling conventions as
-.Xr sendmail 1M
+.Xr sendmail 8
 and may be put into place instead of
-.Xr sendmail 1M
+.Xr sendmail 8
 in
 .Pa /usr/lib/sendmail .
 .Pp
-.Xr sendmail 1M
+.Xr sendmail 8
 also typically has aliases named
 .Xr mailq 1
 and
-.Xr newaliases 1M
+.Xr newaliases 8
 linked to it.
 The program knows to behave differently when its
 .Va argv[0]
@@ -85,7 +85,7 @@ based on calling name, or through a set of programs that provide
 similar functionality.
 .Pp
 Although having drop-in replacements for
-.Xr sendmail 1M
+.Xr sendmail 8
 helps in installing alternative MTAs, it essentially makes the
 configuration of the system depend on hand installing new programs in
 .Pa /usr .
@@ -107,14 +107,14 @@ The
 utility is designed to replace
 .Pa /usr/lib/sendmail
 and to invoke an appropriate MTA instead of
-.Xr sendmail 1M
+.Xr sendmail 8
 based on configuration information placed in
 .Pa /etc/mailer.conf .
 This permits the administrator to configure which MTA is to be invoked on
 the system at run time.
 .Pp
 Other configuration files may need to be altered when replacing
-.Xr sendmail 1M .
+.Xr sendmail 8 .
 .Sh EXIT STATUS
 .Ex -std
 .Sh DIAGNOSTICS
@@ -125,6 +125,6 @@ or does not contain a mapping for the name under which it was invoked.
 .Sh SEE ALSO
 .Xr mail 1 ,
 .Xr mailq 1 ,
-.Xr newaliases 1M ,
-.Xr sendmail 1M ,
-.Xr mailer.conf 4
+.Xr mailer.conf 4 ,
+.Xr newaliases 8 ,
+.Xr sendmail 8
diff --git a/usr/src/man/man8/mdnsd.8 b/usr/src/man/man8/mdnsd.8
index f59e4746bf..5919ed5e2e 100644
--- a/usr/src/man/man8/mdnsd.8
+++ b/usr/src/man/man8/mdnsd.8
@@ -93,7 +93,7 @@ For the source code to
 .Sh INTERFACE STABILITY
 .Sy Volatile .
 .Sh SEE ALSO
-.Xr dns-sd 1M
+.Xr dns-sd 8
 .\"
 .Sh NOTES
 The
diff --git a/usr/src/man/man8/mount_nfs.8 b/usr/src/man/man8/mount_nfs.8
index b2909f7b46..8a6f6fed32 100644
--- a/usr/src/man/man8/mount_nfs.8
+++ b/usr/src/man/man8/mount_nfs.8
@@ -59,9 +59,9 @@ is once again unmounted.
 .Pp
 .Nm
 starts the
-.Xr lockd 1M
+.Xr lockd 8
 and
-.Xr statd 1M
+.Xr statd 8
 daemons if they are not already running.
 .Pp
 If the resource is listed in the
@@ -151,11 +151,11 @@ supports both NFSv3 and NFSv4 mounts.
 The default NFS version is NFSv4.
 .Ss Options
 See
-.Xr mount 1M
+.Xr mount 8
 for the list of supported
 .Ar generic_options .
 See
-.Xr share_nfs 1M
+.Xr share_nfs 8
 for a description of server options.
 .Bl -tag -width Ds
 .It Fl o Ar specific_options
@@ -295,7 +295,7 @@ the URL must be the same.
 .It Sy posix
 Request POSIX.1 semantics for the file system.
 Requires a mount Version 2
-.Xr mountd 1M
+.Xr mountd 8
 on the server.
 See
 .Xr standards 5
@@ -338,7 +338,7 @@ See the discussion of URLs and the public option under
 for a more detailed discussion.
 .It Sy quota Ns | Ns Sy noquota
 Enable or prevent
-.Xr quota 1M
+.Xr quota 8
 to check whether the user is over quota on this file system; if the file system
 has quotas enabled on the server, quotas are still checked for operations on
 this file system.
@@ -466,7 +466,7 @@ File systems mounted with the
 option indicate that
 .Nm mount
 is to retry in the background if the server's mount daemon
-.Pq Xr mountd 1M
+.Pq Xr mountd 8
 does not respond.
 .Nm mount
 retries the request up to the count specified in the
@@ -528,9 +528,9 @@ See
 If the server supports the public file handle, the attempt is successful;
 .Nm mount
 does not need to contact the server's
-.Xr rpcbind 1M
+.Xr rpcbind 8
 and the
-.Xr mountd 1M
+.Xr mountd 8
 daemons to get the port number of the
 .Nm mount
 server and the initial file handle of
@@ -748,12 +748,6 @@ example# mount serv-x:/usr/man,serv-y:/var/man,nfs://serv-z/man /usr/man
 .El
 .Sh SEE ALSO
 .Xr rdist 1 ,
-.Xr lockd 1M ,
-.Xr mountall 1M ,
-.Xr mountd 1M ,
-.Xr nfsd 1M ,
-.Xr quota 1M ,
-.Xr statd 1M ,
 .Xr mkdir 2 ,
 .Xr mmap 2 ,
 .Xr mount 2 ,
@@ -768,7 +762,13 @@ example# mount serv-x:/usr/man,serv-y:/var/man,nfs://serv-z/man /usr/man
 .Xr standards 5 ,
 .Xr lofs 7FS ,
 .Xr inet 7P ,
-.Xr inet6 7P
+.Xr inet6 7P ,
+.Xr lockd 8 ,
+.Xr mountall 8 ,
+.Xr mountd 8 ,
+.Xr nfsd 8 ,
+.Xr quota 8 ,
+.Xr statd 8
 .Rs
 .%A Callaghan
 .%A Brent
@@ -832,7 +832,7 @@ svc:/network/nfs/client:default
 .Pp
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using
-.Xr svcadm 1M .
+.Xr svcadm 8 .
 The service's status can be queried using the
 .Xr svcs 1
 command.
diff --git a/usr/src/man/man8/mountd.8 b/usr/src/man/man8/mountd.8
index 740c86c685..7133496111 100644
--- a/usr/src/man/man8/mountd.8
+++ b/usr/src/man/man8/mountd.8
@@ -46,18 +46,18 @@ whether the client should get read-write, read-only, or no access.
 This access can be dependent on the security mode used in the remoted procedure
 call from the client.
 See
-.Xr share_nfs 1M .
+.Xr share_nfs 8 .
 .Pp
 The command also provides information as to what file systems are mounted by
 which clients.
 This information can be printed using the
-.Xr showmount 1M
+.Xr showmount 8
 command.
 .Pp
 The
 .Nm
 daemon is automatically invoked by
-.Xr share 1M .
+.Xr share 8 .
 .Pp
 Only super user can run the mountd daemon.
 .Pp
@@ -85,14 +85,14 @@ console, as well as how it got that result.
 shared file system table
 .El
 .Sh SEE ALSO
-.Xr nfsd 1M ,
-.Xr share 1M ,
-.Xr share_nfs 1M ,
-.Xr sharectl 1M ,
-.Xr showmount 1M ,
 .Xr nfs 4 ,
 .Xr sharetab 4 ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr nfsd 8 ,
+.Xr share 8 ,
+.Xr share_nfs 8 ,
+.Xr sharectl 8 ,
+.Xr showmount 8
 .Sh NOTES
 Since
 .Nm
diff --git a/usr/src/man/man8/ndp.8 b/usr/src/man/man8/ndp.8
index 80c7a0f3a6..e6638376d5 100644
--- a/usr/src/man/man8/ndp.8
+++ b/usr/src/man/man8/ndp.8
@@ -213,9 +213,9 @@ ndp: No entry for fd00::1
 The command line options for this command are stable, but the output format
 and diagnostic messages are not.
 .Sh SEE ALSO
-.Xr arp 1M ,
-.Xr ifconfig 1M ,
-.Xr netstat 1M ,
 .Xr attributes 5 ,
 .Xr privileges 5 ,
-.Xr ndp 7P
+.Xr ndp 7P ,
+.Xr arp 8 ,
+.Xr ifconfig 8 ,
+.Xr netstat 8
diff --git a/usr/src/man/man8/nfsd.8 b/usr/src/man/man8/nfsd.8
index 699f3d2833..ae6a1d275a 100644
--- a/usr/src/man/man8/nfsd.8
+++ b/usr/src/man/man8/nfsd.8
@@ -46,7 +46,7 @@ can run this daemon.
 The
 .Nm
 daemon is automatically invoked using
-.Xr share 1M
+.Xr share 8
 with the
 .Fl a
 option.
@@ -170,17 +170,17 @@ Daemon failed to start.
 .El
 .Sh SEE ALSO
 .Xr svcs 1 ,
-.Xr mountd 1M ,
-.Xr share 1M ,
-.Xr sharectl 1M ,
-.Xr sharemgr 1M ,
-.Xr svcadm 1M ,
 .Xr nfs 4 ,
 .Xr sharetab 4 ,
 .Xr system 4 ,
 .Xr attributes 5 ,
 .Xr smf 5 ,
-.Xr zones 5
+.Xr zones 5 ,
+.Xr mountd 8 ,
+.Xr share 8 ,
+.Xr sharectl 8 ,
+.Xr sharemgr 8 ,
+.Xr svcadm 8
 .Sh NOTES
 Manually starting and restarting
 .Nm
@@ -190,7 +190,7 @@ If it is necessary to do so, use
 to enable or disable the nfs service
 .Pq svc:/network/nfs/server .
 If it is disabled, it will be enabled by
-.Xr share_nfs 1M ,
+.Xr share_nfs 8 ,
 unless its
 .Sy application Ns / Ns Sy auto_enable
 property is set to
@@ -198,7 +198,7 @@ property is set to
 See
 .Xr smf 5
 and
-.Xr svcadm 1M
+.Xr svcadm 8
 for more information.
 .Pp
 The
@@ -212,7 +212,7 @@ svc:/network/nfs/server
 .Pp
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using
-.Xr svcadm 1M .
+.Xr svcadm 8 .
 The service's status can be queried using the
 .Xr svcs 1
 command.
diff --git a/usr/src/man/man8/nfsmapid.8 b/usr/src/man/man8/nfsmapid.8
index 072bd06f44..63efa98d72 100644
--- a/usr/src/man/man8/nfsmapid.8
+++ b/usr/src/man/man8/nfsmapid.8
@@ -58,7 +58,7 @@ Set the
 property for the
 .Nm nfs
 protocol using
-.Xr sharectl 1M .
+.Xr sharectl 8 .
 .It
 Specify the
 .Sy _nfsv4idmapdomain
@@ -66,19 +66,19 @@ DNS resource record.
 .El
 .Sh SEE ALSO
 .Xr svcs 1 ,
-.Xr automountd 1M ,
-.Xr groupdel 1M ,
-.Xr groupmod 1M ,
-.Xr mount_nfs 1M ,
-.Xr passmgmt 1M ,
-.Xr share_nfs 1M ,
-.Xr sharectl 1M ,
-.Xr svcadm 1M ,
-.Xr userdel 1M ,
-.Xr usermod 1M ,
 .Xr nfs 4 ,
 .Xr attributes 5 ,
-.Xr smf 5
+.Xr smf 5 ,
+.Xr automountd 8 ,
+.Xr groupdel 8 ,
+.Xr groupmod 8 ,
+.Xr mount_nfs 8 ,
+.Xr passmgmt 8 ,
+.Xr share_nfs 8 ,
+.Xr sharectl 8 ,
+.Xr svcadm 8 ,
+.Xr userdel 8 ,
+.Xr usermod 8
 .Sh NOTES
 The
 .Nm
@@ -91,16 +91,16 @@ svc:/network/nfs/mapid
 .Pp
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using
-.Xr svcadm 1M .
+.Xr svcadm 8 .
 The service's status can be queried using the
 .Xr svcs 1
 command.
 .Pp
 If it is disabled, it will be enabled by
-.Xr mount_nfs 1M ,
-.Xr share_nfs 1M ,
+.Xr mount_nfs 8 ,
+.Xr share_nfs 8 ,
 and
-.Xr automountd 1M ,
+.Xr automountd 8 ,
 unless its
 .Sy application Ns / Ns Sy auto_enable
 property is set to
@@ -124,13 +124,13 @@ as follows:
 The utilities that allow you to change UID and GID are:
 .Bl -bullet
 .It
-.Xr usermod 1M
+.Xr usermod 8
 .It
-.Xr userdel 1M
+.Xr userdel 8
 .It
-.Xr groupmod 1M
+.Xr groupmod 8
 .It
-.Xr groupdel 1M
+.Xr groupdel 8
 .It
-.Xr passmgmt 1M
+.Xr passmgmt 8
 .El
diff --git a/usr/src/man/man8/pcitool.8 b/usr/src/man/man8/pcitool.8
index 9bb46f3c79..d312f3eb1f 100644
--- a/usr/src/man/man8/pcitool.8
+++ b/usr/src/man/man8/pcitool.8
@@ -196,10 +196,10 @@ On SPARC platform:
 .Sh INTERFACE STABILITY
 .Sy Volatile
 .Sh SEE ALSO
-.Xr su 1M ,
 .Xr pci 4 ,
 .Xr user_attr 4 ,
-.Xr rbac 5
+.Xr rbac 5 ,
+.Xr su 8
 .Pp
 PCI specification
 .Po available from
@@ -212,7 +212,7 @@ Not all commands are applicable to all platforms.
 .Pp
 The user must have all privileges in order to access interrupt information.
 A regular user can access interrupt information when
-.Xr su 1M
+.Xr su 8
 to root or granted the
 .Qq Maintenance and Repair
 rights profile in the
diff --git a/usr/src/man/man8/rdmsr.8 b/usr/src/man/man8/rdmsr.8
index 2a3270d02a..a7f7f9df36 100644
--- a/usr/src/man/man8/rdmsr.8
+++ b/usr/src/man/man8/rdmsr.8
@@ -31,7 +31,7 @@ instruction).
 .Pp
 The read is done on the current CPU, which may change arbitrarily
 between MSR reads: to read from a particular CPU,
-.Xr pbind 1M
+.Xr pbind 8
 can be used to execute this utility.
 .Sh EXIT STATUS
 The
diff --git a/usr/src/man/man8/rtc.8 b/usr/src/man/man8/rtc.8
index e80ce136c9..b6ea2d55b0 100644
--- a/usr/src/man/man8/rtc.8
+++ b/usr/src/man/man8/rtc.8
@@ -54,7 +54,7 @@ system.
 Commands such as
 .Xr date 1
 and
-.Xr rdate 1M ,
+.Xr rdate 8 ,
 which are used to set the time on a system, invoke
 .Nm Fl c
 to ensure that daylight savings time (DST) is corrected for properly.
@@ -63,7 +63,7 @@ to ensure that daylight savings time (DST) is corrected for properly.
 .It Fl c
 This option checks for DST and makes corrections to the RTC if necessary.
 It is normally run once a day by a
-.Xr cron 1M
+.Xr cron 8
 job.
 .Pp
 If there is no RTC time zone or
@@ -74,7 +74,7 @@ This option specifies that the RTC runs in local standard time all year round.
 It is incompatible with Windows, but is convenient if only one operating system
 is to be run on the computer.
 The
-.Xr cron 1M
+.Xr cron 8
 command is not necessary, and should not be run.
 .It Fl u
 This option specifies that the RTC runs in UTC time.
@@ -83,14 +83,14 @@ As a side effect, it sets the time zone in
 to UTC.
 Windows can operate in UTC time, but requires a registry change to do so.
 The
-.Xr cron 1M
+.Xr cron 8
 command is not necessary.
 .It Fl v
 This option specifies that the RTC tracks local time, including DST changes.
 This is the default.
 It accomodates Windows with no changes.
 The
-.Xr cron 1M
+.Xr cron 8
 command is necessary to change the RTC when DST is in effect.
 .It Fl w
 This option does nothing.
@@ -119,6 +119,6 @@ the system time.
 .Sy x86
 .Sh SEE ALSO
 .Xr date 1 ,
-.Xr cron 1M ,
-.Xr rdate 1M ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr cron 8 ,
+.Xr rdate 8
diff --git a/usr/src/man/man8/share_nfs.8 b/usr/src/man/man8/share_nfs.8
index c4c6800813..9a337b14e3 100644
--- a/usr/src/man/man8/share_nfs.8
+++ b/usr/src/man/man8/share_nfs.8
@@ -40,9 +40,9 @@ The
 .Nm share
 utility makes local file systems available for mounting by remote systems.
 It starts the
-.Xr nfsd 1M
+.Xr nfsd 8
 and
-.Xr mountd 1M
+.Xr mountd 8
 daemons if they are not already running.
 .Pp
 If no argument is specified, then
@@ -559,13 +559,13 @@ The location of the log file, as well as the necessary logging work
 files, is specified by the global entry in
 .Pa /etc/nfs/nfslog.conf .
 The
-.Xr nfslogd 1M
+.Xr nfslogd 8
 daemon runs only if at least one file system entry in
 .Pa /etc/dfs/dfstab
 is shared with logging enabled upon starting or rebooting the system.
 Simply sharing a file system with logging enabled from the command line does not
 start the
-.Xr nfslogd 1M .
+.Xr nfslogd 8 .
 .Ss Example 2 Remap A User Coming From The Particular NFS Client
 The following example remaps the user with uid
 .Sy 100
@@ -577,18 +577,18 @@ to user
 share -o uidmap=100:joe:@10.0.0.1 /export
 .Ed
 .Sh SEE ALSO
-.Xr mount 1M ,
-.Xr mountd 1M ,
-.Xr nfsd 1M ,
-.Xr nfslogd 1M ,
-.Xr share 1M ,
-.Xr unshare 1M ,
 .Xr getnetbyname 3SOCKET ,
 .Xr netgroup 4 ,
 .Xr nfslog.conf 4 ,
 .Xr acl 5 ,
 .Xr attributes 5 ,
-.Xr nfssec 5
+.Xr nfssec 5 ,
+.Xr mount 8 ,
+.Xr mountd 8 ,
+.Xr nfsd 8 ,
+.Xr nfslogd 8 ,
+.Xr share 8 ,
+.Xr unshare 8
 .Sh NOTES
 If the
 .Sy sec Ns =
@@ -785,7 +785,7 @@ share -F nfs -o ro /disk
 .Ed
 .Pp
 The
-.Xr mountd 1M
+.Xr mountd 8
 process allows the processing of a path name that contains a symbolic link.
 This allows the processing of paths that are not themselves explicitly shared
 with
diff --git a/usr/src/man/man8/sharectl.8 b/usr/src/man/man8/sharectl.8
index 1e656473fb..83a69318d0 100644
--- a/usr/src/man/man8/sharectl.8
+++ b/usr/src/man/man8/sharectl.8
@@ -219,7 +219,6 @@ timeout=25
 .Sh INTERFACE STABILITY
 .Sy Committed
 .Sh SEE ALSO
-.Xr sharemgr 1M ,
 .Xr autofs 4 ,
 .Xr nfs 4 ,
 .Xr nsmbrc 4 ,
@@ -228,4 +227,5 @@ timeout=25
 .Xr attributes 5 ,
 .Xr rbac 5 ,
 .Xr smf 5 ,
-.Xr standards 5
+.Xr standards 5 ,
+.Xr sharemgr 8
diff --git a/usr/src/man/man8/smbadm.8 b/usr/src/man/man8/smbadm.8
index 905886ee7e..f65880d642 100644
--- a/usr/src/man/man8/smbadm.8
+++ b/usr/src/man/man8/smbadm.8
@@ -445,17 +445,17 @@ Utility output format is
 .Sy Not-An-Interface .
 .Sh SEE ALSO
 .Xr passwd 1 ,
-.Xr groupadd 1M ,
-.Xr idmap 1M ,
-.Xr idmapd 1M ,
-.Xr kclient 1M ,
-.Xr share 1M ,
-.Xr sharectl 1M ,
-.Xr sharemgr 1M ,
-.Xr smbd 1M ,
-.Xr smbstat 1M ,
 .Xr smb 4 ,
 .Xr smbautohome 4 ,
 .Xr attributes 5 ,
 .Xr pam_smb_passwd 5 ,
-.Xr smf 5
+.Xr smf 5 ,
+.Xr groupadd 8 ,
+.Xr idmap 8 ,
+.Xr idmapd 8 ,
+.Xr kclient 8 ,
+.Xr share 8 ,
+.Xr sharectl 8 ,
+.Xr sharemgr 8 ,
+.Xr smbd 8 ,
+.Xr smbstat 8
diff --git a/usr/src/man/man8/smbstat.8 b/usr/src/man/man8/smbstat.8
index 54a62d5c2d..af5115772f 100644
--- a/usr/src/man/man8/smbstat.8
+++ b/usr/src/man/man8/smbstat.8
@@ -172,7 +172,7 @@ just finished.
 Output format is
 .Sy Not-an-Interface.
 .Sh SEE ALSO
-.Xr sharectl 1M ,
-.Xr sharemgr 1M ,
-.Xr smbadm 1M ,
-.Xr smbd 1M
+.Xr sharectl 8 ,
+.Xr sharemgr 8 ,
+.Xr smbadm 8 ,
+.Xr smbd 8
diff --git a/usr/src/man/man8/stmfadm.8 b/usr/src/man/man8/stmfadm.8
index b84c44c776..7e00bad0f1 100644
--- a/usr/src/man/man8/stmfadm.8
+++ b/usr/src/man/man8/stmfadm.8
@@ -664,5 +664,5 @@ View Entry: 0
 .Sh INTERFACE STABILITY
 .Sy Committed
 .Sh SEE ALSO
-.Xr sbdadm 1M ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr sbdadm 8
diff --git a/usr/src/man/man8/tzreload.8 b/usr/src/man/man8/tzreload.8
index c44f414c4e..15495ea32e 100644
--- a/usr/src/man/man8/tzreload.8
+++ b/usr/src/man/man8/tzreload.8
@@ -45,7 +45,7 @@ only triggers this update for the current zone.
 In addition to updating processes, the
 .Nm
 command also notifies
-.Xr cron 1M
+.Xr cron 8
 to reinitialize the job scheduler with the new timezone information.
 .Sh OPTIONS
 The following options are supported:
@@ -61,18 +61,18 @@ Standard zone information directory.
 .Sh INTERFACE STABILITY
 .Sy Committed
 .Sh SEE ALSO
-.Xr cron 1M ,
-.Xr zdump 1M ,
-.Xr zic 1M ,
-.Xr zoneadm 1M ,
 .Xr ctime 3C ,
 .Xr mktime 3C ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr cron 8 ,
+.Xr zdump 8 ,
+.Xr zic 8 ,
+.Xr zoneadm 8
 .Sh NOTES
 Although
 .Nm
 reinitializes
-.Xr cron 1M ,
+.Xr cron 8 ,
 applications that are affected by timezone changes still need to be restarted or
 reinitialized if they do not reread the new timezone information before timezone
 changes take place.
diff --git a/usr/src/man/man8/zdb.8 b/usr/src/man/man8/zdb.8
index 7e02951cbf..a55102e2f0 100644
--- a/usr/src/man/man8/zdb.8
+++ b/usr/src/man/man8/zdb.8
@@ -77,9 +77,9 @@ It is a not a general purpose tool and options
 .Pq and facilities
 may change.
 This is neither a
-.Xr fsck 1M
+.Xr fsck 8
 nor an
-.Xr fsdb 1M
+.Xr fsdb 8
 utility.
 .Pp
 The output of this command in general reflects the on-disk structure of a ZFS
@@ -421,5 +421,5 @@ dedup = 1.11, compress = 1.80, copies = 1.00, dedup * compress / copies = 2.00
 .Ed
 .El
 .Sh SEE ALSO
-.Xr zfs 1M ,
-.Xr zpool 1M
+.Xr zfs 8 ,
+.Xr zpool 8
diff --git a/usr/src/man/man8/zfs-program.8 b/usr/src/man/man8/zfs-program.8
index 538d6f744f..bd454d85b2 100644
--- a/usr/src/man/man8/zfs-program.8
+++ b/usr/src/man/man8/zfs-program.8
@@ -291,7 +291,7 @@ EBADF     EXDEV       EFBIG
 .Ss API Functions
 For detailed descriptions of the exact behavior of any zfs administrative
 operations, see the main
-.Xr zfs 1M
+.Xr zfs 8
 manual page.
 .Bl -tag -width "xx"
 .It Em zfs.debug(msg)
diff --git a/usr/src/man/man8/zfs.8 b/usr/src/man/man8/zfs.8
index cf22431b5e..b796af6a40 100644
--- a/usr/src/man/man8/zfs.8
+++ b/usr/src/man/man8/zfs.8
@@ -328,7 +328,7 @@
 The
 .Nm
 command configures ZFS datasets within a ZFS storage pool, as described in
-.Xr zpool 1M .
+.Xr zpool 8 .
 A dataset is identified by a unique path within the ZFS namespace.
 For example:
 .Bd -literal
@@ -370,11 +370,11 @@ A storage pool is also the root of the ZFS file system hierarchy.
 The root of the pool can be accessed as a file system, such as mounting and
 unmounting, taking snapshots, and setting properties.
 The physical storage characteristics, however, are managed by the
-.Xr zpool 1M
+.Xr zpool 8
 command.
 .Pp
 See
-.Xr zpool 1M
+.Xr zpool 8
 for more information on creating and administering pools.
 .Ss Snapshots
 A snapshot is a read-only copy of a file system or volume.
@@ -512,7 +512,7 @@ administrator.
 For more information about
 .Nm zonecfg
 syntax, see
-.Xr zonecfg 1M .
+.Xr zonecfg 8 .
 .Pp
 After a dataset is delegated to a non-global zone, the
 .Sy zoned
@@ -1367,7 +1367,7 @@ the special class.
 Before setting this property, a special class vdev must be added to the
 pool.
 See
-.Xr zpool 1M
+.Xr zpool 8
 for more details on the special allocation class.
 .It Sy mountpoint Ns = Ns Pa path Ns | Ns Sy none Ns | Ns Sy legacy
 Controls the mount point used for this file system.
@@ -1398,7 +1398,7 @@ This is used for SMB clients.
 Changes to this property only take effect when the file system is umounted and
 remounted.
 See
-.Xr mount 1M
+.Xr mount 8
 for more information on
 .Sy nbmand
 mounts.
@@ -1725,7 +1725,7 @@ A file system with the
 property set to
 .Sy off
 is managed through traditional tools such as
-.Xr sharemgr 1M .
+.Xr sharemgr 8 .
 Otherwise, the file system is automatically shared and unshared with the
 .Nm zfs Cm share
 and
@@ -1734,10 +1734,10 @@ commands.
 If the property is set to
 .Sy on ,
 the
-.Xr sharemgr 1M
+.Xr sharemgr 8
 command is invoked with no options.
 Otherwise, the
-.Xr sharemgr 1M
+.Xr sharemgr 8
 command is invoked with options equivalent to the contents of this property.
 .Pp
 Because SMB shares requires a resource name, a unique resource name is
@@ -1793,8 +1793,8 @@ A file system with a
 property of
 .Sy off
 is managed through traditional tools such as
-.Xr share 1M ,
-.Xr unshare 1M ,
+.Xr share 8 ,
+.Xr unshare 8 ,
 and
 .Xr dfstab 4 .
 Otherwise, the file system is automatically shared and unshared with the
@@ -1804,10 +1804,10 @@ and
 commands.
 If the property is set to
 .Sy on ,
-.Xr share 1M
+.Xr share 8
 command is invoked with no options.
 Otherwise, the
-.Xr share 1M
+.Xr share 8
 command is invoked with options equivalent to the contents of this property.
 .Pp
 When the
@@ -2042,7 +2042,7 @@ properties are also new permissions that can be assigned to non-privileged users
 by using the ZFS delegated administration feature.
 .Ss "Temporary Mount Point Properties"
 When a file system is mounted, either through
-.Xr mount 1M
+.Xr mount 8
 for legacy mounts or the
 .Nm zfs Cm mount
 command for normal file systems, its mount options are set according to its
@@ -2135,9 +2135,9 @@ A ZFS swap file configuration is not supported.
 .Pp
 If you need to change your swap area or dump device after the system is
 installed or upgraded, use the
-.Xr swap 1M
+.Xr swap 8
 and
-.Xr dumpadm 1M
+.Xr dumpadm 8
 commands.
 .Ss "Encryption"
 Enabling the
@@ -2851,7 +2851,7 @@ systems running older versions of the software.
 .Pp
 In general, the file system version is independent of the pool version.
 See
-.Xr zpool 1M
+.Xr zpool 8
 for information on the
 .Nm zpool Cm upgrade
 command.
@@ -3103,7 +3103,7 @@ Mounts ZFS file systems.
 .It Fl O
 Perform an overlay mount.
 See
-.Xr mount 1M
+.Xr mount 8
 for more information.
 .It Fl a
 Mount all available ZFS file systems.
@@ -4230,7 +4230,7 @@ Channel programs may only be run with root privileges.
 .sp
 For full documentation of the ZFS channel program interface, see the manual
 page for
-.Xr zfs-program 1M .
+.Xr zfs-program 8 .
 .Bl -tag -width ""
 .It Fl j
 Display channel program output in JSON format.
@@ -4259,7 +4259,7 @@ The default memory limit is 10 MB, and can be set to a maximum of 100 MB.
 All remaining argument strings are passed directly to the channel program as
 arguments.
 See
-.Xr zfs-program 1M
+.Xr zfs-program 8
 for more information.
 .El
 .It Xo
@@ -4430,7 +4430,7 @@ property is
 The default is
 .Sy off .
 See
-.Xr zpool 1M
+.Xr zpool 8
 for more information on pool properties.
 .Bd -literal
 # zfs list
@@ -4751,17 +4751,17 @@ M       F       /tank/test/modified
 .Sh SEE ALSO
 .Xr gzip 1 ,
 .Xr ssh 1 ,
-.Xr mount 1M ,
-.Xr share 1M ,
-.Xr sharemgr 1M ,
-.Xr unshare 1M ,
-.Xr zfs-program 1M ,
-.Xr zonecfg 1M ,
-.Xr zpool 1M ,
 .Xr chmod 2 ,
 .Xr stat 2 ,
 .Xr write 2 ,
 .Xr fsync 3C ,
 .Xr dfstab 4 ,
 .Xr acl 5 ,
-.Xr attributes 5
+.Xr attributes 5 ,
+.Xr mount 8 ,
+.Xr share 8 ,
+.Xr sharemgr 8 ,
+.Xr unshare 8 ,
+.Xr zfs-program 8 ,
+.Xr zonecfg 8 ,
+.Xr zpool 8
diff --git a/usr/src/man/man8/zonestatd.8 b/usr/src/man/man8/zonestatd.8
index 8edaa570b0..c116e2089d 100644
--- a/usr/src/man/man8/zonestatd.8
+++ b/usr/src/man/man8/zonestatd.8
@@ -40,7 +40,7 @@ under the service identifier:
 .Pp
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using
-.Xr svcadm 1m .
+.Xr svcadm 8 .
 The service's status can be queried using the
 .Xr svcs 1
 command.
@@ -81,10 +81,10 @@ and utilization data, but rather reads from the zonestat service on the
 global zone.
 .Sh SEE ALSO
 .Xr zonestat 1 ,
-.Xr acctadm 1m ,
-.Xr pooladm 1m ,
-.Xr poolcfg 1m ,
-.Xr prctl 1m ,
-.Xr rcapadm 1m ,
 .Xr smf 5 ,
-.Xr zones 5
+.Xr zones 5 ,
+.Xr acctadm 8 ,
+.Xr pooladm 8 ,
+.Xr poolcfg 8 ,
+.Xr prctl 8 ,
+.Xr rcapadm 8
diff --git a/usr/src/man/man8/zpool.8 b/usr/src/man/man8/zpool.8
index 2fe5815345..3caca69c32 100644
--- a/usr/src/man/man8/zpool.8
+++ b/usr/src/man/man8/zpool.8
@@ -209,7 +209,7 @@ A storage pool is a collection of devices that provides physical storage and
 data replication for ZFS datasets.
 All datasets within a storage pool share the same space.
 See
-.Xr zfs 1M
+.Xr zfs 8
 for information on managing datasets.
 .Ss Virtual Devices (vdevs)
 A "virtual device" describes a single device or a collection of devices
@@ -571,7 +571,7 @@ class by setting the
 dataset property.
 It defaults to zero so you must opt-in by setting it to a non-zero value.
 See
-.Xr zfs 1M
+.Xr zfs 8
 for more info on setting this property.
 .Ss Properties
 Each pool has several properties associated with it.
@@ -638,7 +638,7 @@ contained datasets can actually use.
 The amount of space used in a raidz configuration depends on the characteristics
 of the data being written.
 In addition, ZFS reserves some space for internal accounting that the
-.Xr zfs 1M
+.Xr zfs 8
 command takes into account, but the
 .Nm
 command does not.
@@ -777,7 +777,7 @@ The minimum legal nonzero setting is
 Controls whether a non-privileged user is granted access based on the dataset
 permissions defined on the dataset.
 See
-.Xr zfs 1M
+.Xr zfs 8
 for more information on ZFS delegated administration.
 .It Sy failmode Ns = Ns Sy wait Ns | Ns Sy continue Ns | Ns Sy panic
 Controls the system behavior in the event of catastrophic pool failure.
@@ -1168,7 +1168,7 @@ The mount point must be an absolute path,
 or
 .Sy none .
 For more information on dataset mount points, see
-.Xr zfs 1M .
+.Xr zfs 8 .
 .It Fl n
 Displays the configuration that would be used without actually creating the
 pool.
@@ -1195,7 +1195,7 @@ Sets the given file system properties in the root file system of the pool.
 See the
 .Sx Properties
 section of
-.Xr zfs 1M
+.Xr zfs 8
 for a list of valid properties that can be set.
 .It Fl R Ar root
 Equivalent to
@@ -1445,7 +1445,7 @@ Import the pool without mounting any file systems.
 Comma-separated list of mount options to use when mounting datasets within the
 pool.
 See
-.Xr zfs 1M
+.Xr zfs 8
 for a description of dataset properties and mount options.
 .It Fl o Ar property Ns = Ns Ar value
 Sets the specified property on the imported pool.
@@ -1552,7 +1552,7 @@ option, above.
 Comma-separated list of mount options to use when mounting datasets within the
 pool.
 See
-.Xr zfs 1M
+.Xr zfs 8
 for a description of dataset properties and mount options.
 .It Fl o Ar property Ns = Ns Ar value
 Sets the specified property on the imported pool.
@@ -2541,6 +2541,6 @@ command line option.
 .Sh INTERFACE STABILITY
 .Sy Evolving
 .Sh SEE ALSO
-.Xr zfs 1M ,
 .Xr attributes 5 ,
-.Xr zpool-features 5
+.Xr zpool-features 5 ,
+.Xr zfs 8
diff --git a/usr/src/man/man9e/mac.9e b/usr/src/man/man9e/mac.9e
index 8b896a35c2..cc94deb5a9 100644
--- a/usr/src/man/man9e/mac.9e
+++ b/usr/src/man/man9e/mac.9e
@@ -440,7 +440,7 @@ family of properties, they may change depending on power settings.
 See the
 .Sy Ethernet Link Properties
 section in
-.Xr dladm 1M
+.Xr dladm 8
 for more information.
 .Pp
 It's worth discussing how these different values get used throughout the
@@ -503,7 +503,7 @@ fail the call to
 .Xr detach 9E .
 .Ss Interacting with Devices
 Administrators always interact with devices through the
-.Xr dladm 1M
+.Xr dladm 8
 command line interface.
 The state of devices such as whether the link is considered
 .Sy up
@@ -522,7 +522,7 @@ It is also the preferred way that these properties are set and configured.
 While device tunables may be presented in a
 .Xr driver.conf 4
 file, it is recommended instead to expose such things through
-.Xr dladm 1M
+.Xr dladm 8
 private properties, whether explicitly documented or not.
 .Sh CAPABILITIES
 Capabilities in the MAC Framework are optional features that a device
@@ -1310,7 +1310,7 @@ structure.
 The driver may define whatever semantics it wants for these private
 properties.
 They will not be listed when running
-.Xr dladm 1M ,
+.Xr dladm 8 ,
 unless explicitly requested by name.
 All such properties should start with a leading underscore character and then
 consist of alphanumeric ASCII characters and additional underscores or hyphens.
@@ -1976,10 +1976,10 @@ to switch from one format to the other.
 This way, data can be gathered to determine what the impact of each method is on
 a given platform.
 .Sh SEE ALSO
-.Xr dladm 1M ,
 .Xr driver.conf 4 ,
 .Xr ieee802.3 5 ,
 .Xr dlpi 7P ,
+.Xr dladm 8 ,
 .Xr _fini 9E ,
 .Xr _info 9E ,
 .Xr _init 9E ,
diff --git a/usr/src/man/man9e/mc_getprop.9e b/usr/src/man/man9e/mc_getprop.9e
index 184f167fe5..f74e56bcf8 100644
--- a/usr/src/man/man9e/mc_getprop.9e
+++ b/usr/src/man/man9e/mc_getprop.9e
@@ -96,7 +96,7 @@ identify which one it is.
 At this time, private properties are limited to being string based properties.
 If other types of property values are used, they will not be rendered
 correctly by
-.Xr dladm 1M .
+.Xr dladm 8 .
 .Pp
 The device
 driver can access its device soft state by casting the
diff --git a/usr/src/man/man9f/cmn_err.9f b/usr/src/man/man9f/cmn_err.9f
index d9bf8778a9..6d736e0c94 100644
--- a/usr/src/man/man9f/cmn_err.9f
+++ b/usr/src/man/man9f/cmn_err.9f
@@ -200,14 +200,14 @@ is also
 the message is always sent to the system log, but is only written to the console
 when the system has been booted in verbose mode.
 See
-.Xr kernel 1M .
+.Xr kernel 8 .
 If neither condition is met, the
 .Qq Sy \&?
 character has no effect and is simply ignored.
 .El
 .Pp
 Refer to
-.Xr syslogd 1M
+.Xr syslogd 8
 to determine where the system log is written.
 .Pp
 The
@@ -274,7 +274,7 @@ Using
 will cause messages to be sent to the log associated with the specified local
 zone rather than the log in the global zone.
 This is accomplished by the message being received and processed by the
-.Xr syslogd 1M
+.Xr syslogd 8
 process running in the specified zone instead of the one running in the global
 zone.
 You can retrieve a process zone ID from its credential structure using
@@ -415,9 +415,9 @@ zcmn_err(crgetzoneid(ddi_get_cred()), CE_NOTE, "out of processes");
 .Ed
 .El
 .Sh SEE ALSO
-.Xr dmesg 1M ,
-.Xr kernel 1M ,
 .Xr zones 5 ,
+.Xr dmesg 8 ,
+.Xr kernel 8 ,
 .Xr ddi_binding_name 9F ,
 .Xr ddi_cred 9F ,
 .Xr ddi_driver_name 9F ,
diff --git a/usr/src/man/man9s/mac_callbacks.9s b/usr/src/man/man9s/mac_callbacks.9s
index 7908ff3028..260f9b9ce0 100644
--- a/usr/src/man/man9s/mac_callbacks.9s
+++ b/usr/src/man/man9s/mac_callbacks.9s
@@ -322,10 +322,10 @@ or
 .Sy mc_propinfo
 will want to implement all three endpoints to ensure that the property
 is fully integrated into user land utilities such as
-.Xr dladm 1M .
+.Xr dladm 8 .
 .Sh SEE ALSO
-.Xr dladm 1M ,
 .Xr dlpi 7P ,
+.Xr dladm 8 ,
 .Xr mac 9E ,
 .Xr mc_close 9E ,
 .Xr mc_getcapab 9E ,
diff --git a/usr/src/man/man9s/usba_hcdi_ops.9s b/usr/src/man/man9s/usba_hcdi_ops.9s
index 87e2ac3a8b..b8b509a722 100644
--- a/usr/src/man/man9s/usba_hcdi_ops.9s
+++ b/usr/src/man/man9s/usba_hcdi_ops.9s
@@ -268,7 +268,7 @@ member is an
 .Em optional
 entry point that will be called every time a device is removed from the
 system, whether through it being unplugged or a
-.Xr cfgadm 1M
+.Xr cfgadm 8
 action.
 If an HCD does not need this functionality, the member should be set to
 .Dv NULL .
@@ -302,7 +302,7 @@ See
 .Xr usba_hcdi_hub_update 9E
 for more information.
 .Sh SEE ALSO
-.Xr cfgadm 1M ,
+.Xr cfgadm 8 ,
 .Xr attach 9E ,
 .Xr usba_hcdi 9E ,
 .Xr usba_hcdi_device_address 9E ,