manual: fix up free-form normative manual references in the manual

494 files changed, 3062 insertions, 3062 deletions

diff --git a/usr/src/man/man8/6to4relay.8 b/usr/src/man/man8/6to4relay.8
index dc0228fef5..291b082500 100644
--- a/usr/src/man/man8/6to4relay.8
+++ b/usr/src/man/man8/6to4relay.8
@@ -187,7 +187,7 @@ The default installation root
 .SH SEE ALSO
 .sp
 .LP
-\fBifconfig\fR(1M), \fBattributes\fR(5)
+\fBifconfig\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 Huitema, C. \fIRFC 3068, An Anycast Prefix for 6to4 Relay Routers\fR. Network
diff --git a/usr/src/man/man8/Intro.8 b/usr/src/man/man8/Intro.8
index db71e83461..46fc8cff98 100644
--- a/usr/src/man/man8/Intro.8
+++ b/usr/src/man/man8/Intro.8
@@ -15,9 +15,9 @@ for system maintenance and administration purposes.
 .LP
 Because of command restructuring for the Virtual File System architecture,
 there are several instances of multiple manual pages that begin with the same
-name. For example, the   \fBmount\fR, pages \(mi \fBmount\fR(1M),
-\fBmount_hsfs\fR(1M), \fBmount_nfs\fR(1M), \fBmount_tmpfs\fR(1M),
-and \fBmount_ufs\fR(1M). In each such case the first of the
+name. For example, the   \fBmount\fR, pages \(mi \fBmount\fR(8),
+\fBmount_hsfs\fR(8), \fBmount_nfs\fR(8), \fBmount_tmpfs\fR(8),
+and \fBmount_ufs\fR(8). In each such case the first of the
 multiple pages describes the syntax and options of the generic command, that
 is, those options applicable to all FSTypes (file system types). The succeeding
 pages describe the functionality of the FSType-specific modules of the command.
@@ -101,7 +101,7 @@ Pathname (or other command argument) \fInot\fR beginning with \fB\(mi\fR or,
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for a discussion of the attributes listed in this
+See \fBattributes\fR(7) for a discussion of the attributes listed in this
 section.
 .SH ACKNOWLEDGMENTS
 .LP
@@ -129,7 +129,7 @@ http://www.opengroup.org/unix/online.html\&.
 This notice shall appear on any product containing this material.
 .SH SEE ALSO
 .LP
-\fBgetopt\fR(1), \fBgetopt\fR(3C), \fBattributes\fR(5)
+\fBgetopt\fR(1), \fBgetopt\fR(3C), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .LP
 Upon termination, each command returns 0 for normal termination and non-zero to
diff --git a/usr/src/man/man8/Uutry.8 b/usr/src/man/man8/Uutry.8
index 514f46f93d..31db5a3b1d 100644
--- a/usr/src/man/man8/Uutry.8
+++ b/usr/src/man/man8/Uutry.8
@@ -15,7 +15,7 @@ Uutry, uutry \- attempt to contact remote system with debugging on
 .SH DESCRIPTION
 .sp
 .LP
-\fBUutry\fR is a shell script that is used to invoke \fBuucico\fR(1M) to call a
+\fBUutry\fR is a shell script that is used to invoke \fBuucico\fR(8) to call a
 remote site. Debugging is initially turned on and is set to the default value
 of \fB5\fR. The debugging output is put in file \fB/tmp/\fR\fIsystem-name.\fR
 .SH OPTIONS
@@ -130,4 +130,4 @@ more detailed debugging information.
 .SH SEE ALSO
 .sp
 .LP
-\fBuucp\fR(1C), \fBuux\fR(1C), \fBuucico\fR(1M), \fBattributes\fR(5)
+\fBuucp\fR(1C), \fBuux\fR(1C), \fBuucico\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/accept.8 b/usr/src/man/man8/accept.8
index 206844bcab..f401d5f51d 100644
--- a/usr/src/man/man8/accept.8
+++ b/usr/src/man/man8/accept.8
@@ -61,9 +61,9 @@ The following operands are supported:
 .ad
 .RS 15n
 The name of the destination accepting or rejecting print requests. Destination
-specifies the name of a printer or class of printers (see \fBlpadmin\fR(1M)).
+specifies the name of a printer or class of printers (see \fBlpadmin\fR(8)).
 Specify \fIdestination\fR using atomic name or URI-style (scheme://endpoint)
-names. See \fBprinters.conf\fR(4) for information regarding the naming
+names. See \fBprinters.conf\fR(5) for information regarding the naming
 conventions for destinations.
 .RE
 
@@ -126,7 +126,7 @@ LDAP version of \fB/etc/printers.conf\fR
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -143,8 +143,8 @@ Interface Stability	Obsolete
 
 .SH SEE ALSO
 .LP
-\fBenable\fR(1), \fBlp\fR(1), \fBlpstat\fR(1), \fBlpadmin\fR(1M),
-\fBlpsched\fR(1M), \fBprinters.conf\fR(4), \fBattributes\fR(5)
+\fBenable\fR(1), \fBlp\fR(1), \fBlpstat\fR(1), \fBlpadmin\fR(8),
+\fBlpsched\fR(8), \fBprinters.conf\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .LP
 \fBaccept\fR and \fBreject\fR affect only queueing on the print server's
diff --git a/usr/src/man/man8/acct.8 b/usr/src/man/man8/acct.8
index e98d97a253..25849bb24f 100644
--- a/usr/src/man/man8/acct.8
+++ b/usr/src/man/man8/acct.8
@@ -40,20 +40,20 @@ accounting and miscellaneous accounting commands
 .SH DESCRIPTION
 Accounting software is structured as a set of tools (consisting of both C
 programs and shell procedures) that can be used to build accounting systems.
-\fBacctsh\fR(1M) describes the set of shell procedures built on top of the C
+\fBacctsh\fR(8) describes the set of shell procedures built on top of the C
 programs.
 .sp
 .LP
 Connect time accounting is handled by various programs that write records into
-\fB/var/adm/wtmpx\fR, as described in \fButmpx\fR(4). The programs described in
-\fBacctcon\fR(1M) convert this file into session and charging records, which
-are then summarized by \fBacctmerg\fR(1M).
+\fB/var/adm/wtmpx\fR, as described in \fButmpx\fR(5). The programs described in
+\fBacctcon\fR(8) convert this file into session and charging records, which
+are then summarized by \fBacctmerg\fR(8).
 .sp
 .LP
 Process accounting is performed by the system kernel. Upon termination of a
 process, one record per process is written to a file (normally
-\fB/var/adm/pacct\fR). The programs in \fBacctprc\fR(1M) summarize this data
-for charging purposes; \fBacctcms\fR(1M) is used to summarize command usage.
+\fB/var/adm/pacct\fR). The programs in \fBacctprc\fR(8) summarize this data
+for charging purposes; \fBacctcms\fR(8) is used to summarize command usage.
 Current process data may be examined using \fBacctcom\fR(1).
 .sp
 .LP
@@ -61,7 +61,7 @@ Process accounting records and connect time accounting records (or any
 accounting records in the \fBtacct\fR format described in \fBacct.h\fR(3HEAD))
 can be merged and summarized into total accounting records by \fBacctmerg\fR
 (see \fBtacct\fR format in \fBacct.h\fR(3HEAD)). \fBprtacct\fR (see
-\fBacctsh\fR(1M)) is used to format any or all accounting records.
+\fBacctsh\fR(8)) is used to format any or all accounting records.
 .sp
 .LP
 \fBacctdisk\fR reads lines that contain user \fBID\fR, login name, and number
@@ -80,10 +80,10 @@ is given, it must be the name of an existing file, to which the kernel appends
 process accounting records (see \fBacct\fR(2) and \fBacct.h\fR(3HEAD)).
 .sp
 .LP
-\fBacctwtmp\fR writes a \fButmpx\fR(4) record to \fIfilename\fR. The record
+\fBacctwtmp\fR writes a \fButmpx\fR(5) record to \fIfilename\fR. The record
 contains the current time and a string of characters that describe the
 \fIreason\fR. A record type of \fBACCOUNTING\fR is assigned (see
-\fButmpx\fR(4)) \fIreason\fR must be a string of 11 or fewer characters,
+\fButmpx\fR(5)) \fIreason\fR must be a string of 11 or fewer characters,
 numbers, \fB$\fR, or spaces. For example, the following are suggestions for use
 in reboot and shutdown procedures, respectively:
 .sp
@@ -98,7 +98,7 @@ acctwtmp "acctg off" /var/adm/wtmpx
 .LP
 For each user currently logged on, \fBclosewtmp\fR puts a false
 \fBDEAD_PROCESS\fR record in the \fB/var/adm/wtmpx\fR file. \fBrunacct\fR (see
-\fBrunacct\fR(1M)) uses this false \fBDEAD_PROCESS\fR record so that the
+\fBrunacct\fR(8)) uses this false \fBDEAD_PROCESS\fR record so that the
 connect accounting procedures can track the time used by users logged on before
 \fBrunacct\fR was invoked.
 .sp
@@ -133,7 +133,7 @@ password file is \fB/etc/passwd\fR.
 .SH ENVIRONMENT VARIABLES
 If any of the \fBLC_*\fR variables (\fBLC_TYPE\fR, \fBLC_MESSAGES\fR,
 \fBLC_TIME\fR, \fBLC_COLLATE\fR, \fBLC_NUMERIC\fR, and \fBLC_MONETARY\fR) (see
-\fBenviron\fR(5)) are not set in the environment, the operational behavior of
+\fBenviron\fR(7)) are not set in the environment, the operational behavior of
 \fBacct\fR for each corresponding locale category is determined by the value of
 the \fBLANG\fR environment variable. If \fBLC_ALL\fR is set, its contents are
 used to override both the \fBLANG\fR and the other \fBLC_*\fR variables. If
@@ -200,10 +200,10 @@ History of user access and administration information.
 .RE
 
 .SH SEE ALSO
-\fBacctcom\fR(1), \fBacctcms\fR(1M), \fBacctcon\fR(1M), \fBacctmerg\fR(1M),
-\fBacctprc\fR(1M), \fBacctsh\fR(1M), \fBfwtmp\fR(1M), \fBrunacct\fR(1M),
-\fBacct\fR(2), \fBacct.h\fR(3HEAD), \fBpasswd\fR(4), \fButmpx\fR(4),
-\fBattributes\fR(5), \fBenviron\fR(5)
+\fBacctcom\fR(1), \fBacctcms\fR(8), \fBacctcon\fR(8), \fBacctmerg\fR(8),
+\fBacctprc\fR(8), \fBacctsh\fR(8), \fBfwtmp\fR(8), \fBrunacct\fR(8),
+\fBacct\fR(2), \fBacct.h\fR(3HEAD), \fBpasswd\fR(5), \fButmpx\fR(5),
+\fBattributes\fR(7), \fBenviron\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/acctadm.8 b/usr/src/man/man8/acctadm.8
index 6ced3d263d..f6fa0f66ec 100644
--- a/usr/src/man/man8/acctadm.8
+++ b/usr/src/man/man8/acctadm.8
@@ -106,7 +106,7 @@ resource groups for all available accounting types. See OPERANDS.
 .ad
 .sp .6
 .RS 4n
-Start method for the \fBsmf\fR(5) instance. This option is used to restore the
+Start method for the \fBsmf\fR(7) instance. This option is used to restore the
 extended accounting configuration at boot.
 .RE
 
@@ -170,8 +170,8 @@ facility.
 .ad
 .sp .6
 .RS 4n
-Run \fBacctadm\fR on links and flows administered by \fBdladm\fR(1M) and
-\fBflowadm\fR(1M), respectively. Basic network accounting relates only to
+Run \fBacctadm\fR on links and flows administered by \fBdladm\fR(8) and
+\fBflowadm\fR(8), respectively. Basic network accounting relates only to
 links, while extended network accounting includes both link and flow
 accounting.
 .RE
@@ -328,7 +328,7 @@ Invalid command line options were specified.
 .ad
 .sp .6
 .RS 4n
-A fatal, non-configuration error occurred during the start of the \fBsmf\fR(5)
+A fatal, non-configuration error occurred during the start of the \fBsmf\fR(7)
 service instance.
 .RE
 
@@ -339,13 +339,13 @@ service instance.
 .ad
 .sp .6
 .RS 4n
-A fatal configuration error occurred during the start of the \fBsmf\fR(5)
+A fatal configuration error occurred during the start of the \fBsmf\fR(7)
 service instance.
 .RE
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -360,8 +360,8 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBdladm\fR(1M), \fBflowadm\fR(1M), \fBacct\fR(2), \fBattributes\fR(5),
-\fBsmf\fR(5), \fBipqos\fR(7IPP)
+\fBdladm\fR(8), \fBflowadm\fR(8), \fBacct\fR(2), \fBattributes\fR(7),
+\fBsmf\fR(7), \fBipqos\fR(4IPP)
 .SH NOTES
 .LP
 Both extended accounting and regular accounting can be active.
@@ -372,7 +372,7 @@ platform.
 .sp
 .LP
 Extended accounting configuration is stored in the service management facility
-(\fBsmf\fR(5)) repository. The configuration is restored at boot by a transient
+(\fBsmf\fR(7)) repository. The configuration is restored at boot by a transient
 service instance, one per accounting type:
 .sp
 .in +2
@@ -389,7 +389,7 @@ svc:/system/extended-accounting:net         Network accounting
 .LP
 The instances are enabled or disabled by \fBacctadm\fR as needed. Configuration
 changes are made using \fBacctadm\fR; service properties should not be modified
-directly using \fBsvccfg\fR(1M).
+directly using \fBsvccfg\fR(8).
 .sp
 .LP
 Users can manage extended accounting (start accounting, stop accounting, change
diff --git a/usr/src/man/man8/acctcms.8 b/usr/src/man/man8/acctcms.8
index 30258f84a9..5689d858f1 100644
--- a/usr/src/man/man8/acctcms.8
+++ b/usr/src/man/man8/acctcms.8
@@ -130,9 +130,9 @@ example% \fBacctcms \fR\fB-a\fR\fB \fR\fB-s\fR\fB today\fR
 .SH SEE ALSO
 .sp
 .LP
-\fBacctcom\fR(1), \fBacct\fR(1M), \fBacctcon\fR(1M), \fBacctmerg\fR(1M),
-\fBacctprc\fR(1M), \fBacctsh\fR(1M), \fBfwtmp\fR(1M), \fBrunacct\fR(1M),
-\fBacct\fR(2), \fBacct.h\fR(3HEAD), \fButmpx\fR(4), \fBattributes\fR(5)
+\fBacctcom\fR(1), \fBacct\fR(8), \fBacctcon\fR(8), \fBacctmerg\fR(8),
+\fBacctprc\fR(8), \fBacctsh\fR(8), \fBfwtmp\fR(8), \fBrunacct\fR(8),
+\fBacct\fR(2), \fBacct.h\fR(3HEAD), \fButmpx\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/acctcon.8 b/usr/src/man/man8/acctcon.8
index 564899dcfe..08dad10163 100644
--- a/usr/src/man/man8/acctcon.8
+++ b/usr/src/man/man8/acctcon.8
@@ -79,7 +79,7 @@ sessions charged, number of logins, and number of logoffs.  This file helps
 track line usage, identify bad lines, and find software and hardware oddities.
 Hangup, termination of \fBlogin\fR(1) and termination of the login shell each
 generate logoff records, so that the number of logoffs is often three to four
-times the number of sessions. See \fB init\fR(1M) and \fButmpx\fR(4).
+times the number of sessions. See \fBinit\fR(8) and \fButmpx\fR(5).
 .RE
 
 .sp
@@ -133,10 +133,10 @@ History of user access and administration information
 .SH SEE ALSO
 .sp
 .LP
-\fBacctcom\fR(1), \fBlogin\fR(1), \fBacct\fR(1M), \fBacctcms\fR(1M),
-\fBacctmerg\fR(1M), \fBacctprc\fR(1M), \fBacctsh\fR(1M), \fBfwtmp\fR(1M),
-\fBinit\fR(1M), \fBrunacct\fR(1M), \fBacct\fR(2), \fBacct.h\fR(3HEAD),
-\fButmpx\fR(4), \fBattributes\fR(5)
+\fBacctcom\fR(1), \fBlogin\fR(1), \fBacct\fR(8), \fBacctcms\fR(8),
+\fBacctmerg\fR(8), \fBacctprc\fR(8), \fBacctsh\fR(8), \fBfwtmp\fR(8),
+\fBinit\fR(8), \fBrunacct\fR(8), \fBacct\fR(2), \fBacct.h\fR(3HEAD),
+\fButmpx\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
@@ -144,7 +144,7 @@ History of user access and administration information
 .sp
 .LP
 The line usage report is confused by date changes. Use \fBwtmpfix\fR (see
-\fBfwtmp\fR(1M)), with the \fB/var/adm/wtmpx\fR file as an argument, to correct
+\fBfwtmp\fR(8)), with the \fB/var/adm/wtmpx\fR file as an argument, to correct
 this situation.
 .sp
 .LP
diff --git a/usr/src/man/man8/acctmerg.8 b/usr/src/man/man8/acctmerg.8
index 2d21a66a0c..83287ccb90 100644
--- a/usr/src/man/man8/acctmerg.8
+++ b/usr/src/man/man8/acctmerg.8
@@ -108,9 +108,9 @@ Edit \fIfilename2\fR as you want:
 .SH SEE ALSO
 .sp
 .LP
-\fBacctcom\fR(1), \fBacct\fR(1M), \fBacctcms\fR(1M), \fBacctcon\fR(1M),
-\fBacctprc\fR(1M), \fBacctsh\fR(1M), \fBfwtmp\fR(1M), \fBrunacct\fR(1M),
-\fBacct\fR(2), \fBacct.h\fR(3HEAD), \fButmpx\fR(4), \fBattributes\fR(5)
+\fBacctcom\fR(1), \fBacct\fR(8), \fBacctcms\fR(8), \fBacctcon\fR(8),
+\fBacctprc\fR(8), \fBacctsh\fR(8), \fBfwtmp\fR(8), \fBrunacct\fR(8),
+\fBacct\fR(2), \fBacct.h\fR(3HEAD), \fButmpx\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/acctprc.8 b/usr/src/man/man8/acctprc.8
index 76efd43cce..c215955292 100644
--- a/usr/src/man/man8/acctprc.8
+++ b/usr/src/man/man8/acctprc.8
@@ -88,19 +88,19 @@ system password file
 .SH SEE ALSO
 .sp
 .LP
-\fBacctcom\fR(1), \fBacct\fR(1M), \fBacctcms\fR(1M), \fBacctcon\fR(1M),
-\fBacctmerg\fR(1M), \fBacctsh\fR(1M), \fBcron\fR(1M), \fBfwtmp\fR(1M),
-\fBrunacct\fR(1M), \fBacct\fR(2), \fBacct.h\fR(3HEAD), \fButmpx\fR(4),
-\fBattributes\fR(5)
+\fBacctcom\fR(1), \fBacct\fR(8), \fBacctcms\fR(8), \fBacctcon\fR(8),
+\fBacctmerg\fR(8), \fBacctsh\fR(8), \fBcron\fR(8), \fBfwtmp\fR(8),
+\fBrunacct\fR(8), \fBacct\fR(2), \fBacct.h\fR(3HEAD), \fButmpx\fR(5),
+\fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
 Although it is possible for \fBacctprc1\fR to distinguish among login names
 that share user \fBIDs\fR for commands run from a command line, it is difficult
 for \fBacctprc1\fR to make this distinction for commands invoked in other ways.
-A command run from \fBcron\fR(1M) is an example of where \fBacctprc1\fR might
+A command run from \fBcron\fR(8) is an example of where \fBacctprc1\fR might
 have difficulty. A more precise conversion can be done using the \fBacctwtmp\fR
-program in \fBacct\fR(1M). \fBacctprc\fR does not distinguish between users
+program in \fBacct\fR(8). \fBacctprc\fR does not distinguish between users
 with identical user IDs.
 .sp
 .LP
diff --git a/usr/src/man/man8/acctsh.8 b/usr/src/man/man8/acctsh.8
index ddbdcb3037..3a6b47fb60 100644
--- a/usr/src/man/man8/acctsh.8
+++ b/usr/src/man/man8/acctsh.8
@@ -75,11 +75,11 @@ accounting
 .LP
 \fBchargefee\fR can be invoked to charge a \fInumber\fR of units to
 \fIlogin-name\fR. A record is written to \fB/var/adm/fee\fR, to be merged with
-other accounting records by \fBrunacct\fR(1M).
+other accounting records by \fBrunacct\fR(8).
 .SS "ckpacct Command"
 .sp
 .LP
-\fBckpacct\fR should be initiated using \fBcron\fR(1M) to periodically check
+\fBckpacct\fR should be initiated using \fBcron\fR(8) to periodically check
 the size of \fB/var/adm/pacct\fR. If the size exceeds \fIblocks\fR, \fB500\fR
 by default, \fBturnacct\fR will be invoked with argument \fBswitch\fR. To avoid
 a conflict with \fBturnacct switch\fR execution in \fBrunacct\fR, do not run
@@ -89,16 +89,16 @@ automatically turn off the collection of process accounting records via the
 \fBoff\fR argument to \fBturnacct\fR. When at least  \fB500\fR blocks are
 restored,  the accounting will be activated again on the next invocation of
 \fBckpacct\fR. This feature is sensitive to the frequency at which
-\fBckpacct\fR is executed, usually by the \fBcron\fR(1M) command.
+\fBckpacct\fR is executed, usually by the \fBcron\fR(8) command.
 .SS "dodisk Command"
 .sp
 .LP
-\fBdodisk\fR should be invoked by \fBcron\fR(1M) to perform the disk accounting
+\fBdodisk\fR should be invoked by \fBcron\fR(8) to perform the disk accounting
 functions.
 .SS "lastlogin Command"
 .sp
 .LP
-\fBlastlogin\fR is invoked by \fBrunacct\fR(1M) to update
+\fBlastlogin\fR is invoked by \fBrunacct\fR(8) to update
 \fB/var/adm/acct/sum/loginlog\fR, which shows the last date on which each
 person logged in.
 .SS "monacct Command"
@@ -107,7 +107,7 @@ person logged in.
 \fBmonacct\fR should be invoked once each month or each accounting period.
 \fInumber\fR indicates which month or period it is. If \fInumber\fR is not
 given, it defaults to the current month (01\(mi12). This default is useful if
-\fBmonacct\fR is to executed using \fBcron\fR(1M) on the first day of each
+\fBmonacct\fR is to executed using \fBcron\fR(8) on the first day of each
 month. \fBmonacct\fR creates summary files in \fB/var/adm/acct/fiscal\fR and
 restarts the summary files in \fB/var/adm/acct/sum\fR.
 .SS "nulladm Command"
@@ -120,11 +120,11 @@ group are \fBadm\fR. It is called by various accounting shell procedures.
 .LP
 \fBprctmp\fR can be used to print the session record file (normally
 \fB/var/adm/acct/nite/ctmp\fR created by \fBacctcon1\fR (see
-\fBacctcon\fR(1M)).
+\fBacctcon\fR(8)).
 .SS "prdaily Command"
 .sp
 .LP
-\fBprdaily\fR is invoked by \fBrunacct\fR(1M) to format a report of the
+\fBprdaily\fR is invoked by \fBrunacct\fR(8) to format a report of the
 previous day's accounting data. The report resides in
 \fB/var/adm/acct/sum/rprt/mmdd\fR where \fImmdd\fR is the month and day of the
 report. The current daily accounting reports may be printed by typing
@@ -148,13 +148,13 @@ to turn process accounting on.
 .SS "turnacct Command"
 .sp
 .LP
-\fBturnacct\fR is an interface to \fBaccton\fR (see \fBacct\fR(1M)) to turn
+\fBturnacct\fR is an interface to \fBaccton\fR (see \fBacct\fR(8)) to turn
 process accounting \fBon\fR or \fBoff\fR. The \fBswitch\fR argument moves the
 current \fB/var/adm/pacct\fR to the next free name in
 \fB/var/adm/pacct.\fIincr\fR\fR (where \fIincr\fR is a number starting with
 \fB0\fR and incrementing by one  for each additional \fBpacct\fR file), then
 turns accounting back on again. This procedure is called by \fBckpacct\fR and
-thus can be taken care of by the \fBcron\fR(1M) command and used to keep \fB
+thus can be taken care of by the \fBcron\fR(8) command and used to keep \fB
 pacct\fR to a reasonable size.   \fBshutacct\fR uses \fBturnacct\fR to stop
 process accounting.   \fBstartup\fR uses \fBturnacct\fR to start process
 accounting.
@@ -189,7 +189,7 @@ each invocation of \fBmonacct\fR.
 \fB\fB-o\fR\fR
 .ad
 .RS 6n
-This option uses \fBacctdusg\fR (see \fBacct\fR(1M)) to do a slower version of
+This option uses \fBacctdusg\fR (see \fBacct\fR(8)) to do a slower version of
 disk accounting by login directory. \fIfilename\fRs specifies the one or more
 filesystem names where disk accounting will be done.  If \fIfilename\fRs are
 used, disk accounting will be done on these filesystems only. If the \fB-o\fR
@@ -205,7 +205,7 @@ names of mountable filesystems.
 \fB\fB/etc/logadm.conf\fR\fR
 .ad
 .RS 30n
-Configuration file for the \fBlogadm\fR(1M) command
+Configuration file for the \fBlogadm\fR(8) command
 .RE
 
 .sp
@@ -311,13 +311,13 @@ History of user access and administration information
 .SH SEE ALSO
 .sp
 .LP
-\fBacctcom\fR(1), \fBacct\fR(1M), \fBacctcms\fR(1M), \fBacctcon\fR(1M),
-\fBacctmerg\fR(1M), \fBacctprc\fR(1M), \fBcron\fR(1M), \fBfwtmp\fR(1M),
-\fBlogadm\fR(1M), \fBrunacct\fR(1M), \fBacct\fR(2), \fBacct.h\fR(3HEAD),
-\fButmpx\fR(4), \fBattributes\fR(5)
+\fBacctcom\fR(1), \fBacct\fR(8), \fBacctcms\fR(8), \fBacctcon\fR(8),
+\fBacctmerg\fR(8), \fBacctprc\fR(8), \fBcron\fR(8), \fBfwtmp\fR(8),
+\fBlogadm\fR(8), \fBrunacct\fR(8), \fBacct\fR(2), \fBacct.h\fR(3HEAD),
+\fButmpx\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
-See \fBrunacct\fR(1M) for the main daily accounting shell script, which
+See \fBrunacct\fR(8) for the main daily accounting shell script, which
 performs the accumulation of connect, process, fee, and disk accounting on a
 daily basis. It also creates summaries of command usage.
diff --git a/usr/src/man/man8/adbgen.8 b/usr/src/man/man8/adbgen.8
index 39d675502a..e8e568a9e5 100644
--- a/usr/src/man/man8/adbgen.8
+++ b/usr/src/man/man8/adbgen.8
@@ -339,7 +339,7 @@ platform-specific \fBadb\fR scripts for debugging the 64-bit SPARC V9 kernel
 .SH SEE ALSO
 .sp
 .LP
-\fBadb\fR(1), \fBuname\fR(1), \fBkadb\fR(1M), \fBattributes\fR(5)
+\fBadb\fR(1), \fBuname\fR(1), \fBkadb\fR(8), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .sp
 .LP
diff --git a/usr/src/man/man8/add_allocatable.8 b/usr/src/man/man8/add_allocatable.8
index f965118f5b..f459210f66 100644
--- a/usr/src/man/man8/add_allocatable.8
+++ b/usr/src/man/man8/add_allocatable.8
@@ -116,7 +116,7 @@ the at sign (@) and must be quoted. Default authorization is '@'.
 \fB\fB-c\fR \fIclean\fR\fR
 .ad
 .RS 20n
-Specifies the \fBdevice_clean\fR(5) program \fIclean\fR to be used with the
+Specifies the \fBdevice_clean\fR(7) program \fIclean\fR to be used with the
 device that is specified with \fB-n\fR or with devices of the type that is
 specified with \fB-t\fR. The default clean program is \fB/bin/true\fR.
 .RE
@@ -219,7 +219,7 @@ Permission denied. User does not have DAC or MAC access record updates.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -240,7 +240,7 @@ Not-an-Interface.
 .sp
 .LP
 \fBallocate\fR(1), \fBdeallocate\fR(1), \fBlist_devices\fR(1),
-\fBremove_allocatable\fR(1M), \fBattributes\fR(5), \fBdevice_clean\fR(5)
+\fBremove_allocatable\fR(8), \fBattributes\fR(7), \fBdevice_clean\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/add_drv.8 b/usr/src/man/man8/add_drv.8
index 728081cbb1..8773cf7e67 100644
--- a/usr/src/man/man8/add_drv.8
+++ b/usr/src/man/man8/add_drv.8
@@ -42,12 +42,12 @@ Aliases might require quoting (with double-quotes) if they contain numbers. See
 \fBEXAMPLES\fR.
 .SS "The \fB/etc/minor_perm\fR File"
 .LP
-\fBadd_drv\fR and \fBupdate_drv\fR(1M) read the \fB/etc/minor_perm\fR file to
+\fBadd_drv\fR and \fBupdate_drv\fR(8) read the \fB/etc/minor_perm\fR file to
 obtain permission information. The permission specified is applied to matching
 minor nodes created when a device bound to the driver is attached. A minor
 node's permission may be manually changed by \fBchmod\fR(1). For such nodes,
 the specified permissions apply, overriding the default permissions specified
-via \fBadd_drv\fR or \fBupdate_drv\fR(1M).
+via \fBadd_drv\fR or \fBupdate_drv\fR(8).
 .sp
 .LP
 The format of the \fB/etc/minor_perm\fR file is as follows:
@@ -152,7 +152,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-b\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -244,7 +244,7 @@ The following tokens are defined: \fBread_priv_set\fR and \fBwrite_priv_set\fR.
 effective set of the calling process when opening a device for reading.
 \fBwrite_priv_set\fR defines the privileges that need to be asserted in the
 effective set of the calling process when opening a device for writing. See
-\fBprivileges\fR(5).
+\fBprivileges\fR(7).
 .sp
 A missing minor spec is interpreted as a \fB*\fR.
 .RE
@@ -580,10 +580,10 @@ device privileges
 
 .SH SEE ALSO
 .LP
-\fBboot\fR(1M), \fBchmod\fR(1), \fBdevfsadm\fR(1M), \fBkernel\fR(1M),
-\fBmodinfo\fR(1M), \fBrem_drv\fR(1M), \fBupdate_drv\fR(1M),
-\fBdriver.conf\fR(4), \fBsystem\fR(4), \fBattributes\fR(5),
-\fBprivileges\fR(5), \fBdevfs\fR(7FS), \fBddi_create_minor_node\fR(9F)
+\fBboot\fR(8), \fBchmod\fR(1), \fBdevfsadm\fR(8), \fBkernel\fR(8),
+\fBmodinfo\fR(8), \fBrem_drv\fR(8), \fBupdate_drv\fR(8),
+\fBdriver.conf\fR(5), \fBsystem\fR(5), \fBattributes\fR(7),
+\fBprivileges\fR(7), \fBdevfs\fR(4FS), \fBddi_create_minor_node\fR(9F)
 .sp
 .LP
 \fI\fR
@@ -592,7 +592,7 @@ device privileges
 It is possible to add a driver for a device already being managed by a
 different driver, where the driver being added appears in the device's
 \fBcompatible\fR list before the current driver. In such cases, a
-reconfiguration boot is required (see \fBboot\fR(1M) and \fBkernel\fR(1M)).
+reconfiguration boot is required (see \fBboot\fR(8) and \fBkernel\fR(8)).
 After the reconfiguration boot, device links in \fB/dev\fR and references to
 these files may no longer be valid (see the \fB-v\fR flag). If a
 reconfiguration boot would be required to complete the driver installation,
@@ -622,8 +622,8 @@ The existence of this notice does not imply that any other documentation that
 lacks this notice constitutes an API.
 .sp
 .LP
-\fB/etc/minor_perm\fR can only be updated by \fBadd_drv\fR(1M),
-\fBrem_drv\fR(1M) or \fBupdate_drv\fR(1M).
+\fB/etc/minor_perm\fR can only be updated by \fBadd_drv\fR(8),
+\fBrem_drv\fR(8) or \fBupdate_drv\fR(8).
 .sp
 .LP
 In the current version of \fBadd_drv\fR, the use of double quotes to specify an
diff --git a/usr/src/man/man8/addbadsec.8 b/usr/src/man/man8/addbadsec.8
index e2244ab55c..f1436b1b0f 100644
--- a/usr/src/man/man8/addbadsec.8
+++ b/usr/src/man/man8/addbadsec.8
@@ -82,19 +82,19 @@ The address of the disk drive (see \fBFILES\fR).
 .SH FILES
 .sp
 .LP
-The raw device should be \fB/dev/rdsk/c?[t?]d?p0\fR. See \fBdisks\fR(1M) for an
+The raw device should be \fB/dev/rdsk/c?[t?]d?p0\fR. See \fBdisks\fR(8) for an
 explanation of \fBSCSI\fR and \fBIDE\fR device naming conventions.
 .SH SEE ALSO
 .sp
 .LP
-\fBdisks\fR(1M), \fBdiskscan\fR(1M), \fBfdisk\fR(1M), \fBfmthard\fR(1M),
-\fBformat\fR(1M), \fBattributes\fR(5)
+\fBdisks\fR(8), \fBdiskscan\fR(8), \fBfdisk\fR(8), \fBfmthard\fR(8),
+\fBformat\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
-The \fBformat\fR(1M) utility is available to format, label, analyze, and repair
+The \fBformat\fR(8) utility is available to format, label, analyze, and repair
 \fBSCSI\fR disks. This utility is included with the \fBaddbadsec\fR,
-\fBdiskscan\fR(1M), \fBfdisk\fR(1M), and \fBfmthard\fR(1M) commands available
+\fBdiskscan\fR(8), \fBfdisk\fR(8), and \fBfmthard\fR(8) commands available
 for x86. To format an \fBIDE\fR disk, use the \fB DOS\fR "format" utility;
 however, to label, analyze, or repair \fBIDE\fR disks on x86 systems, use the
-Solaris \fBformat\fR(1M) utility.
+Solaris \fBformat\fR(8) utility.
diff --git a/usr/src/man/man8/arp.8 b/usr/src/man/man8/arp.8
index e46f39707e..424523eb38 100644
--- a/usr/src/man/man8/arp.8
+++ b/usr/src/man/man8/arp.8
@@ -37,7 +37,7 @@ arp \- address resolution display and control
 .SH DESCRIPTION
 .LP
 The \fBarp\fR program displays and modifies the Internet-to-MAC address
-translation tables used by the address resolution protocol (see \fBarp\fR(7P)).
+translation tables used by the address resolution protocol (see \fBarp\fR(4P)).
 .sp
 .LP
 With no flags, the program displays the current \fBARP\fR entry for
@@ -47,7 +47,7 @@ dot notation.
 .LP
 Options that modify the ARP translation tables (\fB-d\fR, \fB-f\fR, and
 \fB-s\fR) can be used only when the invoked command is granted the
-\fBPRIV_SYS_NET_CONFIG\fR privilege. See \fBprivileges\fR(5).
+\fBPRIV_SYS_NET_CONFIG\fR privilege. See \fBprivileges\fR(7).
 .SH OPTIONS
 .ne 2
 .na
@@ -243,5 +243,5 @@ kernel and thus cannot be changed.
 
 .SH SEE ALSO
 .LP
-\fBifconfig\fR(1M), \fBnetstat\fR(1M), \fBndp\fR(1M), \fBattributes\fR(5),
-\fBprivileges\fR(5), \fBarp\fR(7P)
+\fBifconfig\fR(8), \fBnetstat\fR(8), \fBndp\fR(8), \fBattributes\fR(7),
+\fBprivileges\fR(7), \fBarp\fR(4P)
diff --git a/usr/src/man/man8/atohexlabel.8 b/usr/src/man/man8/atohexlabel.8
index 233a33c939..2e7be53228 100644
--- a/usr/src/man/man8/atohexlabel.8
+++ b/usr/src/man/man8/atohexlabel.8
@@ -77,7 +77,7 @@ and values for the defined labels of this system.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -98,8 +98,8 @@ MAC policy.
 .SH SEE ALSO
 .sp
 .LP
-\fBhextoalabel\fR(1M), \fBlabel_to_str\fR(3TSOL), \fBstr_to_label\fR(3TSOL),
-\fBlabel_encodings\fR(4), \fBattributes\fR(5)
+\fBhextoalabel\fR(8), \fBlabel_to_str\fR(3TSOL), \fBstr_to_label\fR(3TSOL),
+\fBlabel_encodings\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fIHow to Get the Hexadecimal Equivalent for a Label\fR in \fISolaris Trusted
diff --git a/usr/src/man/man8/audit.8 b/usr/src/man/man8/audit.8
index ec892f7924..0d795e29ff 100644
--- a/usr/src/man/man8/audit.8
+++ b/usr/src/man/man8/audit.8
@@ -16,9 +16,9 @@ audit \- control the behavior of the audit daemon
 .SH DESCRIPTION
 .LP
 The \fBaudit\fR command is the system administrator's interface to maintaining
-the audit daemon \fBauditd\fR(1M). The audit daemon can be stopped, started, or
-notified to reread the configuration, stored in \fBsmf\fR(5) and managed using
-the \fBauditconfig\fR(1M) command.
+the audit daemon \fBauditd\fR(8). The audit daemon can be stopped, started, or
+notified to reread the configuration, stored in \fBsmf\fR(7) and managed using
+the \fBauditconfig\fR(8) command.
 .SH OPTIONS
 .ne 2
 .na
@@ -69,7 +69,7 @@ integer upon failure.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -84,11 +84,11 @@ Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBpraudit\fR(1M), \fBauditconfig\fR(1M), \fBaudit\fR(2), \fBsmf\fR(5),
-\fBattributes\fR(5)
+\fBpraudit\fR(8), \fBauditconfig\fR(8), \fBaudit\fR(2), \fBsmf\fR(7),
+\fBattributes\fR(7)
 .SH NOTES
 .LP
 The \fB-v\fR option can be used in any zone, but the \fB-t\fR, \fB-s\fR, and
 \fB-n\fR options are valid only in local zones and, then, only if the
-\fBperzone\fR audit policy is set. See \fBauditd\fR(1M) and
-\fBauditconfig\fR(1M) for per-zone audit configuration.
+\fBperzone\fR audit policy is set. See \fBauditd\fR(8) and
+\fBauditconfig\fR(8) for per-zone audit configuration.
diff --git a/usr/src/man/man8/audit_warn.8 b/usr/src/man/man8/audit_warn.8
index b9aff23804..6081038bd8 100644
--- a/usr/src/man/man8/audit_warn.8
+++ b/usr/src/man/man8/audit_warn.8
@@ -16,14 +16,14 @@ audit_warn \- audit daemon warning script
 .SH DESCRIPTION
 .LP
 The \fBaudit_warn\fR utility processes warning or error messages from the audit
-daemon. When a problem is encountered, the audit daemon, \fBauditd\fR(1M) calls
+daemon. When a problem is encountered, the audit daemon, \fBauditd\fR(8) calls
 \fBaudit_warn\fR with the appropriate arguments. The \fIoption\fR argument
 specifies the error type.
 .sp
 .LP
 The system administrator can specify a list of mail recipients to be notified
 when an audit_warn situation arises by defining a mail alias called
-\fBaudit_warn\fR in \fBaliases\fR(4). The users that make up the
+\fBaudit_warn\fR in \fBaliases\fR(5). The users that make up the
 \fBaudit_warn\fR alias are typically the \fBaudit\fR and \fBroot\fR users.
 .SH OPTIONS
 .LP
@@ -134,7 +134,7 @@ resources.
 \fB\fBconfig_error\fR\fR
 .ad
 .RS 16n
-No plugins loaded (including the binary file plugin, \fBaudit_binfile\fR(5))
+No plugins loaded (including the binary file plugin, \fBaudit_binfile\fR(7))
 due to configuration errors. The name string is
 \fB--\fR to indicate that no plugin name applies.
 .RE
@@ -202,7 +202,7 @@ Indicates that there was a problem creating a symlink from
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -220,8 +220,8 @@ Interface Stability	Evolving
 The interface stability is evolving. The file content is unstable.
 .SH SEE ALSO
 .LP
-\fBaudit\fR(1M), \fBauditd\fR(1M), \fBaliases\fR(4),
-\fBaudit.log\fR(4), \fBattributes\fR(5)
+\fBaudit\fR(8), \fBauditd\fR(8), \fBaliases\fR(5),
+\fBaudit.log\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .LP
 If the audit policy \fBperzone\fR is set, the \fB/etc/security/audit_warn\fR
diff --git a/usr/src/man/man8/auditconfig.8 b/usr/src/man/man8/auditconfig.8
index 87e65b8312..522a22bd7b 100644
--- a/usr/src/man/man8/auditconfig.8
+++ b/usr/src/man/man8/auditconfig.8
@@ -222,7 +222,7 @@ string \fBauditing\fR meaning auditing is enabled and turned on (the kernel
 audit module is constructing and queuing audit records); \fBnoaudit\fR, meaning
 auditing is enabled but turned off (the kernel audit module is not constructing
 and queuing audit records); or \fBnospace\fR, meaning there is no space for
-saving audit records. See \fBauditon\fR(2) and \fBauditd\fR(1M) for further
+saving audit records. See \fBauditon\fR(2) and \fBauditd\fR(8) for further
 information.
 .RE
 
@@ -519,7 +519,7 @@ gen nona kern  aud  ctl  enq wrtn wblk rblk drop  tot  mem
 .in -2
 .sp
 
-See \fBauditstat\fR(1M) for a description of the headings in \fB-getstat\fR
+See \fBauditstat\fR(8) for a description of the headings in \fB-getstat\fR
 output.
 .RE
 
@@ -815,7 +815,7 @@ By default, they are not included.
 .ad
 .RS 16n
 Maintain separate configuration, queues, and logs for each zone and execute a
-separate version of \fBauditd\fR(1M) for each zone.
+separate version of \fBauditd\fR(8) for each zone.
 .RE
 
 .sp
@@ -1037,7 +1037,7 @@ Stores class definitions used in the audit system.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1052,10 +1052,10 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBaudit\fR(1M), \fBauditd\fR(1M), \fBauditstat\fR(1M),
-\fBpraudit\fR(1M), \fBauditon\fR(2), \fBexecv\fR(2), \fBaudit_class\fR(4),
-\fBaudit_event\fR(4), \fBattributes\fR(5),
-\fBaudit_binfile\fR(5), \fBaudit_remote\fR(5), \fBaudit_syslog\fR(5)
+\fBaudit\fR(8), \fBauditd\fR(8), \fBauditstat\fR(8),
+\fBpraudit\fR(8), \fBauditon\fR(2), \fBexecv\fR(2), \fBaudit_class\fR(5),
+\fBaudit_event\fR(5), \fBattributes\fR(7),
+\fBaudit_binfile\fR(7), \fBaudit_remote\fR(7), \fBaudit_syslog\fR(7)
 .SH NOTES
 .LP
 If the \fBaudit_remote\fR or \fBaudit_syslog\fR plugins are active, the
@@ -1077,9 +1077,9 @@ audit reflects the local zone if \fBperzone\fR is set. Otherwise, it reflects
 the settings of the global zone.
 .sp
 .LP
-The \fB-setcond\fR option has been removed. Use \fBaudit\fR(1M) to enable or
+The \fB-setcond\fR option has been removed. Use \fBaudit\fR(8) to enable or
 disable auditing.
 .sp
 .LP
 The \fB-getfsize\fR and \fB-setfsize\fR options have been removed. Use
-\fBaudit_binfile\fR(5) \fBp_fsize\fR to set the audit file size.
+\fBaudit_binfile\fR(7) \fBp_fsize\fR to set the audit file size.
diff --git a/usr/src/man/man8/auditd.8 b/usr/src/man/man8/auditd.8
index 29864a4f98..f759d3504b 100644
--- a/usr/src/man/man8/auditd.8
+++ b/usr/src/man/man8/auditd.8
@@ -17,10 +17,10 @@ auditd \- audit daemon
 .LP
 The audit daemon, \fBauditd\fR, controls the generation and location of audit
 trail files and the generation of syslog messages based on its configuration,
-stored in \fBsmf\fR(5) and managed using the \fBauditconfig\fR(1M) command.
+stored in \fBsmf\fR(7) and managed using the \fBauditconfig\fR(8) command.
 .sp
 .LP
-\fBaudit\fR(1M) is used to control \fBauditd\fR. It can cause \fBauditd\fR to:
+\fBaudit\fR(8) is used to control \fBauditd\fR. It can cause \fBauditd\fR to:
 .RS +4
 .TP
 .ie t \(bu
@@ -42,7 +42,7 @@ close the audit trail and terminate auditing.
 .RE
 .SS "Auditing Conditions"
 .LP
-The audit daemon invokes the program \fBaudit_warn\fR(1M) under the following
+The audit daemon invokes the program \fBaudit_warn\fR(8) under the following
 conditions with the indicated options:
 .sp
 .ne 2
@@ -127,7 +127,7 @@ audit daemon to exit.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -142,9 +142,9 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBaudit\fR(1M), \fBauditconfig\fR(1M), \fBaudit_binfile\fR(5),
-\fBaudit_warn\fR(1M), \fBpraudit\fR(1M), \fBauditon\fR(2), \fBaudit.log\fR(4),
-\fBattributes\fR(5)
+\fBaudit\fR(8), \fBauditconfig\fR(8), \fBaudit_binfile\fR(7),
+\fBaudit_warn\fR(8), \fBpraudit\fR(8), \fBauditon\fR(2), \fBaudit.log\fR(5),
+\fBattributes\fR(7)
 .SH NOTES
 .LP
 If the audit policy \fBperzone\fR is set, \fBauditd\fR runs in each zone,
@@ -163,13 +163,13 @@ local zone's \fB/etc/security\fR directory's files:
 Configuration changes do not affect audit sessions that are currently running,
 as the changes do not modify a process's preselection mask. To change the
 preselection mask on a running process, use the \fB-setpmask\fR option of the
-\fBauditconfig\fR command (see \fBauditconfig\fR(1M)). If the user logs out and
+\fBauditconfig\fR command (see \fBauditconfig\fR(8)). If the user logs out and
 logs back in, the new configuration changes will be reflected in the next audit
 session.
 .sp
 .LP
 The \fBauditd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -182,5 +182,5 @@ svc:/system/auditd
 .LP
 The service's status can be queried using the \fBsvcs\fR(1) command. While
 administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M), the \fBaudit\fR(1M)
+requesting restart, can be performed using \fBsvcadm\fR(8), the \fBaudit\fR(8)
 command is the preferred administrative interface.
diff --git a/usr/src/man/man8/auditrecord.8 b/usr/src/man/man8/auditrecord.8
index 944ef0bbef..ed2f8129b5 100644
--- a/usr/src/man/man8/auditrecord.8
+++ b/usr/src/man/man8/auditrecord.8
@@ -17,7 +17,7 @@ auditrecord \- display audit record formats
 .LP
 The \fBauditrecord\fR utility displays the event ID, audit class and selection
 mask, and record format for audit record event types defined in
-\fBaudit_event\fR(4). You can use \fBauditrecord\fR to generate a list of all
+\fBaudit_event\fR(5). You can use \fBauditrecord\fR to generate a list of all
 audit record formats, or to select audit record formats based on event class,
 event name, generating program name, system call name, or event ID.
 .sp
@@ -227,7 +227,7 @@ associated system call or program.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -244,8 +244,8 @@ Interface Stability	Obsolete Uncommitted
 
 .SH SEE ALSO
 .LP
-\fBauditconfig\fR(1M), \fBpraudit\fR(1M), \fBaudit.log\fR(4),
-\fBaudit_class\fR(4), \fBaudit_event\fR(4), \fBattributes\fR(5)
+\fBauditconfig\fR(8), \fBpraudit\fR(8), \fBaudit.log\fR(5),
+\fBaudit_class\fR(5), \fBaudit_event\fR(5), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .LP
 If unable to read either of its input files or to write its output file,
@@ -271,7 +271,7 @@ can be produced. Various audit policies and optional tokens, such as those
 shown below, might also be present.
 .sp
 .LP
-The following is a list of \fBpraudit\fR(1M) token names with their
+The following is a list of \fBpraudit\fR(8) token names with their
 descriptions.
 .sp
 .ne 2
diff --git a/usr/src/man/man8/auditreduce.8 b/usr/src/man/man8/auditreduce.8
index eaebf2f9fb..c52e85b15e 100644
--- a/usr/src/man/man8/auditreduce.8
+++ b/usr/src/man/man8/auditreduce.8
@@ -33,7 +33,7 @@ or files from another directory, or files named explicitly on the command line.
 .sp
 .LP
 The select function allows audit records to be selected on the basis of
-numerous criteria relating to the record's content (see \fBaudit.log\fR(4) for
+numerous criteria relating to the record's content (see \fBaudit.log\fR(5) for
 details of record content). A record must meet all of the
 \fIrecord-selection-option\fR criteria to be selected.
 .SS "Audit Trail Filename Format"
@@ -187,7 +187,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -259,7 +259,7 @@ Select records that occurred before \fIdate-time\fR.
 .RS 4n
 Select records by audit class. Records with events that are mapped to the audit
 classes specified by \fIaudit-classes\fR are selected. Audit class names are
-defined in \fBaudit_class\fR(4). Using the \fBaudit\fR \fIflags,\fR one can
+defined in \fBaudit_class\fR(5). Using the \fBaudit\fR \fIflags,\fR one can
 select records based upon success and failure criteria.
 .RE
 
@@ -539,7 +539,7 @@ or creating user.
 .RS 4n
 Select records containing socket objects with the specified \fIport_number\fR
 or the specified \fImachine\fR where \fImachine\fR is a machine name as defined
-in \fBhosts\fR(4).
+in \fBhosts\fR(5).
 .RE
 
 .sp
@@ -550,7 +550,7 @@ in \fBhosts\fR(4).
 .sp .6
 .RS 4n
 Select records containing fault management resource identifier (FMRI) objects
-with the specified \fIservice instance\fR. See \fBsmf\fR(5).
+with the specified \fIservice instance\fR. See \fBsmf\fR(7).
 .RE
 
 .RE
@@ -610,7 +610,7 @@ input is taken from the standard input.
 .ad
 .sp .6
 .RS 4n
-An audit trail file as defined in \fBaudit.log\fR(4). An audit trail file not
+An audit trail file as defined in \fBaudit.log\fR(5). An audit trail file not
 named on the command line must conform to the audit trail file name format.
 Audit trail files produced as output of \fBauditreduce\fR are in this format as
 well. The format is:
@@ -658,7 +658,7 @@ relative to the starting time. Thus, this form can only be used with the
 .ad
 .sp .6
 .RS 4n
-The literal string or ordinal event number as found in \fBaudit_event\fR(4). If
+The literal string or ordinal event number as found in \fBaudit_event\fR(5). If
 \fIevent\fR is not found in the \fBaudit_event\fR file it is considered
 invalid.
 .RE
@@ -670,7 +670,7 @@ invalid.
 .ad
 .sp .6
 .RS 4n
-The literal string or ordinal group ID number as found in \fBgroup\fR(4). If
+The literal string or ordinal group ID number as found in \fBgroup\fR(5). If
 \fIgroup\fR is not found in the \fBgroup\fR file it is considered invalid.
 \fIgroup\fR can be negative.
 .RE
@@ -707,7 +707,7 @@ A regular expression describing a pathname.
 .ad
 .sp .6
 .RS 4n
-The literal username or ordinal user ID number as found in \fBpasswd\fR(4). If
+The literal username or ordinal user ID number as found in \fBpasswd\fR(5). If
 the username is not found in the \fBpasswd\fR file it is considered invalid.
 \fIuser\fR can be negative.
 .RE
@@ -717,7 +717,7 @@ the username is not found in the \fBpasswd\fR file it is considered invalid.
 \fBExample 1 \fRThe auditreduce command
 .sp
 .LP
-\fBpraudit\fR(1M) is available to display audit records in a human-readable
+\fBpraudit\fR(8) is available to display audit records in a human-readable
 form.
 
 .sp
@@ -860,7 +860,7 @@ location of audit trails, when stored
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -879,9 +879,9 @@ The command invocation is Stable. The binary file format is Stable. The binary
 file contents is Unstable.
 .SH SEE ALSO
 .LP
-\fBpraudit\fR(1M), \fBaudit.log\fR(4), \fBaudit_class\fR(4),
-\fBgroup\fR(4), \fBhosts\fR(4), \fBpasswd\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBpraudit\fR(8), \fBaudit.log\fR(5), \fBaudit_class\fR(5),
+\fBgroup\fR(5), \fBhosts\fR(5), \fBpasswd\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH DIAGNOSTICS
 .LP
 \fBauditreduce\fR displays error messages if there are command line errors and
diff --git a/usr/src/man/man8/auditstat.8 b/usr/src/man/man8/auditstat.8
index f92009c04d..64de0c8a22 100644
--- a/usr/src/man/man8/auditstat.8
+++ b/usr/src/man/man8/auditstat.8
@@ -202,5 +202,5 @@ Display the version number of the kernel audit module software.
 \fBauditstat\fR returns \fB0\fR upon success and \fB1\fR upon failure.
 .SH SEE ALSO
 .LP
-\fBauditconfig\fR(1M), \fBpraudit\fR(1M), \fBaudit\fR(2),
-\fBauditon\fR(2), \fBattributes\fR(5)
+\fBauditconfig\fR(8), \fBpraudit\fR(8), \fBaudit\fR(2),
+\fBauditon\fR(2), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/autopush.8 b/usr/src/man/man8/autopush.8
index e1b525edbc..5617c275e0 100644
--- a/usr/src/man/man8/autopush.8
+++ b/usr/src/man/man8/autopush.8
@@ -172,8 +172,8 @@ Major     Minor     Lastminor     Modules
 .SH SEE ALSO
 .sp
 .LP
-\fBdladm\fR(1M), \fBttymon\fR(1M), \fBattributes\fR(5), \fBldterm\fR(7M),
-\fBsad\fR(7D), \fBstreamio\fR(7I), \fBttcompat\fR(7M)
+\fBdladm\fR(8), \fBttymon\fR(8), \fBattributes\fR(7), \fBldterm\fR(4M),
+\fBsad\fR(4D), \fBstreamio\fR(4I), \fBttcompat\fR(4M)
 .sp
 .LP
 \fI\fR
@@ -182,7 +182,7 @@ Major     Minor     Lastminor     Modules
 .LP
 The use of the \fBautopush\fR command is obsolete for networking data-links.
 The preferred method of configuring a list of automatically pushed STREAMS
-modules on a given networking data-link interface is the \fBdladm\fR(1M)
+modules on a given networking data-link interface is the \fBdladm\fR(8)
 \fBautopush\fR link property.
 .sp
 .LP
@@ -191,5 +191,5 @@ inadequate for networking devices. The granularity of the \fBautopush\fR
 command's configuration is driver-wide, and not per-interface as one might
 expect. Another reason not to use \fBautopush\fR is that administrators are
 more familiar with the names of their network interfaces than with device major
-and minor numbers. The \fBdladm\fR(1M) command allows the configuration using
+and minor numbers. The \fBdladm\fR(8) command allows the configuration using
 data-link interface names.
diff --git a/usr/src/man/man8/bart.8 b/usr/src/man/man8/bart.8
index 84a84b5794..6cd4bd1fd4 100644
--- a/usr/src/man/man8/bart.8
+++ b/usr/src/man/man8/bart.8
@@ -28,12 +28,12 @@ bart \- basic audit reporting tool
 .SH DESCRIPTION
 .sp
 .LP
-\fBbart\fR(1M) is a tool that performs a file-level check of the software
+\fBbart\fR(8) is a tool that performs a file-level check of the software
 contents of a system.
 .sp
 .LP
 You can also specify the files to track and the types of discrepancies to flag
-by means of a rules file, \fBbart_rules\fR. See \fBbart_rules\fR(4).
+by means of a rules file, \fBbart_rules\fR. See \fBbart_rules\fR(5).
 .sp
 .LP
 The \fBbart\fR utility performs two basic functions:
@@ -45,12 +45,12 @@ The \fBbart\fR utility performs two basic functions:
 .RS 16n
 The manifest generator tool takes a file-level \fBsnapshot\fR of a system. The
 output is a catalog of file attributes referred to as a \fBmanifest\fR. See
-\fBbart_manifest\fR(4).
+\fBbart_manifest\fR(5).
 .sp
 You can specify that the list of files be cataloged in three ways. Use \fBbart
 create\fR with no options, specify the files by name on the command line, or
 create a rules file with directives that specify which the files to monitor.
-See \fBbart_rules\fR(4).
+See \fBbart_rules\fR(5).
 .sp
 By default, the manifest generator catalogs all attributes of all files in the
 root (\fB/\fR) file system. File systems mounted on the root file system are
@@ -109,7 +109,7 @@ Specify the file attributes to be ignored globally. Specify attributes as a
 comma separated list.
 .sp
 This option produces the same behavior as supplying the file attributes to a
-global \fBIGNORE\fR keyword in the rules file. See \fBbart_rules\fR(4).
+global \fBIGNORE\fR keyword in the rules file. See \fBbart_rules\fR(5).
 .RE
 
 .sp
@@ -150,7 +150,7 @@ for programmatic parsing. The output is not localized.
 .RS 21n
 Use \fIrules_file\fR to specify which files and directories to catalog, and to
 define which file attribute discrepancies to flag. If \fIrules_file\fR is
-\fB-\fR, then the rules are read from standard input. See \fBbart_rules\fR(4)
+\fB-\fR, then the rules are read from standard input. See \fBbart_rules\fR(5)
 for the definition of the syntax.
 .RE
 
@@ -169,7 +169,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -207,7 +207,7 @@ output, and write error messages to standard error.
 .sp
 .LP
 The \fBbart create\fR command generates a system manifest. See
-\fBbart_manifest\fR(4).
+\fBbart_manifest\fR(5).
 .sp
 .LP
 When the \fBbart compare\fR command compares two system manifests, it generates
@@ -232,7 +232,7 @@ that is suitable for programmatic manipulation.
 .RS 13n
 Name of the file that differs between \fIcontrol-manifest\fR and
 \fItest-manifest\fR. For file names that contain embedded whitespace or newline
-characters, see \fBbart_manifest\fR(4).
+characters, see \fBbart_manifest\fR(5).
 .RE
 
 .sp
@@ -417,7 +417,7 @@ Same as \fIfilename\fR in the default format.
 .RS 4n
 A description of the file attributes that differ between the control and test
 manifests for each file. Each entry includes the attribute value from each
-manifest. See \fBbart_manifest\fR(4) for the definition of the attributes.
+manifest. See \fBbart_manifest\fR(5) for the definition of the attributes.
 .RE
 
 .sp
@@ -612,7 +612,7 @@ bart compare -r rules manifest1 manifest2
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -628,8 +628,8 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBcksum\fR(1), \fBdigest\fR(1), \fBfind\fR(1), \fBbart_manifest\fR(4),
-\fBbart_rules\fR(4), \fBattributes\fR(5)
+\fBcksum\fR(1), \fBdigest\fR(1), \fBfind\fR(1), \fBbart_manifest\fR(5),
+\fBbart_rules\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/beadm.8 b/usr/src/man/man8/beadm.8
index 1cd110afa1..be6efedd98 100644
--- a/usr/src/man/man8/beadm.8
+++ b/usr/src/man/man8/beadm.8
@@ -224,7 +224,7 @@ Create a new BE from an existing snapshot of the BE named beName.
 .RS 4n
 Create the datasets for new BE with specific ZFS properties.  Multiple
 \fB-o\fR
-options can be specified.  See \fBzfs\fR(1M) for more information on
+options can be specified.  See \fBzfs\fR(8) for more information on
 the
 \fB-o\fR option.
 .RE
@@ -914,7 +914,7 @@ Contains default value for BENAME_STARTS_WITH parameter
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the  following  attributes:
+See \fBattributes\fR(7) for descriptions of the  following  attributes:
 .sp
 
 .sp
diff --git a/usr/src/man/man8/boot.8 b/usr/src/man/man8/boot.8
index 4726192a76..e4658c3e6b 100644
--- a/usr/src/man/man8/boot.8
+++ b/usr/src/man/man8/boot.8
@@ -28,7 +28,7 @@ boot \- start the system kernel or a standalone program
 Bootstrapping is the process of loading and executing a standalone program. For
 the purpose of this discussion, bootstrapping means the process of loading and
 executing the bootable operating system. Typically, the standalone program is
-the operating system kernel (see \fBkernel\fR(1M)), but any standalone program
+the operating system kernel (see \fBkernel\fR(8)), but any standalone program
 can be booted instead. On a SPARC-based system, the diagnostic monitor for a
 machine is a good example of a standalone program other than the operating
 system that can be booted.
@@ -41,8 +41,8 @@ statically-linked, it will jump directly to the standalone.
 .sp
 .LP
 Once the kernel is loaded, it starts the UNIX system, mounts the necessary file
-systems (see \fBvfstab\fR(4)), and runs \fB/sbin/init\fR to bring the system to
-the "initdefault" state specified in \fB/etc/inittab\fR. See \fBinittab\fR(4).
+systems (see \fBvfstab\fR(5)), and runs \fB/sbin/init\fR to bring the system to
+the "initdefault" state specified in \fB/etc/inittab\fR. See \fBinittab\fR(5).
 .SS "SPARC Bootstrap Procedure"
 .LP
 On SPARC based systems, the bootstrap procedure on most machines consists of
@@ -60,7 +60,7 @@ used by the firmware. The name of the file to load, and the device to load it
 from can also be manipulated.
 .sp
 .LP
-These flags and names can be set using the \fBeeprom\fR(1M) command from the
+These flags and names can be set using the \fBeeprom\fR(8) command from the
 shell, or by using \fBPROM\fR commands from the \fBok\fR prompt after the
 system has been halted.
 .sp
@@ -122,7 +122,7 @@ received, the PROM then broadcasts a TFTP request to fetch the first block of
 \fBinetboot\fR. Subsequent requests will be sent to the server that initially
 answered the first block request. After loading, \fBinetboot\fR will also use
 reverse ARP to fetch its IP address, then broadcast \fBbootparams\fR RPC calls
-(see \fBbootparams\fR(4)) to locate configuration information and its root file
+(see \fBbootparams\fR(5)) to locate configuration information and its root file
 system. \fBinetboot\fR then loads the boot archive by means of NFS and
 transfers control to that archive.
 .sp
@@ -138,7 +138,7 @@ name appears to be an HTTP URL. If it does not, the PROM downloads
 \fBinetboot\fR, loads that file into memory, and executes it. \fBinetboot\fR
 loads the boot archive, which takes over the machine and releases
 \fBinetboot\fR. Startup scripts then initiate the DHCP agent (see
-\fBdhcpagent\fR(1M)), which implements further DHCP activities.
+\fBdhcpagent\fR(8)), which implements further DHCP activities.
 
 .SS "iSCSI Boot"
 .LP
@@ -169,7 +169,7 @@ the second level boot will look for the standalone in a platform-dependent
 search path. This path is guaranteed to contain
 \fB/platform/\fR\fIplatform-name\fR. Many SPARC platforms next search the
 platform-specific path entry \fB/platform/\fR\fIhardware-class-name\fR. See
-\fBfilesystem\fR(5). If the pathname is absolute, \fBboot\fR will use the
+\fBfilesystem\fR(7). If the pathname is absolute, \fBboot\fR will use the
 specified path. The \fBboot\fR program then loads the standalone at the
 appropriate address, and then transfers control.
 .sp
@@ -648,7 +648,7 @@ this dataset is mounted at /\fIpoolname\fR in the root file system.
 .LP
 There can be multiple bootable datasets (that is, root file systems) within a
 pool. The default file system to load the kernel is identified by the boot
-pool \fBbootfs\fR property (see \fBzpool\fR(1M)). All bootable datasets are
+pool \fBbootfs\fR property (see \fBzpool\fR(8)). All bootable datasets are
 listed in the \fBmenu.lst\fR file, which is used by the boot loader to compose
 the Boot Environment menu, to implement support to load a kernel and boot from
 an alternate Boot Environment.
@@ -659,8 +659,8 @@ specified in the boot loader configuration and hands control over to the
 \fBunix\fR binary. The Unix operating system initializes, links in the
 necessary modules from the boot archive and mounts the root file system on
 the real root device. At this point, the kernel regains
-storage I/O, mounts additional file systems (see \fBvfstab\fR(4)), and starts
-various operating system services (see \fBsmf\fR(5)).
+storage I/O, mounts additional file systems (see \fBvfstab\fR(5)), and starts
+various operating system services (see \fBsmf\fR(7)).
 
 .SH OPTIONS
 .SS "SPARC"
@@ -736,7 +736,7 @@ Display verbose debugging information.
 .sp .6
 .RS 4n
 The boot program passes all \fIboot-flags\fR to \fBfile\fR. They are not
-interpreted by \fBboot\fR. See the \fBkernel\fR(1M) and \fBkmdb\fR(1) manual
+interpreted by \fBboot\fR. See the \fBkernel\fR(8) and \fBkmdb\fR(1) manual
 pages for information about the options available with the default standalone
 program.
 .RE
@@ -800,7 +800,7 @@ The following x86 options are supported:
 One or more property-value pairs to be passed to the kernel. Multiple
 property-value pairs must be separated by a comma. Use of this option is the
 equivalent of the command: \fBeeprom\fR \fIprop\fR=\fIval\fR. See
-\fBeeprom\fR(1M) for available properties and valid values.
+\fBeeprom\fR(8) for available properties and valid values.
 .RE
 
 .sp
@@ -811,7 +811,7 @@ equivalent of the command: \fBeeprom\fR \fIprop\fR=\fIval\fR. See
 .sp .6
 .RS 4n
 The boot program passes all \fIboot-flags\fR to \fBfile\fR. They are not
-interpreted by \fBboot\fR. See \fBkernel\fR(1M) and \fBkmdb\fR(1) for
+interpreted by \fBboot\fR. See \fBkernel\fR(8) and \fBkmdb\fR(1) for
 information about the options available with the kernel.
 .RE
 
@@ -838,7 +838,7 @@ system. This will allow configuring third party boot programs to use the
 chainload technique to boot illumos system.
 
 If the first stage is installed on the master boot block (see the \fB-m\fR
-option of \fBinstallboot\fR(1M)), then \fBstage2\fR is loaded directly
+option of \fBinstallboot\fR(8)), then \fBstage2\fR is loaded directly
 from the Solaris partition regardless of the active partition.
 .sp
 .LP
@@ -910,7 +910,7 @@ When booting from UFS, the root device is specified by the \fBbootpath\fR
 property, and the root file system type is specified by the \fBfstype\fR
 property. These properties should be setup by the Solaris Install/Upgrade
 process in \fB/boot/solaris/bootenv.rc\fR and can be overridden with the
-\fB-B\fR option, described above (see the \fBeeprom\fR(1M) man page).
+\fB-B\fR option, described above (see the \fBeeprom\fR(8) man page).
 .sp
 .LP
 When booting from ZFS, the root device is automatically passed by the boot
@@ -1095,11 +1095,11 @@ the root pool of your current system.
 
 .SH SEE ALSO
 .LP
-\fBkmdb\fR(1), \fBuname\fR(1), \fBbootadm\fR(1M), \fBeeprom\fR(1M),
-\fBinit\fR(1M), \fBinstallboot\fR(1M), \fBkernel\fR(1M), \fBmonitor\fR(1M),
-\fBshutdown\fR(1M), \fBsvcadm\fR(1M), \fBumountall\fR(1M), \fBzpool\fR(1M),
-\fBuadmin\fR(2), \fBbootparams\fR(4), \fBinittab\fR(4), \fBvfstab\fR(4),
-\fBfilesystem\fR(5)
+\fBkmdb\fR(1), \fBuname\fR(1), \fBbootadm\fR(8), \fBeeprom\fR(8),
+\fBinit\fR(8), \fBinstallboot\fR(8), \fBkernel\fR(8), \fBmonitor\fR(8),
+\fBshutdown\fR(8), \fBsvcadm\fR(8), \fBumountall\fR(8), \fBzpool\fR(8),
+\fBuadmin\fR(2), \fBbootparams\fR(5), \fBinittab\fR(5), \fBvfstab\fR(5),
+\fBfilesystem\fR(7)
 .sp
 .LP
 RFC 903, \fIA Reverse Address Resolution Protocol\fR,
diff --git a/usr/src/man/man8/bootadm.8 b/usr/src/man/man8/bootadm.8
index a48c7e874c..30504e7cc8 100644
--- a/usr/src/man/man8/bootadm.8
+++ b/usr/src/man/man8/bootadm.8
@@ -71,7 +71,7 @@ the \fBlist-menu\fR option.
 .sp
 .LP
 Note that OpenBoot PROM (OBP)-based machines, such as SPARC systems, use
-PROM variables to set boot behavior and are managed by the \fBeeprom\fR(1M)
+PROM variables to set boot behavior and are managed by the \fBeeprom\fR(8)
 command.
 .sp
 .LP
@@ -92,7 +92,7 @@ Updates current boot archive if required. Applies to both SPARC and x86
 platforms. The boot archive can be created in a number of different formats;
 the default format is an IEEE/P1003 Data Interchange Standard cpio archive.
 The format is configured through the following service management facility
-(\fBsmf\fR(5)) property:
+(\fBsmf\fR(7)) property:
 .sp
 .in +2
 .nf
@@ -349,7 +349,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -525,7 +525,7 @@ The command exited due to an error.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -540,4 +540,4 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBboot\fR(1M), \fBbeadm\fR(1M), \fBinstallboot\fR(1M), \fBattributes\fR(5)
+\fBboot\fR(8), \fBbeadm\fR(8), \fBinstallboot\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/busstat.8 b/usr/src/man/man8/busstat.8
index e935dce135..4ac11b1434 100644
--- a/usr/src/man/man8/busstat.8
+++ b/usr/src/man/man8/busstat.8
@@ -317,5 +317,5 @@ busstat: events changed (possibly by another busstat).
 .SH SEE ALSO
 .sp
 .LP
-\fBiostat\fR(1M), \fBmpstat\fR(1M), \fBvmstat\fR(1M), \fBstrtol\fR(3C),
-\fBattributes\fR(5)
+\fBiostat\fR(8), \fBmpstat\fR(8), \fBvmstat\fR(8), \fBstrtol\fR(3C),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/captoinfo.8 b/usr/src/man/man8/captoinfo.8
index 1ff79a39db..6a20b2e5e9 100644
--- a/usr/src/man/man8/captoinfo.8
+++ b/usr/src/man/man8/captoinfo.8
@@ -92,8 +92,8 @@ compiled terminal description database
 .SH SEE ALSO
 .sp
 .LP
-\fBinfocmp\fR(1M), \fBcurses\fR(3CURSES), \fBterminfo\fR(4),
-\fBattributes\fR(5)
+\fBinfocmp\fR(8), \fBcurses\fR(3CURSES), \fBterminfo\fR(5),
+\fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/cfgadm.8 b/usr/src/man/man8/cfgadm.8
index 2cc13f1d11..17a5b68f9f 100644
--- a/usr/src/man/man8/cfgadm.8
+++ b/usr/src/man/man8/cfgadm.8
@@ -201,7 +201,7 @@ test level, are supplied as sub-options using the \fB-o\fR option.
 .sp
 .LP
 Operations that change the state of the system configuration are audited by the
-system log daemon \fBsyslogd\fR(1M).
+system log daemon \fBsyslogd\fR(8).
 .sp
 .LP
 The arguments for this command conform to the \fBgetopt\fR(3C) and
@@ -295,8 +295,8 @@ through the receptacle.
 Performs hardware specific operations that allow an occupant's hardware
 resources to be usable by Solaris. Occupants that are configured are part of
 the system configuration and are available for manipulation by Solaris device
-manipulation maintenance commands (eg: \fBpsradm\fR(1M), \fBmount\fR(1M),
-\fBifconfig\fR(1M)).
+manipulation maintenance commands (eg: \fBpsradm\fR(8), \fBmount\fR(8),
+\fBifconfig\fR(8)).
 .RE
 
 .sp
@@ -718,7 +718,7 @@ example# cfgadm -c configure c0::dsk/c0t0d0
 .sp
 
 .SH ENVIRONMENT VARIABLES
-See \fBenviron\fR(5) for descriptions of the following environment variables
+See \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of \fBcfgadm\fR: \fBLC_TIME\fR, \fBLC_MESSAGES\fR,
 \fBNLSPATH\fR and \fBTZ\fR.
 .sp
@@ -791,12 +791,12 @@ Usage error.
 .RE
 
 .SH SEE ALSO
-\fBcfgadm_fp\fR(1M), \fBcfgadm_ib\fR(1M),
-\fBcfgadm_pci\fR(1M), \fBcfgadm_sbd\fR(1M), \fBcfgadm_scsi\fR(1M),
-\fBcfgadm_usb\fR(1M), \fBifconfig\fR(1M), \fBmount\fR(1M), \fBprtdiag\fR(1M),
-\fBpsradm\fR(1M), \fBsyslogd\fR(1M), \fBconfig_admin\fR(3CFGADM),
-\fBgetopt\fR(3C), \fBgetsubopt\fR(3C), \fBisatty\fR(3C), \fBattributes\fR(5),
-\fBenviron\fR(5)
+\fBcfgadm_fp\fR(8), \fBcfgadm_ib\fR(8),
+\fBcfgadm_pci\fR(8), \fBcfgadm_sbd\fR(8), \fBcfgadm_scsi\fR(8),
+\fBcfgadm_usb\fR(8), \fBifconfig\fR(8), \fBmount\fR(8), \fBprtdiag\fR(8),
+\fBpsradm\fR(8), \fBsyslogd\fR(8), \fBconfig_admin\fR(3CFGADM),
+\fBgetopt\fR(3C), \fBgetsubopt\fR(3C), \fBisatty\fR(3C), \fBattributes\fR(7),
+\fBenviron\fR(7)
 .SH DIAGNOSTICS
 Diagnostic messages appear on the standard error output. Other than options and
 usage errors, the following are diagnostic messages produced by this utility:
diff --git a/usr/src/man/man8/cfgadm_cardbus.8 b/usr/src/man/man8/cfgadm_cardbus.8
index d7809e486a..4cf08bdd19 100644
--- a/usr/src/man/man8/cfgadm_cardbus.8
+++ b/usr/src/man/man8/cfgadm_cardbus.8
@@ -42,17 +42,17 @@ cfgadm_cardbus \- cardbus hardware specific commands for cfgadm
 .LP
 The CardBus slots in Solaris are hot plug capable. This capability is supported
 by the \fBPCI\fR hardware specific library \fB/usr/lib/cfgadm/pci.so.1\fR
-through the \fBcfgadm\fR command (see \fBcfgadm\fR(1M)).
+through the \fBcfgadm\fR command (see \fBcfgadm\fR(8)).
 .sp
 .LP
 The hot plug administrative models between CardBus, PCI, CompactPCI, and PCI
-Express operate the same fashion. Please refer to \fBcfgadm_pci\fR(1M) for the
+Express operate the same fashion. Please refer to \fBcfgadm_pci\fR(8) for the
 usage information.
 .SH SEE ALSO
 .sp
 .LP
-\fBcfgadm\fR(1M), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
-\fBattributes\fR(5)
+\fBcfgadm\fR(8), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
+\fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/cfgadm_fp.8 b/usr/src/man/man8/cfgadm_fp.8
index a887fc67ab..144b1991bf 100644
--- a/usr/src/man/man8/cfgadm_fp.8
+++ b/usr/src/man/man8/cfgadm_fp.8
@@ -29,9 +29,9 @@ cfgadm_fp \- driver specific commands for cfgadm
 .LP
 The \fBfp\fR port driver plug-in \fB/usr/lib/cfgadm/fp.so.1\fR provides the
 functionality for Fibre Channel Fabric device node management through
-\fBcfgadm\fR(1M). \fBcfgadm\fR operates on attachment points. Attachment points
+\fBcfgadm\fR(8). \fBcfgadm\fR operates on attachment points. Attachment points
 are locations in the system where hardware resources can be dynamically
-reconfigured. Refer to \fBcfgadm\fR(1M) for additional details on attachment
+reconfigured. Refer to \fBcfgadm\fR(8) for additional details on attachment
 points.
 .sp
 .LP
@@ -383,7 +383,7 @@ LUNs that are specified in the "pwwn-lun-blacklist" property in the
 \fBfp.conf\fR file will remain unconfigured. The FCP SCSI LUN level listing
 reflects the state of such FCP SCSI LUNs. They stay in the "unconfigured" state
 after reboot or Solaris Dynamic Reconfiguration on the controller that they are
-connected through. Refer to \fBfp\fR(7D) for additional details on the
+connected through. Refer to \fBfp\fR(4D) for additional details on the
 "pwwn-lun-blacklist" property.
 .RE
 
@@ -400,7 +400,7 @@ controller that the device is connected, at which time all fabric devices are
 automatically enumerated. The default behavior may be changed through the use
 of the "manual_configuration_only" property in the \fBfp.conf\fR file. If the
 property is set, the device remains unconfigured after reboot. Refer to
-\fBfp\fR(7D) for additional details on the "manual_configuration_only"
+\fBfp\fR(4D) for additional details on the "manual_configuration_only"
 property.
 .RE
 
@@ -477,7 +477,7 @@ repository. When a Fibre Channel Fabric device is unconfigured using the
 \fB-c\fR \fBunconfigure\fR operation, its physical \fBap_id\fR is deleted from
 the same repository. All fabric devices are automatically enumerated by default
 and the repository is used only if the \fBfp.conf\fR
-"manual_configuration_only" property is set. Refer to \fBfp\fR(7D) for
+"manual_configuration_only" property is set. Refer to \fBfp\fR(4D) for
 additional details on the "manual_configuration_only" property.
 .sp
 You can specify the following commands with the \fB-c\fR option to control the
@@ -532,7 +532,7 @@ is removed.
 .ad
 .sp .6
 .RS 4n
-Refer to \fBcfgadm\fR(1M) for usage information.
+Refer to \fBcfgadm\fR(8) for usage information.
 .RE
 
 .sp
@@ -557,7 +557,7 @@ No hardware specific functions are available at present.
 
 .sp
 .LP
-All other options have the same meaning as defined in the \fBcfgadm\fR(1M) man
+All other options have the same meaning as defined in the \fBcfgadm\fR(8) man
 page.
 .SH EXAMPLES
 .LP
@@ -689,8 +689,8 @@ Reconfigures Fabric device(s) of which physical \fBap_id\fR is listed in
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBcfgadm\fR(1M), \fBsvcadm\fR(1M), \fBconfig_admin\fR(3CFGADM),
-\fBlibcfgadm\fR(3LIB), \fBattributes\fR(5), \fBsmf\fR(5), \fBfp\fR(7D)
+\fBsvcs\fR(1), \fBcfgadm\fR(8), \fBsvcadm\fR(8), \fBconfig_admin\fR(3CFGADM),
+\fBlibcfgadm\fR(3LIB), \fBattributes\fR(7), \fBsmf\fR(7), \fBfp\fR(4D)
 .SH WARNINGS
 .sp
 .LP
@@ -724,7 +724,7 @@ has been replaced by the new \fBunusable_SCSI_LUN\fR option.
 .sp
 .LP
 The \fBcfgadm_fp\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -736,7 +736,7 @@ svc:/system/device/fc-fabric:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
diff --git a/usr/src/man/man8/cfgadm_ib.8 b/usr/src/man/man8/cfgadm_ib.8
index 8d6376ede4..b9deebe599 100644
--- a/usr/src/man/man8/cfgadm_ib.8
+++ b/usr/src/man/man8/cfgadm_ib.8
@@ -32,12 +32,12 @@ cfgadm_ib \- InfiniBand hardware specific commands for cfgadm
 .sp
 .LP
 The InfiniBand hardware specific library \fB/usr/lib/cfgadm/ib.so.1\fR provides
-the functionality for administering its fabric through the \fBcfgadm\fR(1M)
-utility. \fBcfgadm\fR operates on attachment points. See \fBcfgadm\fR(1M).
+the functionality for administering its fabric through the \fBcfgadm\fR(8)
+utility. \fBcfgadm\fR operates on attachment points. See \fBcfgadm\fR(8).
 .sp
 .LP
 An InfiniBand (\fBIB\fR) device is enumerated by the IB nexus driver,
-\fBib\fR(7D), based on the services from the IB Device Manager (IBDM).
+\fBib\fR(4D), based on the services from the IB Device Manager (IBDM).
 .sp
 .LP
 The IB nexus driver creates and initializes five types of child device nodes:
@@ -73,9 +73,9 @@ IB Pseudo devices
 .RE
 .sp
 .LP
-See \fBib\fR(7D) for details on enumeration of IB Port, IB VPPA, and IB HCA_SVC
-devices. For additional information on IBDM, see \fBibdm\fR(7D). See
-\fBib\fR(4) for details on IB Pseudo devices.
+See \fBib\fR(4D) for details on enumeration of IB Port, IB VPPA, and IB HCA_SVC
+devices. For additional information on IBDM, see \fBibdm\fR(4D). See
+\fBib\fR(5) for details on IB Pseudo devices.
 .sp
 .LP
 For IB administration, two types of static attachment point are created for the
@@ -96,7 +96,7 @@ shorter, and has a more user friendly name.
 The static ap_id for the IB fabric is \fBib\fR. The IB devices are dynamic
 attachment points and have no physical ap_id. The logical ap_id of an IOC
 contains its GUID, \fBib::\fR\fIIOC-GUID\fR. An example of an IOC ap_id is
-\fBib::80020123456789a\fR. The logical ap_id of a Pseudo device, see ib(4) for
+\fBib::80020123456789a\fR. The logical ap_id of a Pseudo device, see ib(5) for
 details, is of the format \fBib::\fR\fIdriver_name\fR\fB,\fR\fIunit-address\fR.
 An example of a pseudo ap_id would be \fBib::sdp,0\fR where "\fBsdp\fR" is the
 driver name and "\fB0\fR" is its \fIunit-address\fR property. The logical ap_id
@@ -187,7 +187,7 @@ cfgadm \fB-c\fR unconfigure
 .LP
 operation. The distinction was made by the information displayed under the
 \fBCondition\fR column. The IB device with a zero P_Key and HCA GUID is a
-HCA_SVC device. Refer to \fBcfgadm\fR(1M) for more information regarding
+HCA_SVC device. Refer to \fBcfgadm\fR(8) for more information regarding
 listing attachment points.
 .sp
 .LP
@@ -362,7 +362,7 @@ Obtain IB specific help for an IB attachment point.
 .sp .6
 .RS 4n
 List the state and condition of IB attachment points. The \fB-l\fR option works
-as described in \fBcfgadm\fR(1M).
+as described in \fBcfgadm\fR(8).
 .sp
 When paired with the \fB-a\fR option, displays the dynamic attachment points as
 well (IOC, VPPA, Port, Pseudo, and HCA_SVC devices).
@@ -411,7 +411,7 @@ This option is not currently defined.
 .sp .6
 .RS 4n
 Attachment points of class ib can be listed by using the select sub-option.
-Refer to the \fBcfgadm\fR(1M) man page for more information.
+Refer to the \fBcfgadm\fR(8) man page for more information.
 .RE
 
 .sp
@@ -435,7 +435,7 @@ The following hardware specific functions are supported:
 .RS 4n
 This hardware specific function is supported on the static \fBIB\fR attachment
 point. It can be used to add a new service to \fB/kernel/drv/ib.conf\fR file
-and to update the \fBib\fR(7D) driver.
+and to update the \fBib\fR(4D) driver.
 .sp
 You must use the \fBservice=\fR\fIname\fR option to indicate the new service to
 be added. You must use the option \fBcomm=[port|vppa|hca_svc]\fR option to add
@@ -453,7 +453,7 @@ the \fBname\fR service to either \fBport-svc-list\fR or to the
 .RS 4n
 This hardware specific function is supported on the static \fBIB\fR attachment
 point only. It can be used to delete an existing service from the
-\fB/kernel/drv/ib.conf\fR file and also from the \fBib\fR(7D) driver's data
+\fB/kernel/drv/ib.conf\fR file and also from the \fBib\fR(4D) driver's data
 base. You must use the \fBservice=name\fR option to indicate which service to
 delete. You must use the \fBcomm=[port|vppa|hca_svc]\fR option to delete this
 service from the \fBport-svc-list\fR, \fBvppa-svc-list\fR, or
@@ -517,7 +517,7 @@ the properties of specified IOC device node. This command updates the
 \fBport-list\fR, \fBport-entries\fR, \fBservice-id\fR, and \fBservice-name\fR
 IOC node properties .
 .sp
-See \fBib\fR(7D).
+See \fBib\fR(4D).
 .RE
 
 .sp
@@ -531,7 +531,7 @@ Supported on the static \fBib\fR attachment point. Updates the \fBPKEY\fR
 information inside \fBIBTL\fR. \fBIBTL\fR re-reads the \fBP_Key\fR tables for
 all the ports on each \fBHCA\fR present on the host.
 .sp
-See \fBibtl\fR(7D).
+See \fBibtl\fR(4D).
 .RE
 
 .RE
@@ -848,8 +848,8 @@ Hardware-specific library for generic InfiniBand device administration
 .SH SEE ALSO
 .sp
 .LP
-\fBcfgadm\fR(1M), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
-\fBib\fR(4), \fBattributes\fR(5), \fBib\fR(7D), \fBibdm\fR(7D), \fBibtl\fR(7D)
+\fBcfgadm\fR(8), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
+\fBib\fR(5), \fBattributes\fR(7), \fBib\fR(4D), \fBibdm\fR(4D), \fBibtl\fR(4D)
 .sp
 .LP
 InfiniBand Specification Volume 1 (http://www.infinibandta.org)
diff --git a/usr/src/man/man8/cfgadm_pci.8 b/usr/src/man/man8/cfgadm_pci.8
index d0fa1392eb..d899bdf917 100644
--- a/usr/src/man/man8/cfgadm_pci.8
+++ b/usr/src/man/man8/cfgadm_pci.8
@@ -41,7 +41,7 @@ commands for cfgadm
 The PCI hardware specific library, \fB/usr/lib/cfgadm/pci.so.1\fR, provides the
 support for hot plugging PCI, CompactPCI, and PCI Express adapter cards into
 the respective hot pluggable slots in a system that is hot plug capable,
-through the \fBcfgadm\fR command (see \fBcfgadm\fR(1M)). Hot plug
+through the \fBcfgadm\fR command (see \fBcfgadm\fR(8)). Hot plug
 administrative models between PCI, CompactPCI, and PCI Express remain the same
 except where noted in this document.
 .sp
@@ -376,7 +376,7 @@ No hardware specific options are currently defined.
 .ad
 .sp .6
 .RS 4n
-Same as the generic \fBcfgadm\fR(1M).
+Same as the generic \fBcfgadm\fR(8).
 .RE
 
 .sp
@@ -937,8 +937,8 @@ Hardware specific library for PCI hot plugging.
 .RE
 
 .SH SEE ALSO
-\fBcfgadm\fR(1M), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
-\fBattributes\fR(5)
+\fBcfgadm\fR(8), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
+\fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/cfgadm_sata.8 b/usr/src/man/man8/cfgadm_sata.8
index 0ab234f06f..e94f7934a9 100644
--- a/usr/src/man/man8/cfgadm_sata.8
+++ b/usr/src/man/man8/cfgadm_sata.8
@@ -42,7 +42,7 @@ The \fBSATA\fR hardware specific library, \fB/usr/lib/cfgadm/sata.so.1\fR,
 provides the functionality for \fBSATA\fR hot plugging through the \fBcfgadm\fR
 command. \fBcfgadm\fR operates on attachment points, which are locations in the
 system where hardware resources can be dynamically reconfigured. See
-\fBcfgadm\fR(1M) for information regarding attachment points.
+\fBcfgadm\fR(8) for information regarding attachment points.
 .sp
 .LP
 Each \fBSATA\fR controller's and port multiplier's device port is represented
@@ -173,7 +173,7 @@ Ap_Id                     Type        Receptacle   Occupant     Condition
 
 .sp
 .LP
-See \fBcfgadm\fR(1M)for more information regarding listing of attachment
+See \fBcfgadm\fR(8)for more information regarding listing of attachment
 points.
 .sp
 .LP
@@ -434,7 +434,7 @@ Not supported.
 .ad
 .sp .6
 .RS 4n
-The \fB-l\fR option works as described in \fBcfgadm\fR(1M). When paired with
+The \fB-l\fR option works as described in \fBcfgadm\fR(8). When paired with
 the \fB-v\fR option, the "Information" field contains the following
 \fBSATA\fR-specific information:
 .RS +4
@@ -475,7 +475,7 @@ No hardware specific options are currently defined.
 .sp .6
 .RS 4n
 Attachment points of class \fBSATA\fR can be listed by using the select
-suboption. See \fBcfgadm\fR(1M).
+suboption. See \fBcfgadm\fR(8).
 .RE
 
 .sp
@@ -799,8 +799,8 @@ Hardware specific library for generic \fBSATA\fR hot plugging.
 .SH SEE ALSO
 .sp
 .LP
-\fBcfgadm\fR(1M), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
-\fBattributes\fR(5)
+\fBcfgadm\fR(8), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
+\fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/cfgadm_sbd.8 b/usr/src/man/man8/cfgadm_sbd.8
index 501c9f32df..9b8024931e 100644
--- a/usr/src/man/man8/cfgadm_sbd.8
+++ b/usr/src/man/man8/cfgadm_sbd.8
@@ -37,7 +37,7 @@ system boards. It also enables you to connect or disconnect a system board from
 a running system without having to reboot the system.
 .sp
 .LP
-The \fBcfgadm\fR command resides in \fB/usr/sbin\fR. See \fBcfgadm\fR(1M). The
+The \fBcfgadm\fR command resides in \fB/usr/sbin\fR. See \fBcfgadm\fR(8). The
 \fBcfgadm_sbd\fR plugin resides \fB/usr/platform/sun4u/lib/cfgadm\fR.
 .sp
 .LP
@@ -461,7 +461,7 @@ of a command with platform-specific options:
 .sp
 .LP
 This man page does not include the \fB-v\fR, \fB-a\fR, \fB-s\fR, or \fB-h\fR
-options for the \fBcfgadm\fR command. See \fBcfgadm\fR(1M) for descriptions of
+options for the \fBcfgadm\fR command. See \fBcfgadm\fR(8) for descriptions of
 those options. The following options are supported by the \fBcfgadm_sbd\fR
 plugin:
 .sp
@@ -485,7 +485,7 @@ and deletes the physical memory from the system memory pool. If any device is
 still in use, the \fBcfgadm\fR command fails and reports the failure to the
 user. You can retry the command as soon as the device is no longer busy. If a
 \fBCPU\fR is in use, you must ensure that it is off line before you proceed.
-See \fBpbind\fR(1M), \fBpsradm\fR(1M) and \fBpsrinfo\fR(1M).
+See \fBpbind\fR(8), \fBpsradm\fR(8) and \fBpsrinfo\fR(8).
 .sp
 The \fBunconfigure\fR function moves the physical memory to another system
 board before it deletes the memory from the board you want to unconfigure.
@@ -553,7 +553,7 @@ memory is initialized then adds the memory to the system memory pool. The
 has been completed successfully.
 .sp
 For I/O devices, you must use the \fBmount\fR and the \fBifconfig\fR commands
-before the devices can be used. See \fBifconfig\fR(1M) and \fBmount\fR(1M).
+before the devices can be used. See \fBifconfig\fR(8) and \fBmount\fR(8).
 .RE
 
 .sp
@@ -600,7 +600,7 @@ constraints of the hardware and operating system.
 .RS 15n
 Lists the state and condition of attachment points specified in the format
 controlled by the \fB-s\fR, \fB-v\fR, and \fB-a\fR options as specified in
-\fBcfgadm\fR(1M). The \fBcfgadm_sbd\fR plugin provides specific information in
+\fBcfgadm\fR(8). The \fBcfgadm_sbd\fR plugin provides specific information in
 the info field as described below. The format of this information might be
 altered by the \fB\fR\fB-o\fR\fB parsable\fR option.
 .sp
@@ -808,7 +808,7 @@ Returns the information in the \fBinfo\fR field as a boolean \fIname\fR or a
 set of \fBname=value\fR pairs, separated by a space character.
 .sp
 The \fB-o parsable\fR option can be used in conjunction with the \fB-s\fR
-option. See the \fBcfgadm\fR(1M) man page for more information about the
+option. See the \fBcfgadm\fR(8) man page for more information about the
 \fB-s\fR option.
 .RE
 
@@ -1060,7 +1060,7 @@ address=0x1000000 size=2097152 source=SB0::memory
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attribute:
+See \fBattributes\fR(7) for a description of the following attribute:
 .sp
 
 .sp
@@ -1079,9 +1079,9 @@ The interface stability is evolving. The output stability is unstable.
 .SH SEE ALSO
 .sp
 .LP
-\fBcfgadm\fR(1M), \fBdevfsadm\fR(1M), \fBifconfig\fR(1M), \fBmount\fR(1M),
-\fBpbind\fR(1M), \fBpsradm\fR(1M), \fBpsrinfo\fR(1M),
-\fBconfig_admin\fR(3CFGADM), \fBattributes\fR(5)
+\fBcfgadm\fR(8), \fBdevfsadm\fR(8), \fBifconfig\fR(8), \fBmount\fR(8),
+\fBpbind\fR(8), \fBpsradm\fR(8), \fBpsrinfo\fR(8),
+\fBconfig_admin\fR(3CFGADM), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/cfgadm_scsi.8 b/usr/src/man/man8/cfgadm_scsi.8
index 78f5a51bf9..2893077341 100644
--- a/usr/src/man/man8/cfgadm_scsi.8
+++ b/usr/src/man/man8/cfgadm_scsi.8
@@ -40,9 +40,9 @@ cfgadm_scsi \- SCSI hardware specific commands for cfgadm
 .LP
 The \fBSCSI\fR hardware specific library \fB/usr/lib/cfgadm/scsi.so.1\fR
 provides the functionality for \fBSCSI\fR hot-plugging through the
-\fBcfgadm\fR(1M) command. \fBcfgadm\fR operates on attachment points, which are
+\fBcfgadm\fR(8) command. \fBcfgadm\fR operates on attachment points, which are
 locations in the system where hardware resources can be dynamically
-reconfigured. Refer to \fBcfgadm\fR(1M) for information regarding attachment
+reconfigured. Refer to \fBcfgadm\fR(8) for information regarding attachment
 points.
 .sp
 .LP
@@ -118,7 +118,7 @@ sysctrl0:slot1       sbus-upa     connected    configured   ok
 
 .sp
 .LP
-Refer to \fBcfgadm\fR(1M) for more information regarding listing attachment
+Refer to \fBcfgadm\fR(8) for more information regarding listing attachment
 points. The receptacle and occupant state for attachment points at the
 \fBSCSI\fR controller have the following meanings:
 .sp
@@ -329,7 +329,7 @@ No hardware specific options are currently defined.
 .ad
 .RS 24n
 Attachment points of class \fBscsi\fR can be listed by using the \fBselect\fR
-sub-option. Refer to the \fBcfgadm\fR(1M) man page for additional information.
+sub-option. Refer to the \fBcfgadm\fR(8) man page for additional information.
 .RE
 
 .sp
@@ -712,8 +712,8 @@ platform-specific library for generic \fBSCSI\fR hot-plugging
 .SH SEE ALSO
 .sp
 .LP
-\fBcfgadm\fR(1M), \fBluxadm\fR(1M), \fBconfig_admin\fR(3CFGADM),
-\fBlibcfgadm\fR(3LIB), \fBattributes\fR(5)
+\fBcfgadm\fR(8), \fBluxadm\fR(8), \fBconfig_admin\fR(3CFGADM),
+\fBlibcfgadm\fR(3LIB), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/cfgadm_usb.8 b/usr/src/man/man8/cfgadm_usb.8
index 54b4c22a0e..f560b88ad1 100644
--- a/usr/src/man/man8/cfgadm_usb.8
+++ b/usr/src/man/man8/cfgadm_usb.8
@@ -33,9 +33,9 @@ cfgadm_usb \- USB hardware-specific commands for cfgadm
 .LP
 The Universal Serial Bus (\fBUSB\fR) hardware-specific library
 \fB/usr/lib/cfgadm/usb.so.1\fR provides the functionality for administering
-\fBUSB\fR devices via the \fBcfgadm\fR(1M) command. \fBcfgadm\fR operates on
+\fBUSB\fR devices via the \fBcfgadm\fR(8) command. \fBcfgadm\fR operates on
 attachment points. For details regarding attachment points, refer to
-\fBcfgadm\fR(1M).
+\fBcfgadm\fR(8).
 .sp
 .LP
 For \fBUSB\fR administration, the only attachment points supported are the
@@ -344,7 +344,7 @@ in the expected state. Use the \fBcfgadm\fR \fB-l\fR command to display the
 device's current status.
 .sp
 .LP
-All other options have the same meaning as defined in \fBcfgadm\fR(1M).
+All other options have the same meaning as defined in \fBcfgadm\fR(8).
 .sp
 .LP
 The following options are supported:
@@ -432,7 +432,7 @@ Not supported.
 .ad
 .sp .6
 .RS 4n
-The \fB-l\fR option works as described in \fBcfgadm\fR(1M). When paired with
+The \fB-l\fR option works as described in \fBcfgadm\fR(8). When paired with
 the \fB-v\fR option, the \fBInformation\fR field contains the following
 \fBUSB\fR-specific information:
 .RS +4
@@ -491,7 +491,7 @@ of the options available.
 .sp .6
 .RS 4n
 Attachment points of class \fBUSB\fR can be listed by using the \fBselect\fR
-sub-option. See \fBcfgadm\fR(1M).
+sub-option. See \fBcfgadm\fR(8).
 .RE
 
 .sp
@@ -966,8 +966,8 @@ Hardware specific library for generic USB device administration
 
 .SH SEE ALSO
 .LP
-\fBcfgadm\fR(1M), \fBconfig_admin\fR(3CFGADM), \fBattributes\fR(5),
-\fBscsa2usb\fR(7D), \fBusba\fR(7D)
+\fBcfgadm\fR(8), \fBconfig_admin\fR(3CFGADM), \fBattributes\fR(7),
+\fBscsa2usb\fR(4D), \fBusba\fR(4D)
 .sp
 .LP
 Universal Serial Bus 1.1 Specification (\fBwww.usb.org\fR)
@@ -976,10 +976,10 @@ Universal Serial Bus 1.1 Specification (\fBwww.usb.org\fR)
 \fI\fR
 .SH NOTES
 .LP
-\fBcfgadm\fR(1M) can not unconfigure, disconnect, reset, or change the
+\fBcfgadm\fR(8) can not unconfigure, disconnect, reset, or change the
 configuration of any \fBUSB\fR device currently opened by any application.
 These operations also fail on a hub if a device in its hierarchy is opened by
-an application. See \fBscsa2usb\fR(7D) for unconfiguring a \fBUSB\fR
+an application. See \fBscsa2usb\fR(4D) for unconfiguring a \fBUSB\fR
 mass-storage device that is currently in use.
 .sp
 .LP
diff --git a/usr/src/man/man8/chat.8 b/usr/src/man/man8/chat.8
index 0feea6d01c..82ab3a8e69 100644
--- a/usr/src/man/man8/chat.8
+++ b/usr/src/man/man8/chat.8
@@ -722,7 +722,7 @@ possible to decide if the string "BUSY" was received from the modem versus "NO
 DIALTONE." While the first event may be retried, the second probably will not
 succeed during a retry.
 .SH ATTRIBUTES
-See \fBattributes\fR(5)  for descriptions of the following attributes:
+See \fBattributes\fR(7)  for descriptions of the following attributes:
 .sp
 
 .sp
@@ -736,8 +736,8 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-\fBsleep\fR(1), \fBuucp\fR(1C), \fBpppd\fR(1M), \fBuucico\fR(1M),
-\fBsyslog\fR(3C), \fBattributes\fR(5)
+\fBsleep\fR(1), \fBuucp\fR(1C), \fBpppd\fR(8), \fBuucico\fR(8),
+\fBsyslog\fR(3C), \fBattributes\fR(7)
 .sp
 .LP
 Additional information on \fBchat\fR scripts are available with UUCP
diff --git a/usr/src/man/man8/check-hostname.8 b/usr/src/man/man8/check-hostname.8
index aef3322e9f..5d901d41d7 100644
--- a/usr/src/man/man8/check-hostname.8
+++ b/usr/src/man/man8/check-hostname.8
@@ -16,9 +16,9 @@ host name
 .SH DESCRIPTION
 .sp
 .LP
-The \fBcheck-hostname\fR script is a migration aid for \fBsendmail\fR(1M). This
+The \fBcheck-hostname\fR script is a migration aid for \fBsendmail\fR(8). This
 script tries to determine the local host's fully-qualified host name (FQHN) in
-a manner similar to \fBsendmail\fR(1M). If \fBcheck-hostname\fR is able to
+a manner similar to \fBsendmail\fR(8). If \fBcheck-hostname\fR is able to
 determine the \fBFQHN\fR of the local host, it reports success. Otherwise,
 \fBcheck-hostname\fR reports how to reconfigure the system so that the
 \fBFQHN\fR can be properly determined.
@@ -53,7 +53,7 @@ Configuration file for name server routines
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -69,4 +69,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBdomainname\fR(1M), \fBsendmail\fR(1M), \fBhosts\fR(4), \fBattributes\fR(5)
+\fBdomainname\fR(8), \fBsendmail\fR(8), \fBhosts\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/check-permissions.8 b/usr/src/man/man8/check-permissions.8
index d92711d046..da576d12c3 100644
--- a/usr/src/man/man8/check-permissions.8
+++ b/usr/src/man/man8/check-permissions.8
@@ -16,7 +16,7 @@ check-permissions \- check permissions on mail rerouting files
 .sp
 .LP
 The  \fBcheck-permissions\fR script is intended as a migration aid for
-\fBsendmail\fR(1M). It checks the \fB/etc/mail/sendmail.cf\fR file for all
+\fBsendmail\fR(8). It checks the \fB/etc/mail/sendmail.cf\fR file for all
 configured alias files, and checks the alias files for \fB:include:\fR files.
 It also checks for certain \fB\&.forward\fR files. For each file that
 \fBcheck-permissions\fR checks, it verifies that none of the parent directories
@@ -80,7 +80,7 @@ Ascii mail aliases file
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -96,4 +96,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBgetent\fR(1M), \fBsendmail\fR(1M), \fBaliases\fR(4), \fBattributes\fR(5)
+\fBgetent\fR(8), \fBsendmail\fR(8), \fBaliases\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/clear_locks.8 b/usr/src/man/man8/clear_locks.8
index 2f886097ec..faf28e6451 100644
--- a/usr/src/man/man8/clear_locks.8
+++ b/usr/src/man/man8/clear_locks.8
@@ -91,4 +91,4 @@ If unable to contact server (\fBRPC\fR).
 .SH SEE ALSO
 .sp
 .LP
-\fBfcntl\fR(2), \fBattributes\fR(5)
+\fBfcntl\fR(2), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/clinfo.8 b/usr/src/man/man8/clinfo.8
index 110425dd86..521a5ea4bb 100644
--- a/usr/src/man/man8/clinfo.8
+++ b/usr/src/man/man8/clinfo.8
@@ -80,4 +80,4 @@ cluster.
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5)
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/clri.8 b/usr/src/man/man8/clri.8
index 80a21cc709..ba1231f395 100644
--- a/usr/src/man/man8/clri.8
+++ b/usr/src/man/man8/clri.8
@@ -22,7 +22,7 @@ clri, dcopy \- clear inode
 .LP
 \fBclri\fR writes zeros on the inodes with the decimal \fIi-number\fR on the
 file system stored on  \fIspecial\fR. After  \fBclri\fR, any blocks in the
-affected file show up as missing in an  \fBfsck\fR(1M) of \fIspecial\fR.
+affected file show up as missing in an  \fBfsck\fR(8) of \fIspecial\fR.
 .sp
 .LP
 Read and write permission is required on the specified file system device. The
@@ -67,7 +67,7 @@ be used to verify and validate the command line.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBclri\fR and
+See \fBlargefile\fR(7) for the description of the behavior of \fBclri\fR and
 \fBdcopy\fR when encountering files greater than or equal to 2 Gbyte ( 2^31
 bytes).
 .SH FILES
@@ -92,7 +92,7 @@ List of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBfsck\fR(1M), \fBvfstab\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBfsck\fR(8), \fBvfstab\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/consadm.8 b/usr/src/man/man8/consadm.8
index 6b0dd94115..8db2160313 100644
--- a/usr/src/man/man8/consadm.8
+++ b/usr/src/man/man8/consadm.8
@@ -61,7 +61,7 @@ the daemon will shut itself down. Therefore the daemon persists for only as
 long as auxiliary console devices remain active.
 .sp
 .LP
-See \fBeeprom\fR(1M) for instructions on assigning an auxiliary console device
+See \fBeeprom\fR(8) for instructions on assigning an auxiliary console device
 as the system console.
 .SH OPTIONS
 .sp
@@ -153,7 +153,7 @@ example# \fBconsadm\fR
 .SH ENVIRONMENT VARIABLES
 .sp
 .LP
-See \fBenviron\fR(5) for descriptions of the following environment variables
+See \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of \fBconsadm\fR: \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR,
 and \fBNLSPATH\fR.
 .SH EXIT STATUS
@@ -181,7 +181,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -197,9 +197,9 @@ Stability Level	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBeeprom\fR(1M), \fBsvcadm\fR(1M), \fBsyslogd\fR(1M),
-\fBkadb\fR(1M), \fBenviron\fR(5), \fBattributes\fR(5), \fBsmf\fR(5),
-\fBsysmsg\fR(7d), \fBconsole\fR(7d)
+\fBsvcs\fR(1), \fBeeprom\fR(8), \fBsvcadm\fR(8), \fBsyslogd\fR(8),
+\fBkadb\fR(8), \fBenviron\fR(7), \fBattributes\fR(7), \fBsmf\fR(7),
+\fBsysmsg\fR(4D), \fBconsole\fR(4D)
 .SH NOTES
 .sp
 .LP
@@ -209,7 +209,7 @@ do not receive panic messages, and do not receive output directed to
 .sp
 .LP
 The \fBconsadm\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -221,5 +221,5 @@ svc:/system/consadm
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/conv_lp.8 b/usr/src/man/man8/conv_lp.8
index 11095c0a8e..719b5b3a5a 100644
--- a/usr/src/man/man8/conv_lp.8
+++ b/usr/src/man/man8/conv_lp.8
@@ -111,4 +111,4 @@ System printer configuration database.
 .SH SEE ALSO
 .sp
 .LP
-\fBlpset\fR(1M), \fBprinters.conf\fR(4), \fBattributes\fR(5)
+\fBlpset\fR(8), \fBprinters.conf\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/conv_lpd.8 b/usr/src/man/man8/conv_lpd.8
index 4d5d9438de..5641ddd54d 100644
--- a/usr/src/man/man8/conv_lpd.8
+++ b/usr/src/man/man8/conv_lpd.8
@@ -17,7 +17,7 @@ conv_lpd \- convert LPD configuration
 .LP
 \fBconv_lpd\fR converts  \fBLPD\fR printer configuration information from
 \fIfile\fR to a \fBprinters.conf\fR or a  \fBprintcap\fR file (see
-\fBprinters.conf\fR(4)). \fIfile\fR specifies the name of the input file, and
+\fBprinters.conf\fR(5)). \fIfile\fR specifies the name of the input file, and
 can be either in \fBprinters.conf\fR or  \fBprintcap\fR format. If  \fIfile\fR
 is in  \fBprinters.conf\fR format, it converts it to a \fBprintcap\fR file. If
 \fIfile\fR is in  \fBprintcap\fR format, it converts it to a
@@ -152,4 +152,4 @@ SunOS 4.\fIx\fR printer capability database.
 .SH SEE ALSO
 .sp
 .LP
-\fBlpset\fR(1M), \fBprinters.conf\fR(4), \fBattributes\fR(5)
+\fBlpset\fR(8), \fBprinters.conf\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/coreadm.8 b/usr/src/man/man8/coreadm.8
index 50eda13819..599802bd59 100644
--- a/usr/src/man/man8/coreadm.8
+++ b/usr/src/man/man8/coreadm.8
@@ -20,13 +20,13 @@ coreadm \- core file administration
 
 .SH DESCRIPTION
 \fBcoreadm\fR specifies the name and location of core files produced by
-abnormally-terminating processes. See \fBcore\fR(4).
+abnormally-terminating processes. See \fBcore\fR(5).
 .sp
 .LP
 Only users and roles that belong to the "Maintenance and Repair" RBAC profile
 can execute the first form of the \fBSYNOPSIS\fR. This form configures
 system-wide core file options, including a global core file name pattern and a
-core file name pattern for the \fBinit\fR(1M) process. All settings are saved
+core file name pattern for the \fBinit\fR(8) process. All settings are saved
 persistently and will be applied at boot.
 .sp
 .LP
@@ -684,10 +684,10 @@ Invalid command-line options were specified.
 .RE
 
 .SH SEE ALSO
-\fBgcore\fR(1), \fBpfexec\fR(1), \fBsvcs\fR(1), \fBinit\fR(1M),
-\fBsvcadm\fR(1M), \fBexec\fR(2), \fBfork\fR(2), \fBsetuid\fR(2), \fBtime\fR(2),
-\fBsyslog\fR(3C), \fBcore\fR(4), \fBprof_attr\fR(4), \fBuser_attr\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBgcore\fR(1), \fBpfexec\fR(1), \fBsvcs\fR(1), \fBinit\fR(8),
+\fBsvcadm\fR(8), \fBexec\fR(2), \fBfork\fR(2), \fBsetuid\fR(2), \fBtime\fR(2),
+\fBsyslog\fR(3C), \fBcore\fR(5), \fBprof_attr\fR(5), \fBuser_attr\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 In a local (non-global) zone, the global settings apply to processes running in
 that zone. In addition, the global zone's apply to processes run in any zone.
@@ -699,7 +699,7 @@ to take effect in the global zone.
 .sp
 .LP
 The \fBcoreadm\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -711,7 +711,7 @@ svc:/system/coreadm:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
diff --git a/usr/src/man/man8/cpustat.8 b/usr/src/man/man8/cpustat.8
index ad09e1d2d3..890f8eb8c6 100644
--- a/usr/src/man/man8/cpustat.8
+++ b/usr/src/man/man8/cpustat.8
@@ -201,7 +201,7 @@ of \fBlibcpc\fR(3LIB). See \fBcpc\fR(3CPC).
 .LP
 The \fBcpustat\fR utility only monitors the \fBCPU\fRs that are accessible to
 it in the current processor set. Thus, several instances of the utility can be
-running on the \fBCPU\fRs in different processor sets. See \fBpsrset\fR(1M) for
+running on the \fBCPU\fRs in different processor sets. See \fBpsrset\fR(8) for
 more information about processor sets.
 .sp
 .LP
@@ -320,7 +320,7 @@ If a short interval is requested, \fBcpustat\fR might not be able to keep up
 with the desired sample rate. In this case, some samples might be dropped.
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -335,10 +335,10 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBcputrack\fR(1), \fBnawk\fR(1), \fBperl\fR(1), \fBiostat\fR(1M),
-\fBprstat\fR(1M), \fBpsrset\fR(1M), \fBvmstat\fR(1M), \fBcpc\fR(3CPC),
+\fBcputrack\fR(1), \fBnawk\fR(1), \fBperl\fR(1), \fBiostat\fR(8),
+\fBprstat\fR(8), \fBpsrset\fR(8), \fBvmstat\fR(8), \fBcpc\fR(3CPC),
 \fBcpc_open\fR(3CPC), \fBcpc_bind_cpu\fR(3CPC), \fBgethrtime\fR(3C),
-\fBstrtoll\fR(3C), \fBlibcpc\fR(3LIB), \fBattributes\fR(5)
+\fBstrtoll\fR(3C), \fBlibcpc\fR(3LIB), \fBattributes\fR(7)
 .SH NOTES
 .LP
 When \fBcpustat\fR is run on a Pentium 4 with HyperThreading enabled, a CPC set
diff --git a/usr/src/man/man8/cron.8 b/usr/src/man/man8/cron.8
index 946bcb3200..60fae5353a 100644
--- a/usr/src/man/man8/cron.8
+++ b/usr/src/man/man8/cron.8
@@ -45,7 +45,7 @@ submitted.
 .sp
 .LP
 \fBcron\fR and \fBat\fR jobs are not executed if your account is locked.
-The \fBshadow\fR(4) file defines which accounts are not
+The \fBshadow\fR(5) file defines which accounts are not
 locked and will have their jobs executed.
 .SS "Setting cron Jobs Across Timezones"
 .LP
@@ -90,7 +90,7 @@ jobs to \fB/usr/bin:/usr/ucb:\fR. Root jobs continue to use
 \fB/usr/sbin:/usr/bin\fR.
 .sp
 .LP
-The \fBcron\fR log file is periodically rotated by \fBlogadm\fR(1M).
+The \fBcron\fR log file is periodically rotated by \fBlogadm\fR(8).
 .SH FILES
 .ne 2
 .na
@@ -156,13 +156,13 @@ Configuration file for \fBlogadm\fR
 
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBat\fR(1), \fBcrontab\fR(1), \fBsh\fR(1), \fBlogadm\fR(1M),
-\fBsvcadm\fR(1M), \fBqueuedefs\fR(4), \fBshadow\fR(4), \fBattributes\fR(5),
-\fBrbac\fR(5), \fBsmf\fR(5), \fBsmf_security\fR(5)
+\fBsvcs\fR(1), \fBat\fR(1), \fBcrontab\fR(1), \fBsh\fR(1), \fBlogadm\fR(8),
+\fBsvcadm\fR(8), \fBqueuedefs\fR(5), \fBshadow\fR(5), \fBattributes\fR(7),
+\fBrbac\fR(7), \fBsmf\fR(7), \fBsmf_security\fR(7)
 .SH NOTES
 .LP
 The \fBcron\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -174,10 +174,10 @@ svc:/system/cron:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command. Most administrative
 actions may be delegated to users with the \fBsolaris.smf.manage.cron\fR
-authorization (see \fBrbac\fR(5) and \fBsmf_security\fR(5)).
+authorization (see \fBrbac\fR(7) and \fBsmf_security\fR(7)).
 .SH DIAGNOSTICS
 .LP
 A history of all actions taken by \fBcron\fR is stored in \fB/var/cron/log\fR
diff --git a/usr/src/man/man8/cryptoadm.8 b/usr/src/man/man8/cryptoadm.8
index aa0a602b10..4cd93055d5 100644
--- a/usr/src/man/man8/cryptoadm.8
+++ b/usr/src/man/man8/cryptoadm.8
@@ -106,14 +106,14 @@ to display the current status of FIPS-140 mode.
 .sp
 .LP
 Administrators will find it useful to use \fBsyslog\fR facilities (see
-\fBsyslogd\fR(1M) and \fBlogadm\fR(1M)) to maintain the cryptographic
+\fBsyslogd\fR(8) and \fBlogadm\fR(8)) to maintain the cryptographic
 subsystem. Logging can be especially useful under the following circumstances:
 .RS +4
 .TP
 .ie t \(bu
 .el o
 If kernel-level daemon is dead, all applications fail. You can learn this from
-syslog and use \fBsvcadm\fR(1M) to restart the \fBsvc:/system/cryptosvc\fR
+syslog and use \fBsvcadm\fR(8) to restart the \fBsvc:/system/cryptosvc\fR
 service.
 .RE
 .RS +4
@@ -424,7 +424,7 @@ FIPS-140 mode is \fBdisabled\fR.
 .ad
 .sp .6
 .RS 4n
-Private interfaces for use by \fBsmf\fR(5), these must not be used directly.
+Private interfaces for use by \fBsmf\fR(7), these must not be used directly.
 .RE
 
 .sp
@@ -778,7 +778,7 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -796,9 +796,9 @@ Interface Stability	See below
 The \fBstart\fR, \fBstop\fR, and \fBrefresh\fR options are Private interfaces.
 All other options are Evolving. The utility name is Stable.
 .SH SEE ALSO
-\fBlogadm\fR(1M), \fBsvcadm\fR(1M), \fBsyslogd\fR(1M), \fBlibpkcs11\fR(3LIB),
-\fBexec_attr\fR(4), \fBprof_attr\fR(4), \fBattributes\fR(5), \fBsmf\fR(5),
-\fBrandom\fR(7D)
+\fBlogadm\fR(8), \fBsvcadm\fR(8), \fBsyslogd\fR(8), \fBlibpkcs11\fR(3LIB),
+\fBexec_attr\fR(5), \fBprof_attr\fR(5), \fBattributes\fR(7), \fBsmf\fR(7),
+\fBrandom\fR(4D)
 
 .sp
 .LP
diff --git a/usr/src/man/man8/datadm.8 b/usr/src/man/man8/datadm.8
index 9d82fe87cd..12bec9ac86 100644
--- a/usr/src/man/man8/datadm.8
+++ b/usr/src/man/man8/datadm.8
@@ -14,7 +14,7 @@ datadm \- maintain DAT static registry file
 
 .SH DESCRIPTION
 The \fBdatadm\fR utility maintains the DAT static registry file,
-\fBdat.conf\fR(4).
+\fBdat.conf\fR(5).
 .sp
 .LP
 This administrative configuration program allows uDAPL service providers to add
@@ -34,7 +34,7 @@ The following options are supported:
 \fB\fB-a\fR \fBservice_provider.conf\fR\fR
 .ad
 .RS 28n
-Enumerate each device entry in the \fBservice_provider.conf\fR(4) file into a
+Enumerate each device entry in the \fBservice_provider.conf\fR(5) file into a
 list of interface adapters, that is, interfaces to external network that are
 available to uDAPL consumers.
 .RE
@@ -46,7 +46,7 @@ available to uDAPL consumers.
 .ad
 .RS 28n
 Remove the list of interface adapters that corresponds to the device entry in
-the \fBservice_provider.conf\fR(4) file.
+the \fBservice_provider.conf\fR(5) file.
 .RE
 
 .sp
@@ -74,13 +74,13 @@ Display the DAT static registry file, \fBdat.conf\fR.
 .sp
 .LP
 The following example enumerates a device entry in the
-\fBservice_provider.conf\fR(4) file into interface adapters in the
-\fBdat.conf\fR(4) file.
+\fBservice_provider.conf\fR(5) file into interface adapters in the
+\fBdat.conf\fR(5) file.
 
 .sp
 .LP
 Assume that \fBSUNW\fR has a service provider library that supports the device
-\fBtavor\fR. It has a \fBservice_provider.conf\fR(4) file installed in the
+\fBtavor\fR. It has a \fBservice_provider.conf\fR(5) file installed in the
 directory \fB/usr/share/dat/SUNWudaplt.conf\fR with a single entry as follows:
 
 .sp
@@ -177,7 +177,7 @@ DAT static registry file
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -191,5 +191,5 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-\fBlibdat\fR(3LIB), \fBdat.conf\fR(4),
-\fBservice_provider.conf\fR(4), \fBattributes\fR(5)
+\fBlibdat\fR(3LIB), \fBdat.conf\fR(5),
+\fBservice_provider.conf\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/dcs.8 b/usr/src/man/man8/dcs.8
index 568975fa0a..f4f8d102c6 100644
--- a/usr/src/man/man8/dcs.8
+++ b/usr/src/man/man8/dcs.8
@@ -17,7 +17,7 @@ dcs \- domain configuration server
 .LP
 The Domain Configuration Server (DCS) is a daemon process that runs on Sun
 servers that support remote Dynamic Reconfiguration (DR) clients. It is started
-by the Service Management Facility (see \fBsmf\fR(5)) when the first DR request
+by the Service Management Facility (see \fBsmf\fR(7)) when the first DR request
 is received from a client connecting to the network service \fBsun-dr\fR. After
 the DCS accepts a DR request, it uses the \fBlibcfgadm\fR(3LIB) interface to
 execute the DR operation. After the operation is performed, the results are
@@ -81,7 +81,7 @@ entries in the \fB/etc/syslog.conf\fR file log all of the DCS error messages to
 the \fB/var/adm/messages\fR log.
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -96,13 +96,13 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBcfgadm_sbd\fR(1M), \fBsvcadm\fR(1M),
+\fBsvcs\fR(1), \fBcfgadm_sbd\fR(8), \fBsvcadm\fR(8),
 \fBsyslog\fR(3C), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
-\fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5), \fBdr\fR(7D)
+\fBsyslog.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7), \fBdr\fR(4D)
 .SH NOTES
 .LP
 The \fBdcs\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the fault management resource identifier (FMRI):
+\fBsmf\fR(7), under the fault management resource identifier (FMRI):
 .sp
 .in +2
 .nf
@@ -114,5 +114,5 @@ svc:/platform/sun4u/dcs:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/devattr.8 b/usr/src/man/man8/devattr.8
index 479573daa9..ec55186cbe 100644
--- a/usr/src/man/man8/devattr.8
+++ b/usr/src/man/man8/devattr.8
@@ -47,7 +47,7 @@ The following operands are supported:
 .ad
 .RS 13n
 Defines which attribute, or attributes, should be shown. Default is to show all
-attributes for a device. See the \fBputdev\fR(1M) manual page for a complete
+attributes for a device. See the \fBputdev\fR(8) manual page for a complete
 listing and description of available attributes.
 .RE
 
@@ -118,4 +118,4 @@ Requested attribute was not defined for the specified device.
 .SH SEE ALSO
 .sp
 .LP
-\fBgetdev\fR(1M), \fBputdev\fR(1M), \fBattributes\fR(5)
+\fBgetdev\fR(8), \fBputdev\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/devfree.8 b/usr/src/man/man8/devfree.8
index c60c97329c..dd7e662602 100644
--- a/usr/src/man/man8/devfree.8
+++ b/usr/src/man/man8/devfree.8
@@ -110,7 +110,7 @@ the devices was not reserved or was not reserved on the specified key.
 .SH SEE ALSO
 .sp
 .LP
-\fBdevreserv\fR(1M), \fBattributes\fR(5)
+\fBdevreserv\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/devfsadm.8 b/usr/src/man/man8/devfsadm.8
index a71afe9b92..4813537723 100644
--- a/usr/src/man/man8/devfsadm.8
+++ b/usr/src/man/man8/devfsadm.8
@@ -21,10 +21,10 @@ devfsadm, devfsadmd \- administration command for /dev
 .SH DESCRIPTION
 .sp
 .LP
-\fBdevfsadm\fR(1M) maintains the \fB/dev\fR namespace. It replaces the previous
-suite of \fBdevfs\fR administration tools including \fBdrvconfig\fR(1M),
-\fBdisks\fR(1M), \fBtapes\fR(1M), \fBports\fR(1M), \fBaudlinks\fR(1M), and
-\fBdevlinks\fR(1M).
+\fBdevfsadm\fR(8) maintains the \fB/dev\fR namespace. It replaces the previous
+suite of \fBdevfs\fR administration tools including \fBdrvconfig\fR(8),
+\fBdisks\fR(8), \fBtapes\fR(8), \fBports\fR(8), \fBaudlinks\fR(8), and
+\fBdevlinks\fR(8).
 .sp
 .LP
 The default operation is to attempt to load every driver in the system and
@@ -33,19 +33,19 @@ links to device nodes in \fB/dev\fR and \fB/devices\fR and loads the device
 policy.
 .sp
 .LP
-\fBdevfsadmd\fR(1M) is the daemon version of \fBdevfsadm\fR(1M). The daemon is
+\fBdevfsadmd\fR(8) is the daemon version of \fBdevfsadm\fR(8). The daemon is
 started during system startup and is responsible for handling both
 reconfiguration boot processing and updating \fB/dev\fR and \fB/devices\fR in
 response to dynamic reconfiguration event notifications from the kernel.
 .sp
 .LP
-For compatibility purposes, \fBdrvconfig\fR(1M), \fBdisks\fR(1M),
-\fBtapes\fR(1M), \fBports\fR(1M), \fBaudlinks\fR(1M), and \fBdevlinks\fR(1M)
+For compatibility purposes, \fBdrvconfig\fR(8), \fBdisks\fR(8),
+\fBtapes\fR(8), \fBports\fR(8), \fBaudlinks\fR(8), and \fBdevlinks\fR(8)
 are implemented as links to \fBdevfsadm\fR.
 .sp
 .LP
 In addition to managing \fB/dev\fR, \fBdevfsadm\fR also maintains the
-\fBpath_to_inst\fR(4) database.
+\fBpath_to_inst\fR(5) database.
 .SH OPTIONS
 .sp
 .LP
@@ -227,10 +227,10 @@ additional device privileges
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBadd_drv\fR(1M), \fBmodinfo\fR(1M), \fBmodload\fR(1M),
-\fBmodunload\fR(1M), \fBrem_drv\fR(1M), \fBsvcadm\fR(1M), \fBtapes\fR(1M),
-\fBpath_to_inst\fR(4), \fBattributes\fR(5), \fBprivileges\fR(5), \fBsmf\fR(5),
-\fBdevfs\fR(7FS)
+\fBsvcs\fR(1), \fBadd_drv\fR(8), \fBmodinfo\fR(8), \fBmodload\fR(8),
+\fBmodunload\fR(8), \fBrem_drv\fR(8), \fBsvcadm\fR(8), \fBtapes\fR(8),
+\fBpath_to_inst\fR(5), \fBattributes\fR(7), \fBprivileges\fR(7), \fBsmf\fR(7),
+\fBdevfs\fR(4FS)
 .SH NOTES
 .sp
 .LP
@@ -241,11 +241,11 @@ documentation that lacks this notice constitutes an \fBAPI\fR.
 .sp
 .LP
 \fBdevfsadm\fR no longer manages the \fB/devices\fR name space. See
-\fBdevfs\fR(7FS).
+\fBdevfs\fR(4FS).
 .sp
 .LP
 The device configuration service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier, and can be used to start
+\fBsmf\fR(7), under the service identifier, and can be used to start
 \fBdevfsadm\fR during reconfiguration boot by:
 .sp
 .in +2
@@ -269,5 +269,5 @@ svc:/system/sysevent:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/device_remap.8 b/usr/src/man/man8/device_remap.8
index bee530e6f8..ad460a4d43 100644
--- a/usr/src/man/man8/device_remap.8
+++ b/usr/src/man/man8/device_remap.8
@@ -136,7 +136,7 @@ prior to making any changes.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -152,4 +152,4 @@ Interface Stability	Unstable
 .SH SEE ALSO
 .sp
 .LP
-\fBboot\fR(1M), \fBattributes\fR(5)
+\fBboot\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/devinfo.8 b/usr/src/man/man8/devinfo.8
index bb4afb138f..13da9ef24f 100644
--- a/usr/src/man/man8/devinfo.8
+++ b/usr/src/man/man8/devinfo.8
@@ -150,4 +150,4 @@ Operation failed.
 .SH SEE ALSO
 .sp
 .LP
-\fBprtvtoc\fR(1M), \fBattributes\fR(5)
+\fBprtvtoc\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/devlinks.8 b/usr/src/man/man8/devlinks.8
index f1676142f7..33f9d3f0ef 100644
--- a/usr/src/man/man8/devlinks.8
+++ b/usr/src/man/man8/devlinks.8
@@ -15,7 +15,7 @@ devlinks \- adds /dev entries for miscellaneous devices and pseudo-devices
 .SH DESCRIPTION
 .sp
 .LP
-\fBdevfsadm\fR(1M) is now the preferred command for \fB/dev\fR and
+\fBdevfsadm\fR(8) is now the preferred command for \fB/dev\fR and
 \fB/devices\fR and should be used instead of \fBdevlinks\fR.
 .sp
 .LP
@@ -26,7 +26,7 @@ directory tree. The links are created according to specifications found in the
 .sp
 .LP
 \fBdevlinks\fR is called each time the system is reconfiguration-booted, and
-can only be run after \fBdrvconfig\fR(1M) is run.
+can only be run after \fBdrvconfig\fR(8) is run.
 .sp
 .LP
 The \fItable-file\fR (normally \fB/etc/devlink.tab\fR) is an ASCII file, with
@@ -297,7 +297,7 @@ the default rule-file
 .SH SEE ALSO
 .sp
 .LP
-\fBdevfsadm\fR(1M), \fBattributes\fR(5), \fBdevfs\fR(7FS),
+\fBdevfsadm\fR(8), \fBattributes\fR(7), \fBdevfs\fR(4FS),
 \fBddi_create_minor_node\fR(9F)
 .SH BUGS
 .sp
diff --git a/usr/src/man/man8/devnm.8 b/usr/src/man/man8/devnm.8
index 0cfc1f5ad0..212279cc95 100644
--- a/usr/src/man/man8/devnm.8
+++ b/usr/src/man/man8/devnm.8
@@ -68,4 +68,4 @@ produces:
 .SH SEE ALSO
 .sp
 .LP
-\fBmnttab\fR(4), \fBattributes\fR(5)
+\fBmnttab\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/devprop.8 b/usr/src/man/man8/devprop.8
index 1ab57e7ba5..f46994079b 100644
--- a/usr/src/man/man8/devprop.8
+++ b/usr/src/man/man8/devprop.8
@@ -24,7 +24,7 @@ device properties for that device node.
 .sp
 .LP
 The output formats, while Volatile, are patterned after those of
-\fBprtconf\fR(1M).
+\fBprtconf\fR(8).
 .SH OPTIONS
 .sp
 .LP
@@ -144,7 +144,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -164,4 +164,4 @@ utility is Committed.
 .SH SEE ALSO
 .sp
 .LP
-\fBprtconf\fR(1M), \fBlibdevinfo\fR(3LIB), \fBattributes\fR(5)
+\fBprtconf\fR(8), \fBlibdevinfo\fR(3LIB), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/devreserv.8 b/usr/src/man/man8/devreserv.8
index ea5f60be2a..56fc7c5d90 100644
--- a/usr/src/man/man8/devreserv.8
+++ b/usr/src/man/man8/devreserv.8
@@ -166,7 +166,7 @@ Device reservation request could not be fulfilled.
 .SH SEE ALSO
 .sp
 .LP
-\fBdevfree\fR(1M), \fBattributes\fR(5)
+\fBdevfree\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/df.8 b/usr/src/man/man8/df.8
index e6d3def2c8..cfc3bb34e8 100644
--- a/usr/src/man/man8/df.8
+++ b/usr/src/man/man8/df.8
@@ -80,7 +80,7 @@ automounter mounts the file system, the sizes will be reported correctly.
 .sp .6
 .RS 4n
 Reports on all file systems including ones whose entries in \fB/etc/mnttab\fR
-(see \fBmnttab\fR(4)) have the \fBignore\fR option set.
+(see \fBmnttab\fR(5)) have the \fBignore\fR option set.
 .RE
 
 .sp
@@ -112,9 +112,9 @@ Prints only the number of files free.
 .RS 4n
 Specifies the \fIFSType\fR on which to operate. The \fB-F\fR option is intended
 for use with unmounted file systems. The \fIFSType\fR should be specified here
-or be determinable from \fB/etc/vfstab\fR (see \fBvfstab\fR(4)) by matching the
+or be determinable from \fB/etc/vfstab\fR (see \fBvfstab\fR(5)) by matching the
 \fIdirectory\fR, \fIblock_device\fR, or \fIresource\fR with an entry in the
-table, or by consulting \fB/etc/default/fs\fR. See \fBdefault_fs\fR(4).
+table, or by consulting \fB/etc/default/fs\fR. See \fBdefault_fs\fR(5).
 .RE
 
 .sp
@@ -360,7 +360,7 @@ Represents an \fBNFS\fR resource name.
 
 .SH USAGE
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBdf\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBdf\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXAMPLES
 .LP
@@ -397,7 +397,7 @@ file systems, \fB/system/contract\fR is the mount point, \fBctfs\fR is the
 contract file system (used by \fBSMF\fR) with 0 free blocks and
 2147483582(\fBINTMAX\fR-1) free files. For object file systems,
 \fB/system/object\fR is the mount point, \fBobjfs\fR is the object file system
-(see \fBobjfs\fR(7FS)) with 0 free blocks and 2147483511 free files.
+(see \fBobjfs\fR(4FS)) with 0 free blocks and 2147483511 free files.
 .LP
 \fBExample 2 \fRWriting Portable Information About the \fB/usr\fR File System
 .sp
@@ -445,7 +445,7 @@ example%\fB/usr/bin/df -F ufs -o i\fR
 
 .SH ENVIRONMENT VARIABLES
 .LP
-See \fBenviron\fR(5) for descriptions of the following environment variables
+See \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of \fBdf\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
@@ -515,7 +515,7 @@ List of default parameters for each file system
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 
 .TS
 box;
@@ -528,9 +528,9 @@ Interface Stability	Standard
 
 .SH SEE ALSO
 .LP
-\fBfind\fR(1), \fBdf_ufs\fR(1M), \fBmount\fR(1M), \fBstatvfs\fR(2),
-\fBdefault_fs\fR(4), \fBmnttab\fR(4), \fBvfstab\fR(4), \fBattributes\fR(5),
-\fBenviron\fR(5), \fBlargefile\fR(5), \fBstandards\fR(5), \fBobjfs\fR(7FS)
+\fBfind\fR(1), \fBdf_ufs\fR(8), \fBmount\fR(8), \fBstatvfs\fR(2),
+\fBdefault_fs\fR(5), \fBmnttab\fR(5), \fBvfstab\fR(5), \fBattributes\fR(7),
+\fBenviron\fR(7), \fBlargefile\fR(7), \fBstandards\fR(7), \fBobjfs\fR(4FS)
 .SH NOTES
 .LP
 If \fBUFS\fR logging is enabled on a file system, the disk space used for the
diff --git a/usr/src/man/man8/df_ufs.8 b/usr/src/man/man8/df_ufs.8
index e89fafd51a..0f13233fd8 100644
--- a/usr/src/man/man8/df_ufs.8
+++ b/usr/src/man/man8/df_ufs.8
@@ -21,7 +21,7 @@ capacity has been used.The amount of space reported as used and available is
 less than the amount of space in the file system; this is because the system
 reserves a fraction of the space in the file system to allow its file system
 allocation routines to work well. The amount reserved is typically about 10%;
-this can be adjusted using \fBtunefs\fR(1M). When all the space on the file
+this can be adjusted using \fBtunefs\fR(8). When all the space on the file
 system except for this reserve is in use, only the superuser can allocate new
 files and data blocks to existing files. When the file system is overallocated
 in this way, \fBdf\fR might report that the file system is more than 100%
@@ -37,7 +37,7 @@ The following options are supported:
 \fB\fIgeneric_options\fR\fR
 .ad
 .RS 19n
-Options supported by the generic \fBdf\fR command. See \fBdf\fR(1M) for a
+Options supported by the generic \fBdf\fR command. See \fBdf\fR(8) for a
 description of these options.
 .RE
 
@@ -73,8 +73,8 @@ list of file systems currently mounted
 .SH SEE ALSO
 .sp
 .LP
-\fBdf\fR(1M), \fBfsck\fR(1M), \fBfstyp\fR(1M), \fBtunefs\fR(1M),
-\fBmnttab\fR(4), \fBattributes\fR(5), \fBufs\fR(7FS),
+\fBdf\fR(8), \fBfsck\fR(8), \fBfstyp\fR(8), \fBtunefs\fR(8),
+\fBmnttab\fR(5), \fBattributes\fR(7), \fBufs\fR(4FS),
 .SH NOTES
 .sp
 .LP
@@ -92,9 +92,9 @@ requires contiguous sets of fragments for most allocations.
 .sp
 .LP
 If you suspect that you have exhausted contiguous fragments on your file
-system, you can use the \fBfstyp\fR(1M) utility with the \fB-v\fR option. In
+system, you can use the \fBfstyp\fR(8) utility with the \fB-v\fR option. In
 the \fBfstyp\fR output, look at the \fBnbfree\fR (number of blocks free) and
 \fBnffree\fR (number of fragments free) fields. On unmounted filesystems, you
-can use \fBfsck\fR(1M) and observe the last line of output, which reports,
+can use \fBfsck\fR(8) and observe the last line of output, which reports,
 among other items, the number of fragments and the degree of fragmentation. See
-\fBfsck\fR(1M).
+\fBfsck\fR(8).
diff --git a/usr/src/man/man8/dfmounts.8 b/usr/src/man/man8/dfmounts.8
index 29c0a4cb85..ffdb64b2c3 100644
--- a/usr/src/man/man8/dfmounts.8
+++ b/usr/src/man/man8/dfmounts.8
@@ -50,7 +50,7 @@ where:
 \fB\fIresource\fR\fR
 .ad
 .RS 12n
-Specifies the resource name that must be given to the \fBmount\fR(1M) command.
+Specifies the resource name that must be given to the \fBmount\fR(8) command.
 .RE
 
 .sp
@@ -68,7 +68,7 @@ Specifies the system from which the resource was mounted.
 \fB\fIpathname\fR\fR
 .ad
 .RS 12n
-Specifies the pathname that must be given to the \fBshare\fR(1M) command.
+Specifies the pathname that must be given to the \fBshare\fR(8) command.
 .RE
 
 .sp
@@ -133,5 +133,5 @@ file system types
 .SH SEE ALSO
 .sp
 .LP
-\fBdfshares\fR(1M), \fBmount\fR(1M), \fBshare\fR(1M), \fBunshare\fR(1M),
-\fBattributes\fR(5)
+\fBdfshares\fR(8), \fBmount\fR(8), \fBshare\fR(8), \fBunshare\fR(8),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/dfmounts_nfs.8 b/usr/src/man/man8/dfmounts_nfs.8
index 68ffd66e9c..8b518d338c 100644
--- a/usr/src/man/man8/dfmounts_nfs.8
+++ b/usr/src/man/man8/dfmounts_nfs.8
@@ -62,7 +62,7 @@ Specifies the system from which the resource was mounted.
 \fB\fIpathname\fR\fR
 .ad
 .RS 12n
-Specifies the pathname that must be given to the \fBshare\fR(1M) command.
+Specifies the pathname that must be given to the \fBshare\fR(8) command.
 .RE
 
 .sp
@@ -117,4 +117,4 @@ Displays information about the resources mounted from each server, where
 .SH SEE ALSO
 .sp
 .LP
-\fBmount\fR(1M), \fBshare\fR(1M), \fBunshare\fR(1M), \fBattributes\fR(5)
+\fBmount\fR(8), \fBshare\fR(8), \fBunshare\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/dfshares.8 b/usr/src/man/man8/dfshares.8
index c6c06b3a98..cc02e5a6c8 100644
--- a/usr/src/man/man8/dfshares.8
+++ b/usr/src/man/man8/dfshares.8
@@ -44,7 +44,7 @@ where
 \fB\fIresource\fR\fR
 .ad
 .RS 13n
-Specifies the resource name that must be given to the \fBmount\fR(1M) command.
+Specifies the resource name that must be given to the \fBmount\fR(8) command.
 .RE
 
 .sp
@@ -123,5 +123,5 @@ Specify options specific to the filesystem provided by the \fB-F\fR option.
 .SH SEE ALSO
 .sp
 .LP
-\fBdfmounts\fR(1M), \fBmount\fR(1M), \fBshare\fR(1M), \fBunshare\fR(1M),
-\fBattributes\fR(5)
+\fBdfmounts\fR(8), \fBmount\fR(8), \fBshare\fR(8), \fBunshare\fR(8),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/dfshares_nfs.8 b/usr/src/man/man8/dfshares_nfs.8
index 945f13931e..3735e4a07e 100644
--- a/usr/src/man/man8/dfshares_nfs.8
+++ b/usr/src/man/man8/dfshares_nfs.8
@@ -52,7 +52,7 @@ where
 \fB\fIresource\fR\fR
 .ad
 .RS 13n
-Specifies the resource name that must be given to the \fBmount\fR(1M) command.
+Specifies the resource name that must be given to the \fBmount\fR(8) command.
 .RE
 
 .sp
@@ -123,4 +123,4 @@ Suppress header line in output.
 .SH SEE ALSO
 .sp
 .LP
-\fBmount\fR(1M), \fBshare\fR(1M), \fBunshare\fR(1M), \fBattributes\fR(5)
+\fBmount\fR(8), \fBshare\fR(8), \fBunshare\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/dhcpagent.8 b/usr/src/man/man8/dhcpagent.8
index fb0d8d690d..ff23f17660 100644
--- a/usr/src/man/man8/dhcpagent.8
+++ b/usr/src/man/man8/dhcpagent.8
@@ -27,22 +27,22 @@ it must negotiate an extension using \fBDHCP\fR. For this reason,
 powers down.
 .sp
 .LP
-For IPv4, the \fBdhcpagent\fR daemon is controlled through \fBipadm\fR(1M),
-\fBnwamcfg\fR(1M), or \fBifconfig\fR(1M) in much the same way that the
-\fBinit\fR(1M) daemon is controlled by \fBtelinit\fR(1M). \fBdhcpagent\fR can
+For IPv4, the \fBdhcpagent\fR daemon is controlled through \fBipadm\fR(8),
+\fBnwamcfg\fR(8), or \fBifconfig\fR(8) in much the same way that the
+\fBinit\fR(8) daemon is controlled by \fBtelinit\fR(8). \fBdhcpagent\fR can
 be invoked as a user process, albeit one requiring root privileges, but this is
-not necessary, as \fBipadm\fR(1M), \fBnwamcfg\fR(1M), or \fBifconfig\fR(1M)
+not necessary, as \fBipadm\fR(8), \fBnwamcfg\fR(8), or \fBifconfig\fR(8)
 will start \fBdhcpagent\fR automatically.
 .sp
 .LP
 For IPv6, the \fBdhcpagent\fR daemon is invoked automatically by
-\fBin.ndpd\fR(1M). It can also be controlled through \fBifconfig\fR(1M), if
+\fBin.ndpd\fR(8). It can also be controlled through \fBifconfig\fR(8), if
 necessary.
 .sp
 .LP
 When invoked, \fBdhcpagent\fR enters a passive state while it awaits
-instructions from \fBipadm\fR(1M), \fBnwamcfg\fR(1M), \fBifconfig\fR(1M), or
-\fBin.ndpd\fR(1M). When \fBdhcpagent\fR receives a command to configure an
+instructions from \fBipadm\fR(8), \fBnwamcfg\fR(8), \fBifconfig\fR(8), or
+\fBin.ndpd\fR(8). When \fBdhcpagent\fR receives a command to configure an
 interface, \fBdhcpagent\fR brings up the interface (if necessary) and starts
 DHCP. Once DHCP is complete, \fBdhcpagent\fR can be queried for the values of
 the various network parameters. In addition, if DHCP was used to obtain a lease
@@ -72,7 +72,7 @@ from DHCP, the interface is abandoned from DHCP control.
 For IPv6, \fBdhcpagent\fR automatically plumbs and unplumbs logical interfaces
 as necessary for the IPv6 addresses supplied by the server. The IPv6 prefix
 length (netmask) is not set by the DHCPv6 protocol, but is instead set by
-\fBin.ndpd\fR(1M) using prefix information obtained by Router Advertisements.
+\fBin.ndpd\fR(8) using prefix information obtained by Router Advertisements.
 If any of the logical interfaces created by \fBdhcpagent\fR is unplumbed, or
 configured with a different IP address, it will be abandoned from DHCP control.
 If the link-local interface is unplumbed, then all addresses configured by DHCP
@@ -102,7 +102,7 @@ so requests may arrive while some or all of the interfaces are still
 unconfigured. To handle these cases, one interface may be designated as
 primary, which makes it the authoritative source for the values of \fBDHCP\fR
 parameters in the case where no specific interface is requested. See
-\fBdhcpinfo\fR(1) and \fBifconfig\fR(1M) for details.
+\fBdhcpinfo\fR(1) and \fBifconfig\fR(8) for details.
 .sp
 .LP
 For IPv4, the \fBdhcpagent\fR daemon can be configured to request a particular
@@ -284,7 +284,7 @@ might not be present.
 These events occur when an interface acquires new or updated configuration
 information from a DHCP server by means of the DHCPv4 \fBINFORM\fR or the
 DHCPv6 Information-Request message. These messages are sent using an
-\fBifconfig\fR(1M) \fBdhcp inform\fR command or when the DHCPv6 Router
+\fBifconfig\fR(8) \fBdhcp inform\fR command or when the DHCPv6 Router
 Advertisement \fBO\fR (letter 0) bit is set and the \fBM\fR bit is not set.
 Thus, these events occur when the DHCP client does not obtain an IP address
 lease from the server, and instead obtains only configuration parameters.
@@ -367,7 +367,7 @@ If the interface is being adopted, the following conditions apply:
 .sp
 \fBdhcpagent\fR uses the client id specified in
 \fB/chosen\fR:\fI<client_id>\fR, as published by the PROM or as specified on a
-\fBboot\fR(1M) command line. If this value is not present, the client id is
+\fBboot\fR(8) command line. If this value is not present, the client id is
 undefined. The DHCP server then determines what to use as a client id. It is an
 error condition if the interface is an Infiniband interface and the PROM value
 is not present.
@@ -702,14 +702,14 @@ configurations:
 .sp
 .ne 2
 .na
-1.  \fBipadm\fR(1M): include the \fB-1,--primary\fR flag when creating an
-address that uses DHCP so that \fBnodename\fR(4) is used as the
+1.  \fBipadm\fR(8): include the \fB-1,--primary\fR flag when creating an
+address that uses DHCP so that \fBnodename\fR(5) is used as the
 \fIhostname\fR.
 .ad
 .sp
 .ne 2
 .na
-2.  \fBipadm\fR(1M): include the \fB-h,--reqhost\fR \fIhostname\fR switch
+2.  \fBipadm\fR(8): include the \fB-h,--reqhost\fR \fIhostname\fR switch
 when executing the \fBcreate-addr -T dhcp\fR subcommand, or use the
 \fBset-addrprop -p reqhost=\fR\fIhostname\fR subcommand for any existing
 DHCP address.
@@ -717,14 +717,14 @@ DHCP address.
 .sp
 .ne 2
 .na
-3.  \fBnwamcfg\fR(1M): set a property,
+3.  \fBnwamcfg\fR(8): set a property,
 \fBip-primary=\fR\fIon\fR, for an ncu ip that uses DHCP so that
-\fBnodename\fR(4) is used as the \fIhostname\fR.
+\fBnodename\fR(5) is used as the \fIhostname\fR.
 .ad
 .sp
 .ne 2
 .na
-4.  \fBnwamcfg\fR(1M): set a property,
+4.  \fBnwamcfg\fR(8): set a property,
 \fBip-reqhost=\fR\fIhostname\fR, for an ncu ip that uses DHCP.
 .ad
 .sp
@@ -750,8 +750,8 @@ Default value of this option is \fIyes\fR.
 .sp .6
 .RS 4n
 Indicates the value that should be appended to a PQDN specified by the
-\fB-h,--reqhost\fR option of \fBipadm\fR(1M), by the ncu \fBip-reqhost\fR
-property of \fBnwamcfg\fR(1M), or by \fBnodename\fR(4) to construct an FQDN
+\fB-h,--reqhost\fR option of \fBipadm\fR(8), by the ncu \fBip-reqhost\fR
+property of \fBnwamcfg\fR(8), or by \fBnodename\fR(5) to construct an FQDN
 for \fBREQUEST_FQDN\fR processing.
 If the \fIhostname\fR value is already an FQDN, then the value of this
 option is not used.
@@ -765,10 +765,10 @@ option is not used.
 .sp .6
 .RS 4n
 Indicates that a domain name returned by the DHCP server or the \fBdomain\fR
-from \fBresolv.conf\fR(4) should be adopted if needed to construct an FQDN
-from a PQDN specified by the \fB-h,--reqhost\fR option of \fBipadm\fR(1M),
-by the ncu \fBip-reqhost\fR property of \fBnwamcfg\fR(1M), or by
-\fBnodename\fR(4).
+from \fBresolv.conf\fR(5) should be adopted if needed to construct an FQDN
+from a PQDN specified by the \fB-h,--reqhost\fR option of \fBipadm\fR(8),
+by the ncu \fBip-reqhost\fR property of \fBnwamcfg\fR(8), or by
+\fBnodename\fR(5).
 If the \fIhostname\fR value is already an FQDN, then the value of this
 option is not applicable.
 The eligible DHCP option for domain name is DHCPv4 \fBDNSdmain\fR.
@@ -817,7 +817,7 @@ Location of a DHCP event program.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -831,9 +831,9 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-\fBdhcpinfo\fR(1), \fBifconfig\fR(1M), \fBinit\fR(1M), \fBin.mpathd\fR(1M),
-\fBin.ndpd\fR(1M), \fBipadm\fR(1M), \fBnwamcfg\fR(1M), \fBsyslog\fR(3C),
-\fBnodename\fR(4), \fBresolv.conf\fR(4), \fBattributes\fR(5), \fBdhcp\fR(5)
+\fBdhcpinfo\fR(1), \fBifconfig\fR(8), \fBinit\fR(8), \fBin.mpathd\fR(8),
+\fBin.ndpd\fR(8), \fBipadm\fR(8), \fBnwamcfg\fR(8), \fBsyslog\fR(3C),
+\fBnodename\fR(5), \fBresolv.conf\fR(5), \fBattributes\fR(7), \fBdhcp\fR(7)
 .sp
 .LP
 \fI\fR
@@ -885,7 +885,7 @@ the daemon will not add or remove default routes in this case. Note that the
 actual DHCP packet exchange may be performed over any active IP interface in
 the IPMP group. It is strongly recommended that test addresses have infinite
 leases. Otherwise, an extended network outage detectable only by probes may
-cause test address leases to expire, causing \fBin.mpathd\fR(1M) to revert to
+cause test address leases to expire, causing \fBin.mpathd\fR(8) to revert to
 link-based failure detection and trigger an erroneous repair.
 .sp
 .LP
diff --git a/usr/src/man/man8/disks.8 b/usr/src/man/man8/disks.8
index 7043ea74a2..5f76143321 100644
--- a/usr/src/man/man8/disks.8
+++ b/usr/src/man/man8/disks.8
@@ -16,7 +16,7 @@ disks \- creates /dev entries for hard disks attached to the system
 .SH DESCRIPTION
 .sp
 .LP
-\fBdevfsadm\fR(1M) is now the preferred command for \fB/dev\fR and should be
+\fBdevfsadm\fR(8) is now the preferred command for \fB/dev\fR and should be
 used instead of \fBdisks\fR.
 .sp
 .LP
@@ -46,7 +46,7 @@ subsidiary controller attached to a peripheral bus such as \fBSCSI\fR or
 \fBIPI\fR (the \fBtarget\fR number for \fBSCSI,\fR and the \fBfacility\fR
 number for \fBIPI\fR controllers). \fBd\fR\fIN\fR is the number of the disk
 attached to the controller. \fBs\fR\fIN\fR is the \fIslice\fR number on the
-disk. \fBp\fR\fIN\fR is the FDISK partition number used by \fBfdisk\fR(1M).
+disk. \fBp\fR\fIN\fR is the FDISK partition number used by \fBfdisk\fR(8).
 (x86 Only)
 .RE
 .RS +4
@@ -66,8 +66,8 @@ this newly-assigned controller number.
 .sp
 .LP
 \fBdisks\fR is run automatically each time a reconfiguration-boot is performed
-or when \fBadd_drv\fR(1M) is executed. When invoking \fBdisks\fR manually,
-first run \fBdrvconfig\fR(1M) to ensure \fB/devices\fR is consistent with the
+or when \fBadd_drv\fR(8) is executed. When invoking \fBdisks\fR manually,
+first run \fBdrvconfig\fR(8) to ensure \fB/devices\fR is consistent with the
 current device configuration.
 .SS "Notice to Driver Writers"
 .sp
@@ -111,7 +111,7 @@ consists of the string \fBp5\fR through \fBp36\fR followed by \fB,raw\fR.
 .LP
 SPARC drivers should only use the first eight slices: \fBa\fR through \fBh\fR,
 while x86 drivers can use \fBa\fR through \fBu\fR, with \fBq\fR through \fBu\fR
-corresponding to \fBfdisk\fR(1M) primary partitions. \fBq\fR represents the
+corresponding to \fBfdisk\fR(8) primary partitions. \fBq\fR represents the
 entire disk, while \fBr\fR, \fBs\fR, \fBt\fR, and \fBu\fR represent up to four
 additional primary partitions. For logical drives, \fBp5\fR to \fBp36\fR
 correspond to the 32 logical drives that are supported. The device nodes for
@@ -206,7 +206,7 @@ xkdiskattach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 .sp
 .LP
 Installing the \fBxkdisk\fR disk driver on a Sun Fire 4800, with the driver
-controlling a \fBSCSI\fR disk (target 3 attached to an \fBisp\fR(7D) \fBSCSI
+controlling a \fBSCSI\fR disk (target 3 attached to an \fBisp\fR(4D) \fBSCSI
 HBA)\fR and performing a reconfiguration-boot (causing disks to be run) creates
 the following special files in \fB/devices\fR.
 
@@ -304,8 +304,8 @@ Device special files (minor device nodes)
 .SH SEE ALSO
 .sp
 .LP
-\fBadd_drv\fR(1M), \fBdevfsadm\fR(1M), \fBfdisk\fR(1M), \fBattributes\fR(5),
-\fBisp\fR(7D), \fBdevfs\fR(7FS), \fBdkio\fR(7I), \fBattach\fR(9E),
+\fBadd_drv\fR(8), \fBdevfsadm\fR(8), \fBfdisk\fR(8), \fBattributes\fR(7),
+\fBisp\fR(4D), \fBdevfs\fR(4FS), \fBdkio\fR(4I), \fBattach\fR(9E),
 \fBddi_create_minor_node\fR(9F)
 .sp
 .LP
diff --git a/usr/src/man/man8/diskscan.8 b/usr/src/man/man8/diskscan.8
index 3d53831e4b..660e71072d 100644
--- a/usr/src/man/man8/diskscan.8
+++ b/usr/src/man/man8/diskscan.8
@@ -20,7 +20,7 @@ on a portion of a hard disk. The disk portion may be a raw partition or slice;
 it is identified using its raw device name. By default, the specified portion
 of the disk is read (non-destructive) and errors reported on standard error. In
 addition, a progress report is printed on standard out. The list of bad blocks
-should be saved in a file and later fed into \fBaddbadsec\fR(1M), which will
+should be saved in a file and later fed into \fBaddbadsec\fR(8), which will
 remap them.
 .SH OPTIONS
 .sp
@@ -72,12 +72,12 @@ The address of the disk drive (see \fBFILES\fR).
 .SH FILES
 .sp
 .LP
-The raw device should be \fB/dev/rdsk/c?[t?]d?[ps]?\fR. See \fBdisks\fR(1M) for
+The raw device should be \fB/dev/rdsk/c?[t?]d?[ps]?\fR. See \fBdisks\fR(8) for
 an explanation of \fBSCSI\fR and \fBIDE\fR device naming conventions.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -93,14 +93,14 @@ Architecture	x86
 .SH SEE ALSO
 .sp
 .LP
-\fBaddbadsec\fR(1M), \fBdisks\fR(1M), \fBfdisk\fR(1M), \fBfmthard\fR(1M),
-\fBformat\fR(1M), \fBattributes\fR(5)
+\fBaddbadsec\fR(8), \fBdisks\fR(8), \fBfdisk\fR(8), \fBfmthard\fR(8),
+\fBformat\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
-The \fBformat\fR(1M) utility is available to format, label, analyze, and repair
+The \fBformat\fR(8) utility is available to format, label, analyze, and repair
 \fBSCSI\fR disks. This utility is included with the \fBdiskscan\fR,
-\fBaddbadsec\fR(1M), \fBfdisk\fR(1M), and \fBfmthard\fR(1M) commands available
+\fBaddbadsec\fR(8), \fBfdisk\fR(8), and \fBfmthard\fR(8) commands available
 for x86. To format an \fBIDE\fR disk, use the \fB DOS\fR \fBformat\fR utility;
 however, to label, analyze, or repair \fBIDE\fR disks on x86 systems, use the
-Solaris \fBformat\fR(1M) utility.
+Solaris \fBformat\fR(8) utility.
diff --git a/usr/src/man/man8/dispadmin.8 b/usr/src/man/man8/dispadmin.8
index f7210938e9..421c0357ca 100644
--- a/usr/src/man/man8/dispadmin.8
+++ b/usr/src/man/man8/dispadmin.8
@@ -73,11 +73,11 @@ class.
 .sp .6
 .RS 4n
 Gets the parameters for the specified class and writes them to the standard
-output. Parameters for the real-time class are described in \fBrt_dptbl\fR(4).
+output. Parameters for the real-time class are described in \fBrt_dptbl\fR(5).
 Parameters for the time-sharing and inter-active classes are described in
-\fBts_dptbl\fR(4). Parameters for the fair-share class are described in
-\fBFSS\fR(7). Parameters for the fixed-priority class are described in
-\fBfx_dptbl\fR(4).
+\fBts_dptbl\fR(5). Parameters for the fair-share class are described in
+\fBFSS\fR(4). Parameters for the fixed-priority class are described in
+\fBfx_dptbl\fR(5).
 .sp
 The \fB-g\fR and \fB-s\fR options are mutually exclusive: you may not retrieve
 the table at the same time you are overwriting it.
@@ -214,9 +214,9 @@ Possible location for argument to \fB-s\fR option.
 .RE
 
 .SH SEE ALSO
-\fBpriocntl\fR(1), \fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBpriocntl\fR(2),
-\fBfx_dptbl\fR(4), \fBrt_dptbl\fR(4), \fBts_dptbl\fR(4), \fBattributes\fR(5),
-\fBsmf\fR(5), \fBFSS\fR(7)
+\fBpriocntl\fR(1), \fBsvcs\fR(1), \fBsvcadm\fR(8), \fBpriocntl\fR(2),
+\fBfx_dptbl\fR(5), \fBrt_dptbl\fR(5), \fBts_dptbl\fR(5), \fBattributes\fR(7),
+\fBsmf\fR(7), \fBFSS\fR(4)
 .sp
 .LP
 \fI\fR \fI\fR
@@ -226,7 +226,7 @@ overwrite the current scheduler parameters due to lack of required permissions
 or a problem with the specified input file.
 .SH NOTES
 The default scheduling class setting facility is managed by the service
-management facility, \fBsmf\fR(5), under the service identifier:
+management facility, \fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -237,6 +237,6 @@ svc:/system/scheduler:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Note that
+requesting restart, can be performed using \fBsvcadm\fR(8). Note that
 disabling the service while it is running will not change anything. The
 service's status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/dladm.8 b/usr/src/man/man8/dladm.8
index eace0e94a4..fdfe34f2c7 100644
--- a/usr/src/man/man8/dladm.8
+++ b/usr/src/man/man8/dladm.8
@@ -1788,7 +1788,7 @@ Links assigned to a bridge must all have the same MTU. This is checked when the
 link is assigned. The link is added to the bridge in a deactivated form if it
 is not the first link on the bridge and it has a differing MTU.
 .sp
-Note that systems using bridging should not set the \fBeeprom\fR(1M)
+Note that systems using bridging should not set the \fBeeprom\fR(8)
 \fBlocal-mac-address?\fR variable to false.
 .sp
 The options are the same as for the \fBcreate-bridge\fR subcommand.
@@ -4050,12 +4050,12 @@ Show all configured etherstubs by default, or the specified etherstub if
 .sp .6
 .RS 4n
 Create an IP tunnel link named \fIiptun-link\fR. Such links can additionally be
-protected with IPsec using \fBipsecconf\fR(1M).
+protected with IPsec using \fBipsecconf\fR(8).
 .sp
 An IP tunnel is conceptually comprised of two parts: a virtual link between two
 or more IP nodes, and an IP interface above this link that allows the system to
 transmit and receive IP packets encapsulated by the underlying link. This
-subcommand creates a virtual link. The \fBifconfig\fR(1M) command is used to
+subcommand creates a virtual link. The \fBifconfig\fR(8) command is used to
 configure IP interfaces above the link.
 .sp
 .ne 2
@@ -4325,7 +4325,7 @@ associated with the tunnel link, enter:
 .in -2
 .sp
 
-See \fBipsecconf\fR(1M) for more details on how to configure IPsec policy.
+See \fBipsecconf\fR(8) for more details on how to configure IPsec policy.
 .RE
 
 .sp
@@ -4335,9 +4335,9 @@ See \fBipsecconf\fR(1M) for more details on how to configure IPsec policy.
 .ad
 .sp .6
 .RS 4n
-The IP tunnel link was implicitly created with \fBifconfig\fR(1M), and will be
+The IP tunnel link was implicitly created with \fBifconfig\fR(8), and will be
 automatically deleted when it is no longer referenced (that is, when the last
-IP interface over the tunnel is unplumbed). See \fBifconfig\fR(1M) for details
+IP interface over the tunnel is unplumbed). See \fBifconfig\fR(8) for details
 on implicit tunnel creation.
 .RE
 
@@ -4377,7 +4377,7 @@ The tunnel destination address.
 .sp .6
 .RS 4n
 Show the historical network usage from a stored extended accounting file.
-Configuration and enabling of network accounting through \fBacctadm\fR(1M) is
+Configuration and enabling of network accounting through \fBacctadm\fR(8) is
 required. The default output will be the summary of network usage for the
 entire period of time in which extended accounting was enabled.
 .sp
@@ -4499,7 +4499,7 @@ list. It is an error to specify more than one anchor or to have an anchor first
 in the list.
 .sp
 The \fBautopush\fR property is preferred over the more general
-\fBautopush\fR(1M) command.
+\fBautopush\fR(8) command.
 .RE
 
 .sp
@@ -4518,7 +4518,7 @@ ordering for any individual connection will be maintained.
 The processor or set of processors are not exclusively reserved for the link.
 Only the kernel threads and interrupts associated with processing of the link
 are bound to the processor or the set of processors specified. In case it is
-desired that processors be dedicated to the link, \fBpsrset\fR(1M) can be used
+desired that processors be dedicated to the link, \fBpsrset\fR(8) can be used
 to create a processor set and then specifying the processors from the processor
 set to bind the link to.
 .sp
@@ -4732,9 +4732,9 @@ The default value is 0.
 Specifies the zone to which the link belongs. This property can be modified
 only temporarily through \fBdladm\fR, and thus the \fB-t\fR option must be
 specified. To modify the zone assignment such that it persists across reboots,
-please use \fBzonecfg\fR(1M). Possible values consist of any exclusive-IP zone
+please use \fBzonecfg\fR(8). Possible values consist of any exclusive-IP zone
 currently running on the system. By default, the zone binding is as per
-\fBzonecfg\fR(1M).
+\fBzonecfg\fR(8).
 .RE
 
 .SS "Wifi Link Properties"
@@ -4789,7 +4789,7 @@ is no fixed speed.
 .RE
 
 .SS "Ethernet Link Properties"
-The following MII Properties, as documented in \fBieee802.3\fR(5), are
+The following MII Properties, as documented in \fBieee802.3\fR(7), are
 supported in read-only mode:
 .RS +4
 .TP
@@ -5424,7 +5424,7 @@ operation implicitly creates a virtual switch connecting \fBhello0\fR and
 .sp
 .LP
 Network usage statistics can be stored using the extended accounting facility,
-\fBacctadm\fR(1M).
+\fBacctadm\fR(8).
 
 .sp
 .in +2
@@ -5568,11 +5568,11 @@ sitetunnel0: flags=2200041 <UP,RUNNING,NONUD,IPv6> mtu 65515 index 3
 .sp
 .LP
 Note that the system automatically configures the IPv6 address on the 6to4 IP
-interface. See \fBifconfig\fR(1M) for a description of how IPv6 addresses are
+interface. See \fBifconfig\fR(8) for a description of how IPv6 addresses are
 configured on 6to4 tunnel links.
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 .LP
 \fB/usr/sbin\fR
@@ -5604,9 +5604,9 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-\fBacctadm\fR(1M), \fBautopush\fR(1M), \fBifconfig\fR(1M), \fBipsecconf\fR(1M),
-\fBndd\fR(1M), \fBpsrset\fR(1M), \fBwpad\fR(1M), \fBzonecfg\fR(1M),
-\fBattributes\fR(5), \fBieee802.3\fR(5), \fBdlpi\fR(7P)
+\fBacctadm\fR(8), \fBautopush\fR(8), \fBifconfig\fR(8), \fBipsecconf\fR(8),
+\fBndd\fR(8), \fBpsrset\fR(8), \fBwpad\fR(8), \fBzonecfg\fR(8),
+\fBattributes\fR(7), \fBieee802.3\fR(7), \fBdlpi\fR(4P)
 .SH NOTES
 The preferred method of referring to an aggregation in the aggregation
 subcommands is by its link name. Referring to an aggregation by its integer
diff --git a/usr/src/man/man8/dlmgmtd.8 b/usr/src/man/man8/dlmgmtd.8
index 35725ba8fd..2b0a2f5e98 100644
--- a/usr/src/man/man8/dlmgmtd.8
+++ b/usr/src/man/man8/dlmgmtd.8
@@ -35,7 +35,7 @@ svc:/network/datalink-management:default
 .LP
 The daemon should not be invoked directly. It does not constitute an
 administrative nor a programming interface. The administrative interface for
-managing datalinks is \fBdladm\fR(1M).
+managing datalinks is \fBdladm\fR(8).
 .SH OPTIONS
 .sp
 .LP
@@ -43,7 +43,7 @@ The daemon has no options.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -59,4 +59,4 @@ Interface Stability	Private
 .SH SEE ALSO
 .sp
 .LP
-\fBdladm\fR(1M), \fBattributes\fR(5)
+\fBdladm\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/dmesg.8 b/usr/src/man/man8/dmesg.8
index d7d24c177c..326d0677ac 100644
--- a/usr/src/man/man8/dmesg.8
+++ b/usr/src/man/man8/dmesg.8
@@ -18,7 +18,7 @@ dmesg \- collect system diagnostic messages to form error log
 .SH DESCRIPTION
 .sp
 .LP
-\fBdmesg\fR is made obsolete by \fBsyslogd\fR(1M) for maintenance of the system
+\fBdmesg\fR is made obsolete by \fBsyslogd\fR(8) for maintenance of the system
 error log.
 .sp
 .LP
@@ -27,4 +27,4 @@ and prints them on the standard output.
 .SH SEE ALSO
 .sp
 .LP
-\fBsyslogd\fR(1M), \fBattributes\fR(5)
+\fBsyslogd\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/dminfo.8 b/usr/src/man/man8/dminfo.8
index aac9d02f07..11e865a4f1 100644
--- a/usr/src/man/man8/dminfo.8
+++ b/usr/src/man/man8/dminfo.8
@@ -34,7 +34,7 @@ dminfo \- report information about a device entry in a device maps file
 
 .SH DESCRIPTION
 .LP
-\fBdminfo\fR reports and updates information about the \fBdevice_maps\fR(4)
+\fBdminfo\fR reports and updates information about the \fBdevice_maps\fR(5)
 file.
 .SH OPTIONS
 .LP
@@ -55,7 +55,7 @@ entries that match the requested case(s) are printed.
 \fB\fB-d\fR \fIdev\(mipath\fR\fR
 .ad
 .RS 18n
-Search by \fIdev\(mipath\fR. Search \fBdevice_maps\fR(4) for a device special
+Search by \fIdev\(mipath\fR. Search \fBdevice_maps\fR(5) for a device special
 pathname in the \fIdevice_list\fR field matching the \fIdev\(mipath\fR
 argument. This option cannot be used with \fB-n\fR, \fB-t\fR or \fB-u\fR.
 .RE
@@ -76,7 +76,7 @@ Use a device_maps file with \fIpathname\fR instead of
 \fB\fB-n\fR \fIdev\(miname\fR\fR
 .ad
 .RS 18n
-Search by \fIdev\(miname\fR. Search \fBdevice_maps\fR(4) for a
+Search by \fIdev\(miname\fR. Search \fBdevice_maps\fR(5) for a
 \fIdevice_name\fR field matching \fIdev\(miname\fR. This option cannot be used
 with \fB-d\fR, \fB-t\fR or \fB-u\fR.
 .RE
@@ -87,7 +87,7 @@ with \fB-d\fR, \fB-t\fR or \fB-u\fR.
 \fB\fB-t\fR \fIdev\(mitype\fR\fR
 .ad
 .RS 18n
-Search by \fIdev\(mitype\fR. Search \fBdevice_maps\fR(4) for a
+Search by \fIdev\(mitype\fR. Search \fBdevice_maps\fR(5) for a
 \fIdevice_type\fR field matching the given \fIdev\(mitype\fR. This option
 cannot be used with \fB-d\fR, \fB-n\fR or \fB-u\fR.
 .RE
@@ -98,9 +98,9 @@ cannot be used with \fB-d\fR, \fB-n\fR or \fB-u\fR.
 \fB\fB-u\fR \fIdm\(mientry\fR\fR
 .ad
 .RS 18n
-Update the \fBdevice_maps\fR(4) file. This option is provided to add entries to
-the \fBdevice_maps\fR(4) file. The \fIdm\(mientry\fR must be a complete
-\fBdevice_maps\fR(4) file entry. The \fIdm\(mientry\fR has fields, as in the
+Update the \fBdevice_maps\fR(5) file. This option is provided to add entries to
+the \fBdevice_maps\fR(5) file. The \fIdm\(mientry\fR must be a complete
+\fBdevice_maps\fR(5) file entry. The \fIdm\(mientry\fR has fields, as in the
 \fBdevice_maps\fR file. It uses the colon (\fB:\fR) as a field separator, and
 white space as the \fIdevice_list\fR subfield separators. The \fIdm\(mientry\fR
 is not made if any fields are missing, or if the \fIdm\(mientry\fR would be a
@@ -149,4 +149,4 @@ Incorrect syntax.
 \fB/etc/security/device_maps\fR
 .SH SEE ALSO
 .LP
-\fBdevice_maps\fR(4), \fBattributes\fR(5)
+\fBdevice_maps\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/domainname.8 b/usr/src/man/man8/domainname.8
index 2a76913c57..3221b3fd76 100644
--- a/usr/src/man/man8/domainname.8
+++ b/usr/src/man/man8/domainname.8
@@ -24,7 +24,7 @@ components of Solaris to resolve names for entries such as are found in
 as \fBNIS\fR use \fBdomainname\fR to resolve names.
 .sp
 .LP
-With appropriate privileges (root or an equivalent role [see \fBrbac\fR(5)]),
+With appropriate privileges (root or an equivalent role [see \fBrbac\fR(7)]),
 you can set the name of the domain by specifying the name as an argument to the
 \fBdomainname\fR command.
 .sp
@@ -37,7 +37,7 @@ service. If the new domain name is not saved in the \fB/etc/defaultdomain\fR
 file, the machine reverts to the old domain after it reboots.
 .sp
 .LP
-The \fBsendmail\fR(1M) daemon, as shipped with Solaris, and the \fBsendmail\fR
+The \fBsendmail\fR(8) daemon, as shipped with Solaris, and the \fBsendmail\fR
 implementation provided by \fBsendmail.org\fR (formerly referred to as
 "Berkeley 8.x sendmail") both attempt to determine a local host's fully
 qualified host name at startup and both pursue follow-up actions if the initial
@@ -47,7 +47,7 @@ differ.
 .LP
 Both implementations use a standard Solaris or Unix system call to determine
 its fully qualified host name at startup, following the name service priorities
-specified in \fBnsswitch.conf\fR(4). To this point, the Solaris and
+specified in \fBnsswitch.conf\fR(5). To this point, the Solaris and
 \fBsendmail.org\fR versions behave identically.
 .sp
 .LP
@@ -65,7 +65,7 @@ if needed.
 .sp
 .LP
 If the Solaris \fBsendmail\fR cannot determine the fully qualified host name,
-use \fBcheck-hostname\fR(1M) as a troubleshooting aid. This script can offer
+use \fBcheck-hostname\fR(8) as a troubleshooting aid. This script can offer
 guidance as to appropriate corrective action.
 .SH FILES
 .ne 2
@@ -88,15 +88,15 @@ guidance as to appropriate corrective action.
 .SH SEE ALSO
 .LP
 \fBsvcs\fR(1),
-\fBcheck-hostname\fR(1M), \fBhostconfig\fR(1M), \fBnamed\fR(1M),
-\fBsendmail\fR(1M), \fBsvcadm\fR(1M), \fBypinit\fR(1M),
-\fBaliases\fR(4), \fBdefaultdomain\fR(4),
-\fBhosts\fR(4), \fBnsswitch.conf\fR(4), \fBpasswd\fR(4), \fBattributes\fR(5),
-\fBrbac\fR(5), \fBsmf\fR(5)
+\fBcheck-hostname\fR(8), \fBhostconfig\fR(8), \fBnamed\fR(8),
+\fBsendmail\fR(8), \fBsvcadm\fR(8), \fBypinit\fR(8),
+\fBaliases\fR(5), \fBdefaultdomain\fR(5),
+\fBhosts\fR(5), \fBnsswitch.conf\fR(5), \fBpasswd\fR(5), \fBattributes\fR(7),
+\fBrbac\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .LP
 The \fBdomainname\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -108,5 +108,5 @@ svc:/system/identity:domain
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/drd.8 b/usr/src/man/man8/drd.8
index 0fe1793b78..3c0e1d2350 100644
--- a/usr/src/man/man8/drd.8
+++ b/usr/src/man/man8/drd.8
@@ -26,7 +26,7 @@ has no configuration options.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -42,8 +42,8 @@ Interface Stability	Unstable
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBsyslog\fR(3C), \fBsyslog.conf\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBsyslog\fR(3C), \fBsyslog.conf\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH ERRORS
 .sp
 .LP
@@ -57,7 +57,7 @@ to the \fB/var/adm/messages\fR log.
 .sp
 .LP
 The \fBdrd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -68,5 +68,5 @@ svc:/platform/sun4v/drd:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/drvconfig.8 b/usr/src/man/man8/drvconfig.8
index 5b7dbfa810..efffed5bc4 100644
--- a/usr/src/man/man8/drvconfig.8
+++ b/usr/src/man/man8/drvconfig.8
@@ -17,13 +17,13 @@ drvconfig \- apply permission and ownership changes to devices
 .SH DESCRIPTION
 .sp
 .LP
-\fBdevfsadm\fR(1M) is now the preferred command and should be used instead of
+\fBdevfsadm\fR(8) is now the preferred command and should be used instead of
 \fBdrvconfig\fR.
 .sp
 .LP
 The default operation of \fBdrvconfig\fR is to apply permission and ownership
 changes to devices. Normally, this command is run automatically after a new
-driver has been installed (with \fBadd_drv\fR(1M)) and the system has been
+driver has been installed (with \fBadd_drv\fR(8)) and the system has been
 rebooted.
 .SH OPTIONS
 .sp
@@ -48,7 +48,7 @@ by. This option, if used, must be used with the \fB-m\fR \fImajor_num\fR, the
 .RS 16n
 Add a new major number to name binding into the kernel's internal
 \fBname_to_major\fR tables. This option is not normally used directly, but is
-used by other utilities such as \fBadd_drv\fR(1M). Use of the \fB-b\fR option
+used by other utilities such as \fBadd_drv\fR(8). Use of the \fB-b\fR option
 requires that \fB-i\fR and \fB-m\fR be used also. No \fB/devices\fR entries are
 created.
 .RE
@@ -71,7 +71,7 @@ only effective when used with the \fB-b\fR option.
 .ad
 .RS 16n
 Only configure the devices for the named driver. The following options are used
-by the implementation of \fBadd_drv\fR(1M) and \fBrem_drv\fR(1M), and may not
+by the implementation of \fBadd_drv\fR(8) and \fBrem_drv\fR(8), and may not
 be supported in future versions of Solaris:
 .RE
 
@@ -163,6 +163,6 @@ Driver class binding file
 .SH SEE ALSO
 .sp
 .LP
-\fBsh\fR(1), \fBadd_drv\fR(1M), \fBmodinfo\fR(1M), \fBmodload\fR(1M),
-\fBmodunload\fR(1M), \fBrem_drv\fR(1M), \fBupdate_drv\fR(1M),
-\fBpath_to_inst\fR(4), \fBattributes\fR(5), \fBdevfs\fR(7FS)
+\fBsh\fR(1), \fBadd_drv\fR(8), \fBmodinfo\fR(8), \fBmodload\fR(8),
+\fBmodunload\fR(8), \fBrem_drv\fR(8), \fBupdate_drv\fR(8),
+\fBpath_to_inst\fR(5), \fBattributes\fR(7), \fBdevfs\fR(4FS)
diff --git a/usr/src/man/man8/dtrace.8 b/usr/src/man/man8/dtrace.8
index cc25157bf7..f87256c4c7 100644
--- a/usr/src/man/man8/dtrace.8
+++ b/usr/src/man/man8/dtrace.8
@@ -134,8 +134,8 @@ information about anonymous tracing.
 .ad
 .sp .6
 .RS 4n
-Generate \fBdriver.conf\fR(4) directives for anonymous tracing. This option
-constructs a set of \fBdtrace\fR(7D) configuration file directives to enable
+Generate \fBdriver.conf\fR(5) directives for anonymous tracing. This option
+constructs a set of \fBdtrace\fR(4D) configuration file directives to enable
 the specified probes for anonymous tracing and then exits. By default,
 \fBdtrace\fR attempts to store the directives to the file
 \fB/kernel/drv/dtrace.conf\fR. You can modify this behavior if you use the
@@ -726,7 +726,7 @@ Invalid command line options or arguments were specified.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -745,7 +745,7 @@ The command-line syntax is Committed. The human-readable output is Uncommitted.
 .SH SEE ALSO
 .LP
 \fBcpp\fR(1), \fBisainfo\fR(1), \fBssh\fR(1), \fBlibdtrace\fR(3LIB),
-\fBdriver.conf\fR(4), \fBattributes\fR(5), \fBdtrace\fR(7D)
+\fBdriver.conf\fR(5), \fBattributes\fR(7), \fBdtrace\fR(4D)
 .sp
 .LP
 \fIDynamic Tracing Guide\fR:
diff --git a/usr/src/man/man8/dumpadm.8 b/usr/src/man/man8/dumpadm.8
index e0b582a746..856f2750fd 100644
--- a/usr/src/man/man8/dumpadm.8
+++ b/usr/src/man/man8/dumpadm.8
@@ -35,7 +35,7 @@ its associated device drivers and loadable modules, or by faulty hardware.
 Whatever the cause, the crash dump itself provides invaluable information to
 your support engineer to aid in diagnosing the problem. As such, it is vital
 that the crash dump be retrieved and given to your support provider. Following
-an operating system crash, the \fBsavecore\fR(1M) utility is executed
+an operating system crash, the \fBsavecore\fR(8) utility is executed
 automatically during boot to retrieve the crash dump from the dump device, and
 write it to the file system. The directory in which the crash
 dump is saved on reboot can also be configured using \fBdumpadm\fR.
@@ -43,7 +43,7 @@ dump is saved on reboot can also be configured using \fBdumpadm\fR.
 .LP
 When the operating system takes a crash dump the default behavior is to
 compress the crash dump. This behavior is controlled by the \fB-z\fR option.
-When compression is turned on, the \fBsavecore\fR(1M) utility writes one file
+When compression is turned on, the \fBsavecore\fR(8) utility writes one file
 to the file system named \fIvmdump.X\fR. If compression is disabled, it instead
 writes two files named \fIunix.X\fR and \fIvmcore.X\fR. In the uncompressed
 case, both data files form the \fIsaved crash dump\fR. In both cases X is an
@@ -54,7 +54,7 @@ For systems with a UFS root file system, the default dump device is  configured
 to be an appropriate swap partition. Swap partitions are disk partitions
 reserved as virtual memory backing store for the operating system. Thus, no
 permanent information resides in swap to be overwritten by the dump. See
-\fBswap\fR(1M). For systems with a ZFS root file system, dedicated ZFS volumes
+\fBswap\fR(8). For systems with a ZFS root file system, dedicated ZFS volumes
 are used for swap and dump areas. For further information about setting up a
 dump area with ZFS,  see the \fIZFS Administration Guide\fR. To view the
 current dump  configuration, use the \fBdumpadm\fR command with no arguments:
@@ -165,7 +165,7 @@ the system is running a ZFS root file system.
 .RS 4n
 If the special token \fBswap\fR is specified as the dump device, \fBdumpadm\fR
 examines the  active swap entries and selects the most appropriate entry to
-configure as the dump device. See \fBswap\fR(1M). Refer to the \fBNOTES\fR
+configure as the dump device. See \fBswap\fR(8). Refer to the \fBNOTES\fR
 below for details of the algorithm  used to select an appropriate swap entry.
 When the system is first installed with a UFS root file system, \fBdumpadm\fR
 uses the value for \fBswap\fR to determine the initial dump device setting. A
@@ -415,19 +415,19 @@ that command.
 .sp .6
 .RS 4n
 Contains minimum amount of free space for \fIsavecore-directory\fR. See
-\fBsavecore\fR(1M).
+\fBsavecore\fR(8).
 .RE
 
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBuname\fR(1), \fBsavecore\fR(1M), \fBsvcadm\fR(1M),
-\fBswap\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBuname\fR(1), \fBsavecore\fR(8), \fBsvcadm\fR(8),
+\fBswap\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The system crash dump service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -439,7 +439,7 @@ svc:/system/dumpadm:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .SS "Dump Device Selection"
 .sp
diff --git a/usr/src/man/man8/editmap.8 b/usr/src/man/man8/editmap.8
index 81c3fd2ce4..4ea1256d72 100644
--- a/usr/src/man/man8/editmap.8
+++ b/usr/src/man/man8/editmap.8
@@ -37,7 +37,7 @@ editmap \- query and edit single records in database maps for sendmail
 .SH DESCRIPTION
 .LP
 The \fBeditmap\fR command queries or edits one record in a database maps used
-by the keyed map lookups in \fBsendmail\fR(1M). Arguments are passed on the
+by the keyed map lookups in \fBsendmail\fR(8). Arguments are passed on the
 command line and output (for queries) is directed to standard output.
 .sp
 .LP
@@ -206,4 +206,4 @@ Each record is of the form:
 
 .SH SEE ALSO
 .LP
-\fBmakemap\fR(1M), \fBsendmail\fR(1M), \fBattributes\fR(5)
+\fBmakemap\fR(8), \fBsendmail\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/edquota.8 b/usr/src/man/man8/edquota.8
index 9f63b2be4c..b158b20717 100644
--- a/usr/src/man/man8/edquota.8
+++ b/usr/src/man/man8/edquota.8
@@ -35,7 +35,7 @@ specifies otherwise.
 .LP
 Only the super-user may edit quotas.  In order for quotas to be established on
 a file system, the root directory of the file system must contain a file, owned
-by root, called \fBquotas\fR. (See \fBquotaon\fR(1M).)
+by root, called \fBquotas\fR. (See \fBquotaon\fR(8).)
 .sp
 .LP
 \fIproto_user\fR and \fIusername\fR can be numeric, corresponding to the
@@ -100,7 +100,7 @@ value shown is zero (the default).
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBedquota\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBedquota\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH FILES
 .sp
@@ -124,8 +124,8 @@ table of mounted file systems
 .SH SEE ALSO
 .sp
 .LP
-\fBvi\fR(1), \fBquota\fR(1M), \fBquotacheck\fR(1M), \fBquotaon\fR(1M),
-\fBrepquota\fR(1M), \fBattributes\fR(5), \fBlargefile\fR(5), \fBquotactl\fR(7I)
+\fBvi\fR(1), \fBquota\fR(8), \fBquotacheck\fR(8), \fBquotaon\fR(8),
+\fBrepquota\fR(8), \fBattributes\fR(7), \fBlargefile\fR(7), \fBquotactl\fR(4I)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/eeprom.8 b/usr/src/man/man8/eeprom.8
index 02a27a0216..b850893e66 100644
--- a/usr/src/man/man8/eeprom.8
+++ b/usr/src/man/man8/eeprom.8
@@ -187,7 +187,7 @@ escape sequences; instead, echoes them to the output device. Defaults to
 .RS 4n
 Holds a string of arguments that are passed to the boot subsystem. For example,
 you can use \fBboot-args=' - install dhcp'\fR to request a customer jumpstart
-installation. See \fBboot\fR(1M), \fBkadb\fR(1M) and \fBkernel\fR(1M).
+installation. See \fBboot\fR(8), \fBkadb\fR(8) and \fBkernel\fR(8).
 .RE
 
 .sp
@@ -1295,8 +1295,8 @@ Platform-specific version of \fBeeprom\fR. Use \fBuname\fR \fB-i\fR to obtain
 
 .SH SEE ALSO
 \fBpasswd\fR(1), \fBsh\fR(1), \fBsvcs\fR(1), \fBtip\fR(1), \fBuname\fR(1),
-\fBboot\fR(1M), \fBkadb\fR(1M), \fBkernel\fR(1M), \fBinit\fR(1M),
-\fBsvcadm\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBboot\fR(8), \fBkadb\fR(8), \fBkernel\fR(8), \fBinit\fR(8),
+\fBsvcadm\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fIOpenBoot 3.x Command Reference Manual\fR
diff --git a/usr/src/man/man8/efdaemon.8 b/usr/src/man/man8/efdaemon.8
index 654b234256..9ffb877192 100644
--- a/usr/src/man/man8/efdaemon.8
+++ b/usr/src/man/man8/efdaemon.8
@@ -82,13 +82,13 @@ Embedded \fBFCode\fR interpreter
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBprtconf\fR(1M), \fBsvcadm\fR(1M), \fBsyslog\fR(3C),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBprtconf\fR(8), \fBsvcadm\fR(8), \fBsyslog\fR(3C),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBefdaemon\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -100,5 +100,5 @@ svc:/platform/sun4u/efdaemon:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/embedded_su.8 b/usr/src/man/man8/embedded_su.8
index 5b0631ca95..2839d07d2c 100644
--- a/usr/src/man/man8/embedded_su.8
+++ b/usr/src/man/man8/embedded_su.8
@@ -18,11 +18,11 @@ commands as the super user or another user
 .LP
 The \fBembedded_su\fR command allows an application to prompt the user for
 security credentials and then use those credentials to execute a program as
-another user or role (see \fBrbac\fR(5) for information on role-based access
+another user or role (see \fBrbac\fR(7) for information on role-based access
 control). The default \fIusername\fR is \fBroot\fR (super user).
 .sp
 .LP
-\fBembedded_su\fR is identical to \fBsu\fR(1M), except that the user
+\fBembedded_su\fR is identical to \fBsu\fR(8), except that the user
 interaction is packaged in a form suitable for another program to interpret and
 display. Typically, \fBembedded_su\fR would be used to allow a graphical
 program to prompt for the super user password and execute a command as the
@@ -144,12 +144,12 @@ required.
 .LP
 \fBembedded_su\fR uses \fBpam\fR(3PAM) for authentication, account management,
 and session management. Its primary function is to export the \fBPAM\fR
-conversation mechanism to an unprivileged program. Like \fBsu\fR(1M), the
+conversation mechanism to an unprivileged program. Like \fBsu\fR(8), the
 \fBPAM\fR configuration policy can be used to control \fBembedded_su\fR. The
 \fBPAM\fR service name used is "embedded_su".
 .sp
 .LP
-\fBembedded_su\fR is almost exactly equivalent to \fBsu\fR(1M) for security
+\fBembedded_su\fR is almost exactly equivalent to \fBsu\fR(8) for security
 purposes. The only exception is that it is slightly easier to use
 \fBembedded_su\fR in writing a malicious program that might trick a user into
 providing secret data. For those sites needing maximum security, potentially at
@@ -306,7 +306,7 @@ embedded_su  auth  requisite  pam_deny.so.1
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -322,5 +322,5 @@ Interface Stability	Stable
 .SH SEE ALSO
 .sp
 .LP
-\fBsu\fR(1M), \fBpam\fR(3PAM), \fBpam_start\fR(3PAM), \fBattributes\fR(5),
-\fBrbac\fR(5)
+\fBsu\fR(8), \fBpam\fR(3PAM), \fBpam_start\fR(3PAM), \fBattributes\fR(7),
+\fBrbac\fR(7)
diff --git a/usr/src/man/man8/etrn.8 b/usr/src/man/man8/etrn.8
index e7bd9fe86d..9cb6507d1c 100644
--- a/usr/src/man/man8/etrn.8
+++ b/usr/src/man/man8/etrn.8
@@ -21,7 +21,7 @@ for mail nodes that have transient connections to their service providers.
 The \fBetrn\fR utility initiates an SMTP session with the host
 \fIserver-host\fR and sends one or more \fBETRN\fR commands as follows: If no
 \fIclient-hosts\fR are specified, \fBetrn\fR looks up every host name for which
-\fBsendmail\fR(1M) accepts email and, for each name, sends an \fBETRN\fR
+\fBsendmail\fR(8) accepts email and, for each name, sends an \fBETRN\fR
 command with that name as the argument. If any \fIclient-hosts\fR are
 specified, \fBetrn\fR uses each of these as arguments for successive \fBETRN\fR
 commands.
@@ -37,7 +37,7 @@ System boot special case. Make sure localhost is accepting SMTP connections
 before initiating the SMTP session with server-host.
 .sp
 This option is useful because it prevents race conditions between
-\fBsendmail\fR(1M) accepting connections and \fIserver-host\fR attempting to
+\fBsendmail\fR(8) accepting connections and \fIserver-host\fR attempting to
 deliver queued mail. This check is performed automatically if no
 \fIclient-hosts\fR are specified.
 .RE
@@ -139,7 +139,7 @@ ETRN_HOSTS="server1.example.com server2.example.com"
 .LP
 results in set of a \fBETRN\fR commands being sent to both
 \fBserver1.example.com\fR and \fBserver2.example.com\fR; each set contains one
-\fBETRN\fR command for each host name for which \fBsendmail\fR(1M) accepts
+\fBETRN\fR command for each host name for which \fBsendmail\fR(8) accepts
 email, with that host name as the argument.
 
 .SH FILES
@@ -161,7 +161,7 @@ Variables used by \fBsvc:/network/smtp:sendmail\fR
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -175,7 +175,7 @@ Interface Stability	Stable
 .TE
 
 .SH SEE ALSO
-\fBsendmail\fR(1M), \fBattributes\fR(5)
+\fBsendmail\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 RFC 1985
diff --git a/usr/src/man/man8/fcinfo.8 b/usr/src/man/man8/fcinfo.8
index f9fb57b5e7..86919e66d2 100644
--- a/usr/src/man/man8/fcinfo.8
+++ b/usr/src/man/man8/fcinfo.8
@@ -1216,7 +1216,7 @@ The following command forces the link connected with the port
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1232,7 +1232,7 @@ Interface Stability	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5)
+\fBattributes\fR(7)
 .SH ERROR MESSAGES
 .sp
 .LP
diff --git a/usr/src/man/man8/fdetach.8 b/usr/src/man/man8/fdetach.8
index d1090a05e5..eb0b38b344 100644
--- a/usr/src/man/man8/fdetach.8
+++ b/usr/src/man/man8/fdetach.8
@@ -43,7 +43,7 @@ previously attached.
 .SH SEE ALSO
 .sp
 .LP
-\fBfattach\fR(3C), \fBfdetach\fR(3C), \fBattributes\fR(5), \fBstreamio\fR(7I)
+\fBfattach\fR(3C), \fBfdetach\fR(3C), \fBattributes\fR(7), \fBstreamio\fR(4I)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/fdisk.8 b/usr/src/man/man8/fdisk.8
index 480149fe8e..9e60fc8ea3 100644
--- a/usr/src/man/man8/fdisk.8
+++ b/usr/src/man/man8/fdisk.8
@@ -95,8 +95,8 @@ The third mode of operation is not currently supported for extended partitions
 .LP
 When \fBfdisk\fR creates a partition, the space is allocated in the \fBfdisk\fR
 partition table, but the allocated disk space is not initialized.
-\fBnewfs\fR(1M) is required to create and write file system metadata to the new
-partition, and \fBformat\fR(1M) is required to write the VTOC or EFI/GPT
+\fBnewfs\fR(8) is required to create and write file system metadata to the new
+partition, and \fBformat\fR(8) is required to write the VTOC or EFI/GPT
 metadata.
 .SS "Menu Options"
 .LP
@@ -786,7 +786,7 @@ Default master boot program.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -801,8 +801,8 @@ Architecture	x86 and SPARC
 
 .SH SEE ALSO
 .LP
-\fBuname\fR(1), \fBfmthard\fR(1M), \fBformat\fR(1M), \fBnewfs\fR(1M),
-\fBprtvtoc\fR(1M), \fBattributes\fR(5)
+\fBuname\fR(1), \fBfmthard\fR(8), \fBformat\fR(8), \fBnewfs\fR(8),
+\fBprtvtoc\fR(8), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .LP
 Most messages will be self-explanatory. The following may appear immediately
diff --git a/usr/src/man/man8/ff.8 b/usr/src/man/man8/ff.8
index da6f23f08c..38c83f7d76 100644
--- a/usr/src/man/man8/ff.8
+++ b/usr/src/man/man8/ff.8
@@ -188,7 +188,7 @@ A special device.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBff\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBff\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH FILES
 .sp
@@ -222,8 +222,8 @@ list of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBfind\fR(1), \fBncheck\fR(1M), \fBstat\fR(2), \fBvfstab\fR(4),
-\fBattributes\fR(5), \fBlargefile\fR(5) Manual pages for the
+\fBfind\fR(1), \fBncheck\fR(8), \fBstat\fR(2), \fBvfstab\fR(5),
+\fBattributes\fR(7), \fBlargefile\fR(7) Manual pages for the
 \fIFSType\fR-specific modules of \fBff\fR.
 .SH NOTES
 .sp
diff --git a/usr/src/man/man8/ff_ufs.8 b/usr/src/man/man8/ff_ufs.8
index b83abd88e8..5b027da7cb 100644
--- a/usr/src/man/man8/ff_ufs.8
+++ b/usr/src/man/man8/ff_ufs.8
@@ -19,7 +19,7 @@ ff_ufs \- list file names and statistics for a ufs file system
 which resides on the special device \fIspecial\fR.
 .sp
 .LP
-See  \fBff\fR(1M) for information regarding the \fBff\fR command. See
+See  \fBff\fR(8) for information regarding the \fBff\fR command. See
 \fBOPTIONS\fR for information regarding the ufs-specific options.
 .SH OPTIONS
 .sp
@@ -49,7 +49,7 @@ Print the `\fI\&.\fR' and `\fI\&.\|.\fR' directory entries.
 .ad
 .RS 5n
 Print mode information.  This option must be specified in conjunction with the
-\fB\fR\fB-i\fR\fB \fR\fIi-node-list\fR option (see \fBff\fR(1M)).
+\fB\fR\fB-i\fR\fB \fR\fIi-node-list\fR option (see \fBff\fR(8)).
 .RE
 
 .sp
@@ -66,4 +66,4 @@ Print only special files and files with set-user-ID mode.
 .SH SEE ALSO
 .sp
 .LP
-\fBfind\fR(1), \fBff\fR(1M), \fBncheck\fR(1M), \fBattributes\fR(5)
+\fBfind\fR(1), \fBff\fR(8), \fBncheck\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/fiocompress.8 b/usr/src/man/man8/fiocompress.8
index 373bd9a781..42afd5e907 100644
--- a/usr/src/man/man8/fiocompress.8
+++ b/usr/src/man/man8/fiocompress.8
@@ -21,13 +21,13 @@ fiocompress \- file compression utility
 .sp
 .LP
 The \fBfiocompress\fR utility is a file compression tool that works together
-with the \fBdcfs\fR(7FS) file system to perform per-file compression. You can
+with the \fBdcfs\fR(4FS) file system to perform per-file compression. You can
 use \fBfiocompress\fR to decompress a compressed file or mark a compressed file
 as compressed, causing automatic decompression on read. The primary use of
 \fBfiocompress\fR is to compress files in the boot archive.
 .sp
 .LP
-Note that this utility is not a Committed interface. See \fBattributes\fR(5).
+Note that this utility is not a Committed interface. See \fBattributes\fR(7).
 .SH OPTIONS
 .sp
 .LP
@@ -97,7 +97,7 @@ The command exited due to an error.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -113,8 +113,8 @@ Interface Stability	Private
 .SH SEE ALSO
 .sp
 .LP
-\fBboot\fR(1M), \fBbootadm\fR(1M), \fBdcfs\fR(7FS), \fBufs\fR(7FS),
-\fBattributes\fR(5)
+\fBboot\fR(8), \fBbootadm\fR(8), \fBdcfs\fR(4FS), \fBufs\fR(4FS),
+\fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/flowadm.8 b/usr/src/man/man8/flowadm.8
index aac065554c..be6941d776 100644
--- a/usr/src/man/man8/flowadm.8
+++ b/usr/src/man/man8/flowadm.8
@@ -515,8 +515,8 @@ address in dotted-decimal notation or an IPv6 address in colon-separated
 notation. \fIprefix_len\fR is optional.
 .sp
 If \fIprefix_len\fR is specified, it describes the netmask for a subnet
-address, following the same notation convention of \fBifconfig\fR(1M) and
-\fBroute\fR(1M) addresses. If unspecified, the given IP address will be
+address, following the same notation convention of \fBifconfig\fR(8) and
+\fBroute\fR(8) addresses. If unspecified, the given IP address will be
 considered as a host address for which the default prefix length for a IPv4
 address is \fB/32\fR and for IPv6 is \fB/128\fR.
 .RE
@@ -778,7 +778,7 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -792,10 +792,10 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-\fBdladm\fR(1M), \fBflowstat\fR(1M), \fBifconfig\fR(1M),
-\fBroute\fR(1M), \fBattributes\fR(5)
+\fBdladm\fR(8), \fBflowstat\fR(8), \fBifconfig\fR(8),
+\fBroute\fR(8), \fBattributes\fR(7)
 
 .SH NOTES
 The display of statistics by the \fBshow-flow\fR subcommand, and the
 \fBshow-usage\fR subcommand, have been removed. This functionality can
-now be accessed using the \fBflowstat\fR(1M) utility.
+now be accessed using the \fBflowstat\fR(8) utility.
diff --git a/usr/src/man/man8/fmadm.8 b/usr/src/man/man8/fmadm.8
index 9eec8973b6..487445ad6e 100644
--- a/usr/src/man/man8/fmadm.8
+++ b/usr/src/man/man8/fmadm.8
@@ -16,7 +16,7 @@ fmadm \- fault management configuration tool
 .SH DESCRIPTION
 The \fBfmadm\fR utility can be used by administrators and service personnel to
 view and modify system configuration parameters maintained by the Fault
-Manager, \fBfmd\fR(1M). \fBfmd\fR receives telemetry information relating to
+Manager, \fBfmd\fR(8). \fBfmd\fR receives telemetry information relating to
 problems detected by the system software, diagnoses these problems, and
 initiates proactive self-healing activities such as disabling faulty
 components.
@@ -50,12 +50,12 @@ from a human administrator, it produces a message indicating its needs. It also
 refers you to a knowledge article on http://illumos.org/msg/. This web site
 might ask you to use \fBfmadm\fR or one of the other fault management utilities
 to gather more information or perform additional tasks. The documentation for
-\fBfmd\fR(1M), \fBfmdump\fR(1M), and \fBfmstat\fR(1M) describe more about tools
+\fBfmd\fR(8), \fBfmdump\fR(8), and \fBfmstat\fR(8) describe more about tools
 to observe fault management activities.
 .sp
 .LP
 The \fBfmadm\fR utility requires the user to possess the \fBPRIV_SYS_ADMIN\fR
-privilege. See \fBprivileges\fR(5). The \fBfmadm\fR \fBload\fR subcommand
+privilege. See \fBprivileges\fR(7). The \fBfmadm\fR \fBload\fR subcommand
 requires that the user possess all privileges.
 .SS "SUBCOMMANDS"
 \fBfmadm\fR accepts the following subcommands. Some of the subcommands accept
@@ -364,7 +364,7 @@ necessary as the Fault Manager manages its modules automatically.
 .ad
 .sp .6
 .RS 4n
-The \fBrotate\fR subcommand is a helper command for \fBlogadm\fR(1M), so that
+The \fBrotate\fR subcommand is a helper command for \fBlogadm\fR(8), so that
 \fBlogadm\fR can rotate live log files correctly. It is not intended to be
 invoked directly. Use one of the following commands to cause the appropriate
 logfile to be rotated, if the current one is not zero in size:
@@ -443,7 +443,7 @@ Invalid command-line options were specified.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -461,8 +461,8 @@ Interface Stability	See below.
 The command-line options are Committed. The human-readable output is
 not-an-interface.
 .SH SEE ALSO
-\fBfmd\fR(1M), \fBfmdump\fR(1M), \fBfmstat\fR(1M), \fBlogadm\fR(1M),
-\fBsyslogd\fR(1M), \fBattributes\fR(5), \fBprivileges\fR(5)
+\fBfmd\fR(8), \fBfmdump\fR(8), \fBfmstat\fR(8), \fBlogadm\fR(8),
+\fBsyslogd\fR(8), \fBattributes\fR(7), \fBprivileges\fR(7)
 .sp
 .LP
 http://illumos.org/msg/
diff --git a/usr/src/man/man8/fmd.8 b/usr/src/man/man8/fmd.8
index 8ddf09e66b..febc60319e 100644
--- a/usr/src/man/man8/fmd.8
+++ b/usr/src/man/man8/fmd.8
@@ -19,7 +19,7 @@ fmd \- fault manager daemon
 \fBfmd\fR receives telemetry information relating to problems detected by the
 system software, diagnoses these problems, and initiates proactive self-healing
 activities such as disabling faulty components. When appropriate, the fault
-manager also sends a message to the \fBsyslogd\fR(1M) service to notify an
+manager also sends a message to the \fBsyslogd\fR(8) service to notify an
 administrator that a problem has been detected. The message directs
 administrators to a knowledge article on http://illumos.org/msg/, which
 explains more about the problem impact and appropriate responses.
@@ -27,11 +27,11 @@ explains more about the problem impact and appropriate responses.
 .LP
 Each problem diagnosed by the fault manager is assigned a Universal Unique
 Identifier (\fBUUID\fR). The \fBUUID\fR uniquely identifies this particular
-problem across any set of systems. The \fBfmdump\fR(1M) utility can be used to
+problem across any set of systems. The \fBfmdump\fR(8) utility can be used to
 view the list of problems diagnosed by the fault manager, along with their
-\fBUUID\fRs and knowledge article message identifiers. The \fBfmadm\fR(1M)
+\fBUUID\fRs and knowledge article message identifiers. The \fBfmadm\fR(8)
 utility can be used to view the resources on the system believed to be faulty.
-The \fBfmstat\fR(1M) utility can be used to report statistics kept by the fault
+The \fBfmstat\fR(8) utility can be used to report statistics kept by the fault
 manager. The fault manager is started automatically when the operating system
 boots, so it is not necessary to use the \fBfmd\fR command directly.
 .SH OPTIONS
@@ -54,7 +54,7 @@ default fault manager configuration files.
 .ad
 .RS 16n
 Set the specified fault manager option to the specified value. Fault manager
-options are currently a Private interface; see \fBattributes\fR(5) for
+options are currently a Private interface; see \fBattributes\fR(7) for
 information about Private interfaces.
 .RE
 
@@ -137,7 +137,7 @@ Fault manager log directory
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -152,14 +152,14 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBfmadm\fR(1M), \fBfmdump\fR(1M), \fBfmstat\fR(1M),
-\fBsyslogd\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBfmadm\fR(8), \fBfmdump\fR(8), \fBfmstat\fR(8),
+\fBsyslogd\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 http://illumos.org/msg/
 .SH NOTES
 .LP
-The Fault Manager is managed by the service management facility, \fBsmf\fR(5),
+The Fault Manager is managed by the service management facility, \fBsmf\fR(7),
 under the service identifier:
 .sp
 .in +2
diff --git a/usr/src/man/man8/fmdump.8 b/usr/src/man/man8/fmdump.8
index a53bc3ee34..705bdc5764 100644
--- a/usr/src/man/man8/fmdump.8
+++ b/usr/src/man/man8/fmdump.8
@@ -15,7 +15,7 @@ fmdump \- fault management log viewer
 
 .SH DESCRIPTION
 The \fBfmdump\fR utility can be used to display the contents of any of the log
-files associated with the Fault Manager, \fBfmd\fR(1M). The Fault
+files associated with the Fault Manager, \fBfmd\fR(8). The Fault
 Manager runs in the background on each system. It receives telemetry
 information relating to problems detected by the system software, diagnoses
 these problems, and initiates proactive self-healing activities such as
@@ -92,7 +92,7 @@ article located on http://illumos.org/msg/
 .LP
 If a problem requires action by a human administrator or service technician or
 affects system behavior, the Fault Manager also issues a human-readable message
-to \fBsyslogd\fR(1M). This message provides a summary of the problem and a
+to \fBsyslogd\fR(8). This message provides a summary of the problem and a
 reference to the knowledge article on http://illumos.org/msg/.
 .sp
 .LP
@@ -185,7 +185,7 @@ Select fault log or error log events, depending on the \fB-e\fR option, that
 have properties with a matching name (and optionally a matching value). For
 string properties the value can be a regular expression match. Regular
 expression syntax is described in the EXTENDED REGULAR EXPRESSIONS section of
-the \fBregex\fR(5) manual page. Be careful when using the characters:
+the \fBregex\fR(7) manual page. Be careful when using the characters:
 .sp
 .in +2
 .nf
@@ -608,7 +608,7 @@ Fault management fault log
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -626,8 +626,8 @@ Interface Stability	See below.
 The command-line options are Evolving. The human-readable error log output is
 Private. The human-readable fault log output is Evolving.
 .SH SEE ALSO
-\fBsh\fR(1), \fBfmadm\fR(1M), \fBfmd\fR(1M), \fBfmstat\fR(1M),
-\fBsyslogd\fR(1M), \fBlibexacct\fR(3LIB), \fBattributes\fR(5), \fBregex\fR(5)
+\fBsh\fR(1), \fBfmadm\fR(8), \fBfmd\fR(8), \fBfmstat\fR(8),
+\fBsyslogd\fR(8), \fBlibexacct\fR(3LIB), \fBattributes\fR(7), \fBregex\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/fmstat.8 b/usr/src/man/man8/fmstat.8
index 26fd093755..1b4847907b 100644
--- a/usr/src/man/man8/fmstat.8
+++ b/usr/src/man/man8/fmstat.8
@@ -14,7 +14,7 @@ fmstat \- report fault management module statistics
 
 .SH DESCRIPTION
 The \fBfmstat\fR utility can be used by administrators and service personnel to
-report statistics associated with the Fault Manager, \fBfmd\fR(1M) and
+report statistics associated with the Fault Manager, \fBfmd\fR(8) and
 its associated set of modules. The Fault Manager runs in the background on each
 system. It receives telemetry information relating to problems detected
 by the system software, diagnoses these problems, and initiates proactive
@@ -23,7 +23,7 @@ self-healing activities such as disabling faulty components.
 .LP
 You can use \fBfmstat\fR to view statistics for diagnosis engines and agents
 that are currently participating in fault management. The documentation for
-\fBfmd\fR(1M), \fBfmadm\fR(1M), and \fBfmdump\fR(1M) describes more about tools
+\fBfmd\fR(8), \fBfmadm\fR(8), and \fBfmdump\fR(8) describes more about tools
 to observe fault management activities.
 .sp
 .LP
@@ -138,7 +138,7 @@ The amount of persistent buffer space currently allocated by this module.
 .sp
 .LP
 The \fBfmstat\fR utility requires the user to possess the \fBPRIV_SYS_ADMIN\fR
-privilege. See \fBprivileges\fR(5).
+privilege. See \fBprivileges\fR(7).
 .SH OPTIONS
 The following options are supported:
 .sp
@@ -177,7 +177,7 @@ Print a report on the statistics associated with the specified fault management
 module, instead of the default statistics report. Modules can publish an
 arbitrary set of statistics to help Sun service the fault management software
 itself. The module statistics constitute a Private interface. See
-\fBattributes\fR(5) for information on Sun's rules for Private interfaces.
+\fBattributes\fR(7) for information on Sun's rules for Private interfaces.
 Scripts should not be written that depend upon the values of fault management
 module statistics as they can change without notice.
 .RE
@@ -272,7 +272,7 @@ Successful completion.
 .ad
 .RS 5n
 A fatal error occurred. A fatal error could be the failure to communicate with
-\fBfmd\fR(1M). It could also be that insufficient privileges were available to
+\fBfmd\fR(8). It could also be that insufficient privileges were available to
 perform the requested operation.
 .RE
 
@@ -286,7 +286,7 @@ Invalid command-line options were specified.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -304,5 +304,5 @@ Interface Stability	See below.
 The command-line options are Evolving. The human-readable default report is
 Unstable. The human-readable module report is Private.
 .SH SEE ALSO
-\fBfmadm\fR(1M), \fBfmd\fR(1M), \fBfmdump\fR(1M), \fBattributes\fR(5),
-\fBprivileges\fR(5)
+\fBfmadm\fR(8), \fBfmd\fR(8), \fBfmdump\fR(8), \fBattributes\fR(7),
+\fBprivileges\fR(7)
diff --git a/usr/src/man/man8/fmthard.8 b/usr/src/man/man8/fmthard.8
index df0c3f15df..440f46eb46 100644
--- a/usr/src/man/man8/fmthard.8
+++ b/usr/src/man/man8/fmthard.8
@@ -29,10 +29,10 @@ hard disks and, on x86 systems, adds boot information to the Solaris
 \fBfdisk\fR partition. One or more of the options \fB-s\fR \fIdatafile\fR,
 \fB-d\fR \fIdata\fR, or \fB-n\fR \fIvolume_name\fR must be used to request
 modifications to the disk label. To print disk label contents, see
-\fBprtvtoc\fR(1M). The
+\fBprtvtoc\fR(8). The
 \fB/dev/rdsk/c\fR\fI?\fR[\fBt\fR\fI?\fR]\fBd\fR\fI?\fR\fBs2\fR file must be the
 character special file of the device where the new label is to be installed. On
-x86 systems, \fBfdisk\fR(1M) must be run on the drive before \fBfmthard\fR.
+x86 systems, \fBfdisk\fR(8) must be run on the drive before \fBfmthard\fR.
 .sp
 .LP
 If you are using an x86 system, note that the term ``partition'' in this page
@@ -176,11 +176,11 @@ and use it as the \fIdatafile\fR argument to the \fB-s\fR option.
 .SH SEE ALSO
 .sp
 .LP
-\fBuname\fR(1), \fBformat\fR(1M), \fBprtvtoc\fR(1M), \fBattributes\fR(5)
+\fBuname\fR(1), \fBformat\fR(8), \fBprtvtoc\fR(8), \fBattributes\fR(7)
 .SS "x86 Only"
 .sp
 .LP
-\fBfdisk\fR(1M), \fBinstallgrub\fR(1M)
+\fBfdisk\fR(8), \fBinstallgrub\fR(8)
 .SH NOTES
 .sp
 .LP
@@ -190,4 +190,4 @@ precaution, save the old \fBVTOC\fR.
 .sp
 .LP
 For disks under two terabytes, \fBfmthard\fR cannot write a \fBVTOC\fR on an
-unlabeled disk. Use \fBformat\fR(1M) for this purpose.
+unlabeled disk. Use \fBformat\fR(8) for this purpose.
diff --git a/usr/src/man/man8/format.8 b/usr/src/man/man8/format.8
index e12495de4a..8319e32774 100644
--- a/usr/src/man/man8/format.8
+++ b/usr/src/man/man8/format.8
@@ -251,7 +251,7 @@ current disk.)
 \fBfdisk\fR
 .ad
 .RS 13n
-Run the \fBfdisk\fR(1M) program to create a \fBfdisk\fR partition for Solaris
+Run the \fBfdisk\fR(8) program to create a \fBfdisk\fR partition for Solaris
 software (x86 based systems only).
 .RE
 
@@ -378,13 +378,13 @@ default data file
 .RE
 
 .SH SEE ALSO
-\fBfmthard\fR(1M), \fBprtvtoc\fR(1M), \fBrmformat\fR(1), \fBformat.dat\fR(4),
-\fBattributes\fR(5), \fBsd\fR(7D)
+\fBfmthard\fR(8), \fBprtvtoc\fR(8), \fBrmformat\fR(1), \fBformat.dat\fR(5),
+\fBattributes\fR(7), \fBsd\fR(4D)
 .sp
 .LP
 \fI\fR
 .SS "x86 Only"
-\fBfdisk\fR(1M)
+\fBfdisk\fR(8)
 .SH WARNINGS
 When the \fBformat\fR function is selected to format the Maxtor 207MB disk, the
 following message displays:
diff --git a/usr/src/man/man8/fruadm.8 b/usr/src/man/man8/fruadm.8
index 1b48c50c70..7454c48fb2 100644
--- a/usr/src/man/man8/fruadm.8
+++ b/usr/src/man/man8/fruadm.8
@@ -195,7 +195,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -211,4 +211,4 @@ Interface Stability	Unstable
 .SH SEE ALSO
 .sp
 .LP
-\fBprtfru\fR(1M), \fBattributes\fR(5)
+\fBprtfru\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/fsck.8 b/usr/src/man/man8/fsck.8
index dd6c014954..777f7361ed 100644
--- a/usr/src/man/man8/fsck.8
+++ b/usr/src/man/man8/fsck.8
@@ -57,7 +57,7 @@ will be used.
 .LP
 If a file system type supports parallel checking, for example, \fBufs,\fR some
 file systems eligible for checking may be checked in parallel. Consult the file
-system-specific man page (for example, \fBfsck_ufs\fR(1M)) for more
+system-specific man page (for example, \fBfsck_ufs\fR(8)) for more
 information.
 .SH OPTIONS
 .LP
@@ -153,7 +153,7 @@ by commas (with no intervening spaces).
 .RS 4n
 Use block \fIn\fR as the super block for the file system. Block 32 is always
 one of the alternate super blocks. Determine the location of other super blocks
-by running \fBnewfs\fR(1M) with the \fB-Nv\fR options specified.
+by running \fBnewfs\fR(8) with the \fB-Nv\fR options specified.
 .RE
 
 .sp
@@ -172,7 +172,7 @@ negative answer is given, no further operations are done on the file system. In
 preen mode, the direction of the conversion is listed and done if possible
 without user interaction. Conversion in preen mode is best used when all the
 file systems are being converted at once. The format of a file system can be
-determined from the first line of output from \fBfstyp\fR(1M). Note: the
+determined from the first line of output from \fBfstyp\fR(8). Note: the
 \fBc\fR option is seldom used and is included only for compatibility with
 pre-4.1 releases. There is no guarantee that this option will be included in
 future releases.
@@ -316,7 +316,7 @@ file system is mounted read-only and is OK
 .SH USAGE
 .LP
 The \fBfsck\fR command is \fBlarge file aware\fR for UFS file systems, per the
-\fBlargefile\fR(5) man page.
+\fBlargefile\fR(7) man page.
 .SH FILES
 .ne 2
 .na
@@ -350,7 +350,7 @@ list of default parameters for each file system
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -365,10 +365,10 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBclri\fR(1M), \fBfsck_ufs\fR(1M), \fBfsdb_ufs\fR(1M),
-\fBfsirand\fR(1M), \fBfstyp\fR(1M), \fBmkfs\fR(1M), \fBmkfs_ufs\fR(1M),
-\fBmountall\fR(1M), \fBnewfs\fR(1M), \fBreboot\fR(1M), \fBvfstab\fR(4),
-\fBattributes\fR(5), \fBlargefile\fR(5), \fBufs\fR(7FS)
+\fBclri\fR(8), \fBfsck_ufs\fR(8), \fBfsdb_ufs\fR(8),
+\fBfsirand\fR(8), \fBfstyp\fR(8), \fBmkfs\fR(8), \fBmkfs_ufs\fR(8),
+\fBmountall\fR(8), \fBnewfs\fR(8), \fBreboot\fR(8), \fBvfstab\fR(5),
+\fBattributes\fR(7), \fBlargefile\fR(7), \fBufs\fR(4FS)
 .SH WARNINGS
 .LP
 The operating system buffers file system data. Running \fBfsck\fR on a mounted
@@ -383,7 +383,7 @@ occur if running \fBfsck\fR on a file system modifies the file system.
 This command may not be supported for all \fIFSTypes\fR.
 .LP
 Starting with Solaris 9, \fBfsck\fR manages extended attribute data on the
-disk. (See \fBfsattr\fR(5) for a description of extended file attributes.) A
+disk. (See \fBfsattr\fR(7) for a description of extended file attributes.) A
 file system with extended attributes can be mounted on versions of Solaris that
 are not attribute-aware (versions prior to Solaris 9), but the attributes will
 not be accessible and \fBfsck\fR will strip them from the files and place them
diff --git a/usr/src/man/man8/fsck_pcfs.8 b/usr/src/man/man8/fsck_pcfs.8
index a5202d6d65..0f3d18c5e2 100644
--- a/usr/src/man/man8/fsck_pcfs.8
+++ b/usr/src/man/man8/fsck_pcfs.8
@@ -30,7 +30,7 @@ In the case of correcting serious inconsistencies, by default, \fBfsck\fR asks
 for confirmation before making a repair and waits for the operator to respond
 either \fByes\fR or \fBno\fR. If the operator does not have write permission on
 the file system, \fBfsck\fR defaults to a \fB-n\fR (no corrections) action. See
-\fBfsck\fR(1M).
+\fBfsck\fR(8).
 .sp
 .LP
 Repairing some file system inconsistencies may result in loss of data. The
@@ -177,7 +177,7 @@ on the disk contains the \fBpcfs\fR.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -193,8 +193,8 @@ Interface Stability	Stable
 .SH SEE ALSO
 .sp
 .LP
-\fBfsck\fR(1M), \fBfstyp\fR(1M), \fBfdisk\fR(1M), \fBmkfs\fR(1M),
-\fBmkfs_pcfs\fR(1M), \fBmountall\fR(1M), \fBattributes\fR(5), \fBpcfs\fR(7FS),
+\fBfsck\fR(8), \fBfstyp\fR(8), \fBfdisk\fR(8), \fBmkfs\fR(8),
+\fBmkfs_pcfs\fR(8), \fBmountall\fR(8), \fBattributes\fR(7), \fBpcfs\fR(4FS),
 .SH WARNINGS
 .sp
 .LP
diff --git a/usr/src/man/man8/fsck_udfs.8 b/usr/src/man/man8/fsck_udfs.8
index 461f1e390d..b0aee369d9 100644
--- a/usr/src/man/man8/fsck_udfs.8
+++ b/usr/src/man/man8/fsck_udfs.8
@@ -36,14 +36,14 @@ If no special device is specified, all \fBudfs\fR file systems specified in the
 \fBvfstab\fR file with a \fBfsckdev\fR entry are checked. If the \fB-p\fR
 (\fBpreen\fR) option is specified, \fBudfs\fR file systems with an
 \fBfsckpass\fR number greater than \fB1\fR are checked in parallel. See
-\fBfsck\fR(1M).
+\fBfsck\fR(8).
 .sp
 .LP
 In the case of correcting serious inconsistencies, by default, \fBfsck\fR asks
 for confirmation before making a repair and waits for the operator to respond
 with either \fByes\fR or \fBno\fR. If the operator does not have write
 permission on the file system, \fBfsck\fR defaults to the \fB-n\fR (no
-corrections) option. See \fBfsck\fR(1M).
+corrections) option. See \fBfsck\fR(8).
 .sp
 .LP
 Repairing some file system inconsistencies can result in loss of data. The
@@ -230,9 +230,9 @@ List of default parameters for each file system.
 
 .SH SEE ALSO
 .LP
-\fBfsck\fR(1M), \fBfsdb_udfs\fR(1M), \fBfstyp\fR(1M), \fBmkfs\fR(1M),
-\fBmkfs_udfs\fR(1M), \fBmountall\fR(1M), \fBreboot\fR(1M), \fBvfstab\fR(4),
-\fBattributes\fR(5)
+\fBfsck\fR(8), \fBfsdb_udfs\fR(8), \fBfstyp\fR(8), \fBmkfs\fR(8),
+\fBmkfs_udfs\fR(8), \fBmountall\fR(8), \fBreboot\fR(8), \fBvfstab\fR(5),
+\fBattributes\fR(7)
 .SH WARNINGS
 .LP
 The operating system buffers file system data. Running \fBfsck\fR on a mounted
diff --git a/usr/src/man/man8/fsck_ufs.8 b/usr/src/man/man8/fsck_ufs.8
index 618ac3ca6d..7f944034cb 100644
--- a/usr/src/man/man8/fsck_ufs.8
+++ b/usr/src/man/man8/fsck_ufs.8
@@ -38,14 +38,14 @@ file system is error-locked.
 If no \fIspecial\fR device is specified, all \fBufs\fR file systems specified
 in the \fBvfstab\fR with a \fBfsckdev\fR entry will be checked. If the \fB-p\fR
 (``preen'') option is specified, \fBufs\fR file systems with an \fBfsckpass\fR
-number greater than \fB1\fR are checked in parallel. See \fBfsck\fR(1M).
+number greater than \fB1\fR are checked in parallel. See \fBfsck\fR(8).
 .sp
 .LP
 In the case of correcting serious inconsistencies, by default, \fBfsck\fR asks
 for confirmation before making a repair and waits for the operator to respond
 either \fByes\fR or \fBno\fR. If the operator does not have write permission on
 the file system, \fBfsck\fR will default to a \fB-n\fR (no corrections) action.
-See \fBfsck\fR(1M).
+See \fBfsck\fR(8).
 .sp
 .LP
 Repairing some file system inconsistencies can result in loss of data. The
@@ -142,7 +142,7 @@ file (a file whose size is greater than or equal to 2 Gbyte). Invoking
 file system. A successful mount of the file system after invoking \fBfsck\fR
 indicates the absence of large files in the file system. An unsuccessful mount
 attempt indicates the presence of at least one large file. See
-\fBmount_ufs\fR(1M).
+\fBmount_ufs\fR(8).
 .SH OPTIONS
 .sp
 .LP
@@ -209,7 +209,7 @@ Assume a \fByes\fR response to all questions asked by \fBfsck\fR.
 
 .sp
 .LP
-See generic \fBfsck\fR(1M) for the details for specifying \fIspecial\fR.
+See generic \fBfsck\fR(8) for the details for specifying \fIspecial\fR.
 .sp
 .ne 2
 .na
@@ -226,7 +226,7 @@ combination of the following separated by commas (with no intervening spaces).
 .RS 7n
 Use block \fIn\fR as the super block for the file system. Block 32 is always
 one of the alternate super blocks. Determine the location of other super blocks
-by running \fBnewfs\fR(1M) with the \fB-Nv\fR options specified.
+by running \fBnewfs\fR(8) with the \fB-Nv\fR options specified.
 .RE
 
 .sp
@@ -274,10 +274,10 @@ list of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBclri\fR(1M), \fBfsck\fR(1M), \fBfsdb_ufs\fR(1M), \fBfsirand\fR(1M),
-\fBfstyp\fR(1M), \fBmkfs\fR(1M), \fBmkfs_ufs\fR(1M), \fBmount_ufs\fR(1M),
-\fBmountall\fR(1M), \fBnewfs\fR(1M), \fBreboot\fR(1M), \fBvfstab\fR(4),
-\fBattributes\fR(5), \fBlargefile\fR(5), \fBufs\fR(7FS)
+\fBclri\fR(8), \fBfsck\fR(8), \fBfsdb_ufs\fR(8), \fBfsirand\fR(8),
+\fBfstyp\fR(8), \fBmkfs\fR(8), \fBmkfs_ufs\fR(8), \fBmount_ufs\fR(8),
+\fBmountall\fR(8), \fBnewfs\fR(8), \fBreboot\fR(8), \fBvfstab\fR(5),
+\fBattributes\fR(7), \fBlargefile\fR(7), \fBufs\fR(4FS)
 .SH WARNINGS
 .sp
 .LP
diff --git a/usr/src/man/man8/fsdb.8 b/usr/src/man/man8/fsdb.8
index f1b59c0d71..debe46454f 100644
--- a/usr/src/man/man8/fsdb.8
+++ b/usr/src/man/man8/fsdb.8
@@ -59,7 +59,7 @@ Specify  \fIFSType-\fRspecific options.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBfsdb\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBfsdb\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH FILES
 .sp
@@ -93,7 +93,7 @@ list of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBvfstab\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5) Manual pages for the
+\fBvfstab\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7) Manual pages for the
 \fIFSType\fR-specific modules of \fBfsdb\fR.
 .SH NOTES
 .sp
diff --git a/usr/src/man/man8/fsdb_udfs.8 b/usr/src/man/man8/fsdb_udfs.8
index f4b216e7d0..8a9fe49921 100644
--- a/usr/src/man/man8/fsdb_udfs.8
+++ b/usr/src/man/man8/fsdb_udfs.8
@@ -1003,4 +1003,4 @@ address \fB1c92434\fR.
 .sp
 
 .SH SEE ALSO
-\fBclri\fR(1M), \fBfsck_udfs\fR(1M), \fBdir\fR(4),  \fBattributes\fR(5)
+\fBclri\fR(8), \fBfsck_udfs\fR(8), \fBdir\fR(5),  \fBattributes\fR(7)
diff --git a/usr/src/man/man8/fsdb_ufs.8 b/usr/src/man/man8/fsdb_ufs.8
index 19d1fe7bf0..31b1b89b6a 100644
--- a/usr/src/man/man8/fsdb_ufs.8
+++ b/usr/src/man/man8/fsdb_ufs.8
@@ -1209,8 +1209,8 @@ associated with the root inode of this file system:
 
 .SH SEE ALSO
 .LP
-\fBclri\fR(1M), \fBfsck_ufs\fR(1M), \fBdir_ufs\fR(4), \fBattributes\fR(5),
-\fBufs\fR(7FS)
+\fBclri\fR(8), \fBfsck_ufs\fR(8), \fBdir_ufs\fR(5), \fBattributes\fR(7),
+\fBufs\fR(4FS)
 .SH WARNINGS
 .LP
 Since \fBfsdb\fR reads the disk raw, extreme caution is advised in determining
@@ -1223,4 +1223,4 @@ The old command line syntax for clearing i-nodes using the ufs-specific
 is obsolete and will be removed in a future release. Use of this flag will
 result in correct operation, but an error message will be printed warning of
 the impending obsolesence of this option to the command. The equivalent
-functionality is available using the more flexible \fBclri\fR(1M) command.
+functionality is available using the more flexible \fBclri\fR(8) command.
diff --git a/usr/src/man/man8/fsirand.8 b/usr/src/man/man8/fsirand.8
index ca1fc0b37c..489c1139c9 100644
--- a/usr/src/man/man8/fsirand.8
+++ b/usr/src/man/man8/fsirand.8
@@ -22,7 +22,7 @@ superblock. This helps increase the security of file systems exported by
 .sp
 .LP
 \fBfsirand\fR must be used only on an unmounted file system that has been
-checked with \fBfsck\fR(1M) The only exception is that it can be used on the
+checked with \fBfsck\fR(8) The only exception is that it can be used on the
 root file system in single-user mode, if the system is immediately re-booted
 afterwards.
 .SH OPTIONS
@@ -39,9 +39,9 @@ generation numbers.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBfsirand\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBfsirand\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH SEE ALSO
 .sp
 .LP
-\fBfsck\fR(1M), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBfsck\fR(8), \fBattributes\fR(7), \fBlargefile\fR(7)
diff --git a/usr/src/man/man8/fssnap.8 b/usr/src/man/man8/fssnap.8
index 3e5652e9be..c2c7c06f24 100644
--- a/usr/src/man/man8/fssnap.8
+++ b/usr/src/man/man8/fssnap.8
@@ -162,7 +162,7 @@ Specifies the default local file system type.
 .SH SEE ALSO
 .sp
 .LP
-\fBfssnap_ufs\fR(1M), \fBattributes\fR(5)
+\fBfssnap_ufs\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/fssnap_ufs.8 b/usr/src/man/man8/fssnap_ufs.8
index 057d15afc2..679dd3935e 100644
--- a/usr/src/man/man8/fssnap_ufs.8
+++ b/usr/src/man/man8/fssnap_ufs.8
@@ -362,7 +362,7 @@ system snapshot.
 The following example uses \fBufsdump\fR to back up a snapshot of \fB/var\fR.
 Note the use of the \fBN\fR option to \fBufsdump\fR, which writes the name of
 the device being dumped, rather than the name of the snapshot device, to
-\fB/etc/dumpdates\fR file. See \fBufsdump\fR(1M) for details on the \fBN\fR
+\fB/etc/dumpdates\fR file. See \fBufsdump\fR(8) for details on the \fBN\fR
 flag.
 
 .sp
@@ -493,7 +493,7 @@ The script-readable output mode is a stable interface that can be added to, but
 will not change. All other interfaces are subject to change.
 .SH SEE ALSO
 .LP
-\fBmlock\fR(3C), \fBattributes\fR(5)
+\fBmlock\fR(3C), \fBattributes\fR(7)
 .SH NOTES
 .LP
 The \fBfssnap\fR device files should be treated like a regular disk block or
diff --git a/usr/src/man/man8/fsstat.8 b/usr/src/man/man8/fsstat.8
index aab9403291..95fa84f722 100644
--- a/usr/src/man/man8/fsstat.8
+++ b/usr/src/man/man8/fsstat.8
@@ -752,7 +752,7 @@ setsecattr     0
 .SH ENVIRONMENT VARIABLES
 .sp
 .LP
-See \fBenviron\fR(5) for descriptions of the following environment variables
+See \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of \fBfsstat\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR,  \fBLC_MESSAGES\fR,  \fBLC_TIME\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
@@ -790,7 +790,7 @@ Invalid command-line options were specified.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -812,7 +812,7 @@ considered an interface.
 .SH SEE ALSO
 .sp
 .LP
-\fBdate\fR(1), \fBtime\fR(2), \fBattributes\fR(5)
+\fBdate\fR(1), \fBtime\fR(2), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/fstyp.8 b/usr/src/man/man8/fstyp.8
index 04a90bc627..7a6e291cf9 100644
--- a/usr/src/man/man8/fstyp.8
+++ b/usr/src/man/man8/fstyp.8
@@ -100,7 +100,7 @@ attributes may be present:
 .ad
 .RS 13n
 Allowable values are "true" or "false". If the value is "false", the file
-system is damaged or was not unmounted cleanly and the \fBfsck\fR(1M) command
+system is damaged or was not unmounted cleanly and the \fBfsck\fR(8) command
 must be run before this file system can be mounted.
 .RE
 
@@ -141,17 +141,17 @@ file system.
 .ad
 .RS 6n
 Produce verbose output. This is usually information about the file systems
-superblock and varies across different \fIFSTypes\fR. See \fBufs\fR(7FS),
-\fBmkfs_ufs\fR(1M), and \fBtunefs\fR(1M) for details.
+superblock and varies across different \fIFSTypes\fR. See \fBufs\fR(4FS),
+\fBmkfs_ufs\fR(8), and \fBtunefs\fR(8) for details.
 .RE
 
 .SH USAGE
-See \fBlargefile\fR(5) for the description of the behavior of \fBfstyp\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBfstyp\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH SEE ALSO
-\fBfsck\fR(1M), \fBmkfs_ufs\fR(1M), \fBtunefs\fR(1M), \fBattributes\fR(5),
-\fBlibfstyp\fR(3LIB), \fBlargefile\fR(5), \fBhsfs\fR(7FS), \fBufs\fR(7FS),
-\fBpcfs\fR(7FS)
+\fBfsck\fR(8), \fBmkfs_ufs\fR(8), \fBtunefs\fR(8), \fBattributes\fR(7),
+\fBlibfstyp\fR(3LIB), \fBlargefile\fR(7), \fBhsfs\fR(4FS), \fBufs\fR(4FS),
+\fBpcfs\fR(4FS)
 .SH NOTES
 The use of heuristics implies that the result of \fBfstyp\fR is not guaranteed
 to be accurate.
diff --git a/usr/src/man/man8/fuser.8 b/usr/src/man/man8/fuser.8
index 5a9c8d2d8f..17d8c4198c 100644
--- a/usr/src/man/man8/fuser.8
+++ b/usr/src/man/man8/fuser.8
@@ -251,13 +251,13 @@ example% \fBfuser -fn -s term /export/foo/my_file\fR
 .SH ENVIRONMENT VARIABLES
 .sp
 .LP
-See \fBenviron\fR(5) for descriptions of the following environment variables
+See \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of \fBfuser\fR: \fBLANG\fR, \fBLC_ALL\fR
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -273,8 +273,8 @@ Interface Stability	Standard
 .SH SEE ALSO
 .sp
 .LP
-\fBps\fR(1), \fBmount\fR(1M), \fBkill\fR(2), \fBmmap\fR(2), \fBsignal\fR(3C),
-\fBattributes\fR(5), \fBenviron\fR(5), \fBstandards\fR(5)
+\fBps\fR(1), \fBmount\fR(8), \fBkill\fR(2), \fBmmap\fR(2), \fBsignal\fR(3C),
+\fBattributes\fR(7), \fBenviron\fR(7), \fBstandards\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/fwflash.8 b/usr/src/man/man8/fwflash.8
index 052bc2aa09..ae140de4cb 100644
--- a/usr/src/man/man8/fwflash.8
+++ b/usr/src/man/man8/fwflash.8
@@ -114,7 +114,7 @@ two of them can be set with the same value.
 For SCSI Enclosure Services (\fBses\fR or \fBsgen\fR) devices, an identifying
 target-port worldwide name is displayed, if available.
 .sp
-For \fBufm\fR(7D) based devices, identifying information such as PCI
+For \fBufm\fR(4D) based devices, identifying information such as PCI
 identifiers and supported capabilities such as the ability to read
 firmware images or slot information is reported. For each firmware image
 on the device, each slot is displayed along with information about the
@@ -253,7 +253,7 @@ Device[0] /devices/pci@0/pci@0/pci@2/scsi@0/ses@3,0:ses
 .sp
 .LP
 Finally, for devices that support the system's upgradeable firmware
-module APIs (see \fBufm\fR(7D)), one might see output like:
+module APIs (see \fBufm\fR(4D)), one might see output like:
 
 .sp
 .in +2
@@ -395,7 +395,7 @@ Failure
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -409,8 +409,8 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-\fBattributes\fR(5), \fBhermon\fR(7D), \fBses\fR(7D), \fBtavor\fR(7D),
-\fBufm\fR(7D)
+\fBattributes\fR(7), \fBhermon\fR(4D), \fBses\fR(4D), \fBtavor\fR(4D),
+\fBufm\fR(4D)
 .sp
 .LP
 The InfiniBand Trade Association website, http://www.infinibandta.org
diff --git a/usr/src/man/man8/fwtmp.8 b/usr/src/man/man8/fwtmp.8
index 65e1a0196b..92311861ba 100644
--- a/usr/src/man/man8/fwtmp.8
+++ b/usr/src/man/man8/fwtmp.8
@@ -30,7 +30,7 @@ edit  bad records.
 corrects the time/date stamps to make the entries consistent, and writes to the
 standard output. A hyphen (\fB\(mi\fR) can be used in place of \fIfile\fR to
 indicate the standard input. If time/date corrections are not performed,
-\fBacctcon\fR(1M) will fault when it encounters certain date-change records.
+\fBacctcon\fR(8) will fault when it encounters certain date-change records.
 .sp
 .LP
 Each time the date is set, a pair of date change records are written to
@@ -73,10 +73,10 @@ history of user access and administration information
 .SH SEE ALSO
 .sp
 .LP
-\fBacctcom\fR(1), \fBed\fR(1), \fBacct\fR(1M), \fBacctcms\fR(1M),
-\fBacctcon\fR(1M), \fBacctmerg\fR(1M), \fBacctprc\fR(1M), \fBacctsh\fR(1M),
-\fBrunacct\fR(1M), \fBacct\fR(2), \fBacct.h\fR(3HEAD), \fButmpx\fR(4),
-\fBattributes\fR(5)
+\fBacctcom\fR(1), \fBed\fR(1), \fBacct\fR(8), \fBacctcms\fR(8),
+\fBacctcon\fR(8), \fBacctmerg\fR(8), \fBacctprc\fR(8), \fBacctsh\fR(8),
+\fBrunacct\fR(8), \fBacct\fR(2), \fBacct.h\fR(3HEAD), \fButmpx\fR(5),
+\fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/getdev.8 b/usr/src/man/man8/getdev.8
index 0f10b7fe2e..c32b666a84 100644
--- a/usr/src/man/man8/getdev.8
+++ b/usr/src/man/man8/getdev.8
@@ -108,7 +108,7 @@ Selects all devices which have the attribute \fIattribute\fR defined.
 Selects all devices which do not have the attribute \fIattribute\fR defined.
 .RE
 
-See the \fBputdev\fR(1M) manual page for a complete listing and description of
+See the \fBputdev\fR(8) manual page for a complete listing and description of
 available attributes.
 .RE
 
@@ -167,5 +167,5 @@ Device table could not be opened for reading.
 .SH SEE ALSO
 .sp
 .LP
-\fBdevattr\fR(1M), \fBgetdgrp\fR(1M), \fBputdev\fR(1M), \fBputdgrp\fR(1M),
-\fBattributes\fR(5)
+\fBdevattr\fR(8), \fBgetdgrp\fR(8), \fBputdev\fR(8), \fBputdgrp\fR(8),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/getdevpolicy.8 b/usr/src/man/man8/getdevpolicy.8
index d555f9aa13..7b13ed4b02 100644
--- a/usr/src/man/man8/getdevpolicy.8
+++ b/usr/src/man/man8/getdevpolicy.8
@@ -48,7 +48,7 @@ An error occurred.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -66,5 +66,5 @@ Interface Stability	See below
 The invocation is evolving. The output is unstable.
 .SH SEE ALSO
 .LP
-\fBadd_drv\fR(1M), \fBrem_drv\fR(1M), \fBupdate_drv\fR(1M),
-\fBattributes\fR(5), \fBprivileges\fR(5), \fBdevfs\fR(7FS)
+\fBadd_drv\fR(8), \fBrem_drv\fR(8), \fBupdate_drv\fR(8),
+\fBattributes\fR(7), \fBprivileges\fR(7), \fBdevfs\fR(4FS)
diff --git a/usr/src/man/man8/getdgrp.8 b/usr/src/man/man8/getdgrp.8
index 998c4485a9..49f1f4c28e 100644
--- a/usr/src/man/man8/getdgrp.8
+++ b/usr/src/man/man8/getdgrp.8
@@ -119,7 +119,7 @@ Selects all device groups with a member  which does not have the attribute
 \fIattribute\fR defined.
 .RE
 
-See \fBputdev\fR(1M) for a complete listing and description of available
+See \fBputdev\fR(8) for a complete listing and description of available
 attributes.
 .RE
 
@@ -193,5 +193,5 @@ Device table or device group table could not be opened for reading.
 .SH SEE ALSO
 .sp
 .LP
-\fBdevattr\fR(1M), \fBgetdev\fR(1M), \fBputdev\fR(1M), \fBputdgrp\fR(1M),
-\fBattributes\fR(5)
+\fBdevattr\fR(8), \fBgetdev\fR(8), \fBputdev\fR(8), \fBputdgrp\fR(8),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/getty.8 b/usr/src/man/man8/getty.8
index b3a550e4e3..9c3ed1ebf1 100644
--- a/usr/src/man/man8/getty.8
+++ b/usr/src/man/man8/getty.8
@@ -128,5 +128,5 @@ These options are obsolete and will be ignored.
 .SH SEE ALSO
 .sp
 .LP
-\fBct\fR(1C), \fBlogin\fR(1), \fBsttydefs\fR(1M), \fBttymon\fR(1M),
-\fBioctl\fR(2), \fBattributes\fR(5), \fBtty\fR(7D)
+\fBct\fR(1C), \fBlogin\fR(1), \fBsttydefs\fR(8), \fBttymon\fR(8),
+\fBioctl\fR(2), \fBattributes\fR(7), \fBtty\fR(4D)
diff --git a/usr/src/man/man8/getvol.8 b/usr/src/man/man8/getvol.8
index e4816e5edc..66c57b4d0e 100644
--- a/usr/src/man/man8/getvol.8
+++ b/usr/src/man/man8/getvol.8
@@ -159,7 +159,7 @@ Device table could not be opened for reading.
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5)
+\fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/groupadd.8 b/usr/src/man/man8/groupadd.8
index 24a38b9cec..72c4791fa6 100644
--- a/usr/src/man/man8/groupadd.8
+++ b/usr/src/man/man8/groupadd.8
@@ -134,9 +134,9 @@ The \fB/etc/group\fR file cannot be updated.
 .RE
 .SH SEE ALSO
 .LP
-\fBgroupdel\fR(1M), \fBgroupmod\fR(1M), \fBgrpck\fR(1M),
-\fBlogins\fR(1M), \fBpwck\fR(1M), \fBuseradd\fR(1M), \fBuserdel\fR(1M),
-\fBusermod\fR(1M), \fBgroup\fR(4), \fBattributes\fR(5)
+\fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBgrpck\fR(8),
+\fBlogins\fR(8), \fBpwck\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8),
+\fBusermod\fR(8), \fBgroup\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .LP
 \fBgroupadd\fR only adds a group definition to the local system. If a network
@@ -148,4 +148,4 @@ against the external name service.
 .sp
 .LP
 If the number of characters in a \fBgroup\fR entry exceeds 2047, group
-maintenance commands, such as \fBgroupdel\fR(1M) and \fBgroupmod\fR(1M), fail.
+maintenance commands, such as \fBgroupdel\fR(8) and \fBgroupmod\fR(8), fail.
diff --git a/usr/src/man/man8/groupdel.8 b/usr/src/man/man8/groupdel.8
index 8044460f5c..de1d8f06a0 100644
--- a/usr/src/man/man8/groupdel.8
+++ b/usr/src/man/man8/groupdel.8
@@ -76,8 +76,8 @@ system file containing group definitions
 
 .SH SEE ALSO
 .LP
-\fBgroupadd\fR(1M), \fBgroupmod\fR(1M), \fBlogins\fR(1M),
-\fBuseradd\fR(1M), \fBuserdel\fR(1M), \fBusermod\fR(1M), \fBattributes\fR(5)
+\fBgroupadd\fR(8), \fBgroupmod\fR(8), \fBlogins\fR(8),
+\fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .LP
 The \fBgroupdel\fR utility only deletes a group definition that is in the local
diff --git a/usr/src/man/man8/groupmod.8 b/usr/src/man/man8/groupmod.8
index 64b542e6fb..bfba575b6b 100644
--- a/usr/src/man/man8/groupmod.8
+++ b/usr/src/man/man8/groupmod.8
@@ -147,9 +147,9 @@ group file
 
 .SH SEE ALSO
 .LP
-\fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBlogins\fR(1M),
-\fBuseradd\fR(1M), \fBuserdel\fR(1M), \fBusermod\fR(1M), \fBgroup\fR(4),
-\fBattributes\fR(5)
+\fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBlogins\fR(8),
+\fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8), \fBgroup\fR(5),
+\fBattributes\fR(7)
 .SH NOTES
 .LP
 The \fBgroupmod\fR utility only modifies group definitions in the
diff --git a/usr/src/man/man8/growfs.8 b/usr/src/man/man8/growfs.8
index e1733d5cde..df88fbeb76 100644
--- a/usr/src/man/man8/growfs.8
+++ b/usr/src/man/man8/growfs.8
@@ -25,14 +25,14 @@ running the \fBgrowfs\fR command. When adding space to a mirror, you expand
 each submirror before expanding the file system.
 .sp
 .LP
-\fBgrowfs\fR will ``write-lock'' (see \fBlockfs\fR(1M)) a mounted file system
+\fBgrowfs\fR will ``write-lock'' (see \fBlockfs\fR(8)) a mounted file system
 when expanding. The length of time the file system is write-locked can be
 shortened by expanding the file system in stages. For instance, to expand a 1
 Gbyte file system to 2 Gbytes, the file system can be grown in 16 Mbyte stages
 using the \fB-s\fR option to specify the total size of the new file system at
 each stage. The argument for \fB-s\fR is the number of sectors, and must be a
 multiple of the cylinder size. Note: The file system cannot be grown if a
-cylinder size of less than 2 is specified. Refer to the \fBnewfs\fR(1M) man
+cylinder size of less than 2 is specified. Refer to the \fBnewfs\fR(8) man
 page for information on the options available when growing a file system.
 .sp
 .LP
@@ -105,8 +105,8 @@ An error occurred.
 
 .SH SEE ALSO
 .LP
-\fBfsck\fR(1M), \fBlockfs\fR(1M), \fBmkfs\fR(1M), \fBnewfs\fR(1M),
-\fBattributes\fR(5)
+\fBfsck\fR(8), \fBlockfs\fR(8), \fBmkfs\fR(8), \fBnewfs\fR(8),
+\fBattributes\fR(7)
 .SH LIMITATIONS
 .LP
 Only UFS file systems (either mounted or unmounted) can be expanded using the
diff --git a/usr/src/man/man8/gsscred.8 b/usr/src/man/man8/gsscred.8
index 052e438f48..abe2bc9e1f 100644
--- a/usr/src/man/man8/gsscred.8
+++ b/usr/src/man/man8/gsscred.8
@@ -221,7 +221,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -237,10 +237,10 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBgssd\fR(1m), \fBgsscred.conf\fR(4), \fBattributes\fR(5)
+\fBgssd\fR(8), \fBgsscred.conf\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
 Some GSS mechanisms, such as \fBkerberos_v5\fR, provide their own
 authenticated-name-to-local-name (uid) mapping and thus do not usually have to
-be mapped using \fBgsscred\fR. See \fBgsscred.conf\fR(4) for more information.
+be mapped using \fBgsscred\fR. See \fBgsscred.conf\fR(5) for more information.
diff --git a/usr/src/man/man8/gssd.8 b/usr/src/man/man8/gssd.8
index d58fd0bbe5..5d42bdb850 100644
--- a/usr/src/man/man8/gssd.8
+++ b/usr/src/man/man8/gssd.8
@@ -21,7 +21,7 @@ to generate and validate \fBGSS-API\fR security tokens. In addition, \fBgssd\fR
 maps the \fBGSS-API\fR principal names to the local user and group ids. By
 default, all groups that the requested user belongs to will be included in the
 grouplist credential. \fBgssd\fR is invoked by the Internet daemon
-\fBinetd\fR(1m) the first time that the kernel \fBRPC\fR requests \fBGSS-API\fR
+\fBinetd\fR(8) the first time that the kernel \fBRPC\fR requests \fBGSS-API\fR
 services.
 .SH EXIT STATUS
 .sp
@@ -48,7 +48,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -64,9 +64,9 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBkill\fR(1), \fBpkill\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(1M),
-\fBinetd\fR(1M), \fBgsscred\fR(1M), \fBsvcadm\fR(1M), \fBgsscred.conf\fR(4),
-\fBresolv.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBkill\fR(1), \fBpkill\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(8),
+\fBinetd\fR(8), \fBgsscred\fR(8), \fBsvcadm\fR(8), \fBgsscred.conf\fR(5),
+\fBresolv.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fIRFC 2078\fR
@@ -81,17 +81,17 @@ using the \fBkill\fR(1) command:
 \fB\fBSIGHUP\fR\fR
 .ad
 .RS 10n
-\fBgssd\fR rereads the \fBgsscred.conf\fR(4) options.
+\fBgssd\fR rereads the \fBgsscred.conf\fR(5) options.
 .RE
 
 .sp
 .LP
 When one of the mechanisms being used is Kerberos, then the \fBgssd\fR process
-must be restarted after adding or changing the \fBresolv.conf\fR(4) file.
+must be restarted after adding or changing the \fBresolv.conf\fR(5) file.
 .sp
 .LP
 The \fBgssd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -103,8 +103,8 @@ svc:/network/rpc/gss:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/hal-device.8 b/usr/src/man/man8/hal-device.8
index 72151e60d1..38d3bfbffc 100644
--- a/usr/src/man/man8/hal-device.8
+++ b/usr/src/man/man8/hal-device.8
@@ -19,7 +19,7 @@ The Hardware Abstraction Layer (HAL) provides a view of the various hardware
 attached to a system. The \fBhal-device\fR command enables you to manage
 devices that conform to the HAL standard. Specifically, \fBhal-device\fR lets
 you add or remove a device to or from the HAL global device list. Device
-properties are read from stdin in \fBlshal(1M)\fR syntax.
+properties are read from stdin in \fBlshal(8)\fR syntax.
 .SH OPTIONS
 .sp
 .LP
@@ -56,7 +56,7 @@ global device list.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -72,4 +72,4 @@ Interface Stability	Volatile
 .SH SEE ALSO
 .sp
 .LP
-\fBhald\fR(1M), \fBattributes\fR(5), \fBhal\fR(5)
+\fBhald\fR(8), \fBattributes\fR(7), \fBhal\fR(7)
diff --git a/usr/src/man/man8/hal-fdi-validate.8 b/usr/src/man/man8/hal-fdi-validate.8
index 5158e637e6..58fdaa2dce 100644
--- a/usr/src/man/man8/hal-fdi-validate.8
+++ b/usr/src/man/man8/hal-fdi-validate.8
@@ -16,7 +16,7 @@ hal-fdi-validate \- validate HAL device information files
 .sp
 .LP
 The \fBhal-fdi-validate\fR command validates one or more device information
-files. See \fBfdi\fR(4). The standard DTD file will be used unless the \fB-f\fR
+files. See \fBfdi\fR(5). The standard DTD file will be used unless the \fB-f\fR
 option is used to specify a different file.
 .SH OPTIONS
 .sp
@@ -47,7 +47,7 @@ One or more DTD files to be validated.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -63,4 +63,4 @@ Interface Stability	Volatile
 .SH SEE ALSO
 .sp
 .LP
-\fBhald\fR(1M), \fBfdi\fR(4), \fBattributes\fR(5), \fBhal\fR(5)
+\fBhald\fR(8), \fBfdi\fR(5), \fBattributes\fR(7), \fBhal\fR(7)
diff --git a/usr/src/man/man8/hal-find.8 b/usr/src/man/man8/hal-find.8
index bad2c06efd..af75f2213d 100644
--- a/usr/src/man/man8/hal-find.8
+++ b/usr/src/man/man8/hal-find.8
@@ -91,7 +91,7 @@ Display version and exit.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -107,4 +107,4 @@ Interface Stability	Volatile
 .SH SEE ALSO
 .sp
 .LP
-\fBhald\fR(1M), \fBattributes\fR(5), \fBhal\fR(5)
+\fBhald\fR(8), \fBattributes\fR(7), \fBhal\fR(7)
diff --git a/usr/src/man/man8/hal-get-property.8 b/usr/src/man/man8/hal-get-property.8
index 34c147e9ff..52c2b71492 100644
--- a/usr/src/man/man8/hal-get-property.8
+++ b/usr/src/man/man8/hal-get-property.8
@@ -182,7 +182,7 @@ Display list of options and exit
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -197,4 +197,4 @@ Interface Stability	Volatile
 
 .SH SEE ALSO
 .LP
-\fBhald\fR(1M), \fBattributes\fR(5), \fBhal\fR(5)
+\fBhald\fR(8), \fBattributes\fR(7), \fBhal\fR(7)
diff --git a/usr/src/man/man8/hald.8 b/usr/src/man/man8/hald.8
index ded9eb1147..7a525f7465 100644
--- a/usr/src/man/man8/hald.8
+++ b/usr/src/man/man8/hald.8
@@ -21,7 +21,7 @@ that conform to the Hardware Abstraction Layer (HAL) specification.
 .sp
 .LP
 The enabling and disabling of \fBhald\fR can be performed through the service
-management facility (SMF) (see \fBsmf\fR(5)). \fBhald\fR is managed using the
+management facility (SMF) (see \fBsmf\fR(7)). \fBhald\fR is managed using the
 fault management resource identifier (FMRI) \fBsvc:/system/hal\fR. Options can
 be specified as SMF properties. See EXAMPLES.
 .SH OPTIONS
@@ -79,7 +79,7 @@ Display version information and exit.
 \fBExample 1 \fRSpecifying a Property
 .sp
 .LP
-The following \fBsvccfg\fR(1M) command specifies the \fB--verbose\fR option.
+The following \fBsvccfg\fR(8) command specifies the \fB--verbose\fR option.
 
 .sp
 .in +2
@@ -117,7 +117,7 @@ Device information files
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -133,4 +133,4 @@ Interface Stability	Volatile
 .SH SEE ALSO
 .sp
 .LP
-\fBsvccfg\fR(1M), \fBattributes\fR(5), \fBhal\fR(5), \fBsmf\fR(5)
+\fBsvccfg\fR(8), \fBattributes\fR(7), \fBhal\fR(7), \fBsmf\fR(7)
diff --git a/usr/src/man/man8/halt.8 b/usr/src/man/man8/halt.8
index 266995dea9..fa43904323 100644
--- a/usr/src/man/man8/halt.8
+++ b/usr/src/man/man8/halt.8
@@ -27,7 +27,7 @@ machine remove power, if possible.
 .sp
 .LP
 The \fBhalt\fR and \fBpoweroff\fR utilities normally log the system shutdown to
-the system log daemon, \fBsyslogd\fR(1M), and place a shutdown record in the
+the system log daemon, \fBsyslogd\fR(8), and place a shutdown record in the
 login accounting file \fB/var/adm/wtmpx\fR. These actions are inhibited if the
 \fB-n\fR or \fB-q\fR options are present.
 .SH OPTIONS
@@ -40,7 +40,7 @@ The following options are supported:
 \fB\fB-d\fR\fR
 .ad
 .RS 6n
-Force a system crash dump before rebooting. See \fBdumpadm\fR(1M) for
+Force a system crash dump before rebooting. See \fBdumpadm\fR(8) for
 information on configuring system crash dumps.
 .RE
 
@@ -50,7 +50,7 @@ information on configuring system crash dumps.
 \fB\fB-l\fR\fR
 .ad
 .RS 6n
-Suppress sending a message to the system log daemon, \fBsyslogd\fR(1M), about
+Suppress sending a message to the system log daemon, \fBsyslogd\fR(8), about
 who executed \fBhalt\fR.
 .RE
 
@@ -60,7 +60,7 @@ who executed \fBhalt\fR.
 \fB\fB-n\fR\fR
 .ad
 .RS 6n
-Prevent the \fBsync\fR(1M) before stopping.
+Prevent the \fBsync\fR(8) before stopping.
 .RE
 
 .sp
@@ -94,13 +94,13 @@ History of user access and administration information.
 .SH SEE ALSO
 .sp
 .LP
-\fBdumpadm\fR(1M), \fBinit\fR(1M), \fBreboot\fR(1M), \fBshutdown\fR(1M),
-\fBsync\fR(1M), \fBsyslogd\fR(1M), \fBinittab\fR(4), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBdumpadm\fR(8), \fBinit\fR(8), \fBreboot\fR(8), \fBshutdown\fR(8),
+\fBsync\fR(8), \fBsyslogd\fR(8), \fBinittab\fR(5), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBhalt\fR and \fBpoweroff\fR utilities do not cleanly shutdown
-\fBsmf\fR(5) services. Execute the scripts in \fB/etc/rcnum.d\fR or execute
-shutdown actions in \fBinittab\fR(4). To ensure a complete shutdown of system
-services, use \fBshutdown\fR(1M) or \fBinit\fR(1M) to reboot a Solaris system.
+\fBsmf\fR(7) services. Execute the scripts in \fB/etc/rcnum.d\fR or execute
+shutdown actions in \fBinittab\fR(5). To ensure a complete shutdown of system
+services, use \fBshutdown\fR(8) or \fBinit\fR(8) to reboot a Solaris system.
diff --git a/usr/src/man/man8/hextoalabel.8 b/usr/src/man/man8/hextoalabel.8
index 01e0b3f4a6..e488c1574d 100644
--- a/usr/src/man/man8/hextoalabel.8
+++ b/usr/src/man/man8/hextoalabel.8
@@ -64,7 +64,7 @@ On failure, and writes diagnostics to the standard error file.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -97,8 +97,8 @@ and values for the defined labels of this system.
 .SH SEE ALSO
 .sp
 .LP
-\fBatohexlabel\fR(1M), \fBlabel_to_str\fR(3TSOL), \fBstr_to_label\fR(3TSOL),
-\fBlabel_encodings\fR(4), \fBattributes\fR(5)
+\fBatohexlabel\fR(8), \fBlabel_to_str\fR(3TSOL), \fBstr_to_label\fR(3TSOL),
+\fBlabel_encodings\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fIHow to Get a Readable Label From Its Hexadecimal Form\fR in \fISolaris
diff --git a/usr/src/man/man8/hostconfig.8 b/usr/src/man/man8/hostconfig.8
index b9e40c8347..5f770aded6 100644
--- a/usr/src/man/man8/hostconfig.8
+++ b/usr/src/man/man8/hostconfig.8
@@ -146,4 +146,4 @@ example# hostconfig='hostconfig \fB-p\fR bootparams \fB-h\fR'
 .SH SEE ALSO
 .sp
 .LP
-\fBhostname\fR(1), \fBdomainname\fR(1M), \fBroute\fR(1M), \fBattributes\fR(5)
+\fBhostname\fR(1), \fBdomainname\fR(8), \fBroute\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/hotplug.8 b/usr/src/man/man8/hotplug.8
index 6ebe5d6971..bea295ecf5 100644
--- a/usr/src/man/man8/hotplug.8
+++ b/usr/src/man/man8/hotplug.8
@@ -264,7 +264,7 @@ The following error message is displayed on systems that do not have any
 supported I/O buses:
 .Bd -literal
 ERROR: there are no connections to display.
-(See hotplug(1m) for more information.)
+(See hotplug(8) for more information.)
 .Ed
 .Pp
 If this error message is seen, note that the system might still have other I/O
diff --git a/usr/src/man/man8/id.8 b/usr/src/man/man8/id.8
index 8bb325d1ab..2d788fa604 100644
--- a/usr/src/man/man8/id.8
+++ b/usr/src/man/man8/id.8
@@ -347,7 +347,7 @@ The user (login) name for which information is to be written.
 .SH ENVIRONMENT VARIABLES
 .sp
 .LP
-See \fBenviron\fR(5) for descriptions of the following environment variables
+See \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of \fBid\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
@@ -375,7 +375,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .SS "/usr/bin/id"
 .sp
 
@@ -406,8 +406,8 @@ Interface Stability	Standard
 .sp
 .LP
 \fBfold\fR(1), \fBlogname\fR(1), \fBwho\fR(1), \fBgetgid\fR(2),
-\fBgetgroups\fR(2), \fBgetprojid\fR(2), \fBgetuid\fR(2), \fBattributes\fR(5),
-\fBenviron\fR(5), \fBstandards\fR(5)
+\fBgetgroups\fR(2), \fBgetprojid\fR(2), \fBgetuid\fR(2), \fBattributes\fR(7),
+\fBenviron\fR(7), \fBstandards\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/idmap.8 b/usr/src/man/man8/idmap.8
index 00ad1eb3d5..1abad80b37 100644
--- a/usr/src/man/man8/idmap.8
+++ b/usr/src/man/man8/idmap.8
@@ -122,7 +122,7 @@ If the \fBidmap\fR utility is invoked without a subcommand or option, it reads
 the subcommands from standard input. When standard input is a TTY, the
 \fBidmap\fR command prints the usage message and exits.
 .SS "Mapping Mechanisms"
-The \fBidmapd\fR(1M) daemon maps Windows user and group SIDs to UNIX UIDs and
+The \fBidmapd\fR(8) daemon maps Windows user and group SIDs to UNIX UIDs and
 GIDs as follows:
 .RS +4
 .TP
@@ -169,7 +169,7 @@ with the same name:
 
 .sp
 .LP
-If configured to use a directory service, \fBidmapd\fR(1M) will first try to
+If configured to use a directory service, \fBidmapd\fR(8) will first try to
 use the mapping information that is stored in user or group objects in the
 Active Directory (AD) and/or the native LDAP directory service. For example, an
 AD object for a given Windows user or group can be augmented to include the
@@ -178,14 +178,14 @@ LDAP object for a given Solaris user or group can be augmented to include the
 corresponding Windows user or group name.
 .sp
 .LP
-\fBidmapd\fR(1M) can be configured to use AD and/or native LDAP directory-based
+\fBidmapd\fR(8) can be configured to use AD and/or native LDAP directory-based
 name mappings by setting the appropriate service management facility (SMF)
 properties of the \fBidmap\fR service. See "Service Properties," below, for
 more details.
 .sp
 .LP
 If directory-based name mapping is not configured or if configured but not
-found, then \fBidmapd\fR(1M) will process locally stored name-based mapping
+found, then \fBidmapd\fR(8) will process locally stored name-based mapping
 rules.
 .sp
 .LP
@@ -353,10 +353,10 @@ is performed in the following order:
 \fB*\fR to \fIwindows-name\fR\fB@\fR\fIdomain\fR
 .RE
 .SS "Service Properties"
-The service properties determine the behavior of the \fBidmapd\fR(1M) daemon.
-These properties are stored in the SMF repository (see \fBsmf\fR(5)) under
+The service properties determine the behavior of the \fBidmapd\fR(8) daemon.
+These properties are stored in the SMF repository (see \fBsmf\fR(7)) under
 property group \fBconfig\fR. They can be accessed and modified using
-\fBsvccfg\fR(1M), which requires \fBsolaris.smf.value.idmap\fR authorization.
+\fBsvccfg\fR(8), which requires \fBsolaris.smf.value.idmap\fR authorization.
 The service properties for the \fBidmap\fR service are:
 .sp
 .ne 2
@@ -414,7 +414,7 @@ is used.
 .sp
 .LP
 Changes to service properties do not affect a running \fBidmap\fR service. The
-service must be refreshed (with \fBsvcadm\fR(1M)) for the changes to take
+service must be refreshed (with \fBsvcadm\fR(8)) for the changes to take
 effect.
 .SH OPERANDS
 The \fBidmap\fR command uses the following operands:
@@ -866,7 +866,7 @@ The following options are supported:
 .sp .6
 .RS 4n
 Specify authentication method when modifying native LDAP entry. See
-\fBldapaddent\fR(1M) for details. Default value is \fBsasl/GSSAPI\fR.
+\fBldapaddent\fR(8) for details. Default value is \fBsasl/GSSAPI\fR.
 .RE
 
 .sp
@@ -1244,7 +1244,7 @@ An error occurred. A diagnostic message is written to standard error.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1258,11 +1258,11 @@ Interface Stability	Uncommitted
 .TE
 
 .SH SEE ALSO
-\fBsvcs\fR(1), \fBidmapd\fR(1M), \fBldapaddent\fR(1M), \fBsvcadm\fR(1M),
-\fBsvccfg\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBidmapd\fR(8), \fBldapaddent\fR(8), \fBsvcadm\fR(8),
+\fBsvccfg\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 The \fBidmapd\fR service is managed by the service management facility,
-\fBsmf\fR(5). The service identifier for the \fBidmapd\fR service is
+\fBsmf\fR(7). The service identifier for the \fBidmapd\fR service is
 \fBsvc:/system/idmap\fR.
 .sp
 .LP
diff --git a/usr/src/man/man8/idmapd.8 b/usr/src/man/man8/idmapd.8
index 3604979afb..32b5492e4a 100644
--- a/usr/src/man/man8/idmapd.8
+++ b/usr/src/man/man8/idmapd.8
@@ -19,7 +19,7 @@ The \fBidmapd\fR daemon maps Windows Security Identifiers (SIDs) to POSIX
 Identifiers (UIDs/GIDs) and conversely.
 .sp
 .LP
-The \fBidmap\fR(1M) utility provides a front end to the \fBidmapd\fR daemon.
+The \fBidmap\fR(8) utility provides a front end to the \fBidmapd\fR daemon.
 .SH FILES
 .sp
 .ne 2
@@ -48,7 +48,7 @@ The database should not be accessed or modified directly.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -97,8 +97,8 @@ Project Private
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBidmap\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
-\fBdefaultdomain\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBidmap\fR(8), \fBsvcadm\fR(8), \fBsvccfg\fR(8),
+\fBdefaultdomain\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/idsconfig.8 b/usr/src/man/man8/idsconfig.8
index e574dbee2e..d123d7b5af 100644
--- a/usr/src/man/man8/idsconfig.8
+++ b/usr/src/man/man8/idsconfig.8
@@ -159,7 +159,7 @@ An error occurred.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -176,5 +176,5 @@ Interface Stability	Evolving
 .LP
 \fBldap\fR(1), \fBldapadd\fR(1), \fBldapdelete\fR(1), \fBldaplist\fR(1),
 \fBldapmodify\fR(1), \fBldapmodrdn\fR(1), \fBldapsearch\fR(1),
-\fBldap_cachemgr\fR(1M), \fBldapaddent\fR(1M), \fBldapclient\fR(1M),
-\fBresolv.conf\fR(4), \fBattributes\fR(5)
+\fBldap_cachemgr\fR(8), \fBldapaddent\fR(8), \fBldapclient\fR(8),
+\fBresolv.conf\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/if_mpadm.8 b/usr/src/man/man8/if_mpadm.8
index ca98bda332..71e446cb84 100644
--- a/usr/src/man/man8/if_mpadm.8
+++ b/usr/src/man/man8/if_mpadm.8
@@ -21,7 +21,7 @@ interfaces and undoing previous offline operations.
 When an IP interface is taken offline, all IP data traffic that was flowing
 over the IP interface is moved to another IP interface in the IPMP group. In
 addition, all \fBUP\fR IP addresses hosted on the IP interface are brought
-down, causing \fBin.mpathd\fR(1M) to stop probe-based failure detection on the
+down, causing \fBin.mpathd\fR(8) to stop probe-based failure detection on the
 IP interface. As a result, an offline IP interface will not be used for any
 inbound or outbound IP traffic. Only IP interfaces that are in an IPMP group
 may be brought offline. If the IP interface is the last functioning interface
@@ -30,13 +30,13 @@ in the IPMP group, the offline operation will fail.
 When an offline operation is undone, any IP addresses hosted on that IP
 interface are brought \fBUP\fR and will be considered by \fBin.mpathd\fR for
 probe-based failure detection. In addition, provided the IP interface is
-otherwise active (see \fBin.mpathd\fR(1M)), it will again be used to send and
+otherwise active (see \fBin.mpathd\fR(8)), it will again be used to send and
 receive IP data traffic for the IPMP group. Note that not all offline
 operations can be undone. For instance, \fBin.mpathd\fR may have offlined an IP
 interface because its hardware address was not unique within its IPMP group.
 The \fBipmpstat\fR utility can be used to determine why an IP interface is
 offline, identify which IP interfaces in a group are being used for inbound and
-outbound IP traffic, and more; see \fBipmpstat\fR(1M).
+outbound IP traffic, and more; see \fBipmpstat\fR(8).
 .SH OPTIONS
 .LP
 The \fBif_mpadm\fR utility supports the following options:
@@ -92,7 +92,7 @@ example% \fBif_mpadm -r under0\fR
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -107,8 +107,8 @@ Interface Stability	Unstable
 
 .SH SEE ALSO
 .LP
-\fBifconfig\fR(1M), \fBin.mpathd\fR(1M), \fBipmpstat\fR(1M),
-\fBattributes\fR(5)
+\fBifconfig\fR(8), \fBin.mpathd\fR(8), \fBipmpstat\fR(8),
+\fBattributes\fR(7)
 .SH DIAGNOSTICS
 .LP
 cannot offline: no other functioning interfaces are in its IPMP group.
diff --git a/usr/src/man/man8/ifconfig.8 b/usr/src/man/man8/ifconfig.8
index 6fe95452da..a0406efc75 100644
--- a/usr/src/man/man8/ifconfig.8
+++ b/usr/src/man/man8/ifconfig.8
@@ -58,7 +58,7 @@ protocol suite can only be observed by using the \fBdladm\fR command.
 The forms of \fBifconfig\fR that use the \fBauto-dhcp\fR or \fBdhcp\fR
 arguments are used to control the Dynamic Host Configuration Protocol
 ("\fBDHCP\fR") configuration of the interface. In this mode, \fBifconfig\fR is
-used to control operation of \fBdhcpagent\fR(1M), the \fBDHCP\fR client daemon.
+used to control operation of \fBdhcpagent\fR(8), the \fBDHCP\fR client daemon.
 Once an interface is placed under \fBDHCP\fR control by using the \fBstart\fR
 operand, \fBifconfig\fR should not, in normal operation, be used to modify the
 address or characteristics of the interface. If the address of an interface
@@ -92,7 +92,7 @@ appropriate zone to which to deliver data is determined using the
 \fBtnzonecfg\fR database. This option is available only if the system is
 configured with the Solaris Trusted Extensions feature.
 .sp
-The \fBtnzonecfg\fR database is described in the \fBtnzonecfg(4)\fR man page,
+The \fBtnzonecfg\fR database is described in the \fBtnzonecfg(5)\fR man page,
 which is part of the \fISolaris Trusted Extensions Reference Manual\fR.
 .RE
 
@@ -154,7 +154,7 @@ specified. The algorithm can be either a number or an algorithm name, including
 must be specified on the same command line. To disable tunnel security, specify
 an \fBauth_alg\fR of \fBnone\fR.
 .sp
-It is now preferable to use the \fBipsecconf\fR(1M) command when configuring a
+It is now preferable to use the \fBipsecconf\fR(8) command when configuring a
 tunnel's security properties. If \fBipsecconf\fR was used to set a tunnel's
 security properties, this keyword will not affect the tunnel.
 .RE
@@ -418,8 +418,8 @@ addressed to this host. Additionally, when all logical interfaces on a given
 physical interface are "down," the physical interface itself is disabled.
 .sp
 When a logical interface is down, all routes that specify that interface as the
-output (using the \fB-ifp\fR option in the \fBroute\fR(1M) command or
-\fBRTA_IFP\fR in a \fBroute\fR(7P) socket) are removed from the forwarding
+output (using the \fB-ifp\fR option in the \fBroute\fR(8) command or
+\fBRTA_IFP\fR in a \fBroute\fR(4P) socket) are removed from the forwarding
 table. Routes marked with \fBRTF_STATIC\fR are returned to the table if the
 interface is brought back up, while routes not marked with \fBRTF_STATIC\fR are
 simply deleted.
@@ -441,11 +441,11 @@ because the gateway is unreachable.
 Set the tunnel encapsulation limit for the interface to n. This option applies
 to IPv4-in-IPv6 and IPv6-in-IPv6 tunnels only, and it simply modifies the
 \fBencaplimit\fR link property of the underlying IPv6 tunnel link (see
-\fBdladm\fR(1M)). The tunnel encapsulation limit controls how many more tunnels
+\fBdladm\fR(8)). The tunnel encapsulation limit controls how many more tunnels
 a packet can enter before it leaves any tunnel, that is, the tunnel nesting
 level.
 .sp
-This option is obsolete, superseded by the \fBdladm\fR(1M) \fBencaplimit\fR
+This option is obsolete, superseded by the \fBdladm\fR(8) \fBencaplimit\fR
 link property.
 .RE
 
@@ -458,10 +458,10 @@ link property.
 .RS 4n
 Disable generation of the tunnel encapsulation limit. This option applies only
 to IPv4-in-IPv6 and IPv6-in-IPv6 tunnels. This simply sets the \fBencaplimit\fR
-link property of the underlying IPv6 tunnel link to 0 (see \fBdladm\fR(1M)
+link property of the underlying IPv6 tunnel link to 0 (see \fBdladm\fR(8)
 \fBencaplimit\fR).
 .sp
-This option is obsolete, superseded by the \fBdladm\fR(1M) \fBencaplimit\fR
+This option is obsolete, superseded by the \fBdladm\fR(8) \fBencaplimit\fR
 link property.
 .RE
 
@@ -478,7 +478,7 @@ or \fBnone\fR, to indicate no algorithm preference. If an \fBESP\fR encryption
 algorithm is specified but the authentication algorithm is not, the default
 value for the \fBESP\fR authentication algorithm will be \fBany\fR.
 .sp
-It is now preferable to use the \fBipsecconf\fR(1M) command when configuring a
+It is now preferable to use the \fBipsecconf\fR(8) command when configuring a
 tunnel's security properties. If \fBipsecconf\fR was used to set a tunnel's
 security properties, this keyword will not affect the tunnel.
 .RE
@@ -497,7 +497,7 @@ security, specify the value of \fBencr_alg\fR as \fBnone\fR. If an \fBESP\fR
 authentication algorithm is specified, but the encryption algorithm is not, the
 default value for the \fBESP\fR encryption will be \fBnull\fR.
 .sp
-It is now preferable to use the \fBipsecconf\fR(1M) command when configuring a
+It is now preferable to use the \fBipsecconf\fR(8) command when configuring a
 tunnel's security properties. If \fBipsecconf\fR was used to set a tunnel's
 security properties, this keyword will not affect the tunnel.
 .RE
@@ -523,7 +523,7 @@ Some, though not all, Ethernet interface cards have their own addresses. To use
 cards that do not have their own addresses, refer to section 3.2.3(4) of the
 IEEE 802.3 specification for a definition of the locally administered address
 space. Note that all IP interfaces in an IPMP group must have unique hardware
-addresses; see \fBin.mpathd\fR(1M).
+addresses; see \fBin.mpathd\fR(8).
 .RE
 
 .sp
@@ -758,13 +758,13 @@ with a "\fB+\fR" (plus sign) address, or
 .TP
 4.
 with a pseudo host name/pseudo network name found in the network database
-\fBnetworks\fR(4).
+\fBnetworks\fR(5).
 .RE
 If a "\fB+\fR" (plus sign) is given for the netmask value, the mask is looked
-up in the \fBnetmasks\fR(4) database. This lookup finds the longest matching
+up in the \fBnetmasks\fR(5) database. This lookup finds the longest matching
 netmask in the database by starting with the interface's IPv4 address as the
 key and iteratively masking off more and more low order bits of the address.
-This iterative lookup ensures that the \fBnetmasks\fR(4) database can be used
+This iterative lookup ensures that the \fBnetmasks\fR(5) database can be used
 to specify the netmasks when variable length subnetmasks are used within a
 network number.
 .sp
@@ -772,7 +772,7 @@ If a pseudo host name/pseudo network name is supplied as the netmask value,
 netmask data may be located in the \fBhosts\fR or \fBnetworks\fR database.
 Names are looked up by first using \fBgethostbyname\fR(3NSL). If not found
 there, the names are looked up in \fBgetnetbyname\fR(3SOCKET). These interfaces
-may in turn use \fBnsswitch.conf\fR(4) to determine what data store(s) to use
+may in turn use \fBnsswitch.conf\fR(5) to determine what data store(s) to use
 to fetch the actual value.
 .sp
 For both \fBinet\fR and \fBinet6\fR, the same information conveyed by
@@ -935,7 +935,7 @@ Set the destination address of a tunnel. The address should not be the same as
 the \fBdest_address\fR of the tunnel, because no packets leave the system over
 such a tunnel.
 .sp
-This option is obsolete, superseded by the \fBdladm\fR(1M) \fBcreate-iptun\fR
+This option is obsolete, superseded by the \fBdladm\fR(8) \fBcreate-iptun\fR
 and \fBmodify-iptun\fR subcommands.
 .RE
 
@@ -950,9 +950,9 @@ Set the hop limit for a tunnel interface. The hop limit value is used as the
 \fBTTL\fR in the IPv4 header for the IPv6-in-IPv4 and IPv4-in-IPv4 tunnels. For
 IPv6-in-IPv6 and IPv4-in-IPv6 tunnels, the hop limit value is used as the hop
 limit in the IPv6 header. This option simply modifies the \fBhoplimit\fR link
-property of the underlying IP tunnel link (see \fBdladm\fR(1M)).
+property of the underlying IP tunnel link (see \fBdladm\fR(8)).
 .sp
-This option is obsolete, superseded by the \fBdladm\fR(1M) \fBhoplimit\fR link
+This option is obsolete, superseded by the \fBdladm\fR(8) \fBhoplimit\fR link
 property.
 .RE
 
@@ -1007,7 +1007,7 @@ Set the source address of a tunnel. This is the source address on an outer
 encapsulating \fBIP\fR header. It must be an address of another interface
 already configured using \fBifconfig\fR.
 .sp
-This option is obsolete, superseded by the \fBdladm\fR(1M) \fBcreate-iptun\fR
+This option is obsolete, superseded by the \fBdladm\fR(8) \fBcreate-iptun\fR
 and \fBmodify-iptun\fR subcommands.
 .RE
 
@@ -1056,7 +1056,7 @@ keyword \fBnone\fR is used, then any previous selection is cleared.
 When an application does not choose a non-zero source address using
 \fBbind\fR(3SOCKET), the system will select an appropriate source address based
 on the outbound interface and the address selection rules (see
-\fBipaddrsel\fR(1M)).
+\fBipaddrsel\fR(8)).
 .sp
 When \fBusesrc\fR is specified and the specified interface is selected in the
 forwarding table for output, the system looks first to the specified physical
@@ -1077,7 +1077,7 @@ that are sent through \fBeri0\fR. Further examples are provided in the
 \fBEXAMPLES\fR section.
 .sp
 While you can specify any physical interface (or even loopback), be aware that
-you can also specify the virtual IP interface (see \fBvni\fR(7D)). The virtual
+you can also specify the virtual IP interface (see \fBvni\fR(4D)). The virtual
 IP interface is not associated with any physical hardware and is thus immune to
 hardware failures. You can specify any number of physical interfaces to use the
 source address hosted on a single virtual interface. This simplifies the
@@ -1128,7 +1128,7 @@ receive packets.
 Place the logical interface in zone \fIzonename\fR. The named zone must be
 active in the kernel in the ready or running state. The interface is unplumbed
 when the zone is halted or rebooted. The zone must be configured to be an
-shared-IP zone. \fBzonecfg\fR(1M) is used to assign network interface names to
+shared-IP zone. \fBzonecfg\fR(8) is used to assign network interface names to
 exclusive-IP zones.
 .RE
 
@@ -1279,12 +1279,12 @@ command line, the command line overrides the \fBDEFAULT_IP\fR settings.
 .sp .6
 .RS 4n
 For the IPv4 family (\fBinet\fR), the \fIaddress\fR is either a host name
-present in the host name data base (see \fBhosts\fR(4)) or in the Network
+present in the host name data base (see \fBhosts\fR(5)) or in the Network
 Information Service (NIS) map \fBhosts\fR, or an IPv4 address expressed in the
 Internet standard "dot notation".
 .sp
 For the IPv6 family (\fBinet6\fR), the \fIaddress\fR is either a host name
-present in the host name data base (see \fBhosts\fR(4)) or in the Network
+present in the host name data base (see \fBhosts\fR(5)) or in the Network
 Information Service (\fBNIS\fR) map \fBipnode\fR, or an IPv6 address expressed
 in the Internet standard colon-separated hexadecimal format represented as
 \fIx:x:x:x:x:x:x:x\fR where \fIx\fR is a hexadecimal number between \fB0\fR and
@@ -1400,7 +1400,7 @@ IPMP IP interfaces, this will only be set if all interfaces in the group have
 CoS set.
 .sp
 Note that this flag is only set on interfaces over VLAN links and over Ethernet
-links that have their \fBdladm\fR(1M) \fBtagmode\fR link property set to
+links that have their \fBdladm\fR(8) \fBtagmode\fR link property set to
 \fBnormal\fR.
 .RE
 
@@ -1426,7 +1426,7 @@ on all \fBNOFAILOVER\fR addresses, though this may change in a future release.
 .ad
 .sp .6
 .RS 4n
-The logical interface is managed by \fBdhcpagent\fR(1M).
+The logical interface is managed by \fBdhcpagent\fR(8).
 .RE
 
 .sp
@@ -1484,7 +1484,7 @@ dynamic MTU changes that can occur when drivers notify IP of link MTU changes.
 The physical interface is functioning but is not used to send or receive data
 traffic according to administrative policy. This flag is initially set by the
 \fBstandby\fR subcommand and is subsequently controlled by \fBin.mpathd\fR. It
-also set when \fBFAILBACK=no\fR mode is enabled (see \fBin.mpathd\fR(1M)) to
+also set when \fBFAILBACK=no\fR mode is enabled (see \fBin.mpathd\fR(8)) to
 indicate that the IP interface has repaired but is not being used.
 .RE
 
@@ -1610,8 +1610,8 @@ advertise this address.
 .sp .6
 .RS 4n
 The interface is offline and thus cannot send or receive IP data traffic. This
-is only set on IP interfaces in an IPMP group. See \fBif_mpadm\fR(1M) and
-\fBcfgadm\fR(1M).
+is only set on IP interfaces in an IPMP group. See \fBif_mpadm\fR(8) and
+\fBcfgadm\fR(8).
 .RE
 
 .sp
@@ -1849,7 +1849,7 @@ Interfaces assigned to the same IPMP group are treated as equivalent and
 monitored for failure by \fBin.mpathd\fR. Provided that active interfaces in
 the group remain, IP interface failures (and any subsequent repairs) are
 handled transparently to sockets-based applications. IPMP is also integrated
-with the Dynamic Reconfiguration framework (see \fBcfgadm\fR(1M)), which
+with the Dynamic Reconfiguration framework (see \fBcfgadm\fR(8)), which
 enables network adapters to be replaced in a way that is invisible to
 sockets-based applications.
 .sp
@@ -1857,7 +1857,7 @@ sockets-based applications.
 The IP module automatically load-spreads all outbound traffic across all active
 interfaces in an IPMP group. Similarly, all \fBUP\fR addresses hosted on the
 IPMP IP interface will be distributed across the active interfaces to promote
-inbound load-spreading. The \fBipmpstat\fR(1M) utility allows many aspects of
+inbound load-spreading. The \fBipmpstat\fR(8) utility allows many aspects of
 the IPMP subsystem to be observed, including the current binding of IP data
 addresses to IP interfaces.
 .sp
@@ -1893,7 +1893,7 @@ the address is removed from the group.
 .LP
 Each interface placed into an IPMP group may be optionally configured with a
 "test" address that \fBin.mpathd\fR will use for probe-based failure detection;
-see \fBin.mpathd\fR(1M). These addresses must be marked \fBNOFAILOVER\fR (using
+see \fBin.mpathd\fR(8). These addresses must be marked \fBNOFAILOVER\fR (using
 the \fB-failover\fR subcommand) prior to being marked \fBUP\fR. Test addresses
 may also be acquired through DHCP by means of the \fBdhcp\fR subcommand.
 .sp
@@ -1979,7 +1979,7 @@ or more IP nodes, and an IP interface above this link which allows the system
 to transmit and receive IP packets encapsulated by the underlying link.
 .sp
 .LP
-The \fBdladm\fR(1M) command is used to configure tunnel links, and
+The \fBdladm\fR(8) command is used to configure tunnel links, and
 \fBifconfig\fR is used to configure IP interfaces over those tunnel links.  An
 IPv4-over-IPv4 tunnel is created by plumbing an IPv4 interface over an IPv4
 tunnel link.  An IPv6-over-IPv4 tunnel is created by plumbing an IPv6 interface
@@ -2055,7 +2055,7 @@ unplumbed).
 .LP
 The \fBtsrc\fR, \fBtdst\fR, \fBencaplim\fR, and \fBhoplimit\fR options to
 \fBifconfig\fR are obsolete and maintained only for backward compatibility.
-They are equivalent to their \fBdladm\fR(1M) counterparts.
+They are equivalent to their \fBdladm\fR(8) counterparts.
 .SS "Display of Tunnel Security Settings"
 The \fBifconfig\fR output for IP tunnel interfaces indicates whether IPsec
 policy is configured for the underlying IP tunnel link. For example, a line of
@@ -2071,7 +2071,7 @@ tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
 .sp
 .LP
 If you do net set security policy, using either \fBifconfig\fR or
-\fBipsecconf\fR(1M), there is no tunnel security setting displayed.
+\fBipsecconf\fR(8), there is no tunnel security setting displayed.
 .SH EXAMPLES
 \fBExample 1 \fRUsing the \fBifconfig\fR Command
 .sp
@@ -2164,7 +2164,7 @@ example% \fBifconfig tun0 plumb mysrc thedst up\fR
 
 .sp
 .LP
-Use \fBipsecconf\fR(1M), as described above, to configure tunnel security
+Use \fBipsecconf\fR(8), as described above, to configure tunnel security
 properties.
 
 .sp
@@ -2362,7 +2362,7 @@ and its aliases.
 .sp
 .LP
 The following is an example of how the \fBusesrc\fR feature can be used with
-the \fBzones\fR(5) facility in Solaris. The following commands are invoked in
+the \fBzones\fR(7) facility in Solaris. The following commands are invoked in
 the global zone:
 
 .sp
@@ -2413,7 +2413,7 @@ vni0:3:
 There is one virtual interface alias per zone (\fBtest1\fR, \fBtest2\fR, and
 \fBtest3\fR). A source address from the virtual interface alias in the same
 zone is selected. The virtual interface aliases were created using
-\fBzonecfg\fR(1M) as follows:
+\fBzonecfg\fR(8) as follows:
 
 .sp
 .in +2
@@ -2437,7 +2437,7 @@ the same way.
 .LP
 The following example shows how to disable automatic use of DHCPv6 on all
 interfaces, and immediately shut down DHCPv6 on the interface named \fBhme0\fR.
-See \fBin.ndpd\fR(1M) and \fBndpd.conf\fR(4) for more information on the
+See \fBin.ndpd\fR(8) and \fBndpd.conf\fR(5) for more information on the
 automatic DHCPv6 configuration mechanism.
 
 .sp
@@ -2471,7 +2471,7 @@ Default Internet protocol type.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -2489,14 +2489,14 @@ Interface Stability for command output	Uncommitted
 .TE
 
 .SH SEE ALSO
-\fBdhcpinfo\fR(1), \fBcfgadm\fR(1M), \fBdhcpagent\fR(1M), \fBdladm\fR(1M),
-\fBif_mpadm\fR(1M), \fBin.mpathd\fR(1M), \fBin.ndpd\fR(1M),
-\fBin.routed\fR(1M), \fBipmpstat\fR(1M), \fBipsecconf\fR(1M), \fBndd\fR(1M),
-\fBnetstat\fR(1M), \fBzoneadm\fR(1M), \fBzonecfg\fR(1M), \fBethers\fR(3SOCKET),
-\fBgethostbyname\fR(3NSL), \fBgetnetbyname\fR(3SOCKET), \fBhosts\fR(4),
-\fBinet_type\fR(4), \fBndpd.conf\fR(4), \fBnetmasks\fR(4), \fBnetworks\fR(4),
-\fBnsswitch.conf\fR(4), \fBattributes\fR(5), \fBprivileges\fR(5),
-\fBzones\fR(5), \fBarp\fR(7P), \fBipsecah\fR(7P), \fBipsecesp\fR(7P)
+\fBdhcpinfo\fR(1), \fBcfgadm\fR(8), \fBdhcpagent\fR(8), \fBdladm\fR(8),
+\fBif_mpadm\fR(8), \fBin.mpathd\fR(8), \fBin.ndpd\fR(8),
+\fBin.routed\fR(8), \fBipmpstat\fR(8), \fBipsecconf\fR(8), \fBndd\fR(8),
+\fBnetstat\fR(8), \fBzoneadm\fR(8), \fBzonecfg\fR(8), \fBethers\fR(3SOCKET),
+\fBgethostbyname\fR(3NSL), \fBgetnetbyname\fR(3SOCKET), \fBhosts\fR(5),
+\fBinet_type\fR(5), \fBndpd.conf\fR(5), \fBnetmasks\fR(5), \fBnetworks\fR(5),
+\fBnsswitch.conf\fR(5), \fBattributes\fR(7), \fBprivileges\fR(7),
+\fBzones\fR(7), \fBarp\fR(4P), \fBipsecah\fR(4P), \fBipsecesp\fR(4P)
 .sp
 .LP
 \fISystem Administration Guide: IP Services\fR
diff --git a/usr/src/man/man8/ifparse.8 b/usr/src/man/man8/ifparse.8
index 2688cb43ea..0107bb34ee 100644
--- a/usr/src/man/man8/ifparse.8
+++ b/usr/src/man/man8/ifparse.8
@@ -15,7 +15,7 @@ ifparse \- parse \fBifconfig\fR command line
 .SH DESCRIPTION
 .sp
 .LP
-Use the \fBifparse\fR command to parse the \fBifconfig\fR(1M) command line
+Use the \fBifparse\fR command to parse the \fBifconfig\fR(8) command line
 options and output substrings, one per line, as appropriate. If no options are
 specified, \fBifparse\fR returns the entire \fBifconfig\fR command line as a
 series of substrings, one per line.
@@ -103,7 +103,7 @@ addif 1.2.3.5 -failover up
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -119,7 +119,7 @@ Stability Level	Obsolete
 .SH SEE ALSO
 .sp
 .LP
-\fBifconfig\fR(1M), \fBattributes\fR(5)
+\fBifconfig\fR(8), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .sp
 .LP
diff --git a/usr/src/man/man8/ikeadm.8 b/usr/src/man/man8/ikeadm.8
index 6ceb818409..5566645ad1 100644
--- a/usr/src/man/man8/ikeadm.8
+++ b/usr/src/man/man8/ikeadm.8
@@ -62,7 +62,7 @@ ikeadm [\fB-np\fR] token [login | logout] \fIPKCS#11_Token_Object\fR
 .LP
 The \fBikeadm\fR utility retrieves information from and manipulates the
 configuration of the Internet Key Exchange (\fBIKE\fR) protocol daemon,
-\fBin.iked\fR(1M).
+\fBin.iked\fR(8).
 .sp
 .LP
 \fBikeadm\fR supports a set of operations, which may be performed on one or
@@ -412,7 +412,7 @@ that is loaded. See .
 .sp .6
 .RS 4n
 Display default values used by the \fBin.iked\fR daemon. Some values can be
-overridden in the daemon configuration file (see \fBike.config\fR(4)); for these
+overridden in the daemon configuration file (see \fBike.config\fR(5)); for these
 values, the token name is displayed in the \fBget defaults\fR output. The
 output will reflect where a configuration token has changed the default.
 .sp
@@ -539,8 +539,8 @@ string assigned to the rule when it is created.
 .LP
 Formatting a rule or preshared key for the add command follows the format rules
 for the in.iked configuration files. Both are made up of a series of id-value
-pairs, contained in curly braces (\fB{\fR and \fB}\fR). See \fBike.config\fR(4)
-and \fBike.preshared\fR(4) for details on the formatting of rules and preshared
+pairs, contained in curly braces (\fB{\fR and \fB}\fR). See \fBike.config\fR(5)
+and \fBike.preshared\fR(5) for details on the formatting of rules and preshared
 keys.
 .SH SECURITY
 .LP
@@ -808,7 +808,7 @@ An error occurred. Writes an appropriate error message to standard error.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -823,8 +823,8 @@ Interface Stability	Not an Interface
 
 .SH SEE ALSO
 .LP
-\fBin.iked\fR(1M), \fBike.config\fR(4), \fBike.preshared\fR(4),
-\fBattributes\fR(5), \fBipsec\fR(7P)
+\fBin.iked\fR(8), \fBike.config\fR(5), \fBike.preshared\fR(5),
+\fBattributes\fR(7), \fBipsec\fR(4P)
 .sp
 .LP
 Schneier, Bruce, \fIApplied Cryptography: Protocols, Algorithms, and Source
diff --git a/usr/src/man/man8/ikecert.8 b/usr/src/man/man8/ikecert.8
index 4fa67ddfbc..ab6a30c2de 100644
--- a/usr/src/man/man8/ikecert.8
+++ b/usr/src/man/man8/ikecert.8
@@ -238,7 +238,7 @@ If \fB-T\fR is specified, the hardware token will generate the pair of keys.
 .sp
 If \fB-p\fR is specified with \fB-T\fR, the PKCS#11 token pin is stored in the
 clear on-disk, with root-protected file permissions. If not specified, one must
-unlock the token with \fBikeadm\fR(1M) once \fBin.iked\fR(1M) is running.
+unlock the token with \fBikeadm\fR(8) once \fBin.iked\fR(8) is running.
 .RE
 
 .RE
@@ -491,7 +491,7 @@ separately, if desired.
 .sp
 If \fB-p\fR is specified, the PKCS#11 token pin is stored in the clear on-disk,
 with root-protected file permissions. If not specified, one must unlock the
-token with \fBikeadm\fR(1M) once \fBin.iked\fR(1M) is running.
+token with \fBikeadm\fR(8) once \fBin.iked\fR(8) is running.
 .RE
 
 .RE
@@ -532,7 +532,7 @@ Solaris \fBIKE\fR utilities.
 .sp
 If \fB-p\fR is specified, the PKCS#11 token pin is stored in the clear on-disk,
 with root-protected file permissions. If not specified, one must unlock the
-token with \fBikeadm\fR(1M) once \fBin.iked\fR(1M) is running.
+token with \fBikeadm\fR(8) once \fBin.iked\fR(8) is running.
 .RE
 
 .RE
@@ -656,7 +656,7 @@ the Solaris Cryptographic Framework:
 .sp
 
 The mechanisms displayed by the preceding command are described in
-\fBpkcs11_softtoken\fR(5). If your system has hardware acceleration, the
+\fBpkcs11_softtoken\fR(7). If your system has hardware acceleration, the
 mechanisms supported by the hardware will be listed in a separate section for
 each provider. Mechanisms can be any of:
 .sp
@@ -710,7 +710,7 @@ Key type. It can be \fBrsa-sha1\fR, \fBrsa-md5\fR, or \fBdsa-sha1\fR.
 .RS 4n
 PKCS#11 token identifier for hardware key storage. This specifies a hardware
 device instance in conformance to the PKCS#11 standard. A PKCS#11 library must
-be specified in \fB/etc/inet/ike/config\fR. (See \fBike.config\fR(4).)
+be specified in \fB/etc/inet/ike/config\fR. (See \fBike.config\fR(5).)
 .sp
 A token identifier is a 32-character space-filled string. If the token given is
 less than 32 characters long, it will be automatically padded with spaces.
@@ -867,7 +867,7 @@ Consulted for the pathname of a PKCS#11 library.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -881,8 +881,8 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-\fBikeadm\fR(1M), \fBin.iked\fR(1M), \fBgetdate\fR(3C), \fBike.config\fR(4),
-\fBattributes\fR(5), \fBpkcs11_softtoken\fR(5)
+\fBikeadm\fR(8), \fBin.iked\fR(8), \fBgetdate\fR(3C), \fBike.config\fR(5),
+\fBattributes\fR(7), \fBpkcs11_softtoken\fR(7)
 .sp
 .LP
 Schneier, Bruce. \fIApplied Cryptography: Protocols, Algorithms, and Source
@@ -1023,5 +1023,5 @@ day and 2 hours ago and an end date of Jan 22nd, 2007 at 12:00:00 local time.
 
 .sp
 .LP
-As \fBin.iked\fR(1M) can run only in the global zone and exclusive-IP zones,
+As \fBin.iked\fR(8) can run only in the global zone and exclusive-IP zones,
 this command is not useful in shared-IP zones.
diff --git a/usr/src/man/man8/in.chargend.8 b/usr/src/man/man8/in.chargend.8
index e4d5610b83..1bb3cf96ba 100644
--- a/usr/src/man/man8/in.chargend.8
+++ b/usr/src/man/man8/in.chargend.8
@@ -21,7 +21,7 @@ FMRI \fIsvc\fR:/internet/chargen:default
 .sp
 .LP
 FMRI stands for Fault Management Resource Identifier. It is used to identify
-resources managed by the Fault Manager. See \fBfmd\fR(1M) and \fBsmf\fR(5).
+resources managed by the Fault Manager. See \fBfmd\fR(8) and \fBsmf\fR(7).
 .sp
 .LP
 The \fBin.chargend\fR service provides the server-side of the
@@ -29,7 +29,7 @@ character-generator protocol. This protocol is used for debugging and bandwidth
 measurement and is available on both TCP and UDP transports, through port 19.
 .sp
 .LP
-The in.chargend service is an \fBinetd\fR(1M) \fBsmf\fR(5) delegated service.
+The in.chargend service is an \fBinetd\fR(8) \fBsmf\fR(7) delegated service.
 The \fBin.chargend\fR detects which transport is requested by examining the
 socket it is passed by the \fBinetd\fR daemon.
 .sp
@@ -64,7 +64,7 @@ a carriage return and a line feed character.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -80,7 +80,7 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBinetd\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBinetd\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 RFC 864
diff --git a/usr/src/man/man8/in.comsat.8 b/usr/src/man/man8/in.comsat.8
index bc42a178d8..9143a4d10b 100644
--- a/usr/src/man/man8/in.comsat.8
+++ b/usr/src/man/man8/in.comsat.8
@@ -17,12 +17,12 @@ in.comsat, comsat \- biff server
 .LP
 \fBcomsat\fR is the server process which listens for reports of incoming mail
 and notifies users who have requested to be told when mail arrives. It is
-invoked as needed by \fBinetd\fR(1M), and times out if inactive for a few
+invoked as needed by \fBinetd\fR(8), and times out if inactive for a few
 minutes.
 .sp
 .LP
 \fBcomsat\fR listens on a datagram port associated with the \fBbiff\fR service
-specification (see \fBservices\fR(4)) for one line messages of the form
+specification (see \fBservices\fR(5)) for one line messages of the form
 .sp
 .LP
 \fIuser\fR\fB@\fR\fImailbox\fR\fB-\fR\fIoffset\fR
@@ -48,8 +48,8 @@ user access and administration information
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M),
-\fBsvcadm\fR(1M), \fBservices\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8),
+\fBsvcadm\fR(8), \fBservices\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -57,7 +57,7 @@ The message header filtering is prone to error.
 .sp
 .LP
 The \fBin.comsat\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -69,8 +69,8 @@ svc:/network/comsat:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/in.daytimed.8 b/usr/src/man/man8/in.daytimed.8
index a48c2b7d57..5782878cc5 100644
--- a/usr/src/man/man8/in.daytimed.8
+++ b/usr/src/man/man8/in.daytimed.8
@@ -21,7 +21,7 @@ FMRI \fIsvc\fR:/internet/daytime:default
 .sp
 .LP
 FMRI stands for Fault Management Resource Identifier. It is used to identify
-resources managed by the Fault Manager. See \fBfmd\fR(1M) and \fBsmf\fR(5).
+resources managed by the Fault Manager. See \fBfmd\fR(8) and \fBsmf\fR(7).
 .sp
 .LP
 The \fBin.daytimed\fR service provides the server-side of the daytime protocol.
@@ -29,7 +29,7 @@ This protocol is used for debugging and bandwidth measurement and is available
 on both TCP and UDP transports, through port 13.
 .sp
 .LP
-The \fBin.daytimed\fR service is an \fBinetd\fR(1M) \fBsmf\fR(5) delegated
+The \fBin.daytimed\fR service is an \fBinetd\fR(8) \fBsmf\fR(7) delegated
 service. The \fBin.daytimed\fR detects which transport is requested by
 examining the socket it is passed by the \fBinetd\fR daemon.
 .sp
@@ -59,7 +59,7 @@ request. Any received data is ignored.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -75,7 +75,7 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBinetd\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBinetd\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 RFC 867
diff --git a/usr/src/man/man8/in.discardd.8 b/usr/src/man/man8/in.discardd.8
index 4e077400f9..b25f28ebaa 100644
--- a/usr/src/man/man8/in.discardd.8
+++ b/usr/src/man/man8/in.discardd.8
@@ -21,7 +21,7 @@ FMRI \fIsvc\fR:/internet/discard:default
 .sp
 .LP
 FMRI stands for Fault Management Resource Identifier. It is used to identify
-resources managed by the Fault Manager. See \fBfmd\fR(1M) and \fBsmf\fR(5).
+resources managed by the Fault Manager. See \fBfmd\fR(8) and \fBsmf\fR(7).
 .sp
 .LP
 The \fBin.discardd\fR service provides the server-side of the discard protocol.
@@ -29,7 +29,7 @@ This protocol is used for debugging and bandwidth measurement and is available
 on both TCP and UDP transports through port 9.
 .sp
 .LP
-The \fBin.discardd\fR service is an \fBinetd\fR(1M) \fBsmf\fR(5) delegated
+The \fBin.discardd\fR service is an \fBinetd\fR(8) \fBsmf\fR(7) delegated
 service. The \fBin.discardd\fR detects which transport is requested by
 examining the socket it is passed by the \fBinetd\fR daemon.
 .sp
@@ -59,7 +59,7 @@ the server discards it. No response is sent.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -75,7 +75,7 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBinetd\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBinetd\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 RFC 863
diff --git a/usr/src/man/man8/in.echod.8 b/usr/src/man/man8/in.echod.8
index bda44fdf0f..eb668c5b38 100644
--- a/usr/src/man/man8/in.echod.8
+++ b/usr/src/man/man8/in.echod.8
@@ -21,7 +21,7 @@ FMRI \fIsvc\fR:/internet/echo:default
 .sp
 .LP
 FMRI stands for Fault Management Resource Identifier. It is used to identify
-resources managed by the Fault Manager. See \fBfmd\fR(1M) and \fBsmf\fR(5).
+resources managed by the Fault Manager. See \fBfmd\fR(8) and \fBsmf\fR(7).
 .sp
 .LP
 The \fBin.echod\fR service provides the server-side of the echo protocol. This
@@ -29,7 +29,7 @@ protocol is used for debugging and bandwidth measurement and is available on
 both TCP and UDP transports, through port 7.
 .sp
 .LP
-The \fBin.echod\fR service is an \fBinetd\fR(1M) \fBsmf\fR(5) delegated
+The \fBin.echod\fR service is an \fBinetd\fR(8) \fBsmf\fR(7) delegated
 service. The \fBin.echod\fR detects which transport is requested by examining
 the socket it is passed by the \fBinetd\fR daemon.
 .sp
@@ -57,7 +57,7 @@ the client.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -73,7 +73,7 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBinetd\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBinetd\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 RFC 862
diff --git a/usr/src/man/man8/in.fingerd.8 b/usr/src/man/man8/in.fingerd.8
index b2401734ec..d07582e2fc 100644
--- a/usr/src/man/man8/in.fingerd.8
+++ b/usr/src/man/man8/in.fingerd.8
@@ -77,12 +77,12 @@ User's projects.
 .SH USAGE
 .sp
 .LP
-\fBfingerd\fR and \fBin.fingerd\fR are IPv6-enabled. See \fBip6\fR(7P).
+\fBfingerd\fR and \fBin.fingerd\fR are IPv6-enabled. See \fBip6\fR(4P).
 .SH SEE ALSO
 .sp
 .LP
-\fBfinger\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M),
-\fBsvcadm\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5), \fBip6\fR(7P)
+\fBfinger\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8),
+\fBsvcadm\fR(8), \fBattributes\fR(7), \fBsmf\fR(7), \fBip6\fR(4P)
 .sp
 .LP
 Harrenstien, Ken, \fIRFC 742, NAME/FINGER\fR,  Network Information Center, SRI
@@ -99,7 +99,7 @@ received.
 .sp
 .LP
 The \fBin.fingerd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -111,8 +111,8 @@ svc:/network/finger:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/in.iked.8 b/usr/src/man/man8/in.iked.8
index 6599fb0fac..7629d364c4 100644
--- a/usr/src/man/man8/in.iked.8
+++ b/usr/src/man/man8/in.iked.8
@@ -46,12 +46,12 @@ Diffie-Hellman key derivation using either \fB768\fR, \fB1024\fR, or
 Authentication protection with cipher choices of \fBAES\fR, \fBDES\fR,
 Blowfish, or \fB3DES\fR, and hash choices of either \fBHMAC-MD5\fR or
 \fBHMAC-SHA-1\fR. Encryption in \fBin.iked\fR is limited to the \fBIKE\fR
-authentication and key exchange. See \fBipsecesp\fR(7P) for information
+authentication and key exchange. See \fBipsecesp\fR(4P) for information
 regarding IPsec protection choices.
 .RE
 .sp
 .LP
-\fBin.iked\fR is managed by the following \fBsmf\fR(5) service:
+\fBin.iked\fR is managed by the following \fBsmf\fR(7) service:
 .sp
 .in +2
 .nf
@@ -63,24 +63,24 @@ svc:/network/ipsec/ike
 .sp
 .LP
 This service is delivered disabled because the configuration file needs to be
-created before the service can be enabled. See \fBike.config\fR(4) for the
+created before the service can be enabled. See \fBike.config\fR(5) for the
 format of this file.
 .sp
 .LP
-See "Service Management Facility" for information on managing the \fBsmf\fR(5)
+See "Service Management Facility" for information on managing the \fBsmf\fR(7)
 service.
 .sp
 .LP
 \fBin.iked\fR listens for incoming \fBIKE\fR requests from the network and for
 requests for outbound traffic using the \fBPF_KEY\fR socket. See
-\fBpf_key\fR(7P).
+\fBpf_key\fR(4P).
 .sp
 .LP
 \fBin.iked\fR has two support programs that are used for IKE administration and
-diagnosis: \fBikeadm\fR(1M) and \fBikecert\fR(1M).
+diagnosis: \fBikeadm\fR(8) and \fBikecert\fR(8).
 .sp
 .LP
-The \fBikeadm\fR(1M) command can read the \fB/etc/inet/ike/config\fR file as a
+The \fBikeadm\fR(8) command can read the \fB/etc/inet/ike/config\fR file as a
 \fBrule\fR, then pass the configuration information to the running
 \fBin.iked\fR daemon using a doors interface.
 .sp
@@ -93,7 +93,7 @@ example# \fBikeadm read rule /etc/inet/ike/config\fR
 
 .sp
 .LP
-Refreshing the \fBike\fR \fBsmf\fR(5) service provided to manage the
+Refreshing the \fBike\fR \fBsmf\fR(7) service provided to manage the
 \fBin.iked\fR daemon sends a \fBSIGHUP\fR signal to the \fBin.iked\fR daemon,
 which will (re)read \fB/etc/inet/ike/config\fR and reload the certificate
 database.
@@ -106,14 +106,14 @@ more details on managing the \fBin.iked\fR daemon.
 .sp
 .LP
 The IKE daemon (\fBin.iked\fR) is managed by the service management facility,
-\fBsmf\fR(5). The following group of services manage the components of IPsec:
+\fBsmf\fR(7). The following group of services manage the components of IPsec:
 .sp
 .in +2
 .nf
-svc:/network/ipsec/ipsecalgs   (See ipsecalgs(1M))
-svc:/network/ipsec/policy      (See ipsecconf(1M))
-svc:/network/ipsec/manual-key  (See ipseckey(1M))
-svc:/network/ipsec/ike         (see ike.config(4))
+svc:/network/ipsec/ipsecalgs   (See ipsecalgs(8))
+svc:/network/ipsec/policy      (See ipsecconf(8))
+svc:/network/ipsec/manual-key  (See ipseckey(8))
+svc:/network/ipsec/ike         (see ike.config(5))
 .fi
 .in -2
 .sp
@@ -126,7 +126,7 @@ described in the respective man pages listed above.
 .sp
 .LP
 The correct administrative procedure is to create the configuration file for
-each service, then enable each service using \fBsvcadm\fR(1M).
+each service, then enable each service using \fBsvcadm\fR(8).
 .sp
 .LP
 The \fBike\fR service has a dependency on the \fBipsecalgs\fR and \fBpolicy\fR
@@ -154,7 +154,7 @@ The following properties are defined for the \fBike\fR service:
 .ad
 .sp .6
 .RS 4n
-Defines the level that \fBikeadm\fR(1M) invocations can change or observe the
+Defines the level that \fBikeadm\fR(8) invocations can change or observe the
 running \fBin.iked\fR. The acceptable values for this property are the same as
 those for the \fB-p\fR option. See the description of \fB-p\fR in
 \fBOPTIONS\fR.
@@ -168,7 +168,7 @@ those for the \fB-p\fR option. See the description of \fB-p\fR in
 .sp .6
 .RS 4n
 Defines the configuration file to use. The default value is
-\fB/etc/inet/ike/config\fR. See \fBike.config\fR(4) for the format of this
+\fB/etc/inet/ike/config\fR. See \fBike.config\fR(5) for the format of this
 file. This property has the same effect as the \fB-f\fR flag. See the
 description of \fB-f\fR in \fBOPTIONS\fR.
 .RE
@@ -184,7 +184,7 @@ Defines the amount of debug output that is written to the \fBdebug_logfile\fR
 file, described below. The default value for this is \fBop\fR or
 \fBoperator\fR. This property controls the recording of information on events
 such as re-reading the configuration file. Acceptable value for
-\fBdebug_level\fR are listed in the \fBikeadm\fR(1M) man page. The value
+\fBdebug_level\fR are listed in the \fBikeadm\fR(8) man page. The value
 \fBall\fR is equivalent to the \fB-d\fR flag. See the description of \fB-d\fR
 in \fBOPTIONS\fR.
 .RE
@@ -198,7 +198,7 @@ in \fBOPTIONS\fR.
 .RS 4n
 Defines where debug output should be written. The messages written here are
 from debug code within \fBin.iked\fR. Startup error messages are recorded by
-the \fBsmf\fR(5) framework and recorded in a service-specific log file. Use any
+the \fBsmf\fR(7) framework and recorded in a service-specific log file. Use any
 of the following commands to examine the \fBlogfile\fR property:
 .sp
 .in +2
@@ -227,13 +227,13 @@ file have syntax errors. The default value is \fBfalse\fR, which causes
 .sp
 Setting this value to \fBtrue\fR causes the IKE service to stay online, but
 correct operation requires the administrator to configure the running daemon
-with \fBikeadm\fR(1M). This option is provided for compatibility with previous
+with \fBikeadm\fR(8). This option is provided for compatibility with previous
 releases.
 .RE
 
 .sp
 .LP
-These properties can be modified using \fBsvccfg\fR(1M) by users who have been
+These properties can be modified using \fBsvccfg\fR(8) by users who have been
 assigned the following authorization:
 .sp
 .in +2
@@ -261,10 +261,10 @@ solaris.network.ipsec.ike.token.logout
 
 .sp
 .LP
-See \fBauths\fR(1), \fBikeadm\fR(1M), \fBuser_attr\fR(4), \fBrbac\fR(5).
+See \fBauths\fR(1), \fBikeadm\fR(8), \fBuser_attr\fR(5), \fBrbac\fR(7).
 .sp
 .LP
-The service needs to be refreshed using \fBsvcadm\fR(1M) before a new property
+The service needs to be refreshed using \fBsvcadm\fR(8) before a new property
 value is effective. General, non-modifiable properties can be viewed with the
 \fBsvcprop\fR(1) command.
 .sp
@@ -280,7 +280,7 @@ value is effective. General, non-modifiable properties can be viewed with the
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling,
-refreshing, and requesting restart can be performed using \fBsvcadm\fR(1M). A
+refreshing, and requesting restart can be performed using \fBsvcadm\fR(8). A
 user who has been assigned the authorization shown below can perform these
 actions:
 .sp
@@ -296,11 +296,11 @@ solaris.smf.manage.ipsec
 The service's status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
-The \fBin.iked\fR daemon is designed to be run under \fBsmf\fR(5) management.
+The \fBin.iked\fR daemon is designed to be run under \fBsmf\fR(7) management.
 While the \fBin.iked\fR command can be run from the command line, this is
 discouraged. If the \fBin.iked\fR command is to be run from the command line,
-the \fBike\fR \fBsmf\fR(5) service should be disabled first. See
-\fBsvcadm\fR(1M).
+the \fBike\fR \fBsmf\fR(7) service should be disabled first. See
+\fBsvcadm\fR(8).
 .SH OPTIONS
 .sp
 .LP
@@ -332,7 +332,7 @@ produces large amounts of debugging output. This option is deprecated. See
 .ad
 .RS 15n
 Use \fIfilename\fR instead of \fB/etc/inet/ike/config\fR. See
-\fBike.config\fR(4) for the format of this file. This option is deprecated. See
+\fBike.config\fR(5) for the format of this file. This option is deprecated. See
 "Service Management Facility" for more details.
 .RE
 
@@ -343,7 +343,7 @@ Use \fIfilename\fR instead of \fB/etc/inet/ike/config\fR. See
 .ad
 .RS 15n
 Specify privilege level (\fIlevel\fR). This option sets how much
-\fBikeadm\fR(1M) invocations can change or observe about the running
+\fBikeadm\fR(8) invocations can change or observe about the running
 \fBin.iked\fR.
 .sp
 Valid \fIlevels\fR are:
@@ -384,7 +384,7 @@ This option is deprecated. See "Service Management Facility" for more details.
 .LP
 This program has sensitive private keying information in its image. Care should
 be taken with any core dumps or system dumps of a running \fBin.iked\fR daemon,
-as these files contain sensitive keying information. Use the \fBcoreadm\fR(1M)
+as these files contain sensitive keying information. Use the \fBcoreadm\fR(8)
 command to limit any corefiles produced by \fBin.iked\fR.
 .SH FILES
 .sp
@@ -442,9 +442,9 @@ Public key certificate revocation lists.
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBcoreadm\fR(1M), \fBikeadm\fR(1M), \fBikecert\fR(1M),
-\fBsvccfg\fR(1M), \fBsvcadm\fR(1M), \fBike.config\fR(4), \fBattributes\fR(5),
-\fBsmf\fR(5), \fBipsecesp\fR(7P), \fBpf_key\fR(7P)
+\fBsvcs\fR(1), \fBcoreadm\fR(8), \fBikeadm\fR(8), \fBikecert\fR(8),
+\fBsvccfg\fR(8), \fBsvcadm\fR(8), \fBike.config\fR(5), \fBattributes\fR(7),
+\fBsmf\fR(7), \fBipsecesp\fR(4P), \fBpf_key\fR(4P)
 .sp
 .LP
 Harkins, Dan and Carrel, Dave. \fIRFC 2409, Internet Key Exchange (IKE)\fR.
diff --git a/usr/src/man/man8/in.lpd.8 b/usr/src/man/man8/in.lpd.8
index 5c38a95255..eaf434253e 100644
--- a/usr/src/man/man8/in.lpd.8
+++ b/usr/src/man/man8/in.lpd.8
@@ -23,7 +23,7 @@ verbose status, and canceling print jobs.
 .sp
 .LP
 The \fBin.lpd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -35,9 +35,9 @@ svc:/network/lp
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
 .sp
@@ -118,5 +118,5 @@ Spooler translation modules.
 
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBsvcadm\fR(1M),
-\fBprinters.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8), \fBsvcadm\fR(8),
+\fBprinters.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
diff --git a/usr/src/man/man8/in.mpathd.8 b/usr/src/man/man8/in.mpathd.8
index 2ec1fdced8..ee77c531ac 100644
--- a/usr/src/man/man8/in.mpathd.8
+++ b/usr/src/man/man8/in.mpathd.8
@@ -30,7 +30,7 @@ each IP interface (probe-based failure detection). Link-based failure detection
 is instantaneous and is always enabled (provided the network driver supports
 the feature); probe-based failure detection must be enabled through the
 configuration of one or more test addresses (described below), but tests the
-entire IP interface send and receive path. The \fBipmpstat\fR(1M) utility can
+entire IP interface send and receive path. The \fBipmpstat\fR(8) utility can
 be used to check which failure detection methods are enabled.
 .sp
 .LP
@@ -45,14 +45,14 @@ same failure detection methods.
 As mentioned above, to perform probe-based failure detection \fBin.mpathd\fR
 requires a test address on each IP interface for the purpose of sending and
 receiving probes. Each address must be marked \fBNOFAILOVER\fR (see
-\fBifconfig\fR(1M)) and \fBin.mpathd\fR will be limited to probing targets on
+\fBifconfig\fR(8)) and \fBin.mpathd\fR will be limited to probing targets on
 the same subnet. Each address may be configured statically or acquired by means
 of DHCP. To find targets, \fBin.mpathd\fR first consults the routing table for
 routes on the same subnet, and uses the specified next-hop. If no routes match,
 it sends all-hosts ICMP probes and selects a subset of the systems that
 respond. Thus, for probe-based failure detection to operate, there must be at
 least one neighbor on each subnet that responds to ICMP echo request probes.
-The \fBipmpstat\fR(1M) utility can be used to display both the current probe
+The \fBipmpstat\fR(8) utility can be used to display both the current probe
 target information and the status of sent probes.
 .sp
 .LP
@@ -81,7 +81,7 @@ administrative configuration specifies, \fBin.mpathd\fR will deactivate one of
 the interfaces (preferably one marked \fBSTANDBY\fR), except when the
 \fBFAILBACK\fR variable is used, as described below. Similar adjustments will
 be made by \fBin.mpathd\fR when offlining IP interfaces (for instance, in
-response to \fBif_mpadm\fR(1M)).
+response to \fBif_mpadm\fR(8)).
 .sp
 .LP
 The \fBin.mpathd\fR daemon accesses three variable values in
@@ -131,8 +131,8 @@ Contains default values used by the \fBin.mpathd\fR daemon.
 .SH SEE ALSO
 .sp
 .LP
-\fBif_mpadm\fR(1M), \fBifconfig\fR(1M), \fBipmpstat\fR(1M),
-\fBattributes\fR(5), \fBicmp\fR(7P), \fBicmp6\fR(7P),
+\fBif_mpadm\fR(8), \fBifconfig\fR(8), \fBipmpstat\fR(8),
+\fBattributes\fR(7), \fBicmp\fR(4P), \fBicmp6\fR(4P),
 .sp
 .LP
 \fISystem Administration Guide: IP Services\fR
diff --git a/usr/src/man/man8/in.ndpd.8 b/usr/src/man/man8/in.ndpd.8
index c63cea9920..91c01c4217 100644
--- a/usr/src/man/man8/in.ndpd.8
+++ b/usr/src/man/man8/in.ndpd.8
@@ -53,7 +53,7 @@ privacy extensions for stateless address autoconfiguration.
 .RE
 .sp
 .LP
-Other aspects of Neighbor Discovery are implemented by \fBip6\fR(7P),
+Other aspects of Neighbor Discovery are implemented by \fBip6\fR(4P),
 including:
 .RS +4
 .TP
@@ -114,14 +114,14 @@ generate the addresses. \fBin.ndpd\fR will plumb logical interfaces for each of
 these addresses.
 .sp
 .LP
-Stateful autoconfiguration involves the \fBdhcpagent\fR(1M) daemon and the use
+Stateful autoconfiguration involves the \fBdhcpagent\fR(8) daemon and the use
 of the DHCPv6 protocol. The \fBdhcpagent\fR daemon is responsible for plumbing
 the logical interfaces for the acquired addresses, maintaining the leases, and
 handling duplicate addresses. \fBin.ndpd\fR starts the \fBdhcpagent\fR daemon
 automatically and signals when DHCPv6 should be started. \fBin.ndpd\fR also
 detects when \fBdhcpagent\fR configures the logical interfaces, and sets the
 appropriate prefix length on each according to received Routing Advertisement
-messages. \fBin.ndpd\fR will not stop \fBdhcpagent\fR; use \fBifconfig\fR(1M)
+messages. \fBin.ndpd\fR will not stop \fBdhcpagent\fR; use \fBifconfig\fR(8)
 to control \fBdhcpagent\fR if necessary.
 .sp
 .LP
@@ -169,7 +169,7 @@ service properties are set using a command of the form:
 Turn off stateless and stateful address auto configuration. When set, the
 daemon does not autoconfigure any addresses and does not renumber any
 addresses. This option does the same thing as the following lines in
-\fBndpd.conf\fR(4):
+\fBndpd.conf\fR(5):
 .sp
 .in +2
 .nf
@@ -230,9 +230,9 @@ the hosts.
 .RE
 
 .SH SEE ALSO
-\fBdhcpagent\fR(1M), \fBifconfig\fR(1M), \fBndp\fR(1M), \fBrouteadm\fR(1M),
-\fBsvcadm\fR(1M), \fBndpd.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5),
-\fBicmp6\fR(7P), \fBip6\fR(7P), \fBndp\fR(7P)
+\fBdhcpagent\fR(8), \fBifconfig\fR(8), \fBndp\fR(8), \fBrouteadm\fR(8),
+\fBsvcadm\fR(8), \fBndpd.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7),
+\fBicmp6\fR(4P), \fBip6\fR(4P), \fBndp\fR(4P)
 .sp
 .LP
 Narten, T., Nordmark, E., Simpson, W. \fIRFC 2461, Neighbor Discovery for IP
@@ -250,7 +250,7 @@ Receipt of a \fBSIGHUP\fR signal will make \fBin.ndpd\fR restart and reread
 \fB/etc/inet/ndpd.conf\fR.
 .SH NOTES
 The \fBin.ndpd\fR daemon service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -261,5 +261,5 @@ svc:/network/routing/ndp:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M) or
-\fBrouteadm\fR(1M).
+requesting restart, can be performed using \fBsvcadm\fR(8) or
+\fBrouteadm\fR(8).
diff --git a/usr/src/man/man8/in.rarpd.8 b/usr/src/man/man8/in.rarpd.8
index b8b8601c84..9bcd30fb9b 100644
--- a/usr/src/man/man8/in.rarpd.8
+++ b/usr/src/man/man8/in.rarpd.8
@@ -101,7 +101,7 @@ example# /usr/sbin/in.rarpd le 0
 \fB\fB/etc/ethers\fR\fR
 .ad
 .RS 15n
-File or other source, as specified by \fBnsswitch.conf\fR(4).
+File or other source, as specified by \fBnsswitch.conf\fR(5).
 .RE
 
 .sp
@@ -110,7 +110,7 @@ File or other source, as specified by \fBnsswitch.conf\fR(4).
 \fB\fB/etc/hosts\fR\fR
 .ad
 .RS 15n
-File or other source, as specified by \fBnsswitch.conf\fR(4).
+File or other source, as specified by \fBnsswitch.conf\fR(5).
 .RE
 
 .sp
@@ -143,9 +143,9 @@ File or other source, as specified by \fBnsswitch.conf\fR(4).
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBboot\fR(1M), \fBifconfig\fR(1M), \fBsvcadm\fR(1M),
-\fBethers\fR(4), \fBhosts\fR(4), \fBnetconfig\fR(4),
-\fBnsswitch.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5), \fBdlpi\fR(7P)
+\fBsvcs\fR(1), \fBboot\fR(8), \fBifconfig\fR(8), \fBsvcadm\fR(8),
+\fBethers\fR(5), \fBhosts\fR(5), \fBnetconfig\fR(5),
+\fBnsswitch.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7), \fBdlpi\fR(4P)
 .sp
 .LP
 Finlayson, R., Mann, T., Mogul, J., and Theimer, M., \fIRFC 903, A Reverse
@@ -155,7 +155,7 @@ June 1984.
 .sp
 .LP
 The \fBin.rarpd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -167,5 +167,5 @@ svc:/network/rarp
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/in.rdisc.8 b/usr/src/man/man8/in.rdisc.8
index 4a1d854623..20cf9c0ba2 100644
--- a/usr/src/man/man8/in.rdisc.8
+++ b/usr/src/man/man8/in.rdisc.8
@@ -23,8 +23,8 @@ in.rdisc, rdisc \- network router discovery daemon
 .sp
 .LP
 \fBin.rdisc\fR remains part of the software distribution of the Solaris
-Operating Environment. It is, however, not used by default. \fBin.routed\fR(1M)
-includes the functionality provided by \fBin.rdisc\fR. See \fBrouteadm\fR(1M)
+Operating Environment. It is, however, not used by default. \fBin.routed\fR(8)
+includes the functionality provided by \fBin.rdisc\fR. See \fBrouteadm\fR(8)
 for details of how to specify the IPV4 routing daemon.
 .sp
 .LP
@@ -180,9 +180,9 @@ means of the \fBsend_address\fR and \fBreceive_address\fR properties.
 .SH SEE ALSO
 .sp
 .LP
-\fBin.routed\fR(1M), \fBrouteadm\fR(1M), \fBsvcadm\fR(1M), \fBioctl\fR(2),
-\fBgateways\fR(4), \fBattributes\fR(5), \fBsmf\fR(5), \fBicmp\fR(7P),
-\fBinet\fR(7P)
+\fBin.routed\fR(8), \fBrouteadm\fR(8), \fBsvcadm\fR(8), \fBioctl\fR(2),
+\fBgateways\fR(5), \fBattributes\fR(7), \fBsmf\fR(7), \fBicmp\fR(4P),
+\fBinet\fR(4P)
 .sp
 .LP
 Deering, S.E., editor, \fIICMP Router Discovery Messages\fR, \fBRFC\fR 1256,
diff --git a/usr/src/man/man8/in.rexecd.8 b/usr/src/man/man8/in.rexecd.8
index 5b5e7905e1..07396285ea 100644
--- a/usr/src/man/man8/in.rexecd.8
+++ b/usr/src/man/man8/in.rexecd.8
@@ -18,7 +18,7 @@ in.rexecd, rexecd \- remote execution server
 .LP
 \fBin.rexecd\fR is the server for the \fBrexec\fR(3SOCKET) routine.  The server
 provides remote execution facilities with authentication based on user names
-and passwords. It is invoked automatically as needed by \fBinetd\fR(1M), and
+and passwords. It is invoked automatically as needed by \fBinetd\fR(8), and
 then executes the following protocol:
 .RS +4
 .TP
@@ -70,12 +70,12 @@ shell inherits the network connections established by \fBrexecd\fR.
 .SH USAGE
 .sp
 .LP
-\fBin.rexecd\fR and \fBrexecd\fR are IPv6-enabled. See \fBip6\fR(7P).
+\fBin.rexecd\fR and \fBrexecd\fR are IPv6-enabled. See \fBip6\fR(4P).
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBinetd\fR(1M), \fBinetadm\fR(1M), \fBsvcadm\fR(1M),
-\fBrexec\fR(3SOCKET), \fBattributes\fR(5), \fBsmf\fR(5), \fBip6\fR(7P)
+\fBsvcs\fR(1), \fBinetd\fR(8), \fBinetadm\fR(8), \fBsvcadm\fR(8),
+\fBrexec\fR(3SOCKET), \fBattributes\fR(7), \fBsmf\fR(7), \fBip6\fR(4P)
 .SH DIAGNOSTICS
 .sp
 .LP
@@ -160,7 +160,7 @@ The user's login shell could not be started.
 .sp
 .LP
 The \fBin.rexecd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -172,8 +172,8 @@ svc:/network/rexec:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/in.ripngd.8 b/usr/src/man/man8/in.ripngd.8
index 90053e78cd..2845d4bce6 100644
--- a/usr/src/man/man8/in.ripngd.8
+++ b/usr/src/man/man8/in.ripngd.8
@@ -16,7 +16,7 @@ in.ripngd \- network routing daemon for IPv6
 .SH DESCRIPTION
 .sp
 .LP
-\fBin.ripngd\fR is the IPv6 equivalent of \fBin.routed\fR(1M). It is invoked at
+\fBin.ripngd\fR is the IPv6 equivalent of \fBin.routed\fR(8). It is invoked at
 boot time to manage the network routing tables. The routing daemon uses the
 Routing Information Protocol for IPv6.
 .sp
@@ -33,7 +33,7 @@ svc:/network/routing/ripng:default
 
 .sp
 .LP
-In normal operation, \fBin.ripngd\fR listens on the \fBudp\fR(7P) socket port
+In normal operation, \fBin.ripngd\fR listens on the \fBudp\fR(4P) socket port
 521 for routing information packets. If the host is an internetwork router, it
 periodically supplies copies of its routing tables to any directly connected
 hosts and networks.
@@ -197,8 +197,8 @@ The logfile can be specified for the \fBripng\fR service by means of the
 .SH SEE ALSO
 .sp
 .LP
-\fBin.routed\fR(1M), \fBrouteadm\fR(1M), \fBsvcadm\fR(1M), \fBioctl\fR(2),
-\fBattributes\fR(5), \fBsmf\fR(5), \fBudp\fR(7P)
+\fBin.routed\fR(8), \fBrouteadm\fR(8), \fBsvcadm\fR(8), \fBioctl\fR(2),
+\fBattributes\fR(7), \fBsmf\fR(7), \fBudp\fR(4P)
 .sp
 .LP
 G. Malkin, R. Minnear, \fIRFC 2080, RIPng for IPv6\fR, January 1997.
@@ -211,7 +211,7 @@ only remedy for this is to place the routing process in the kernel.
 .sp
 .LP
 \fBin.ripngd\fR currently does not support all of the functionality of
-\fBin.routed\fR(1M). Future releases may support more if appropriate.
+\fBin.routed\fR(8). Future releases may support more if appropriate.
 .sp
 .LP
 \fBin.ripngd\fR initially obtains a routing table by examining the interfaces
@@ -220,7 +220,7 @@ networks for more routing information. \fBin.ripngd\fR does not recognize or
 use any routing information already established on the machine prior to
 startup. With the exception of interface changes, \fBin.ripngd\fR does not see
 any routing table changes that have been done by other programs on the machine,
-for example, routes added, deleted or flushed by means of the \fBroute\fR(1M)
+for example, routes added, deleted or flushed by means of the \fBroute\fR(8)
 command. Therefore, these types of changes should not be done while
 \fBin.ripngd\fR is running. Rather, shut down \fBin.ripngd\fR, make the changes
 required, and then restart \fBin.ripngd\fR.
diff --git a/usr/src/man/man8/in.rlogind.8 b/usr/src/man/man8/in.rlogind.8
index ca206bad7b..c297102c7d 100644
--- a/usr/src/man/man8/in.rlogind.8
+++ b/usr/src/man/man8/in.rlogind.8
@@ -19,7 +19,7 @@ provides a remote login facility with authentication based on Kerberos V5 or
 privileged port numbers.
 .sp
 .LP
-\fBin.rlogind\fR is invoked by \fBinetd\fR(1M) when a remote login connection
+\fBin.rlogind\fR is invoked by \fBinetd\fR(8) when a remote login connection
 is established. When Kerberos V5 authentication is required (see option
 \fB-k\fR below), the authentication sequence is as follows:
 .RS +4
@@ -32,7 +32,7 @@ Check Kerberos V5 authentication.
 .TP
 .ie t \(bu
 .el o
-Check authorization according to the rules in \fBkrb5_auth_rules\fR(5).
+Check authorization according to the rules in \fBkrb5_auth_rules\fR(7).
 .RE
 .RS +4
 .TP
@@ -53,7 +53,7 @@ file on the \fBin.rlogind\fR server. An example principal might be:
 \fBhost/bigmachine.eng.example.com\fR
 .sp
 .LP
-See \fBkadmin\fR(1M) for instructions on adding a principal to a
+See \fBkadmin\fR(8) for instructions on adding a principal to a
 \fBkrb5.keytab\fR file. See \fI\fR for a discussion of Kerberos
 authentication.
 .sp
@@ -76,8 +76,8 @@ exists in both \fB/etc/hosts\fR and \fB/etc/hosts.equiv\fR, a user logging in
 from the client is not prompted for a password. If the address is associated
 with a host for which no corresponding entry exists in \fB/etc/hosts\fR, the
 user is prompted for a password, regardless of  whether or not an entry for the
-client is present in  \fB/etc/hosts.equiv\fR. See \fBhosts\fR(4) and
-\fBhosts.equiv\fR(4).
+client is present in  \fB/etc/hosts.equiv\fR. See \fBhosts\fR(5) and
+\fBhosts.equiv\fR(5).
 .RE
 .sp
 .LP
@@ -171,7 +171,7 @@ authorization check is passed, then the user is allowed to log in.
 .ad
 .RS 13n
 Uses the indicated Kerberos V5 realm. By default, the daemon will determine its
-realm from the settings in the \fBkrb5.conf\fR(4) file.
+realm from the settings in the \fBkrb5.conf\fR(5) file.
 .RE
 
 .sp
@@ -230,7 +230,7 @@ Same as \fB-e\fR, for backwards compatibility.
 .RE
 
 .SH USAGE
-\fBrlogind\fR and \fBin.rlogind\fR are IPv6-enabled. See \fBip6\fR(7P).
+\fBrlogind\fR and \fBin.rlogind\fR are IPv6-enabled. See \fBip6\fR(4P).
 \fBIPv6\fR is not currently supported with Kerberos V5 authentication.
 .sp
 .LP
@@ -279,7 +279,7 @@ entry for the client exists in both \fB/etc/hosts\fR and
 password. If the address is associated with a host for which no corresponding
 entry exists in \fB/etc/hosts\fR, the user is prompted for a password,
 regardless of whether or not an entry for the client is present in
-\fB/etc/hosts.equiv\fR. See \fBhosts\fR(4) and \fBhosts.equiv\fR(4).
+\fB/etc/hosts.equiv\fR. See \fBhosts\fR(5) and \fBhosts.equiv\fR(5).
 .sp
 .LP
 When running a Kerberized rlogin service (with or without the encryption
@@ -296,13 +296,13 @@ through the \fBpam_rhosts_auth.so.1\fR module is sufficient to authenticate the
 user. Only if this authentication fails is the next authentication module used.
 .SH SEE ALSO
 \fBlogin\fR(1), \fBsvcs\fR(1), \fBrlogin\fR(1),
-\fBin.rshd\fR(1M), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBkadmin\fR(1M),
-\fBsvcadm\fR(1M), \fBpam\fR(3PAM), \fBhosts\fR(4), \fBhosts.equiv\fR(4),
-\fBkrb5.conf\fR(4), \fBpam.conf\fR(4), \fBattributes\fR(5), \fBenviron\fR(5),
-\fBkrb5_auth_rules\fR(5), \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5), \fBpam_unix_session\fR(5),
-\fBsmf\fR(5)
+\fBin.rshd\fR(8), \fBinetadm\fR(8), \fBinetd\fR(8), \fBkadmin\fR(8),
+\fBsvcadm\fR(8), \fBpam\fR(3PAM), \fBhosts\fR(5), \fBhosts.equiv\fR(5),
+\fBkrb5.conf\fR(5), \fBpam.conf\fR(5), \fBattributes\fR(7), \fBenviron\fR(7),
+\fBkrb5_auth_rules\fR(7), \fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7), \fBpam_unix_session\fR(7),
+\fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
@@ -349,15 +349,15 @@ machine and the connecting medium.  This is insecure, but it is useful in an
 A facility to allow all data exchanges to be encrypted should be present.
 .sp
 .LP
-The \fBpam_unix\fR(5) module is no longer supported. Similar functionality is
-provided by \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5), and
-\fBpam_unix_session\fR(5).
+The \fBpam_unix\fR(7) module is no longer supported. Similar functionality is
+provided by \fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7), and
+\fBpam_unix_session\fR(7).
 .sp
 .LP
 The \fBin.rlogind\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -371,8 +371,8 @@ svc:/network/login:eklogin (rlogin with kerberos and encryption)
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/in.routed.8 b/usr/src/man/man8/in.routed.8
index 11da5501b7..c236fe9734 100644
--- a/usr/src/man/man8/in.routed.8
+++ b/usr/src/man/man8/in.routed.8
@@ -37,7 +37,7 @@ svc:/network/routing/route:default
 .sp
 .LP
 The daemon listens on a \fBudp\fR socket for the \fBroute\fR service (see
-\fBservices\fR(4)) for Routing Information Protocol packets. It also sends and
+\fBservices\fR(5)) for Routing Information Protocol packets. It also sends and
 receives multicast Router Discovery ICMP messages. If the host is a router,
 \fBin.routed\fR periodically supplies copies of its routing tables to any
 directly connected hosts and networks. It also advertises or solicits default
@@ -51,7 +51,7 @@ for the interfaces to the kernel routing table. Soon after being first started,
 and provided there is at least one interface on which RIP has not been
 disabled, \fBin.routed\fR deletes all pre-existing non-static routes in the
 kernel table. Static routes in the kernel table are preserved and included in
-RIP responses if they have a valid RIP metric (see \fBroute\fR(1M)).
+RIP responses if they have a valid RIP metric (see \fBroute\fR(8)).
 .sp
 .LP
 If more than one interface is present (not counting the loopback interface), it
@@ -65,13 +65,13 @@ When a request packet is received, \fBin.routed\fR formulates a reply based on
 the information maintained in its internal tables. The response packet
 generated contains a list of known routes, each marked with a "hop count"
 metric (a count of 16 or greater is considered "infinite"). Advertised metrics
-reflect the metric associated with an interface (see \fBifconfig\fR(1M)), so
+reflect the metric associated with an interface (see \fBifconfig\fR(8)), so
 setting the metric on an interface is an effective way to steer traffic.
 .sp
 .LP
 Responses do not include routes with a first hop on the requesting network, to
 implement in part split-horizon. Requests from query programs such as
-\fBrtquery\fR(1M) are answered with the complete table.
+\fBrtquery\fR(8) are answered with the complete table.
 .sp
 .LP
 The routing table maintained by the daemon includes space for several gateways
@@ -114,7 +114,7 @@ interfaces that support multicasting.
 .LP
 If no response is received on a remote interface, if there are errors while
 sending responses, or if there are more errors than input or output (see
-\fBnetstat\fR(1M)), then the cable or some other part of the interface is
+\fBnetstat\fR(8)), then the cable or some other part of the interface is
 assumed to be disconnected or broken, and routes are adjusted appropriately.
 .sp
 .LP
@@ -134,7 +134,7 @@ The Router Discovery standard requires that advertisements have a default
 "lifetime" of 30 minutes. That means should something happen, a client can be
 without a good route for 30 minutes. It is a good idea to reduce the default to
 45 seconds using \fB\fR\fB-P\fR \fBrdisc_interval=45\fR on the command line or
-\fBrdisc_interval=45\fR in the \fB/etc/gateways\fR file. See \fBgateways\fR(4).
+\fBrdisc_interval=45\fR in the \fB/etc/gateways\fR file. See \fBgateways\fR(5).
 .sp
 .LP
 While using Router Discovery (which happens by default when the system has a
@@ -147,7 +147,7 @@ running with \fB-q\fR might need the \fBno_rdisc\fR argument described below.
 .LP
 To support "legacy" systems that can handle neither RIPv2 nor Router Discovery,
 you can use the \fBpm_rdisc\fR parameter in the \fB/etc/gateways\fR. See
-\fBgateways\fR(4).
+\fBgateways\fR(5).
 .sp
 .LP
 By default, neither Router Discovery advertisements nor solicitations are sent
@@ -423,7 +423,7 @@ Displays the version of the daemon.
 Increase the debugging level, which causes more information to be logged on the
 tracefile specified with \fB-T\fR or stdout. The debugging level can be
 increased or decreased with the \fBSIGUSR1\fR or \fBSIGUSR2\fR signals or with
-the \fBrtquery\fR(1M) command.
+the \fBrtquery\fR(8) command.
 .RE
 
 .SH FILES
@@ -434,7 +434,7 @@ the \fBrtquery\fR(1M) command.
 .ad
 .RS 22n
 If this file is present and contains the address of a default router, the
-system startup script does not run \fBin.routed\fR. See \fBdefaultrouter\fR(4).
+system startup script does not run \fBin.routed\fR. See \fBdefaultrouter\fR(5).
 .RE
 
 .sp
@@ -444,15 +444,15 @@ system startup script does not run \fBin.routed\fR. See \fBdefaultrouter\fR(4).
 .ad
 .RS 22n
 List of distant gateways and general configuration options for \fBin.routed\fR.
-See \fBgateways\fR(4).
+See \fBgateways\fR(5).
 .RE
 
 .SH SEE ALSO
 .sp
 .LP
-\fBroute\fR(1M), \fBrouteadm\fR(1M), \fBrtquery\fR(1M), \fBsvcadm\fR(1M),
-\fBioctl\fR(2), \fBinet\fR(3SOCKET), \fBdefaultrouter\fR(4), \fBgateways\fR(4),
-\fBattributes\fR(5), \fBicmp\fR(7P), \fBinet\fR(7P), \fBudp\fR(7P)
+\fBroute\fR(8), \fBrouteadm\fR(8), \fBrtquery\fR(8), \fBsvcadm\fR(8),
+\fBioctl\fR(2), \fBinet\fR(3SOCKET), \fBdefaultrouter\fR(5), \fBgateways\fR(5),
+\fBattributes\fR(7), \fBicmp\fR(4P), \fBinet\fR(4P), \fBudp\fR(4P)
 .sp
 .LP
 \fIInternet Transport Protocols, XSIS 028112, Xerox System Integration
diff --git a/usr/src/man/man8/in.rshd.8 b/usr/src/man/man8/in.rshd.8
index eab042c0f9..9e0ad3c5b7 100644
--- a/usr/src/man/man8/in.rshd.8
+++ b/usr/src/man/man8/in.rshd.8
@@ -19,7 +19,7 @@ remote execution facilities with authentication based on Kerberos V5 or
 privileged port numbers.
 .sp
 .LP
-\fBin.rshd\fR is invoked by \fBinetd\fR(1M) each time a shell service is
+\fBin.rshd\fR is invoked by \fBinetd\fR(8) each time a shell service is
 requested.
 .sp
 .LP
@@ -33,7 +33,7 @@ Check Kerberos V5 authentication.
 .RS +4
 .TP
 2.
-Check authorization according to rules in \fBkrb5_auth_rules\fR(5).
+Check authorization according to rules in \fBkrb5_auth_rules\fR(7).
 .RE
 .RS +4
 .TP
@@ -55,7 +55,7 @@ must have a \fBkeytab\fR entry in the \fB/etc/krb5/krb5.keytab\fR file on the
 \fBhost/bigmachine.eng.example.com\fR
 .sp
 .LP
-See \fBkadmin\fR(1M) for instructions on adding a principal to a
+See \fBkadmin\fR(8) for instructions on adding a principal to a
 \fBkrb5.keytab\fR file. See \fI\fR for a discussion of Kerberos
 authentication.
 .sp
@@ -202,7 +202,7 @@ List of environment variables that need to be saved and passed along.
 .ad
 .RS 14n
 Uses the indicated Kerberos V5 realm. By default, the daemon will determine its
-realm from the settings in the \fBkrb5.conf\fR(4) file.
+realm from the settings in the \fBkrb5.conf\fR(5) file.
 .RE
 
 .sp
@@ -235,7 +235,7 @@ Refuses connections that cannot be mapped to a name through the
 .RE
 
 .SH USAGE
-\fBrshd\fR and \fBin.rshd\fR are IPv6-enabled. See \fBip6\fR(7P). \fBIPv6\fR is
+\fBrshd\fR and \fBin.rshd\fR are IPv6-enabled. See \fBip6\fR(4P). \fBIPv6\fR is
 not currently supported with Kerberos V5 authentication.
 .sp
 .LP
@@ -303,14 +303,14 @@ Kerberos configuration file.
 .RE
 
 .SH SEE ALSO
-\fBrsh\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(1M),
-\fBinetd\fR(1M), \fBkadmin\fR(1M), \fBsvcadm\fR(1M), \fBpam\fR(3PAM),
-\fBgetnameinfo\fR(3SOCKET), \fBhosts\fR(4), \fBkrb5.conf\fR(4),
-\fBpam.conf\fR(4), \fBattributes\fR(5), \fBenviron\fR(5),
-\fBkrb5_auth_rules\fR(5), \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_rhosts_auth\fR(5), \fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5),
-\fBpam_unix_session\fR(5), \fBsmf\fR(5), \fBip6\fR(7P)
+\fBrsh\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(8),
+\fBinetd\fR(8), \fBkadmin\fR(8), \fBsvcadm\fR(8), \fBpam\fR(3PAM),
+\fBgetnameinfo\fR(3SOCKET), \fBhosts\fR(5), \fBkrb5.conf\fR(5),
+\fBpam.conf\fR(5), \fBattributes\fR(7), \fBenviron\fR(7),
+\fBkrb5_auth_rules\fR(7), \fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_rhosts_auth\fR(7), \fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7),
+\fBpam_unix_session\fR(7), \fBsmf\fR(7), \fBip6\fR(4P)
 .sp
 .LP
 \fI\fR
@@ -410,15 +410,15 @@ machine and the connecting medium. This is insecure, but it is useful in an
 A facility to allow all data exchanges to be encrypted should be present.
 .sp
 .LP
-The \fBpam_unix\fR(5) module is no longer supported. Similar functionality is
-provided by \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5), and
-\fBpam_unix_session\fR(5).
+The \fBpam_unix\fR(7) module is no longer supported. Similar functionality is
+provided by \fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7), and
+\fBpam_unix_session\fR(7).
 .sp
 .LP
 The \fBin.rshd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -430,8 +430,8 @@ svc:/network/shell:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/in.rwhod.8 b/usr/src/man/man8/in.rwhod.8
index a93147f7c6..b3f00f0566 100644
--- a/usr/src/man/man8/in.rwhod.8
+++ b/usr/src/man/man8/in.rwhod.8
@@ -30,7 +30,7 @@ located in the directory \fB/var/spool/rwho\fR.
 .sp
 .LP
 The \fBrwho\fR server transmits and receives messages at the port indicated in
-the \fBrwho\fR service specification, see \fBservices\fR(4). The messages sent
+the \fBrwho\fR service specification, see \fBservices\fR(5). The messages sent
 and received are defined in \fB/usr/include/protocols/rwhod.h\fR and are of the
 form:
 .sp
@@ -67,7 +67,7 @@ averages over the 1, 5, and 15 minute intervals prior to a server's
 transmission.  The host name included is that returned by the \fBuname\fR(2)
 system call. The array at the end of the message contains information about the
 users who are logged in to the sending machine.  This information includes the
-contents of the \fButmpx\fR(4) entry for each non-idle terminal line and a
+contents of the \fButmpx\fR(5) entry for each non-idle terminal line and a
 value indicating the time since a character was last received on the terminal
 line.
 .sp
@@ -113,8 +113,8 @@ information about other machines
 .SH SEE ALSO
 .sp
 .LP
-\fBruptime\fR(1), \fBrwho\fR(1), \fBw\fR(1), \fBuname\fR(2), \fBservices\fR(4),
-\fButmpx\fR(4), \fBattributes\fR(5)
+\fBruptime\fR(1), \fBrwho\fR(1), \fBw\fR(1), \fBuname\fR(2), \fBservices\fR(5),
+\fButmpx\fR(5), \fBattributes\fR(7)
 .SH WARNINGS
 .sp
 .LP
diff --git a/usr/src/man/man8/in.talkd.8 b/usr/src/man/man8/in.talkd.8
index 4356ed3a9b..73f3964634 100644
--- a/usr/src/man/man8/in.talkd.8
+++ b/usr/src/man/man8/in.talkd.8
@@ -17,14 +17,14 @@ in.talkd, talkd \- server for talk program
 .LP
 \fBtalkd\fR is a server used by the \fBtalk\fR(1) program.  It listens at the
 \fBUDP\fR port indicated in the ``talk'' service description; see
-\fBservices\fR(4). The actual conversation takes place on a  \fBTCP\fR
+\fBservices\fR(5). The actual conversation takes place on a  \fBTCP\fR
 connection that is established by negotiation between the two machines
 involved.
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBtalk\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M),
-\fBsvcadm\fR(1M), \fBservices\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBtalk\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8),
+\fBsvcadm\fR(8), \fBservices\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -32,7 +32,7 @@ The protocol is architecture dependent.
 .sp
 .LP
 The \fBin.talkd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -44,8 +44,8 @@ svc:/network/talk
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/in.telnetd.8 b/usr/src/man/man8/in.telnetd.8
index 4e1c0f51a3..ad461d55dd 100644
--- a/usr/src/man/man8/in.telnetd.8
+++ b/usr/src/man/man8/in.telnetd.8
@@ -16,9 +16,9 @@ in.telnetd, telnetd \- DARPA TELNET protocol server
 .SH DESCRIPTION
 \fBin.telnetd\fR is a server that supports the \fBDARPA\fR standard
 \fBTELNET\fR virtual terminal protocol. \fBin.telnetd\fR is normally invoked in
-the internet server (see \fBinetd\fR(1M)), for requests to connect to the
+the internet server (see \fBinetd\fR(8)), for requests to connect to the
 \fBTELNET\fR port as indicated by the \fB/etc/services\fR file (see
-\fBservices\fR(4)).
+\fBservices\fR(5)).
 .sp
 .LP
 \fBin.telnetd\fR operates by allocating a pseudo-terminal device for a client,
@@ -33,7 +33,7 @@ options to the client side indicating a willingness to do \fIremote\fR
 \fBecho\fR of characters, and to \fIsuppress\fR \fIgo\fR \fIahead\fR. The
 pseudo-terminal allocated to the client is configured to operate in "cooked"
 mode, and with \fBXTABS\fR, \fBICRNL\fR and \fBONLCR\fR enabled. See
-\fBtermio\fR(7I).
+\fBtermio\fR(4I).
 .sp
 .LP
 \fBin.telnetd\fR is willing to do: \fIecho\fR, \fIbinary\fR, \fIsuppress\fR
@@ -171,7 +171,7 @@ Disables displaying host specific information before login has been completed.
 .ad
 .RS 15n
 Uses the indicated Kerberos V5 realm. By default, the daemon will determine its
-realm from the settings in the \fBkrb5.conf\fR(4) file.
+realm from the settings in the \fBkrb5.conf\fR(5) file.
 .RE
 
 .sp
@@ -213,7 +213,7 @@ Disables Kerberos V5 authentication support negotiation.
 .RE
 
 .SH USAGE
-\fBtelnetd\fR and \fBin.telnetd\fR are IPv6-enabled. See \fBip6\fR(7P).
+\fBtelnetd\fR and \fBin.telnetd\fR are IPv6-enabled. See \fBip6\fR(4P).
 .SH SECURITY
 \fBin.telnetd\fR can authenticate using Kerberos V5 authentication,
 \fBpam\fR(3PAM), or both. By default, the telnet server will accept valid
@@ -239,7 +239,7 @@ must have a \fBkeytab\fR entry in the \fB/etc/krb5/krb5.keytab\fR file on the
 \fBhost/bigmachine.eng.example.com\fR
 .sp
 .LP
-See \fBkadmin\fR(1M) for instructions on adding a principal to a
+See \fBkadmin\fR(8) for instructions on adding a principal to a
 \fBkrb5.keytab\fR file. See \fI\fR for a discussion of Kerberos
 authentication.
 .sp
@@ -290,13 +290,13 @@ For a Kerberized telnet service, the correct \fBPAM\fR service name is
 
 .SH SEE ALSO
 \fBlogin\fR(1), \fBsvcs\fR(1), \fBtelnet\fR(1),
-\fBinetadm\fR(1M), \fBinetd\fR(1M), \fBkadmin\fR(1M), \fBsvcadm\fR(1M),
-\fBpam\fR(3PAM), \fBgetnameinfo\fR(3SOCKET), \fBissue\fR(4),
-\fBkrb5.conf\fR(4), \fBpam.conf\fR(4), \fBservices\fR(4), \fBattributes\fR(5),
-\fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5), \fBpam_unix_session\fR(5),
-\fBsmf\fR(5), \fBip6\fR(7P), \fBtermio\fR(7I)
+\fBinetadm\fR(8), \fBinetd\fR(8), \fBkadmin\fR(8), \fBsvcadm\fR(8),
+\fBpam\fR(3PAM), \fBgetnameinfo\fR(3SOCKET), \fBissue\fR(5),
+\fBkrb5.conf\fR(5), \fBpam.conf\fR(5), \fBservices\fR(5), \fBattributes\fR(7),
+\fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7), \fBpam_unix_session\fR(7),
+\fBsmf\fR(7), \fBip6\fR(4P), \fBtermio\fR(4I)
 .sp
 .LP
 \fI\fR
@@ -367,15 +367,15 @@ intelligent flushing of input and output queues.
 \fBin.telnetd\fR never sends \fBTELNET\fR \fIgo\fR \fIahead\fR commands.
 .sp
 .LP
-The \fBpam_unix\fR(5) module is no longer supported.. Similar functionality is
-provided by \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5), and
-\fBpam_unix_session\fR(5).
+The \fBpam_unix\fR(7) module is no longer supported.. Similar functionality is
+provided by \fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7), and
+\fBpam_unix_session\fR(7).
 .sp
 .LP
 The \fBin.telnetd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -387,8 +387,8 @@ svc:/network/telnet
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/in.tftpd.8 b/usr/src/man/man8/in.tftpd.8
index ccb750a9d7..a0b55ea0de 100644
--- a/usr/src/man/man8/in.tftpd.8
+++ b/usr/src/man/man8/in.tftpd.8
@@ -68,14 +68,14 @@ retransmission timeout value.
 
 .SH USAGE
 .LP
-The \fBin.tftpd\fR server is IPv6-enabled. See \fBip6\fR(7P).
+The \fBin.tftpd\fR server is IPv6-enabled. See \fBip6\fR(4P).
 .LP
 \fBin.tftpd\fR supports transfers of greater than 32 MB, per RFC 2348.
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBtftp\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M),
-\fBsvcadm\fR(1M), \fBnetconfig\fR(4), \fBattributes\fR(5), \fBsmf\fR(5),
-\fBip6\fR(7P)
+\fBsvcs\fR(1), \fBtftp\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8),
+\fBsvcadm\fR(8), \fBnetconfig\fR(5), \fBattributes\fR(7), \fBsmf\fR(7),
+\fBip6\fR(4P)
 .LP
 Malkin, G. and Harkin, A. \fIRFC 2347, TFTP Option Extension\fR. The Internet
 Society. May 1998
@@ -97,7 +97,7 @@ The \fBtftpd\fR server only acknowledges the transfer size option that is sent
 with a \fBread\fR request when the octet transfer mode is specified.
 .LP
 The \fBin.tftpd.1m\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -109,8 +109,8 @@ svc:/network/tftp/udp6:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/in.timed.8 b/usr/src/man/man8/in.timed.8
index 7ac6625939..97c24b93d9 100644
--- a/usr/src/man/man8/in.timed.8
+++ b/usr/src/man/man8/in.timed.8
@@ -21,7 +21,7 @@ FMRI \fIsvc\fR:/internet/time:default
 .sp
 .LP
 FMRI stands for Fault Management Resource Identifier. It is used to identify
-resources managed by the Fault Manager. See \fBfmd\fR(1M) and \fBsmf\fR(5).
+resources managed by the Fault Manager. See \fBfmd\fR(8) and \fBsmf\fR(7).
 .sp
 .LP
 The \fBin.timed\fR service provides the server-side of the time protocol. The
@@ -30,7 +30,7 @@ time server sends to requestors the time in seconds since midnight, January 1,
 port 37.
 .sp
 .LP
-The in.timed service is an \fBinetd\fR(1M) \fBsmf\fR(5) delegated service. The
+The in.timed service is an \fBinetd\fR(8) \fBsmf\fR(7) delegated service. The
 \fBin.timed\fR detects which transport is requested by examining the socket it
 is passed by the \fBinetd\fR daemon.
 .sp
@@ -57,7 +57,7 @@ and sends it to the client. Any received data is ignored.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -73,7 +73,7 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBinetd\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBinetd\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 RFC 868
diff --git a/usr/src/man/man8/in.uucpd.8 b/usr/src/man/man8/in.uucpd.8
index ed5f0c45a8..97643faf6c 100644
--- a/usr/src/man/man8/in.uucpd.8
+++ b/usr/src/man/man8/in.uucpd.8
@@ -19,13 +19,13 @@ in.uucpd, uucpd \- UUCP server
 networks.
 .sp
 .LP
-\fBin.uucpd\fR is invoked by \fBinetd\fR(1M) when a \fBUUCP\fR connection is
+\fBin.uucpd\fR is invoked by \fBinetd\fR(8) when a \fBUUCP\fR connection is
 established, that is, a connection to the port indicated in the "uucp" service
-specification, and executes the following protocol. See \fBservices\fR(4):
+specification, and executes the following protocol. See \fBservices\fR(5):
 .RS +4
 .TP
 1.
-The server prompts with \fBlogin:\fR. The \fBuucico\fR(1M) process at the
+The server prompts with \fBlogin:\fR. The \fBuucico\fR(8) process at the
 other end must supply a username.
 .RE
 .RS +4
@@ -107,12 +107,12 @@ time of last login
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBsvcadm\fR(1M),
-\fBuucico\fR(1M), \fBpam\fR(3PAM), \fBpam.conf\fR(4), \fBservices\fR(4),
-\fBattributes\fR(5), \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5), \fBpam_unix_session\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8), \fBsvcadm\fR(8),
+\fBuucico\fR(8), \fBpam\fR(3PAM), \fBpam.conf\fR(5), \fBservices\fR(5),
+\fBattributes\fR(7), \fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7), \fBpam_unix_session\fR(7),
+\fBsmf\fR(7)
 .SH DIAGNOSTICS
 .sp
 .LP
@@ -151,7 +151,7 @@ account.
 .sp
 .LP
 The \fBin.uucpd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -163,15 +163,15 @@ svc:/network/uucp
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
 .sp
 .LP
-The \fBpam_unix\fR(5) module is no longer supported. Similar functionality is
-provided by \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5), and
-\fBpam_unix_session\fR(5).
+The \fBpam_unix\fR(7) module is no longer supported. Similar functionality is
+provided by \fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7), and
+\fBpam_unix_session\fR(7).
diff --git a/usr/src/man/man8/inetadm.8 b/usr/src/man/man8/inetadm.8
index 067d541b79..0eab767b3a 100644
--- a/usr/src/man/man8/inetadm.8
+++ b/usr/src/man/man8/inetadm.8
@@ -78,15 +78,15 @@ values provided by \fBinetd\fR.
 .RE
 .sp
 .LP
-See \fBsmf\fR(5) for a description of an SMF service.
+See \fBsmf\fR(7) for a description of an SMF service.
 .sp
 .LP
-With no arguments, \fBinetadm\fR lists all services under \fBinetd\fR(1M)
+With no arguments, \fBinetadm\fR lists all services under \fBinetd\fR(8)
 control, including such attributes as their current run state and whether or
 not they are enabled.
 .SH OPTIONS
 .LP
-For options taking one or more FMRI operands (see \fBsmf\fR(5) for a
+For options taking one or more FMRI operands (see \fBsmf\fR(7) for a
 description of an FMRI), if the operand specifies a service (instead of a
 service instance), and that service has only a single instance, \fBinetadm\fR
 operates on that instance.
@@ -99,7 +99,7 @@ message is displayed and that operand is ignored.
 .LP
 For those options taking \fIname\fR=\fIvalue\fR parameters, a description of
 each of the possible names and the allowed values is found in the
-\fBinetd\fR(1M) man page.
+\fBinetd\fR(8) man page.
 .sp
 .LP
 The following options are supported:
@@ -317,7 +317,7 @@ Invalid arguments were supplied, such as an ambiguous service FMRI or pattern.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -332,4 +332,4 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBinetd\fR(1M), \fBsvccfg\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBinetd\fR(8), \fBsvccfg\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
diff --git a/usr/src/man/man8/inetconv.8 b/usr/src/man/man8/inetconv.8
index 65cc3f5b78..a2f04be2ed 100644
--- a/usr/src/man/man8/inetconv.8
+++ b/usr/src/man/man8/inetconv.8
@@ -28,10 +28,10 @@ them into smf repository
 .sp
 .LP
 The \fBinetconv\fR utility converts a file containing records of
-\fBinetd.conf\fR(4) into \fBsmf\fR(5) service manifests, and then import those
+\fBinetd.conf\fR(5) into \fBsmf\fR(7) service manifests, and then import those
 manifests into the \fBsmf\fR repository. Once the \fBinetd.conf\fR file has
 been converted, the only way to change aspects of an inet service is to use the
-\fBinetadm\fR(1M) utility.
+\fBinetadm\fR(8) utility.
 .sp
 .LP
 There is a one-to-one correspondence between a service line in the input file
@@ -102,7 +102,7 @@ conversion of that service is not performed.
 .ad
 .RS 14n
 Permits the specification of an alternate input file \fIsrcfile\fR. If this
-option is not specified, then the \fBinetd.conf\fR(4) file is used as input.
+option is not specified, then the \fBinetd.conf\fR(5) file is used as input.
 .RE
 
 .sp
@@ -113,7 +113,7 @@ option is not specified, then the \fBinetd.conf\fR(4) file is used as input.
 .RS 14n
 Turns off the auto-import of the manifests generated during the conversion
 process. Later, if you want to import a generated manifest into the
-\fBsmf\fR(5) repository, you can do so through the use of the \fBsvccfg\fR(1M)
+\fBsmf\fR(7) repository, you can do so through the use of the \fBsvccfg\fR(8)
 utility.
 .sp
 If the \fB-e\fR option is specified, the \fB-n\fR option only displays the
@@ -137,7 +137,7 @@ a RPC service, or \fB/var/svc/manifest/network\fR otherwise.
 \fBExample 1 \fRGenerating \fBsmf\fR Manifests from \fBinetd.conf\fR
 .sp
 .LP
-The following command generates \fBsmf\fR(5) manifests from \fBinetd.conf\fR(4)
+The following command generates \fBsmf\fR(7) manifests from \fBinetd.conf\fR(5)
 and places them in \fB/var/tmp\fR, overwriting any preexisting manifests of the
 same name, and then imports them into the \fBsmf\fR repository.
 
@@ -232,7 +232,7 @@ default output manifest file name
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -248,5 +248,5 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBinetadm\fR(1M), \fBinetd\fR(1M), \fBsvccfg\fR(1M), \fBinetd.conf\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBinetadm\fR(8), \fBinetd\fR(8), \fBsvccfg\fR(8), \fBinetd.conf\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
diff --git a/usr/src/man/man8/inetd.8 b/usr/src/man/man8/inetd.8
index ea4aa6f1d6..be13afb26e 100644
--- a/usr/src/man/man8/inetd.8
+++ b/usr/src/man/man8/inetd.8
@@ -27,9 +27,9 @@ failures; and, when appropriate, to listen for network requests for services.
 .sp
 .LP
 Services are no longer managed by editing the inetd configuration file,
-\fBinetd.conf\fR(4). Instead, you use \fBinetconv\fR(1M) to convert the
+\fBinetd.conf\fR(5). Instead, you use \fBinetconv\fR(8) to convert the
 configuration file content into SMF format services, then manage these services
-using \fBinetadm\fR(1M) and \fBsvcadm\fR(1M). Once a service has been converted
+using \fBinetadm\fR(8) and \fBsvcadm\fR(8). Once a service has been converted
 by \fBinetconv\fR, any changes to the legacy data in the \fBinetd\fR config
 file will not become effective. However, \fBinetd\fR does alert the
 administrator when it notices change in the configuration file. See the start
@@ -60,7 +60,7 @@ to an SMF request, or when it receives a SIGHUP signal. See the \fBrefresh\fR
 description under "inetd Methods" for the behavior on configuration refresh.
 .sp
 .LP
-You can use the \fBinetadm\fR(1M) or \fBsvccfg\fR(1M) utilities to make
+You can use the \fBinetadm\fR(8) or \fBsvccfg\fR(8) utilities to make
 configuration changes to Internet services within the SMF repository.
 \fBinetadm\fR has the advantage over \fBsvccfg\fR in that it provides an
 Internet/RPC service context.
@@ -68,7 +68,7 @@ Internet/RPC service context.
 .LP
 As part of its service management duties, \fBinetd\fR implements a state
 machine for each of its managed services. The states in this machine are made
-up of the \fBsmf\fR(5) set of states. The semantics of these states are as
+up of the \fBsmf\fR(7) set of states. The semantics of these states are as
 follows:
 .sp
 .ne 2
@@ -183,7 +183,7 @@ this state.
 
 .sp
 .LP
-Use \fBinetadm\fR(1M) to obtain the current state of a managed service.
+Use \fBinetadm\fR(8) to obtain the current state of a managed service.
 .SS "Service Methods"
 .LP
 As part of certain state transitions \fBinetd\fR will execute, if supplied, one
@@ -278,7 +278,7 @@ applicable to all \fBinetd\fR-managed services.
 .sp
 .LP
 For details on viewing and modifying the configuration of a service and the
-defaults, refer to \fBinetadm\fR(1M).
+defaults, refer to \fBinetadm\fR(8).
 .sp
 .LP
 The basic configuration of a service is stored in a property group named
@@ -399,7 +399,7 @@ If true, pass \fBinetd\fR's environment on to the service's start method.
 Regardless of this setting, \fBinetd\fR will set the variables \fBSMF_FMRI\fR,
 \fBSMF_METHOD\fR, and \fBSMF_RESTARTER\fR in the start method's environment, as
 well as any environment variables set in the method context. These variables
-are described in \fBsmf_method\fR(5).
+are described in \fBsmf_method\fR(7).
 .RE
 
 .sp
@@ -515,7 +515,7 @@ If true, and this is a \fBnowait\fR-type service, \fBinetd\fR logs the client's
 IP address and TCP port number, along with the name of the service, for each
 incoming connection, using the \fBsyslog\fR(3C) facility. \fBinetd\fR uses the
 \fBsyslog\fR facility \fBcode\fR daemon and \fBnotice\fR priority level. See
-\fBsyslog.conf\fR(4) for a description of \fBsyslog\fR codes and severity
+\fBsyslog.conf\fR(5) for a description of \fBsyslog\fR codes and severity
 levels. This logging is separate from the logging done by the TCP wrappers
 facility.
 .sp
@@ -534,14 +534,14 @@ If \fBtrue\fR, enable TCP wrappers access control. This applies only to
 services with \fBendpoint_type\fR set to \fBstreams\fR and \fBwait\fR set to
 \fBfalse\fR. The \fBsyslog\fR facility \fBcode\fR daemon is used to log allowed
 connections (using the \fBnotice\fR severity level) and denied traffic (using
-the \fBwarning\fR severity level). See \fBsyslog.conf\fR(4) for a description
+the \fBwarning\fR severity level). See \fBsyslog.conf\fR(5) for a description
 of \fBsyslog\fR codes and severity levels. The stability level of the TCP
 wrappers facility and its configuration files is External. As the TCP wrappers
 facility is not controlled by Sun, intra-release incompatibilities are not
-uncommon. See \fBattributes\fR(5).
+uncommon. See \fBattributes\fR(7).
 .sp
 For more information about configuring TCP wrappers, refer to
-\fBtcpd\fR(1M) and \fBhosts_access\fR(4).
+\fBtcpd\fR(8) and \fBhosts_access\fR(5).
 .sp
 \fBtcp_wrappers\fR is equivalent to the previous inetd's
 \fB/etc/default/inetd\fR property \fBENABLE_TCPWRAPPERS\fR.
@@ -585,7 +585,7 @@ A number of the basic properties are optional for a service. In their absence,
 their values are taken from the set of default values present in the
 \fBdefaults\fR property group in the \fBinetd\fR service. These properties,
 with their seed values, are listed below. Note that these values are
-configurable through \fBinetadm\fR(1M).
+configurable through \fBinetadm\fR(8).
 .sp
 .in +2
 .nf
@@ -608,7 +608,7 @@ tcp_wrappers        false
 Each method specified for a service will have its configuration stored in the
 SMF repository, within a property group of the same name as the method. The set
 of properties allowable for these methods includes those specified for the
-services managed by \fBsvc.startd\fR(1M). (See \fBsvc.startd\fR(1M) for further
+services managed by \fBsvc.startd\fR(8). (See \fBsvc.startd\fR(8) for further
 details.) Additionally, for the \fBinetd_start\fR method, you can set the
 \fBarg0\fR property.
 .sp
@@ -632,12 +632,12 @@ arg0='/path/to/service/daemon'
 
 .sp
 .LP
-In addition to the special method tokens mentioned in \fBsmf_method\fR(5),
+In addition to the special method tokens mentioned in \fBsmf_method\fR(7),
 \fBinetd\fR also supports the \fB:kill_process\fR token for \fBwait\fR-type
 services. This results in behavior identical to that if the \fB:kill\fR token
 were supplied, except that the \fBkill\fR signal is sent only to the parent
 process of the \fBwait\fR-type service's \fBstart\fR method, not to all members
-of its encompassing process contract (see \fBprocess\fR(4)).
+of its encompassing process contract (see \fBprocess\fR(5)).
 .SS "Configuring Protocols for Sockets-Based Services"
 .LP
 When configuring \fBinetd\fR for a sockets-based service, you have the choice,
@@ -683,7 +683,7 @@ IPv4 and IPv6.
 .SS "\fBinetd\fR Methods"
 .LP
 \fBinetd\fR provides the methods listed below for consumption by the master
-restarter, \fBsvc.startd\fR(1M).
+restarter, \fBsvc.startd\fR(8).
 .sp
 .ne 2
 .na
@@ -696,9 +696,9 @@ beginning to handle \fBsmf\fR requests for its managed services and network
 requests for those services that are in either the \fBonline\fR or
 \fBdegraded\fR state.
 .sp
-In addition, \fBinetd\fR also checks if the \fBinetd.conf\fR(4)-format
+In addition, \fBinetd\fR also checks if the \fBinetd.conf\fR(5)-format
 configuration file it is monitoring has changed since the last
-\fBinetconv\fR(1M) conversion was carried out. If it has, then a message
+\fBinetconv\fR(8) conversion was carried out. If it has, then a message
 telling the administrator to re-run \fBinetconv\fR to effect the changes made
 is logged in \fBsyslog\fR.
 .RE
@@ -724,7 +724,7 @@ methods in the process.
 .sp .6
 .RS 4n
 Results in a refresh being performed for each of its managed services and the
-\fBinetd.conf\fR(4) format configuration file being checked for change, as in
+\fBinetd.conf\fR(5) format configuration file being checked for change, as in
 the \fBstart\fR method. When a service is refreshed, its behavior depends on
 its current state:
 .RS +4
@@ -772,7 +772,7 @@ No options are supported.
 .sp .6
 .RS 4n
 Specifies an alternate location for the legacy service file
-(\fBinetd.conf\fR(4)).
+(\fBinetd.conf\fR(5)).
 .RE
 
 .sp
@@ -812,11 +812,11 @@ online         15:52:10 svc:/network/mysvc:stream6
 
 .sp
 .LP
-See \fBsvcs\fR(1) and \fBinetadm\fR(1M) for descriptions of those commands.
+See \fBsvcs\fR(1) and \fBinetadm\fR(8) for descriptions of those commands.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -831,17 +831,17 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBfmd\fR(1M), \fBinetadm\fR(1M), \fBinetconv\fR(1M), \fBsvcadm\fR(1M),
-\fBsvccfg\fR(1M), \fBsvcs\fR(1), \fBsvc.startd\fR(1M), \fBsyslog\fR(3C),
+\fBfmd\fR(8), \fBinetadm\fR(8), \fBinetconv\fR(8), \fBsvcadm\fR(8),
+\fBsvccfg\fR(8), \fBsvcs\fR(1), \fBsvc.startd\fR(8), \fBsyslog\fR(3C),
 \fBgetnetconfigent\fR(3NSL), \fBgetrpcbyname\fR(3NSL),
-\fBgetservbyname\fR(3SOCKET), \fBinetd.conf\fR(4), \fBprocess\fR(4),
-\fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5), \fBsmf_method\fR(5)
+\fBgetservbyname\fR(3SOCKET), \fBinetd.conf\fR(5), \fBprocess\fR(5),
+\fBsyslog.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7), \fBsmf_method\fR(7)
 .SH NOTES
 .LP
 The \fBinetd\fR daemon performs the same function as, but is implemented
 significantly differently from, the daemon of the same name in Solaris 9 and
 prior Solaris operating system releases. In the current Solaris release,
-\fBinetd\fR is part of the Service Management Facility (see \fBsmf\fR(5)) and
+\fBinetd\fR is part of the Service Management Facility (see \fBsmf\fR(7)) and
 will run only within that facility.
 .sp
 .LP
diff --git a/usr/src/man/man8/infocmp.8 b/usr/src/man/man8/infocmp.8
index 41af7d2605..2de827e453 100644
--- a/usr/src/man/man8/infocmp.8
+++ b/usr/src/man/man8/infocmp.8
@@ -331,5 +331,5 @@ Compiled terminal description database.
 .SH SEE ALSO
 .sp
 .LP
-\fBcaptoinfo\fR(1M), \fBtic\fR(1M), \fBcurses\fR(3CURSES), \fBterminfo\fR(4),
-\fBattributes\fR(5)
+\fBcaptoinfo\fR(8), \fBtic\fR(8), \fBcurses\fR(3CURSES), \fBterminfo\fR(5),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/init.8 b/usr/src/man/man8/init.8
index 34b10b6f8c..2baab82eae 100644
--- a/usr/src/man/man8/init.8
+++ b/usr/src/man/man8/init.8
@@ -23,16 +23,16 @@ init, telinit \- process control initialization
 .LP
 \fBinit\fR is the default primordial user process. (Options given to the kernel
 during boot may result in the invocation of an alternative primordial user
-process, as described on \fBkernel\fR(1M)). \fBinit\fR initiates the core
-components of the service management facility, \fBsvc.configd\fR(1M) and
-\fBsvc.startd\fR(1M), and restarts these components if they fail. For backwards
+process, as described on \fBkernel\fR(8)). \fBinit\fR initiates the core
+components of the service management facility, \fBsvc.configd\fR(8) and
+\fBsvc.startd\fR(8), and restarts these components if they fail. For backwards
 compatibility, \fBinit\fR also starts and restarts general processes according
 to \fB/etc/inittab\fR, as desribed below.
 .sp
 .LP
 The run levels and system booting descriptions given below are provided for
 compatibility purposes only, and otherwise made obsolete by the service
-management facility, \fBsmf\fR(5).
+management facility, \fBsmf\fR(7).
 .SS "init Failure"
 .sp
 .LP
@@ -55,7 +55,7 @@ First, it reads \fB/etc/default/init\fR to set environment variables. This is
 typically where \fBTZ\fR (time zone) and locale-related environments such as
 \fBLANG\fR or \fBLC_CTYPE\fR get set. (See the FILES section at the end of this
 page.) \fBinit\fR then looks in \fB/etc/inittab\fR for the \fBinitdefault\fR
-entry (see \fBinittab\fR(4)). If the \fBinitdefault\fR entry:
+entry (see \fBinittab\fR(5)). If the \fBinitdefault\fR entry:
 .sp
 .ne 2
 .na
@@ -65,7 +65,7 @@ entry (see \fBinittab\fR(4)). If the \fBinitdefault\fR entry:
 .RS 4n
 \fBinit\fR usually uses the run level specified in that entry as the initial
 run level to enter only if the options/milestone property has not been
-specified for \fBsvc.startd\fR(1M).
+specified for \fBsvc.startd\fR(8).
 .RE
 
 .sp
@@ -75,8 +75,8 @@ specified for \fBsvc.startd\fR(1M).
 .ad
 .sp .6
 .RS 4n
-The service management facility, \fBsmf\fR(5), examines its configuration
-specified in \fBsvc.startd\fR(1M), and enters the milestone specified by the
+The service management facility, \fBsmf\fR(7), examines its configuration
+specified in \fBsvc.startd\fR(8), and enters the milestone specified by the
 options/milestone property.
 .RE
 
@@ -93,7 +93,7 @@ run levels:
 .RS 4n
 \fBinit\fR goes to the single-user state. In this state, the system console
 device (\fB/dev/console\fR) is opened for reading and writing and the command
-\fB/sbin/su\fR, (see \fBsu\fR(1M)), is invoked. Use either \fBinit\fR or
+\fB/sbin/su\fR, (see \fBsu\fR(8)), is invoked. Use either \fBinit\fR or
 \fBtelinit\fR to change the run level of the system. Note that if the shell is
 terminated (using an end-of-file), \fBinit\fR only re-initializes to the
 single-user state if \fB/etc/inittab\fR does not exist.
@@ -115,7 +115,7 @@ single-user state if \fB/etc/inittab\fR does not exist.
 .LP
 If this is the first time since power up that \fBinit\fR has entered a run
 level other than single-user state, \fBinit\fR first scans \fB/etc/inittab\fR
-for \fBboot\fR and \fBbootwait\fR entries (see \fBinittab\fR(4)). These entries
+for \fBboot\fR and \fBbootwait\fR entries (see \fBinittab\fR(5)). These entries
 are performed before any other processing of \fB/etc/inittab\fR takes place,
 providing that the run level entered matches that of the entry. In this way any
 special initialization of the operating system, such as mounting file systems,
@@ -151,8 +151,8 @@ When a run level change request is made, \fBinit\fR or a designate sends the
 warning signal (\fBSIGTERM\fR) to all processes that are undefined in the
 target run level. A minimum interval of five seconds is observed before
 \fBinit\fR or its designate forcibly terminates these processes by sending a
-kill signal (\fBSIGKILL\fR). Additionally, init informs \fBsvc.startd\fR(1M)
-that the run level is changing. \fBsvc.startd\fR(1M) then restricts the system
+kill signal (\fBSIGKILL\fR). Additionally, init informs \fBsvc.startd\fR(8)
+that the run level is changing. \fBsvc.startd\fR(8) then restricts the system
 to the set of services which the milestone corresponding to the run-level
 change depends on.
 .sp
@@ -221,7 +221,7 @@ mounted. Only a small set of essential kernel processes are left running. This
 mode is for administrative tasks such as installing optional utility packages.
 All files are accessible and no users are logged in on the system.
 .sp
-This request corresponds to a request for \fBsmf\fR(5) to restrict the system
+This request corresponds to a request for \fBsmf\fR(7) to restrict the system
 milestone to svc:/milestone/single-user:default.
 .RE
 
@@ -236,7 +236,7 @@ Put the system in multi-user mode. All multi-user environment terminal
 processes and daemons are spawned. This state is commonly referred to as the
 multi-user state.
 .sp
-This request corresponds to a request for \fBsmf\fR(5) to restrict the system
+This request corresponds to a request for \fBsmf\fR(7) to restrict the system
 milestone to svc:/milestone/multi-user:default.
 .RE
 
@@ -249,7 +249,7 @@ milestone to svc:/milestone/multi-user:default.
 .RS 4n
 Extend multi-user mode by making local resources available over the network.
 .sp
-This request corresponds to a request for \fBsmf\fR(5) to restrict the system
+This request corresponds to a request for \fBsmf\fR(7) to restrict the system
 milestone to svc:/milestone/multi-user-server:default.
 .RE
 
@@ -334,7 +334,7 @@ killed. This last condition insures that all port monitors started by the
 \fBSAC\fR are killed and all services started by these port monitors, including
 \fBttymon\fR login services, are killed.
 .sp
-This request corresponds to a request for \fBsmf\fR(5) to restrict the system
+This request corresponds to a request for \fBsmf\fR(7) to restrict the system
 milestone to svc:/milestone/single-user:default.
 .RE
 
@@ -369,7 +369,7 @@ variables are:
 Either specifies the timezone information (see \fBctime\fR(3C)) or the name of
 a timezone information file \fB/usr/share/lib/zoneinfo\fR.
 .sp
-Refer to the \fBTIMEZONE\fR(4) man page before changing this setting.
+Refer to the \fBTIMEZONE\fR(5) man page before changing this setting.
 .RE
 
 .sp
@@ -523,12 +523,12 @@ A named pipe used for internal communication.
 .SH SEE ALSO
 .sp
 .LP
-\fBlogin\fR(1), \fBsh\fR(1), \fBstty\fR(1), \fBwho\fR(1), \fBkernel\fR(1M),
-\fBshutdown\fR(1M), \fBsu\fR(1M), \fBsvc.configd\fR(1M), \fBsvc.startd\fR(1M),
-\fBttymon\fR(1M), \fBioctl\fR(2), \fBkill\fR(2), \fBctime\fR(3C),
-\fBpam\fR(3PAM), \fBinit.d\fR(4), \fBinittab\fR(4), \fBpam.conf\fR(4),
-\fBTIMEZONE\fR(4), \fButmpx\fR(4), \fBattributes\fR(5),
-\fBpam_unix_session\fR(5), \fBsmf\fR(5), \fBtermio\fR(7I)
+\fBlogin\fR(1), \fBsh\fR(1), \fBstty\fR(1), \fBwho\fR(1), \fBkernel\fR(8),
+\fBshutdown\fR(8), \fBsu\fR(8), \fBsvc.configd\fR(8), \fBsvc.startd\fR(8),
+\fBttymon\fR(8), \fBioctl\fR(2), \fBkill\fR(2), \fBctime\fR(3C),
+\fBpam\fR(3PAM), \fBinit.d\fR(5), \fBinittab\fR(5), \fBpam.conf\fR(5),
+\fBTIMEZONE\fR(5), \fButmpx\fR(5), \fBattributes\fR(7),
+\fBpam_unix_session\fR(7), \fBsmf\fR(7), \fBtermio\fR(4I)
 .SH DIAGNOSTICS
 .sp
 .LP
@@ -563,7 +563,7 @@ file system is not accessible.
 .sp
 .LP
 When a system transitions down to the \fBS\fR or \fBs\fR state, the
-\fB/etc/nologin\fR file (see \fBnologin\fR(4)) is created. Upon subsequent
+\fB/etc/nologin\fR file (see \fBnologin\fR(5)) is created. Upon subsequent
 transition to run level 2, this file is removed.
 .sp
 .LP
@@ -571,5 +571,5 @@ transition to run level 2, this file is removed.
 communication.
 .sp
 .LP
-The \fBpam_unix\fR(5) module is no longer supported. Similar functionality is
-provided by \fBpam_unix_session\fR(5).
+The \fBpam_unix\fR(7) module is no longer supported. Similar functionality is
+provided by \fBpam_unix_session\fR(7).
diff --git a/usr/src/man/man8/inityp2l.8 b/usr/src/man/man8/inityp2l.8
index 160cba5443..696b698247 100644
--- a/usr/src/man/man8/inityp2l.8
+++ b/usr/src/man/man8/inityp2l.8
@@ -17,7 +17,7 @@ inityp2l \- create NIS (YP) to LDAP configuration files
 .sp
 .LP
 The \fBinityp2l\fR utility assists with creation of the \fBNISLDAPmapping\fR
-and \fBypserv\fR files. See \fBNISLDAPmapping\fR(4) and \fBypserv\fR(4).
+and \fBypserv\fR files. See \fBNISLDAPmapping\fR(5) and \fBypserv\fR(5).
 \fBinityp2l\fR examines the NIS maps on a system. and through a dialogue with
 the user, determines which NIS to (and from) LDAP mappings are required. A
 \fBNISLDAPmapping\fR file is then created based on this information. The
@@ -111,7 +111,7 @@ The default location for the generated \fBypserv\fR file
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -127,4 +127,4 @@ Interface Stability	Obsolete
 .SH SEE ALSO
 .sp
 .LP
-\fBNISLDAPmapping\fR(4), \fBypserv\fR(4), \fBattributes\fR(5)
+\fBNISLDAPmapping\fR(5), \fBypserv\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/install.8 b/usr/src/man/man8/install.8
index c699f5774c..be064bc56f 100644
--- a/usr/src/man/man8/install.8
+++ b/usr/src/man/man8/install.8
@@ -214,10 +214,10 @@ Suppress printing of messages other than error messages.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBinstall\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBinstall\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH SEE ALSO
 .sp
 .LP
 \fBchgrp\fR(1), \fBchmod\fR(1), \fBchown\fR(1), \fBcp\fR(1), \fBinstall\fR(1B),
-\fBmake\fR(1S), \fBmkdir\fR(1), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBmake\fR(1S), \fBmkdir\fR(1), \fBattributes\fR(7), \fBlargefile\fR(7)
diff --git a/usr/src/man/man8/installf.8 b/usr/src/man/man8/installf.8
index ce3341d4ed..ae679ee4d2 100644
--- a/usr/src/man/man8/installf.8
+++ b/usr/src/man/man8/installf.8
@@ -27,7 +27,7 @@ installf \- add a file to the software installation database
 .sp
 .LP
 \fBinstallf\fR informs the system that a pathname not listed in the
-\fBpkgmap\fR(4) file is being created or modified. It should be invoked before
+\fBpkgmap\fR(5) file is being created or modified. It should be invoked before
 any file modifications have occurred.
 .sp
 .LP
@@ -52,9 +52,9 @@ In all cases, the current content information is calculated and stored
 appropriately.
 .sp
 .LP
-Package commands are \fBlargefile\fR(5)-aware. They handle files larger than 2
+Package commands are \fBlargefile\fR(7)-aware. They handle files larger than 2
 GB in the same way they handle smaller files. In their current implementations,
-\fBpkgadd\fR(1M), \fBpkgtrans\fR(1) and other package commands can process a
+\fBpkgadd\fR(8), \fBpkgtrans\fR(1) and other package commands can process a
 datastream of  up to 4 GB.
 .SH OPTIONS
 .sp
@@ -103,8 +103,8 @@ specified when installing to a client from a server (for example,
 .sp
 \fBinstallf\fR inherits the value of the \fBPKG_INSTALL_ROOT\fR environment
 variable. (See ENVIRONMENT VARIABLES, below.) If \fBPKG_INSTALL_ROOT\fR is set,
-such as when the \fB-R\fR option is used with \fBpkgadd\fR(1M) or
-\fBpkgrm\fR(1M), there is no need to use the \fBinstallf\fR \fB-R\fR option.
+such as when the \fB-R\fR option is used with \fBpkgadd\fR(8) or
+\fBpkgrm\fR(8), there is no need to use the \fBinstallf\fR \fB-R\fR option.
 .LP
 Note -
 .sp
@@ -112,7 +112,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -343,7 +343,7 @@ installf \fB-f\fR $PKGINST || exit 2
 .sp
 .LP
 \fBinstallf\fR inherits the value of the following environment variable. This
-variable is set when \fBpkgadd\fR(1M) or \fBpkgrm\fR(1M) is invoked with the
+variable is set when \fBpkgadd\fR(8) or \fBpkgrm\fR(8) is invoked with the
 \fB-R\fR option.
 .sp
 .ne 2
@@ -381,9 +381,9 @@ An error occurred.
 .sp
 .LP
 \fBpkginfo\fR(1), \fBpkgmk\fR(1), \fBpkgparam\fR(1), \fBpkgproto\fR(1),
-\fBpkgtrans\fR(1), \fBpkgadd\fR(1M), \fBpkgask\fR(1M), \fBpkgchk\fR(1M),
-\fBpkgrm\fR(1M), \fBremovef\fR(1M), \fBpkgmap\fR(4), \fBspace\fR(4),
-\fBattributes\fR(5), \fBlargefile\fR(5)
+\fBpkgtrans\fR(1), \fBpkgadd\fR(8), \fBpkgask\fR(8), \fBpkgchk\fR(8),
+\fBpkgrm\fR(8), \fBremovef\fR(8), \fBpkgmap\fR(5), \fBspace\fR(5),
+\fBattributes\fR(7), \fBlargefile\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/installgrub.8 b/usr/src/man/man8/installgrub.8
index e8d95efc91..0b3d141615 100644
--- a/usr/src/man/man8/installgrub.8
+++ b/usr/src/man/man8/installgrub.8
@@ -123,7 +123,7 @@ Directory where GRUB files reside.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -138,8 +138,8 @@ Interface Stability	Uncommitted
 
 .SH SEE ALSO
 .LP
-\fBboot\fR(1M), \fBfdisk\fR(1M), \fBfmthard\fR(1M), \fBkernel\fR(1M),
-\fBattributes\fR(5)
+\fBboot\fR(8), \fBfdisk\fR(8), \fBfmthard\fR(8), \fBkernel\fR(8),
+\fBattributes\fR(7)
 .SH WARNINGS
 .LP
 Installing GRUB on the master boot sector (\fB-m\fR option) overrides any boot
diff --git a/usr/src/man/man8/intrd.8 b/usr/src/man/man8/intrd.8
index 8a1ae78f11..992e2d2726 100644
--- a/usr/src/man/man8/intrd.8
+++ b/usr/src/man/man8/intrd.8
@@ -21,7 +21,7 @@ assignments are imbalanced and harmful to system performance, it will generate
 and implement new assignments.
 .sp
 .LP
-Any notifications will be delivered via \fBsyslogd\fR(1M).
+Any notifications will be delivered via \fBsyslogd\fR(8).
 .sp
 .LP
 Because \fBintrd\fR dynamically monitors a system  for optimal performance, it
@@ -30,7 +30,7 @@ behavior is normal.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -46,13 +46,13 @@ Interface Stability 	Unstable
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBsyslogd\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBsyslogd\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The interrupt distribution daemon is managed by the service management
-facility, \fBsmf\fR(5), under the service identifier:
+facility, \fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -64,5 +64,5 @@ svc:/system/intrd:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/intrstat.8 b/usr/src/man/man8/intrstat.8
index 68079bc97f..4827b00947 100644
--- a/usr/src/man/man8/intrstat.8
+++ b/usr/src/man/man8/intrstat.8
@@ -27,7 +27,7 @@ The device name is given in the form of
 \fB{\fR\fIname\fR}\fI#\fR\fB{\fR\fIinstance\fR\fB}\fR. The name is the
 normalized driver name, and typically corresponds to the name of the module
 implementing the driver. See \fBddi_driver_name\fR(9F). Many Sun-delivered
-drivers have their own manual pages. See \fBIntro\fR(7).
+drivers have their own manual pages. See \fBIntro\fR(4).
 .sp
 .LP
 If standard output is a terminal, the table contains as many columns of data as
@@ -180,7 +180,7 @@ example# intrstat
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -198,7 +198,7 @@ Interface Stability	See below.
 The command-line syntax is Evolving. The human-readable output is Unstable.
 .SH SEE ALSO
 .LP
-\fBdtrace\fR(1M), \fBtrapstat\fR(1M), \fBattributes\fR(5), \fBIntro\fR(7),
+\fBdtrace\fR(8), \fBtrapstat\fR(8), \fBattributes\fR(7), \fBIntro\fR(4),
 \fBddi_driver_name\fR(9F)
 .sp
 .LP
diff --git a/usr/src/man/man8/iostat.8 b/usr/src/man/man8/iostat.8
index f223c95e1d..69fe892901 100644
--- a/usr/src/man/man8/iostat.8
+++ b/usr/src/man/man8/iostat.8
@@ -78,8 +78,8 @@ Note that the \fBnames\fR printed in these state change messages are affected
 by the \fB-n\fR and \fB-m\fR options as appropriate.
 .sp
 .LP
-For more general system statistics, use \fBsar\fR(1), \fBsar\fR(1M), or
-\fBvmstat\fR(1M).
+For more general system statistics, use \fBsar\fR(1), \fBsar\fR(8), or
+\fBvmstat\fR(8).
 .SS "Output"
 .sp
 .LP
@@ -225,7 +225,7 @@ The following options are supported:
 .RS 12n
 Report the percentage of time the system has spent in user mode, in system
 mode, in dtrace probes, and idling. See the NOTES section and
-\fBmpstat\fR(1m) for more information.
+\fBmpstat\fR(8) for more information.
 .RE
 
 .sp
@@ -413,7 +413,7 @@ time. See \fBtime\fR(2). Specify \fBd\fR for standard date format. See
 \fB\fB-X\fR\fR
 .ad
 .RS 12n
-For disks under \fBscsi_vhci\fR(7D) control, in addition to disk \fIlun\fR
+For disks under \fBscsi_vhci\fR(4D) control, in addition to disk \fIlun\fR
 statistics, also report statistics for \fIlun\fR.\fIcontroller\fR.
 .RE
 
@@ -440,7 +440,7 @@ is implied.
 \fB\fB-Y\fR\fR
 .ad
 .RS 12n
-For disks under \fBscsi_vhci\fR(7D) control, in addition to disk \fIlun\fR
+For disks under \fBscsi_vhci\fR(4D) control, in addition to disk \fIlun\fR
 statistics, also report statistics for \fIlun\fR.\fItargetport\fR and
 \fIlun\fR.\fItargetport\fR.\fIcontroller\fR.
 .sp
@@ -640,7 +640,7 @@ ssd22.t2.fp3    0.0    0.0    0.4    0.0  0.0  0.0    0.0   0   0
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -659,8 +659,8 @@ Invocation is evolving. Human readable output is unstable.
 .SH SEE ALSO
 .sp
 .LP
-\fBdate\fR(1), \fBsar\fR(1), \fBsar\fR(1M), \fBmpstat\fR(1M), \fBvmstat\fR(1M),
-\fBtime\fR(2), \fBattributes\fR(5), \fBscsi_vhci\fR(7D)
+\fBdate\fR(1), \fBsar\fR(1), \fBsar\fR(8), \fBmpstat\fR(8), \fBvmstat\fR(8),
+\fBtime\fR(2), \fBattributes\fR(7), \fBscsi_vhci\fR(4D)
 .SH NOTES
 .sp
 .LP
@@ -674,9 +674,9 @@ are fairly normal in such cases.
 .sp
 .LP
 The \fBmpstat\fR utility reports the same \fBdt\fR, \fBusr\fR, and \fBsys\fR
-statistics. See \fBmpstat\fR(1M) for more information.
+statistics. See \fBmpstat\fR(8) for more information.
 .sp
 .LP
 When executed in a \fBzone\fR and if the pools facility is active,
-\fBiostat\fR(1M) will only provide information for those processors in the
+\fBiostat\fR(8) will only provide information for those processors in the
 processor set of the pool to which the \fBzone\fR is bound.
diff --git a/usr/src/man/man8/ipaddrsel.8 b/usr/src/man/man8/ipaddrsel.8
index 7b8fd3bb23..9c3efbd875 100644
--- a/usr/src/man/man8/ipaddrsel.8
+++ b/usr/src/man/man8/ipaddrsel.8
@@ -29,7 +29,7 @@ Use the \fBipaddrsel\fR utility to configure the IPv6 default address selection
 policy table. The policy table is a longest-matching-prefix lookup table that
 is used for IPv6 source address selection and for destination address ordering
 when resolving names to \fBAF_INET6\fR addresses. For a description of how the
-policy table is used for source address selection, see \fBinet6\fR(7P). For a
+policy table is used for source address selection, see \fBinet6\fR(4P). For a
 description of how the policy table is used for destination address ordering,
 see \fBgetaddrinfo\fR(3SOCKET).
 .sp
@@ -50,7 +50,7 @@ accepts.
 Note -
 .sp
 .RS 2
-If the \fBusesrc\fR subcommand to \fBifconfig\fR(1M) is applied to a particular
+If the \fBusesrc\fR subcommand to \fBifconfig\fR(8) is applied to a particular
 physical interface, the selection policy specified by \fBusesrc\fR overrides
 the source address selection policies specified by \fBipaddrsel\fR. This is
 true for packets that are locally generated and for applications that do not
@@ -287,7 +287,7 @@ started.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -302,11 +302,11 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBnscd\fR(1M), \fBinet\fR(3SOCKET), \fBgetaddrinfo\fR(3SOCKET),
-\fBipaddrsel.conf\fR(4), \fBattributes\fR(5), \fBinet6\fR(7P)
+\fBnscd\fR(8), \fBinet\fR(3SOCKET), \fBgetaddrinfo\fR(3SOCKET),
+\fBipaddrsel.conf\fR(5), \fBattributes\fR(7), \fBinet6\fR(4P)
 .SH NOTES
 .LP
-The ipnodes cache kept by \fBnscd\fR(1M) contains addresses that are ordered
+The ipnodes cache kept by \fBnscd\fR(8) contains addresses that are ordered
 using the destination address ordering algorithm, which is one of the reasons
 why \fBipaddrsel\fR is called before \fBnscd\fR in the boot sequence. If
 \fBipaddrsel\fR is used to change the address selection policy after \fBnscd\fR
diff --git a/usr/src/man/man8/ipdadm.8 b/usr/src/man/man8/ipdadm.8
index 73baa7bc8c..a25ebc3c60 100644
--- a/usr/src/man/man8/ipdadm.8
+++ b/usr/src/man/man8/ipdadm.8
@@ -204,7 +204,7 @@ Invalid command line options or arguments were specified.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -220,4 +220,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBzonename\fR(1), \fBzoneadm\fR(1M), \fBattributes\fR(5), \fBzones(5)\fR
+\fBzonename\fR(1), \fBzoneadm\fR(8), \fBattributes\fR(7), \fBzones\fR(7)
diff --git a/usr/src/man/man8/ipf.8 b/usr/src/man/man8/ipf.8
index b2b5e10e66..615b81af1e 100644
--- a/usr/src/man/man8/ipf.8
+++ b/usr/src/man/man8/ipf.8
@@ -15,7 +15,7 @@ ipf \- alter packet filtering lists for IP packet input and output
 
 .SH DESCRIPTION
 The \fBipf\fR utility is part of a suite of commands associated with the
-Solaris IP Filter feature. See \fBipfilter\fR(5).
+Solaris IP Filter feature. See \fBipfilter\fR(7).
 .sp
 .LP
 The \fBipf\fR utility opens the filenames listed (treating a hyphen (\fB-\fR)
@@ -39,24 +39,24 @@ activate the Solaris IP Filter feature.
 .TP
 1.
 Assume a role that includes the IP Filter Management rights profile (see
-\fBrbac\fR(5)) or become superuser.
+\fBrbac\fR(7)) or become superuser.
 .RE
 .RS +4
 .TP
 2.
-Configure system and services' firewall policies. See \fBsvc.ipfd\fR(1M) and
-\fBipf\fR(4).
+Configure system and services' firewall policies. See \fBsvc.ipfd\fR(8) and
+\fBipf\fR(5).
 .RE
 .RS +4
 .TP
 3.
 (Optional) Create a network address translation (NAT) configuration file.
-See \fBipnat\fR(4).
+See \fBipnat\fR(5).
 .RE
 .RS +4
 .TP
 4.
-(Optional) Create an address pool configuration file. See \fBippool\fR(4).
+(Optional) Create an address pool configuration file. See \fBippool\fR(5).
 .sp
 Create an \fBippool.conf\fR file if you want to refer to a group of addresses as
 a single address pool. If you want the address pool configuration file to be
@@ -118,7 +118,7 @@ Load \fBippools\fR:
 .in -2
 .sp
 
-See \fBippool\fR(1M).
+See \fBippool\fR(8).
 .RE
 .RS +4
 .TP
@@ -145,7 +145,7 @@ See \fBippool\fR(1M).
 .in -2
 .sp
 
-See \fBipnat\fR(1M).
+See \fBipnat\fR(8).
 .RE
 .LP
 Note -
@@ -506,7 +506,7 @@ Links to IP Filter pseudo devices.
 .ad
 .sp .6
 .RS 4n
-Location of \fBipf\fR startup configuration file. See \fBipf\fR(4).
+Location of \fBipf\fR startup configuration file. See \fBipf\fR(5).
 .RE
 
 .sp
@@ -520,7 +520,7 @@ Contains numerous IP Filter examples.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -534,9 +534,9 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-\fBipfstat\fR(1M), \fBipmon\fR(1M), \fBipnat\fR(1M), \fBippool\fR(1M),
-\fBsvcadm\fR(1M), \fBsvc.ipfd\fR(1M), \fBipf\fR(4), \fBipnat\fR(4),
-\fBippool\fR(4), \fBattributes\fR(5), \fBipfilter\fR(5), \fBzones(5)\fR
+\fBipfstat\fR(8), \fBipmon\fR(8), \fBipnat\fR(8), \fBippool\fR(8),
+\fBsvcadm\fR(8), \fBsvc.ipfd\fR(8), \fBipf\fR(5), \fBipnat\fR(5),
+\fBippool\fR(5), \fBattributes\fR(7), \fBipfilter\fR(7), \fBzones\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/ipfs.8 b/usr/src/man/man8/ipfs.8
index 3077a1ca5f..7be3ef1c31 100644
--- a/usr/src/man/man8/ipfs.8
+++ b/usr/src/man/man8/ipfs.8
@@ -171,7 +171,7 @@ beginning of this operation and unlocked once complete.
 .RS 6n
 Operate on the in-zone state information for the specified zone. If neither
 this option nor \fB-G\fR is specified, the current zone is used. This command
-is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m) for
+is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(8) for
 more information.
 .RE
 
@@ -184,7 +184,7 @@ more information.
 Operate on the global zone controlled state information for the specified
 zone. If neither this option nor \fB-z\fR is specified, the current zone is
 used. This command is only available in the Global Zone. See \fBZONES\fR in
-\fBipf\fR(1m) for more information.
+\fBipf\fR(8) for more information.
 .RE
 
 .SH FILES
@@ -220,7 +220,7 @@ used. This command is only available in the Global Zone. See \fBZONES\fR in
 .RE
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -235,8 +235,8 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBipf\fR(1M), \fBipmon\fR(1M), \fBipnat\fR(1M), \fBattributes\fR(5),
-\fBzones(5)\fR
+\fBipf\fR(8), \fBipmon\fR(8), \fBipnat\fR(8), \fBattributes\fR(7),
+\fBzones\fR(7)
 .SH DIAGNOSTICS
 .LP
 Arguably, the \fB-W\fR and \fB-R\fR operations should set the locking and,
diff --git a/usr/src/man/man8/ipfstat.8 b/usr/src/man/man8/ipfstat.8
index bfdbe9af1f..af04a17287 100644
--- a/usr/src/man/man8/ipfstat.8
+++ b/usr/src/man/man8/ipfstat.8
@@ -21,7 +21,7 @@ ipfstat \- reports on packet filter statistics and filter list
 .SH DESCRIPTION
 .LP
 The \fBipfstat\fR command is part of a suite of commands associated with the
-Solaris IP Filter feature. See \fBipfilter\fR(5).
+Solaris IP Filter feature. See \fBipfilter\fR(7).
 .sp
 .LP
 The \fBipfstat\fR command examines \fB/dev/kmem\fR using the symbols
@@ -50,7 +50,7 @@ operations.
 .LP
 The \fBipfstat\fR command supports the \fBkstat\fR(3KSTAT) kernel facility.
 Because of this support, as an alternative to \fBipfstat\fR, you can use
-\fBkstat\fR(1M). For example:
+\fBkstat\fR(8). For example:
 .sp
 .LP
 # kstat \(hym ipf
@@ -358,7 +358,7 @@ Turn verbose mode on. Displays additional debugging information.
 .RS 18n
 Report the in-zone statistics for the specified zone. If neither this option
 nor \fB-G\fR is specified, the current zone is used. This command is only
-available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m) for more
+available in the Global Zone. See \fBZONES\fR in \fBipf\fR(8) for more
 information.
 .RE
 
@@ -370,7 +370,7 @@ information.
 .RS 18n
 Report the global zone controlled statistics for the specified zone. If
 neither this option nor \fB-z\fR is specified, the current zone is used. This
-command is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m)
+command is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(8)
 for more information.
 .RE
 
@@ -401,7 +401,7 @@ for more information.
 .RE
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -416,8 +416,8 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBipf\fR(1M), \fBkstat\fR(1M), \fBkstat\fR(3KSTAT), \fBattributes\fR(5),
-\fBipfilter\fR(5), \fBzones(5)\fR
+\fBipf\fR(8), \fBkstat\fR(8), \fBkstat\fR(3KSTAT), \fBattributes\fR(7),
+\fBipfilter\fR(7), \fBzones\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/ipmon.8 b/usr/src/man/man8/ipmon.8
index ab7bcbf99f..dc0f8ca6c9 100644
--- a/usr/src/man/man8/ipmon.8
+++ b/usr/src/man/man8/ipmon.8
@@ -16,7 +16,7 @@ ipmon \- monitors /dev/ipl for logged packets
 .SH DESCRIPTION
 .LP
 The \fBipmon\fR command is part of a suite of commands associated with the
-Solaris IP Filter feature. See \fBipfilter\fR(5).
+Solaris IP Filter feature. See \fBipfilter\fR(7).
 .sp
 .LP
 The \fBipmon\fR command opens \fB/dev/ipl\fR for reading and awaits data to be
@@ -24,7 +24,7 @@ saved from the packet filter. The binary data read from the device is reprinted
 in human readable form. However, IP addresses are not mapped back to hostnames,
 nor are ports mapped back to service names. The output goes to standard output,
 by default, or a filename, if specified on the command line. Should the
-\fB-s\fR option be used, output is sent instead to \fBsyslogd\fR(1M). Messages
+\fB-s\fR option be used, output is sent instead to \fBsyslogd\fR(8). Messages
 sent by means of \fBsyslog\fR have the day, month, and year removed from the
 message, but the time (including microseconds), as recorded in the log, is
 still included.
@@ -60,7 +60,7 @@ The name of the interface on which the packet was processed, for example,
 .el o
 The group and rule number of the rule, for example, \fB@0:17\fR. These can be
 viewed with \fBipfstat\fR \fB-in\fR for input rules or \fBipfstat\fR \fB-in\fR
-for output rules. See \fBipfstat\fR(1M).
+for output rules. See \fBipfstat\fR(8).
 .RE
 .RS +4
 .TP
@@ -94,7 +94,7 @@ example, \fBlen 20 40\fR.
 .LP
 If the packet is a TCP packet, there will be an additional field starting with
 a hyphen followed by letters corresponding to any flags that were set. See
-\fBipf.conf\fR(4) for a list of letters and their flags.
+\fBipf.conf\fR(5) for a list of letters and their flags.
 .sp
 .LP
 If the packet is an ICMP packet, there will be two fields at the end, the first
@@ -351,7 +351,7 @@ Show the log header record data in hex.
 .RS 4n
 Monitor packets the specified zone's in-zone filter. If neither this option
 nor \fB-G\fR is specified, the current zone is used. This command is only
-available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m) for more
+available in the Global Zone. See \fBZONES\fR in \fBipf\fR(8) for more
 information.
 .RE
 
@@ -364,7 +364,7 @@ information.
 .RS 4n
 Monitor packets for the specified zone's global zone controlled filter. If
 neither this option nor \fB-z\fR is specified, the current zone is used. This
-command is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m)
+command is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(8)
 for more information.
 .RE
 
@@ -389,7 +389,7 @@ for more information.
 .RE
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -404,8 +404,8 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBipf\fR(1M), \fBipfstat\fR(1M), \fBipnat\fR(1M), \fBattributes\fR(5),
-\fBipfilter\fR(5), \fBzones(5)\fR
+\fBipf\fR(8), \fBipfstat\fR(8), \fBipnat\fR(8), \fBattributes\fR(7),
+\fBipfilter\fR(7), \fBzones\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/ipmpstat.8 b/usr/src/man/man8/ipmpstat.8
index 5e672feaca..3dcd859978 100644
--- a/usr/src/man/man8/ipmpstat.8
+++ b/usr/src/man/man8/ipmpstat.8
@@ -147,7 +147,7 @@ take precedence.
 .sp .6
 .RS 4n
 The state of the address. Either \fBup\fR if the address is \fBIFF_UP\fR (see
-\fBifconfig\fR(1M)), or \fBdown\fR if the address is not \fBIFF_UP\fR.
+\fBifconfig\fR(8)), or \fBdown\fR if the address is not \fBIFF_UP\fR.
 .RE
 
 .sp
@@ -208,7 +208,7 @@ output fields are supported:
 .sp .6
 .RS 4n
 The IPMP IP interface name associated with the information. For the anonymous
-group (see \fBin.mpathd\fR(1M)), this field will be empty.
+group (see \fBin.mpathd\fR(8)), this field will be empty.
 .RE
 
 .sp
@@ -342,7 +342,7 @@ used by the system for IP data traffic.
 .sp .6
 .RS 4n
 The IPMP IP interface associated with the IP interface. For IP interfaces in
-the anonymous group (see \fBin.mpathd\fR(1M)), this field will be empty.
+the anonymous group (see \fBin.mpathd\fR(8)), this field will be empty.
 .RE
 
 .sp
@@ -827,7 +827,7 @@ interface:
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 .LP
 \fB/usr/sbin/ipmpstat\fR:
@@ -852,5 +852,5 @@ Human-Friendly Format	Not-an-Interface
 \fB/sbin/ipmpstat\fR is not a Committed interface.
 .SH SEE ALSO
 .LP
-\fBif_mpadm\fR(1M), \fBifconfig\fR(1M), \fBin.mpathd\fR(1M),
-\fBattributes\fR(5)
+\fBif_mpadm\fR(8), \fBifconfig\fR(8), \fBin.mpathd\fR(8),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/ipnat.8 b/usr/src/man/man8/ipnat.8
index d56cfdfbbe..dda1eaa353 100644
--- a/usr/src/man/man8/ipnat.8
+++ b/usr/src/man/man8/ipnat.8
@@ -147,7 +147,7 @@ active rules/table entries.
 .RS 15n
 Operate on the in-zone IP NAT for the specified zone. If neither this option
 nor \fB-G\fR is specified, the current zone is used. This command is only
-available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m) for more
+available in the Global Zone. See \fBZONES\fR in \fBipf\fR(8) for more
 information.
 .RE
 
@@ -159,7 +159,7 @@ information.
 .RS 15n
 Operate on the global zone controlled IP NAT for the specified zone. If
 neither this option nor \fB-z\fR is specified, the current zone is used. This
-command is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m)
+command is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(8)
 for more information.
 .RE
 
@@ -205,7 +205,7 @@ Contains numerous IP Filter examples.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -220,5 +220,5 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBipf\fR(1M), \fBipfstat\fR(1M), \fBipnat\fR(4), \fBattributes\fR(5),
-\fBzones(5)\fR
+\fBipf\fR(8), \fBipfstat\fR(8), \fBipnat\fR(5), \fBattributes\fR(7),
+\fBzones\fR(7)
diff --git a/usr/src/man/man8/ippool.8 b/usr/src/man/man8/ippool.8
index 084046866a..e52b14c6ea 100644
--- a/usr/src/man/man8/ippool.8
+++ b/usr/src/man/man8/ippool.8
@@ -117,7 +117,7 @@ Turn verbose mode on.
 .RS 6n
 Manage the specified zone's in-zone IP pools. If neither this option nor
 \fB-G\fR is specified, the current zone is used. This command is only
-available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m) for more
+available in the Global Zone. See \fBZONES\fR in \fBipf\fR(8) for more
 information.
 .RE
 
@@ -129,7 +129,7 @@ information.
 .RS 6n
 Manage the specified zone's global zone controlled IP pools. If neither this
 option nor \fB-z\fR is specified, the current zone is used. This command is
-only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m) for more
+only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(8) for more
 information.
 .RE
 
@@ -330,7 +330,7 @@ Location of \fBippool\fR startup configuration file.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -345,5 +345,5 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBipf\fR(1M), \fBipfstat\fR(1M), \fBippool\fR(4), \fBattributes\fR(5),
-\fBzones(5)\fR
+\fBipf\fR(8), \fBipfstat\fR(8), \fBippool\fR(5), \fBattributes\fR(7),
+\fBzones\fR(7)
diff --git a/usr/src/man/man8/ipqosconf.8 b/usr/src/man/man8/ipqosconf.8
index d142b4339a..b53d7e493a 100644
--- a/usr/src/man/man8/ipqosconf.8
+++ b/usr/src/man/man8/ipqosconf.8
@@ -1017,7 +1017,7 @@ given user priority
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1035,9 +1035,9 @@ Interface Stability	Evolving
 .LP
 \fBsyslog\fR(3C), \fBgetipnodebyname\fR(3SOCKET),
 \fBgetprotobyname\fR(3SOCKET), \fBgetservbyname\fR(3SOCKET),
-\fBattributes\fR(5), \fBdlcosmk\fR(7IPP), \fBdscpmk\fR(7IPP),
-\fBflowacct\fR(7IPP), \fBipgpc\fR(7IPP), \fBipqos\fR(7IPP),
-\fBtokenmt\fR(7IPP), \fBtswtclmt\fR(7IPP)
+\fBattributes\fR(7), \fBdlcosmk\fR(4IPP), \fBdscpmk\fR(4IPP),
+\fBflowacct\fR(4IPP), \fBipgpc\fR(4IPP), \fBipqos\fR(4IPP),
+\fBtokenmt\fR(4IPP), \fBtswtclmt\fR(4IPP)
 .SH DIAGNOSTICS
 .sp
 .LP
diff --git a/usr/src/man/man8/ipsecalgs.8 b/usr/src/man/man8/ipsecalgs.8
index 8c84572795..0f15195bb2 100644
--- a/usr/src/man/man8/ipsecalgs.8
+++ b/usr/src/man/man8/ipsecalgs.8
@@ -101,8 +101,8 @@ algorithms and the protocols they belong to. These numbers are defined by the
 Internet Assigned Numbers Authority (IANA). Each algorithm belongs to a
 protocol. Algorithm information includes supported key lengths, block or MAC
 length, and the name of the cryptographic mechanism corresponding to that
-algorithm. This information is used by the IPsec modules, \fBipsecesp\fR(7P)
-and \fBipsecah\fR(7P), to determine the authentication and encryption
+algorithm. This information is used by the IPsec modules, \fBipsecesp\fR(4P)
+and \fBipsecah\fR(4P), to determine the authentication and encryption
 algorithms that can be applied to IPsec traffic.
 .sp
 .LP
@@ -131,7 +131,7 @@ provide authentication.
 .LP
 The mechanism name specified by an algorithm entry must correspond to a valid
 Solaris Cryptographic Framework mechanism. You can obtain the list of available
-mechanisms by using the \fBcryptoadm\fR(1M) command.
+mechanisms by using the \fBcryptoadm\fR(8) command.
 .sp
 .LP
 Applications can retrieve the supported algorithms and their associated
@@ -186,7 +186,7 @@ block length by separating the values with commas.
 .RS 6n
 Designates the execution mode of cryptographic requests for the specified
 protocol in the absence of cryptographic hardware provider. See
-\fBcryptoadm\fR(1M). \fIexec-mode\fR can be one of the following values:
+\fBcryptoadm\fR(8). \fIexec-mode\fR can be one of the following values:
 .sp
 .ne 2
 .na
@@ -314,7 +314,7 @@ Displays the kernel algorithm tables.
 .RS 6n
 Specifies the name of the cryptographic framework mechanism name corresponding
 to the algorithm. Cryptographic framework mechanisms are described in the
-\fBcryptoadm\fR(1M) man page.
+\fBcryptoadm\fR(8) man page.
 .RE
 
 .sp
@@ -465,7 +465,7 @@ Never edit this file manually.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -481,10 +481,10 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBcryptoadm\fR(1M), \fBipsecconf\fR(1M), \fBipseckey\fR(1M), \fBsvcadm\fR(1M),
+\fBcryptoadm\fR(8), \fBipsecconf\fR(8), \fBipseckey\fR(8), \fBsvcadm\fR(8),
 \fBgetipsecalgbyname\fR(3NSL), \fBgetipsecprotobyname\fR(3NSL),
-\fBike.config\fR(4), \fBattributes\fR(5), \fBsmf\fR(5), \fBipsecah\fR(7P),
-\fBipsecesp\fR(7P)
+\fBike.config\fR(5), \fBattributes\fR(7), \fBsmf\fR(7), \fBipsecah\fR(4P),
+\fBipsecesp\fR(4P)
 .sp
 .LP
 Piper, Derrell, \fIRFC 2407, The Internet IP Security Domain of Interpretation
@@ -499,7 +499,7 @@ decrypt packets.
 .sp
 .LP
 Synchronization of the \fBipsecalgs\fR configuration with the kernel at system
-startup is provided by the following \fBsmf\fR(5) service:
+startup is provided by the following \fBsmf\fR(7) service:
 .sp
 .in +2
 .nf
@@ -526,13 +526,13 @@ svc:/network/ipsec/ike:default (disabled)
 .LP
 Services that are delivered disabled are delivered that way because the system
 administrator must create configuration files for those services before
-enabling them. See \fBipseckey\fR(1M) and \fBike.config\fR(4). The default
+enabling them. See \fBipseckey\fR(8) and \fBike.config\fR(5). The default
 policy for the \fBpolicy\fR service is to allow all traffic to pass without
-IPsec protection. See \fBipsecconf\fR(1M).
+IPsec protection. See \fBipsecconf\fR(8).
 .sp
 .LP
 The correct administrative procedure is to create the configuration file for
-each service, then enable each service using \fBsvcadm\fR(1M), as shown in the
+each service, then enable each service using \fBsvcadm\fR(8), as shown in the
 following example:
 .sp
 .in +2
@@ -560,7 +560,7 @@ example# \fBsvcadm refresh ipsecalgs\fR
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling,
-refreshing, and requesting restart can be performed using \fBsvcadm\fR(1M). A
+refreshing, and requesting restart can be performed using \fBsvcadm\fR(8). A
 user who has been assigned the authorization shown below can perform these
 actions:
 .sp
@@ -573,14 +573,14 @@ solaris.smf.manage.ipsec
 
 .sp
 .LP
-See \fBauths\fR(1), \fBuser_attr\fR(4), \fBrbac\fR(5).
+See \fBauths\fR(1), \fBuser_attr\fR(5), \fBrbac\fR(7).
 .sp
 .LP
-The \fBipsecalgs\fR \fBsmf\fR(5) service does not have any user-configurable
+The \fBipsecalgs\fR \fBsmf\fR(7) service does not have any user-configurable
 properties.
 .sp
 .LP
-The \fBsmf\fR(5) framework records any errors in the service-specific log file.
+The \fBsmf\fR(7) framework records any errors in the service-specific log file.
 Use any of the following commands to examine the \fBlogfile\fR property:
 .sp
 .in +2
@@ -596,6 +596,6 @@ example# \fBsvccfg -s ipsecalgs listprop\fR
 .LP
 This command requires \fBsys_ip_config\fR privilege to operate and thus can run
 in the global zone and in exclusive-IP zones. All shared-IP zones share the
-same available set of algorithms; however, you can use \fBipsecconf\fR(1M) to
+same available set of algorithms; however, you can use \fBipsecconf\fR(8) to
 set up system policy that uses differing algorithms for various shared-IP
 zones. All exclusive-IP zones have their own set of algorithms.
diff --git a/usr/src/man/man8/ipsecconf.8 b/usr/src/man/man8/ipsecconf.8
index f72253e354..62a9079717 100644
--- a/usr/src/man/man8/ipsecconf.8
+++ b/usr/src/man/man8/ipsecconf.8
@@ -58,7 +58,7 @@ found and there is at least one entry for the tunnel, the traffic will
 automatically drop. The difference in behavior is because of the assumptions
 about IPsec tunnels made in many implementations. Datagrams that are being
 forwarded will not be subjected to policy checks that are added using this
-command.  See \fBifconfig\fR(1M) and \fBdladm\fR(1M) for information on how to
+command.  See \fBifconfig\fR(8) and \fBdladm\fR(8) for information on how to
 protect forwarded packets.  Depending upon the match of the policy entry, a
 specific action will be taken.
 .sp
@@ -107,7 +107,7 @@ entered.
 .LP
 Policy entries are not preserved across system restarts. Permanent policy
 entries should be added to \fB/etc/inet/ipsecinit.conf\fR. This file is read by
-the following \fBsmf\fR(5) service:
+the following \fBsmf\fR(7) service:
 .sp
 .in +2
 .nf
@@ -158,7 +158,7 @@ not advisable to depend upon this feature.
 .RS 4n
 Check the syntax of the configuration file and report any errors without making
 any changes to the policy. This option is useful when debugging configurations
-and when \fBsmf\fR(5) reports a configuration error. See \fBSECURITY\fR.
+and when \fBsmf\fR(7) reports a configuration error. See \fBSECURITY\fR.
 .RE
 
 .sp
@@ -328,7 +328,7 @@ corresponding entry in the datagram.
 .sp
 .LP
 One thing to remember is that UDP port 500 is always bypassed regardless of any
-policy entries. This is a requirement for \fBin.iked\fR(1M) to work.
+policy entries. This is a requirement for \fBin.iked\fR(8) to work.
 .sp
 .LP
 File can be commented by using a \fB#\fR as the first character. Comments may
@@ -681,7 +681,7 @@ be present. A range of codes can be specified with a hyphen separating numbers.
 .ad
 .sp .6
 .RS 4n
-Specifies a tunnel network interface, as configured with \fBifconfig\fR(1M). If
+Specifies a tunnel network interface, as configured with \fBifconfig\fR(8). If
 a tunnel of \fIname\fR does not yet exist, the policy entries are added anyway,
 and joined with the tunnel state when it is created. If a tunnel is unplumbed,
 its policy entries disappear.
@@ -702,7 +702,7 @@ For per-tunnel security, specify whether the IPsec SAs protecting the traffic
 should be tunnel-mode SAs or transport-mode SAs. If transport-mode SAs are
 specified, no addresses can appear in the policy entry. Transport-mode is
 backward compatible with Solaris 9, and tunnel IPsec policies configured with
-\fBifconfig\fR(1M) will show up as transport mode entries here.
+\fBifconfig\fR(8) will show up as transport mode entries here.
 .RE
 
 .sp
@@ -733,7 +733,7 @@ This entry can contain either a string or a decimal number.
 This should be either \fBMD5\fR or \fBHMAC-MD5\fR denoting the \fBHMAC-MD5\fR
 algorithm as described in \fIRFC 2403\fR, and \fBSHA1\fR, or \fBHMAC-SHA1\fR or
 \fBSHA\fR or \fBHMAC-SHA\fR denoting the \fBHMAC-SHA\fR algorithm described in
-\fIRFC 2404\fR. You can use the \fBipsecalgs\fR(1M) command to obtain the
+\fIRFC 2404\fR. You can use the \fBipsecalgs\fR(8) command to obtain the
 complete list of authentication algorithms.
 .sp
 The string can also be \fBANY\fR, which denotes no-preference for the
@@ -794,7 +794,7 @@ BLOWFISH or BLOWFISH-CBC	BLOWFISH-CBC	2451
 AES or AES-CBC	AES-CBC	2451
 .TE
 
-You can use the \fBipsecalgs\fR(1M) command to obtain the complete list of
+You can use the \fBipsecalgs\fR(8) command to obtain the complete list of
 authentication algorithms.
 .sp
 The value can be \fBNULL\fR, which implies a \fBNULL\fR encryption, pursuant to
@@ -932,7 +932,7 @@ Values following this decide the attribute of the security association. Value
 indicates whether a unique security association should be used or any existing
 \fBSA\fR can be used. If there is a policy requirement, \fBSA\fRs are created
 dynamically on the first outbound datagram using the key management daemon.
-Static \fBSA\fRs can be created using \fBipseckey\fR(1M). The values used here
+Static \fBSA\fRs can be created using \fBipseckey\fR(8). The values used here
 determine whether a new \fBSA\fR will be used/obtained. Valid values are
 strings that could be one of the following:
 .sp
@@ -1071,7 +1071,7 @@ The standard uses of \fBAH\fR and \fBESP\fR were what drove this ranking of
 authentication, which will allow cut-and-paste or replay attacks, or without
 encryption, which makes it equivalent or slightly weaker than \fBAH\fR. An
 administrator should take care to use \fBESP\fR properly. See
-\fBipsecesp\fR(7P) for more details.
+\fBipsecesp\fR(4P) for more details.
 .sp
 .LP
 If the new entry has \fBbypass\fR as action, \fBbypass\fR has the highest
@@ -1104,7 +1104,7 @@ the configuration file is writable only by trusted users.
 .sp
 .LP
 The configuration file is defined by a property of the \fBpolicy\fR
-\fBsmf\fR(5) service. The default configuration file, is
+\fBsmf\fR(7) service. The default configuration file, is
 \fB/etc/inet/ipsecinit.conf\fR. This can be changed using the \fBsvcprop\fR(1)
 command. See \fBNOTES\fR for more details.
 .sp
@@ -1123,7 +1123,7 @@ trustworthy.
 .LP
 If the name switch is configured to use a name service that is not local to the
 system, bypass policy entries might be required to prevent the policy from
-preventing communication to the name service. See \fBnsswitch.conf\fR(4).
+preventing communication to the name service. See \fBnsswitch.conf\fR(5).
 .sp
 .LP
 Policy is latched for \fBTCP/UDP\fR sockets on which a \fBconnect\fR(3SOCKET)
@@ -1133,9 +1133,9 @@ is not advisable to depend upon this feature.
 .sp
 .LP
 The \fBipsecconf\fR command can only be run by a user who has sufficient
-privilege to open the \fBpf_key\fR(7P) socket. The appropriate privilege can be
+privilege to open the \fBpf_key\fR(4P) socket. The appropriate privilege can be
 assigned to a user with the Network IPsec Management profile. See
-\fBprofiles\fR(1), \fBrbac\fR(5), \fBprof_attr\fR(4).
+\fBprofiles\fR(1), \fBrbac\fR(7), \fBprof_attr\fR(5).
 .sp
 .LP
 Make sure to set up the policies before starting any communications, as
@@ -1144,7 +1144,7 @@ Similarly, do not change policies in the middle of a communication.
 .sp
 .LP
 Note that certain \fBndd\fR tunables affect how policies configured with this
-tool are enforced; see \fBipsecesp\fR(7P) for more details.
+tool are enforced; see \fBipsecesp\fR(4P) for more details.
 .SH EXAMPLES
 .LP
 \fBExample 1 \fRProtecting Outbound \fBTCP\fR Traffic With \fBESP\fR and the
@@ -1519,7 +1519,7 @@ the remote machine spiderweb:
 .sp
 .LP
 The following example is equivalent to "\fBencr_algs aes encr_auth_algs md5\fR"
-in \fBifconfig\fR(1M):
+in \fBifconfig\fR(8):
 
 .sp
 .in +2
@@ -1539,7 +1539,7 @@ topology, such that a client's default route goes "inside".
 .sp
 .in +2
 .nf
-# Unlike route(1m), the default route has to be spelled-out.
+# Unlike route(8), the default route has to be spelled-out.
 {tunnel ip.tun0 negotiate tunnel raddr client-inside/32
 laddr 0.0.0.0/0} ipsec {encr_algs aes encr_auth_algs sha1}
 .fi
@@ -1596,7 +1596,7 @@ Cache of IPsec policies currently configured for the system, maintained by
 .sp .6
 .RS 4n
 File containing IPsec policies to be installed at system restart by the
-\fBpolicy\fR \fBsmf\fR(5) service. See \fBNOTES\fR for more information.
+\fBpolicy\fR \fBsmf\fR(7) service. See \fBNOTES\fR for more information.
 .RE
 
 .sp
@@ -1611,7 +1611,7 @@ Sample input file for \fBipseconf\fR.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1627,15 +1627,15 @@ Interface Stability	Committed
 .SH SEE ALSO
 .LP
 \fBauths\fR(1), \fBprofiles\fR(1), \fBsvcprop\fR(1), \fBsvcs\fR(1),
-\fBin.iked\fR(1M), \fBinit\fR(1M), \fBifconfig\fR(1M), \fBipsecalgs\fR(1M),
-\fBipseckey\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
+\fBin.iked\fR(8), \fBinit\fR(8), \fBifconfig\fR(8), \fBipsecalgs\fR(8),
+\fBipseckey\fR(8), \fBsvcadm\fR(8), \fBsvccfg\fR(8),
 \fBgethostbyname\fR(3NSL), \fBaccept\fR(3SOCKET), \fBconnect\fR(3SOCKET),
 \fBgethostbyname\fR(3XNET), \fBgetnetbyname\fR(3XNET),
 \fBgetprotobyname\fR(3XNET), \fBgetservbyname\fR(3XNET),
-\fBgetaddrinfo\fR(3SOCKET), \fBsocket\fR(3SOCKET), \fBike.config\fR(4),
-\fBnsswitch.conf\fR(4), \fBprof_attr\fR(4), \fBuser_attr\fR(4),
-\fBattributes\fR(5), \fBrbac\fR(5), \fBsmf\fR(5), \fBipsecah\fR(7P),
-\fBipsecesp\fR(7P), \fBpf_key\fR(7P)
+\fBgetaddrinfo\fR(3SOCKET), \fBsocket\fR(3SOCKET), \fBike.config\fR(5),
+\fBnsswitch.conf\fR(5), \fBprof_attr\fR(5), \fBuser_attr\fR(5),
+\fBattributes\fR(7), \fBrbac\fR(7), \fBsmf\fR(7), \fBipsecah\fR(4P),
+\fBipsecesp\fR(4P), \fBpf_key\fR(4P)
 .sp
 .LP
 Glenn, R. and Kent, S. \fIRFC 2410, The NULL Encryption Algorithm and Its Use
@@ -1728,7 +1728,7 @@ new entry.
 
 .SH NOTES
 .LP
-IPsec manual keys are managed by the service management facility, \fBsmf\fR(5).
+IPsec manual keys are managed by the service management facility, \fBsmf\fR(7).
 The services listed below manage the components of IPsec. These services are
 delivered as follows:
 .sp
@@ -1746,7 +1746,7 @@ svc:/network/ipsec/ike:default (disabled)
 .LP
 The manual-key service is delivered disabled. The system administrator must
 create manual IPsec Security Associations (SAs), as described in
-\fBipseckey\fR(1M), before enabling that service.
+\fBipseckey\fR(8), before enabling that service.
 .sp
 .LP
 The policy service is delivered enabled, but without a configuration file, so
@@ -1759,14 +1759,14 @@ this file, the service enters maintenance mode.
 .LP
 Services that are delivered disabled are delivered that way because the system
 administrator must create configuration files for those services before
-enabling them. See \fBike.config\fR(4) for the \fBike\fR service.
+enabling them. See \fBike.config\fR(5) for the \fBike\fR service.
 .sp
 .LP
-See \fBipsecalgs\fR(1M) for the \fBipsecalgs\fR service.
+See \fBipsecalgs\fR(8) for the \fBipsecalgs\fR service.
 .sp
 .LP
 The correct administrative procedure is to create the configuration file for
-each service, then enable each service using \fBsvcadm\fR(1M).
+each service, then enable each service using \fBsvcadm\fR(8).
 .sp
 .LP
 If the configuration needs to be changed, edit the configuration file then
@@ -1781,7 +1781,7 @@ example# \fBsvcadm refresh policy\fR
 
 .sp
 .LP
-The \fBsmf\fR(5) framework will record any errors in the service-specific log
+The \fBsmf\fR(7) framework will record any errors in the service-specific log
 file. Use any of the following commands to examine the \fBlogfile\fR property:
 .sp
 .in +2
@@ -1806,7 +1806,7 @@ config/config_file
 
 .sp
 .LP
-This property can be modified using \fBsvccfg\fR(1M) by users who have been
+This property can be modified using \fBsvccfg\fR(8) by users who have been
 assigned the following authorization:
 .sp
 .in +2
@@ -1818,10 +1818,10 @@ solaris.smf.value.ipsec
 
 .sp
 .LP
-See \fBauths\fR(1), \fBuser_attr\fR(4), \fBrbac\fR(5).
+See \fBauths\fR(1), \fBuser_attr\fR(5), \fBrbac\fR(7).
 .sp
 .LP
-The service needs to be refreshed using \fBsvcadm\fR(1M) before the new
+The service needs to be refreshed using \fBsvcadm\fR(8) before the new
 property is effective. General non-modifiable properties can be viewed with the
 \fBsvcprop\fR(1) command.
 .sp
@@ -1836,7 +1836,7 @@ property is effective. General non-modifiable properties can be viewed with the
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling,
-refreshing, and requesting restart can be performed using \fBsvcadm\fR(1M). A
+refreshing, and requesting restart can be performed using \fBsvcadm\fR(8). A
 user who has been assigned the authorization shown below can perform these
 actions:
 .sp
@@ -1853,7 +1853,7 @@ The service's status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
 The \fBipsecconf\fR command is designed to be managed by the \fBpolicy\fR
-\fBsmf\fR(5) service. While the \fBipsecconf\fR command can be run from the
+\fBsmf\fR(7) service. While the \fBipsecconf\fR command can be run from the
 command line, this is discouraged. If the \fBipsecconf\fR command is to be run
-from the command line, the \fBpolicy\fR \fBsmf\fR(5) service should be disabled
-first. See \fBsvcadm\fR(1M).
+from the command line, the \fBpolicy\fR \fBsmf\fR(7) service should be disabled
+first. See \fBsvcadm\fR(8).
diff --git a/usr/src/man/man8/ipseckey.8 b/usr/src/man/man8/ipseckey.8
index 1eec6f2494..a3be48c67b 100644
--- a/usr/src/man/man8/ipseckey.8
+++ b/usr/src/man/man8/ipseckey.8
@@ -53,8 +53,8 @@ ipseckey \- manually manipulate an IPsec Security Association Database (SADB)
 
 .SH DESCRIPTION
 The \fBipseckey\fR command is used to manually manipulate the security
-association databases of the network security services, \fBipsecah\fR(7P) and
-\fBipsecesp\fR(7P). You can use the \fBipseckey\fR command to set up security
+association databases of the network security services, \fBipsecah\fR(4P) and
+\fBipsecesp\fR(4P). You can use the \fBipseckey\fR command to set up security
 associations between communicating parties when automated key management is not
 available.
 .sp
@@ -62,7 +62,7 @@ available.
 While the \fBipseckey\fR utility has only a limited number of general options,
 it supports a rich command language. The user may specify requests to be
 delivered by means of a programmatic interface specific for manual keying. See
-\fBpf_key\fR(7P). When \fBipseckey\fR is invoked with no arguments, it will
+\fBpf_key\fR(4P). When \fBipseckey\fR is invoked with no arguments, it will
 enter an interactive mode which prints a prompt to the standard output and
 accepts commands from the standard input until the end-of-file is reached. Some
 commands require an explicit security association ("\fBSA\fR") type, while
@@ -249,7 +249,7 @@ Remove all \fBSA\fR for a given \fBSA_TYPE\fR, or all \fBSA\fR for all types.
 .RS 4n
 Continuously report on any \fBPF_KEY\fR messages. This uses the
 \fBSADB_X_PROMISC\fR message to enable messages that a normal \fBPF_KEY\fR
-socket would not receive to be received. See \fBpf_key\fR(7P).
+socket would not receive to be received. See \fBpf_key\fR(4P).
 .RE
 
 .sp
@@ -504,7 +504,7 @@ Often, algorithm names will have several synonyms. This extension is required
 by the \fBadd\fR command for certain \fBSA\fR types. It is also used by the
 \fBupdate\fR command.
 .sp
-Use the \fBipsecalgs\fR(1M) command to obtain the complete list of
+Use the \fBipsecalgs\fR(8) command to obtain the complete list of
 authentication algorithms.
 .RE
 
@@ -525,7 +525,7 @@ strings indicating an algorithm name. Current encryption algorithms include DES
 ("aes"). This extension is required by the add command for certain \fBSA\fR
 types. It is also used by the \fBupdate\fR command.
 .sp
-Use the \fBipsecalgs\fR(1M) command to obtain the complete list of encryption
+Use the \fBipsecalgs\fR(8) command to obtain the complete list of encryption
 algorithms.
 .RE
 
@@ -535,7 +535,7 @@ The next six extensions are lifetime extensions. There are two varieties,
 "\fBhard\fR" and "\fBsoft\fR". If a \fBhard\fR lifetime expires, the \fBSA\fR
 will be deleted automatically by the system. If a \fBsoft\fR lifetime expires,
 an \fBSADB_EXPIRE\fR message will be transmitted by the system, and its state
-will be downgraded to \fBdying\fR from \fBmature\fR. See \fBpf_key\fR(7P). The
+will be downgraded to \fBdying\fR from \fBmature\fR. See \fBpf_key\fR(4P). The
 \fBmonitor\fR command to \fBkey\fR allows you to view \fBSADB_EXPIRE\fR
 messages.
 .sp
@@ -1063,11 +1063,11 @@ A world-readable file with keying material in it is also risky.
 .TP
 3.
 The \fBipseckey\fR command is designed to be managed by the \fBmanual-key\fR
-\fBsmf\fR(5) service. Because the \fBsmf\fR(5) log files are world-readable,
+\fBsmf\fR(7) service. Because the \fBsmf\fR(7) log files are world-readable,
 the \fBipseckey\fR does not record any syntax errors in the log files, as these
 errors might include secret information.
 .sp
-If a syntax error is found when the \fBmanual-key\fR \fBsmf\fR(5) service is
+If a syntax error is found when the \fBmanual-key\fR \fBsmf\fR(7) service is
 enabled, the service enters maintenance mode. The log file will indicate that
 there was a syntax error, but will not specify what the error was.
 .sp
@@ -1091,7 +1091,7 @@ For further thoughts on this subject, see the afterward by Matt Blaze in Bruce
 Schneier's \fIApplied Cryptography: Protocols, Algorithms, and Source Code in
 C\fR.
 .SS "Service Management Facility"
-IPsec manual keys are managed by the service management facility, \fBsmf\fR(5).
+IPsec manual keys are managed by the service management facility, \fBsmf\fR(7).
 The services listed below manage the components of IPsec. These services are
 delivered as follows:
 .sp
@@ -1117,19 +1117,19 @@ that, as a starting condition, packets are not protected by IPsec. After you
 create the configuration file \fB/etc/inet/ipsecinit.conf\fR and refresh the
 service (\fBsvcadm refresh\fR, see below), the policy contained in the
 configuration file is applied. If there is an error in this file, the service
-enters maintenance mode. See \fBipsecconf\fR(1M).
+enters maintenance mode. See \fBipsecconf\fR(8).
 .sp
 .LP
 Services that are delivered disabled are delivered that way because the system
 administrator must create configuration files for those services before
-enabling them. See \fBike.config\fR(4) for the \fBike\fR service.
+enabling them. See \fBike.config\fR(5) for the \fBike\fR service.
 .sp
 .LP
-See \fBipsecalgs\fR(1M) for the \fBipsecalgs\fR service.
+See \fBipsecalgs\fR(8) for the \fBipsecalgs\fR service.
 .sp
 .LP
 The correct administrative procedure is to create the configuration file for
-each service, then enable each service using \fBsvcadm\fR(1M).
+each service, then enable each service using \fBsvcadm\fR(8).
 .sp
 .LP
 If the configuration needs to be changed, edit the configuration file then
@@ -1146,13 +1146,13 @@ example# \fBsvcadm refresh manual-key\fR
 .LP
 \fBWarning:\fR To prevent \fBipseckey\fR complaining about duplicate
 Associations, the \fBipseckey\fR command flushes the Security Association Data
-Base (SADB) when the \fBipseckey\fR command is run from \fBsmf\fR(5), before
+Base (SADB) when the \fBipseckey\fR command is run from \fBsmf\fR(7), before
 adding any new Security Associations defined in the configuration file. This
 differs from the command line behavior where the SADB is not flushed before
 adding new Security Associations.
 .sp
 .LP
-The \fBsmf\fR(5) framework will record any errors in the service-specific log
+The \fBsmf\fR(7) framework will record any errors in the service-specific log
 file. Use any of the following commands to examine the \fBlogfile\fR property:
 .sp
 .in +2
@@ -1177,7 +1177,7 @@ config/config_file
 
 .sp
 .LP
-This property can be modified using \fBsvccfg\fR(1M) by users who have been
+This property can be modified using \fBsvccfg\fR(8) by users who have been
 assigned the following authorization:
 .sp
 .in +2
@@ -1189,10 +1189,10 @@ solaris.smf.value.ipsec
 
 .sp
 .LP
-See \fBauths\fR(1), \fBuser_attr\fR(4), \fBrbac\fR(5).
+See \fBauths\fR(1), \fBuser_attr\fR(5), \fBrbac\fR(7).
 .sp
 .LP
-The service needs to be refreshed using \fBsvcadm\fR(1M) before the new
+The service needs to be refreshed using \fBsvcadm\fR(8) before the new
 property is effective. General non-modifiable properties can be viewed with the
 \fBsvcprop\fR(1) command.
 .sp
@@ -1208,7 +1208,7 @@ property is effective. General non-modifiable properties can be viewed with the
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling,
-refreshing, and requesting restart can be performed using \fBsvcadm\fR(1M). A
+refreshing, and requesting restart can be performed using \fBsvcadm\fR(8). A
 user who has been assigned the authorization shown below can perform these
 actions:
 .sp
@@ -1224,11 +1224,11 @@ solaris.smf.manage.ipsec
 The service's status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
-The \fBipseckey\fR command is designed to be run under \fBsmf\fR(5) management.
+The \fBipseckey\fR command is designed to be run under \fBsmf\fR(7) management.
 While the \fBipsecconf\fR command can be run from the command line, this is
 discouraged. If the \fBipseckey\fR command is to be run from the command line,
-the \fBmanual-key\fR \fBsmf\fR(5) service should be disabled first. See
-\fBsvcadm\fR(1M).
+the \fBmanual-key\fR \fBsmf\fR(7) service should be disabled first. See
+\fBsvcadm\fR(8).
 .SH EXAMPLES
 \fBExample 1 \fREmptying Out All \fBSA\fRs
 .sp
@@ -1476,7 +1476,7 @@ and \fBSECURITY\fR for more information.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1489,10 +1489,10 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-\fBps\fR(1), \fBsvcprop\fR(1), \fBsvcs\fR(1), \fBipsecconf\fR(1M),
-\fBipsecalgs\fR(1M), \fBroute\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
-\fBike.config\fR(4), \fBattributes\fR(5), \fBsmf\fR(5), \fBipsec\fR(7P),
-\fBipsecah\fR(7P), \fBipsecesp\fR(7P), \fBpf_key\fR(7P)
+\fBps\fR(1), \fBsvcprop\fR(1), \fBsvcs\fR(1), \fBipsecconf\fR(8),
+\fBipsecalgs\fR(8), \fBroute\fR(8), \fBsvcadm\fR(8), \fBsvccfg\fR(8),
+\fBike.config\fR(5), \fBattributes\fR(7), \fBsmf\fR(7), \fBipsec\fR(4P),
+\fBipsecah\fR(4P), \fBipsecesp\fR(4P), \fBpf_key\fR(4P)
 .sp
 .LP
 Schneier, B., \fIApplied Cryptography: Protocols, Algorithms, and Source Code
@@ -1506,7 +1506,7 @@ as possible.
 The \fBipseckey\fR command does not attempt to use a \fBCOMMAND\fR that has a
 syntax error. A \fBCOMMAND\fR might be syntactically correct but can
 nevertheless generate an error because the kernel rejected the request made to
-\fBpf_key\fR(7P). This might occur because a key had an invalid length or
+\fBpf_key\fR(4P). This might occur because a key had an invalid length or
 because an unsupported algorithm was specified.
 .sp
 .LP
@@ -1608,7 +1608,7 @@ provides more detail about what precise value was incorrect and why.
 
 .SH NOTES
 In spite of its IPsec-specific name, \fBipseckey\fR is analogous to
-\fBroute\fR(1M), in that it is a command-line interface to a socket-based
+\fBroute\fR(8), in that it is a command-line interface to a socket-based
 administration engine, in this case, \fBPF_KEY\fR. \fBPF_KEY\fR was originally
 developed at the United States Naval Research Laboratory.
 .sp
diff --git a/usr/src/man/man8/iscsiadm.8 b/usr/src/man/man8/iscsiadm.8
index 736c419aca..3807e32898 100644
--- a/usr/src/man/man8/iscsiadm.8
+++ b/usr/src/man/man8/iscsiadm.8
@@ -487,7 +487,7 @@ address>\fR[,\fI<IP address>\fR\&...]\fR
 .RS 4n
 Sets the number of configured iSCSI sessions that will be created for each
 iSCSI target. The feature should be used in combination with the Solaris I/O
-multipathing feature described in \fBscsi_vhci\fR(7D).
+multipathing feature described in \fBscsi_vhci\fR(4D).
 .RE
 
 .sp
@@ -685,7 +685,7 @@ address>\fR[,\fI<IP address>\fR\&...]\fR
 .RS 4n
 Sets the number of configured iSCSI sessions that will be created for each
 iSCSI target. The feature should be used in combination with the Solaris I/O
-multipathing feature described in \fBscsi_vhci\fR(7D).
+multipathing feature described in \fBscsi_vhci\fR(4D).
 .RE
 
 .sp
@@ -1355,7 +1355,7 @@ target parameters.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1371,7 +1371,7 @@ Interface Stability	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBiscsi\fR(7D), \fBscsi_vhci\fR(7D)
+\fBattributes\fR(7), \fBiscsi\fR(4D), \fBscsi_vhci\fR(4D)
 .sp
 .LP
 \fISystem Administration Guide: Devices and File Systems\fR
diff --git a/usr/src/man/man8/isns.8 b/usr/src/man/man8/isns.8
index 4e881a17fe..28dc4de0cf 100644
--- a/usr/src/man/man8/isns.8
+++ b/usr/src/man/man8/isns.8
@@ -29,7 +29,7 @@ current implementation does not support iFCP devices.
 .LP
 Solaris iSNS server is implemented as the daemon \fBisns\fR, which binds to the
 well -known port 3205 to service client requests. The daemon is started by the
-service management facility (\fBsmf\fR(5)), using the fault management resource
+service management facility (\fBsmf\fR(7)), using the fault management resource
 identifier (FMRI):
 .sp
 .in +2
@@ -41,12 +41,12 @@ svc:/network/isns_server
 
 .sp
 .LP
-Use \fBsvcadm\fR(1M) to enable \fBisns\fR. Enabling the service means that it
+Use \fBsvcadm\fR(8) to enable \fBisns\fR. Enabling the service means that it
 starts and runs automatically whenever the operating system is booted. The
 state of service can be displayed with the \fBsvcs\fR(1) command.
 .sp
 .LP
-The service properties listed below can be managed using \fBsvccfg\fR(1M). The
+The service properties listed below can be managed using \fBsvccfg\fR(8). The
 default value is assigned per RFC 4171 and implementation choice.
 .sp
 .ne 2
@@ -92,7 +92,7 @@ Control node names.
 
 .sp
 .LP
-After changing a property value, you must use \fBsvcadm\fR(1M) \fBrefresh\fR to
+After changing a property value, you must use \fBsvcadm\fR(8) \fBrefresh\fR to
 enable \fBisns\fR to recognize the new value. If you change the
 \fBdata_store_location\fR property, you must enter a \fBsvcadm restart\fR
 command for the change to take effect.
@@ -141,9 +141,9 @@ The default state of the Default discovery domain set is inactive.
 .RE
 .sp
 .LP
-The \fBisns\fR server supports certain \fBrbac\fR(5) authorizations that allow
+The \fBisns\fR server supports certain \fBrbac\fR(7) authorizations that allow
 you to administer \fBisns\fR activity. These authorizations include the
-following \fBauth_attr\fR(4) privileges:
+following \fBauth_attr\fR(5) privileges:
 .sp
 .ne 2
 .na
@@ -163,7 +163,7 @@ domain or grouping of discovery domains in a discovery domain set.
 .ad
 .sp .6
 .RS 4n
-Required to manage the \fBisns\fR server through  the \fBsmf\fR(5).
+Required to manage the \fBisns\fR server through  the \fBsmf\fR(7).
 .RE
 
 .sp
@@ -178,8 +178,8 @@ Required to change the SMF service properties associated with \fBisns\fR.
 
 .sp
 .LP
-The iSNS Server Management profile (see \fBprof_attr\fR(4)) includes all of the
-preceding authorizations. See \fBrbac\fR(5) for an overview of roles and
+The iSNS Server Management profile (see \fBprof_attr\fR(5)) includes all of the
+preceding authorizations. See \fBrbac\fR(7) for an overview of roles and
 authorizations.
 .SH OPTIONS
 .sp
@@ -245,7 +245,7 @@ iSNS daemon binary.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -261,9 +261,9 @@ Interface Stability	Standard
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBisnsadm\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
-\fBauth_attr\fR(4), \fBprof_attr\fR(4), \fBattributes\fR(5), \fBrbac\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBisnsadm\fR(8), \fBsvcadm\fR(8), \fBsvccfg\fR(8),
+\fBauth_attr\fR(5), \fBprof_attr\fR(5), \fBattributes\fR(7), \fBrbac\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -273,7 +273,7 @@ setting for existing and new clients.
 .sp
 .LP
 A control node, as described in RFC 4171, is not required to administer the
-server. Control node operations can be achieved through the \fBisnsadm\fR(1M)
+server. Control node operations can be achieved through the \fBisnsadm\fR(8)
 command interface on the local host. For example, \fBisnsadm\fR enables you to
 create a discovery domain and a discovery domain set and to add a member to it,
 in order to create discovery domain and discovery domain set associations.
diff --git a/usr/src/man/man8/isnsadm.8 b/usr/src/man/man8/isnsadm.8
index f288182ed5..bd896cc3ea 100644
--- a/usr/src/man/man8/isnsadm.8
+++ b/usr/src/man/man8/isnsadm.8
@@ -27,7 +27,7 @@ server management functions.
 .sp
 .LP
 For any operations that will change the iSNS configurations the
-\fBsolaris.isnsmgr.write\fR authorization is required. Refer to \fBisns\fR(1M).
+\fBsolaris.isnsmgr.write\fR authorization is required. Refer to \fBisns\fR(8).
 For read operations, the command does not require special authorizations.
 .sp
 .LP
@@ -504,7 +504,7 @@ Specifies the discovery domain from which a node will be removed.
 .LP
 The \fBshow-config\fR subcommand displays the iSNS server administrative
 settings. Note that the setting can be modified by means of the service
-management facility (see \fBsmf\fR(5)).  Refer to \fBisns\fR(1M).
+management facility (see \fBsmf\fR(7)).  Refer to \fBisns\fR(8).
 .sp
 .LP
 The \fBshow-config\fR subcommand has the following syntax:
@@ -735,7 +735,7 @@ administrative settings.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -751,8 +751,8 @@ Interface Stability	Volatile
 .SH SEE ALSO
 .sp
 .LP
-\fBiscsiadm\fR(1M), \fBiscsitadm\fR(1M), \fBisns\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBiscsiadm\fR(8), \fBiscsitadm\fR(8), \fBisns\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/itadm.8 b/usr/src/man/man8/itadm.8
index 604b90b87b..e1c34a09e0 100644
--- a/usr/src/man/man8/itadm.8
+++ b/usr/src/man/man8/itadm.8
@@ -101,7 +101,7 @@ itadm \- administer iSCSI targets
 .SH DESCRIPTION
 .LP
 The \fBitadm\fR command manages Internet SCSI (iSCSI) target nodes within the
-SCSI Target Mode Framework described in \fBstmfadm\fR(1M) and
+SCSI Target Mode Framework described in \fBstmfadm\fR(8) and
 \fBlibstmf\fR(3LIB).  This allows the iSCSI initiators to access STMF logical
 units using the iSCSI protocol. In addition to iSCSI target nodes, \fBitadm\fR
 manages two other classes of managed objects: iSCSI Target Portal Groups, and
@@ -233,7 +233,7 @@ Specifies the CHAP username for a target for use in mutual CHAP authentication.
 This value is allowed only for targets, cannot be set globally, and is used
 only when the initiator node is configured to use mutual CHAP authentication.
 If no value is specified then the target node name is used as the username. See
-\fBiscsiadm\fR(1M).
+\fBiscsiadm\fR(8).
 .RE
 
 .sp
@@ -968,7 +968,7 @@ iqn.1986-03.com.sun:02:2cb0c526-c05a-e279-e396-a367006f4227  online   1
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -983,4 +983,4 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBiscsiadm\fR(1M), \fBstmfadm\fR(1M), \fBlibstmf\fR(3LIB), \fBattributes\fR(5)
+\fBiscsiadm\fR(8), \fBstmfadm\fR(8), \fBlibstmf\fR(3LIB), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/k5srvutil.8 b/usr/src/man/man8/k5srvutil.8
index eac1009822..0e80055455 100644
--- a/usr/src/man/man8/k5srvutil.8
+++ b/usr/src/man/man8/k5srvutil.8
@@ -70,7 +70,7 @@ In all cases, the default keytab file is \fB/etc/krb5/krb5.keytab\fR unless
 overridden by the \fB-f\fR option.
 .sp
 .LP
-\fBk5srvutil\fR uses the \fBkadmin\fR(1M) program to edit the keytab in place.
+\fBk5srvutil\fR uses the \fBkadmin\fR(8) program to edit the keytab in place.
 However, old keys are retained, so they are available in case of failure.
 .SH OPTIONS
 .LP
@@ -105,7 +105,7 @@ Displays old and new keys when using the \fBchange\fR operand.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -120,4 +120,4 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBktutil\fR(1), \fBkadmin\fR(1M), \fBattributes\fR(5)
+\fBktutil\fR(1), \fBkadmin\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/kadb.8 b/usr/src/man/man8/kadb.8
index 0d38474e38..4190766b21 100644
--- a/usr/src/man/man8/kadb.8
+++ b/usr/src/man/man8/kadb.8
@@ -115,7 +115,7 @@ port sizes supported by \fBkadb\fR.
 
 .SH SEE ALSO
 .LP
-\fBadb\fR(1), \fBmdb\fR(1), \fBkmdb\fR(1), \fBattributes\fR(5)
+\fBadb\fR(1), \fBmdb\fR(1), \fBkmdb\fR(1), \fBattributes\fR(7)
 .sp
 .LP
 \fIModular Debugger Guide\fR:
diff --git a/usr/src/man/man8/kadmin.8 b/usr/src/man/man8/kadmin.8
index b424d4d9be..aff9ca0b82 100644
--- a/usr/src/man/man8/kadmin.8
+++ b/usr/src/man/man8/kadmin.8
@@ -35,7 +35,7 @@ to both versions.
 By default, both versions of \fBkadmin\fR attempt to determine your user name
 and perform operations on behalf of your "\fIusername\fR/\fIadmin\fR" instance.
 Operations performed are subject to privileges granted or denied to this user
-instance by the Kerberos ACL file (see \fBkadm5.acl\fR(4)). You may perform
+instance by the Kerberos ACL file (see \fBkadm5.acl\fR(5)). You may perform
 administration as another user instance by using the \fB-p\fR option.
 .sp
 .LP
@@ -55,7 +55,7 @@ uses that service ticket to interact with \fBkadmind\fR.
 .LP
 The local version, \fBkadmin.local\fR, must be run with an effective UID of
 root, and normally uses a key from the \fB/var/krb5/.k5.\fR\fIrealm\fR stash
-file (see \fBkdb5_util\fR(1M)) to decrypt information from the database rather
+file (see \fBkdb5_util\fR(8)) to decrypt information from the database rather
 than prompting for a password. The \fB-m\fR option will bypass the
 \fB\&.k5.\fR\fIrealm\fR stash file and prompt for the master password.
 .SH OPTIONS
@@ -203,7 +203,7 @@ LDAP and the \fBBerkeley-db2\fR plug-in. These arguments are:
 .sp .6
 .RS 4n
 LDAP simple bind DN for authorization on the directory server. Overrides the
-\fBldap_kadmind_dn\fR parameter setting in \fBkrb5.conf\fR(4).
+\fBldap_kadmind_dn\fR parameter setting in \fBkrb5.conf\fR(5).
 .RE
 
 .sp
@@ -547,7 +547,7 @@ unauthorized users gain read access to the script.
 .ad
 .sp .6
 .RS 4n
-Override the list of enctype:salttype pairs given in \fBkdc.conf\fR(4) for
+Override the list of enctype:salttype pairs given in \fBkdc.conf\fR(5) for
 setting the key of the principal. The quotes are necessary if there are
 multiple enctype:salttype pairs. One key for each similar enctype and same
 salttype will be created and the first one listed will be used. For example, in
@@ -714,7 +714,7 @@ Sets the password to the specified string. Not recommended.
 .ad
 .sp .6
 .RS 4n
-Override the list of enctype:salttype pairs given in \fBkdc.conf\fR(4) for
+Override the list of enctype:salttype pairs given in \fBkdc.conf\fR(5) for
 setting the key of the principal. The quotes are necessary if there are
 multiple enctype:salttype pairs. For each key, the first matching similar
 enctype and same salttype in the list will be used to set the new key(s).
@@ -1160,9 +1160,9 @@ keys with the same encryption type but different \fBsalt\fR types. If the
 \fB/etc/krb5/krb5.keytab\fR, is used.
 .sp
 The "\fB-e\fR \fB\fIenctype\fR:salt\fR" option overrides the list of
-\fIenctypes\fR given in \fBkrb5.conf\fR(4), in the \fBpermitted_enctypes\fR
+\fIenctypes\fR given in \fBkrb5.conf\fR(5), in the \fBpermitted_enctypes\fR
 parameter. If "\fB-e\fR \fB\fIenctype\fR:salt\fR" is not used and
-\fBpermitted_enctypes\fR is not defined in \fBkrb5.conf\fR(4), a key for each
+\fBpermitted_enctypes\fR is not defined in \fBkrb5.conf\fR(5), a key for each
 \fIenctype\fR supported by the system on which \fBkadmin\fR is run will be
 created and added to the \fBkeytab\fR. Restricting the \fIenctypes\fR of keys
 in the \fBkeytab\fR is useful when the system for which keys are being created
@@ -1394,7 +1394,7 @@ You can also use the following time modifiers: \fBfirst\fR, \fBsecond\fR,
 \fBeighth\fR, \fBninth\fR, \fBtenth\fR, \fBeleventh\fR, \fBtwelfth\fR, and
 \fBago\fR.
 .SH ENVIRONMENT VARIABLES
-See \fBenviron\fR(5) for descriptions of the following environment variables
+See \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of \fBkadmin\fR:
 .sp
 .ne 2
@@ -1481,7 +1481,7 @@ Keytab for \fBkadmind\fR principals: \fBkadmin\fR/\fIfqdn\fR,
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1495,10 +1495,10 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-\fBkpasswd\fR(1), \fBmore\fR(1), \fBkadmind\fR(1M),
-\fBkdb5_util\fR(1M), \fBkdb5_ldap_util\fR(1M), \fBkproplog\fR(1M),
-\fBkadm5.acl\fR(4), \fBkdc.conf\fR(4), \fBkrb5.conf\fR(4), \fBattributes\fR(5),
-\fBenviron\fR(5), \fBkerberos\fR(5), \fBkrb5envvar\fR(5)
+\fBkpasswd\fR(1), \fBmore\fR(1), \fBkadmind\fR(8),
+\fBkdb5_util\fR(8), \fBkdb5_ldap_util\fR(8), \fBkproplog\fR(8),
+\fBkadm5.acl\fR(5), \fBkdc.conf\fR(5), \fBkrb5.conf\fR(5), \fBattributes\fR(7),
+\fBenviron\fR(7), \fBkerberos\fR(7), \fBkrb5envvar\fR(7)
 .SH HISTORY
 The \fBkadmin\fR program was originally written by Tom Yu at MIT, as an
 interface to the OpenVision Kerberos administration program.
diff --git a/usr/src/man/man8/kadmind.8 b/usr/src/man/man8/kadmind.8
index 093cafedff..c12cb8d94b 100644
--- a/usr/src/man/man8/kadmind.8
+++ b/usr/src/man/man8/kadmind.8
@@ -20,7 +20,7 @@ kadmind \- Kerberos administration daemon
 \fBkadmind\fR runs on the master key distribution center (\fBKDC\fR), which
 stores the principal and policy databases. \fBkadmind\fR accepts remote
 requests to administer the information in these databases. Remote requests are
-sent, for example, by \fBkpasswd\fR(1) and \fBkadmin\fR(1M) commands, both of
+sent, for example, by \fBkpasswd\fR(1) and \fBkadmin\fR(8) commands, both of
 which are clients of \fBkadmind\fR. When you install a \fBKDC\fR,
 \fBkadmind\fR is set up in the \fBinit\fR scripts to start automatically
 when the \fBKDC\fR is rebooted.
@@ -41,7 +41,7 @@ number of configuration variables (called relations) in this file, some of
 which are mandatory and some of which are optional. In particular,
 \fBkadmind\fR uses the \fBacl_file\fR, \fBdict_file\fR, \fBadmin_keytab\fR, and
 \fBkadmind_port\fR relations in the [\fIrealms\fR] section. Refer to the
-\fBkdc.conf\fR(4) man page for information regarding the format of the
+\fBkdc.conf\fR(5) man page for information regarding the format of the
 \fBKDC\fR configuration file.
 .RE
 
@@ -56,9 +56,9 @@ which are mandatory and some of which are optional. In particular,
 for the \fBkadmin\fR/\fIfqdn\fR, \fBkadmin\fR/\fBchangepw\fR and
 \fBkadmin\fR/\fBchangepw\fR principals for every realm that \fBkadmind\fR
 answers requests. The \fBkeytab\fR can be created with the
-\fBkadmin.local\fR(1M) or \fBkdb5_util\fR(1M) command. The location of the
+\fBkadmin.local\fR(8) or \fBkdb5_util\fR(8) command. The location of the
 keytab is determined by the \fBadmin_keytab\fR relation in the
-\fBkdc.conf\fR(4) file.
+\fBkdc.conf\fR(5) file.
 .RE
 
 .sp
@@ -71,8 +71,8 @@ keytab is determined by the \fBadmin_keytab\fR relation in the
 \fBkadmind\fR uses an \fBACL\fR (access control list) to determine which
 principals are allowed to perform Kerberos administration actions. The path of
 the \fBACL\fR file is determined by the \fBacl_file\fR relation in the
-\fBkdc.conf\fR file. See \fBkdc.conf\fR(4). For information regarding the
-format of the \fBACL\fR file, refer to \fBkadm5.acl\fR(4).
+\fBkdc.conf\fR file. See \fBkdc.conf\fR(5). For information regarding the
+format of the \fBACL\fR file, refer to \fBkadm5.acl\fR(5).
 .sp
 The \fBkadmind\fR daemon will need to be restarted to reread the
 \fBkadm5.acl\fR file after it has been modified. You can do this, as root, with
@@ -96,7 +96,7 @@ disassociates itself from its controlling terminal.
 \fBkadmind\fR can be configured for incremental database propagation.
 Incremental propagation allows slave KDC servers to receive principal and
 policy updates incrementally instead of receiving full dumps of the database.
-These settings can be changed in the \fBkdc.conf\fR(4) file:
+These settings can be changed in the \fBkdc.conf\fR(5) file:
 .sp
 .ne 2
 .na
@@ -129,11 +129,11 @@ in which the master KDC resides.
 .sp
 .LP
 Kerberos client machines can automatically migrate Unix users to the default
-Kerberos realm specified in the local \fBkrb5.conf\fR(4), if the user does not
+Kerberos realm specified in the local \fBkrb5.conf\fR(5), if the user does not
 have a valid kerberos account already. You achieve this by using the
-\fBpam_krb5_migrate\fR(5) service module for the service in question. The
+\fBpam_krb5_migrate\fR(7) service module for the service in question. The
 Kerberos service principal used by the client machine attempting the migration
-needs to be validated using the \fBu\fR privilege in \fBkadm5.acl\fR(4). When
+needs to be validated using the \fBu\fR privilege in \fBkadm5.acl\fR(5). When
 using the \fBu\fR privilege, \fBkadmind\fR validates user passwords using PAM,
 specifically using a \fBPAM_SERVICE\fR name of \fBk5migrate\fR by calling
 \fBpam_authenticate\fR(3PAM) and \fBpam_acct_mgmt\fR(3PAM).
@@ -188,7 +188,7 @@ explicitly place the daemon in the background.
 .RS 4n
 Specifies the port on which the \fBkadmind\fR daemon listens for connections.
 The default is controlled by the \fBkadmind_port\fR relation in the
-\fBkdc.conf\fR(4) file.
+\fBkdc.conf\fR(5) file.
 .RE
 
 .sp
@@ -221,7 +221,7 @@ LDAP and the \fBBerkeley-db2\fR plug-in. These arguments are:
 .sp .6
 .RS 4n
 LDAP simple bind DN for authorization on the directory server. Overrides the
-\fBldap_kadmind_dn\fR parameter setting in \fBkrb5.conf\fR(4).
+\fBldap_kadmind_dn\fR parameter setting in \fBkrb5.conf\fR(5).
 .RE
 
 .sp
@@ -353,7 +353,7 @@ Keytab for \fBkadmin\fR principals: \fBkadmin\fR/\fIfqdn\fR,
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -369,12 +369,12 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBkpasswd\fR(1), \fBsvcs\fR(1), \fBkadmin\fR(1M),
-\fBkadmin.local\fR(1M), \fBkdb5_util\fR(1M), \fBkdb5_ldap_util\fR(1M),
-\fBkproplog\fR(1M), \fBsvcadm\fR(1M), \fBpam_acct_mgmt\fR(3PAM),
-\fBpam_authenticate\fR(3PAM), \fBkadm5.acl\fR(4), \fBkdc.conf\fR(4),
-\fBkrb5.conf\fR(4), \fBattributes\fR(5), \fBkerberos\fR(5),
-\fBkrb5envvar\fR(5), \fBpam_krb5_migrate\fR(5), \fBsmf\fR(5)
+\fBkpasswd\fR(1), \fBsvcs\fR(1), \fBkadmin\fR(8),
+\fBkadmin.local\fR(8), \fBkdb5_util\fR(8), \fBkdb5_ldap_util\fR(8),
+\fBkproplog\fR(8), \fBsvcadm\fR(8), \fBpam_acct_mgmt\fR(3PAM),
+\fBpam_authenticate\fR(3PAM), \fBkadm5.acl\fR(5), \fBkdc.conf\fR(5),
+\fBkrb5.conf\fR(5), \fBattributes\fR(7), \fBkerberos\fR(7),
+\fBkrb5envvar\fR(7), \fBpam_krb5_migrate\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -384,7 +384,7 @@ change-password requests from non-Solaris Kerberos clients.
 .sp
 .LP
 The \fBkadmind\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -396,5 +396,5 @@ svc:/network/security/kadmin
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/kclient.8 b/usr/src/man/man8/kclient.8
index fec753c18d..3d6d3fdd4e 100644
--- a/usr/src/man/man8/kclient.8
+++ b/usr/src/man/man8/kclient.8
@@ -22,7 +22,7 @@ utility to:
 .ie t \(bu
 .el o
 Configure a machine as a Kerberos client for a specified realm and for KDC by
-setting up \fBkrb5.conf\fR(4).
+setting up \fBkrb5.conf\fR(5).
 .RE
 .RS +4
 .TP
@@ -85,7 +85,7 @@ servers that are non-Solaris and non-MS Active Directory servers.
 .TP
 .ie t \(bu
 .el o
-Configure \fBpam.conf\fR(4) to use Kerberos authentication for specified
+Configure \fBpam.conf\fR(5) to use Kerberos authentication for specified
 services.
 .RE
 .RS +4
@@ -127,7 +127,7 @@ local host's \fBkeytab\fR.
 .sp
 .LP
 The \fBkclient\fR utility assumes that the local host has been setup for DNS
-and requires the presence of a valid \fBresolv.conf\fR(4). Also, \fBkclient\fR
+and requires the presence of a valid \fBresolv.conf\fR(5). Also, \fBkclient\fR
 can fail if the localhost time is not synchronized with that of the KDC. For
 Kerberos to function the localhost time must be within five minutes of that of
 the KDC. It is advised that both systems run some form of time synchronization
@@ -143,7 +143,7 @@ The non-interactive mode supports the following options:
 .sp .6
 .RS 4n
 Set up the machine for kerberized NFS. This involves making changes to
-\fBkrb5*\fR security flavors in \fBnfssec.conf\fR(4). This option will also add
+\fBkrb5*\fR security flavors in \fBnfssec.conf\fR(5). This option will also add
 \fBnfs/fqdn\fR and \fBroot/fqdn\fR entries to the local host's \fBkeytab\fR
 file if the \fB-K\fR option has not been specified.
 .RE
@@ -243,7 +243,7 @@ with the server if the \fBms_ad\fR option is specified.
 .ad
 .sp .6
 .RS 4n
-Specifies the pathname to the \fBkrb5.conf\fR(4) master file, to be copied over
+Specifies the pathname to the \fBkrb5.conf\fR(5) master file, to be copied over
 to the local host. The path specified normally points to a master copy on a
 remote host and brought over to the local host by means of NFS.
 .RE
@@ -256,7 +256,7 @@ remote host and brought over to the local host by means of NFS.
 .sp .6
 .RS 4n
 Specifies the DNS lookup option to be used and specified in the
-\fBkrb5.conf\fR(4) file. Valid \fIdnsarg\fR entries are: \fBnone\fR,
+\fBkrb5.conf\fR(5) file. Valid \fIdnsarg\fR entries are: \fBnone\fR,
 \fBdns_lookup_kdc\fR, \fBdns_lookup_realm\fR and \fBdns_fallback\fR. Any other
 entry is considered invalid. The latter three \fIdnsarg\fR values assume the
 same meaning as those described in \fBkrb5.conf\fR. \fBdns_lookup_kdc\fR
@@ -406,7 +406,7 @@ listed in the profile.
 .RS 4n
 Specifies that the PAM service names, listed in \fIpam_service\fR, are
 authenticated through Kerberos before any other type of authentication. Using
-this option updates \fBpam.conf\fR(4) to include \fBpam_krb5\fR(5) to existing
+this option updates \fBpam.conf\fR(5) to include \fBpam_krb5\fR(7) to existing
 authentication stacks for the specified service(s) in \fIpam_service\fR. An
 example of a possible \fIpam_service\fR value is: \fBdtlogin,sshd-kbdint\fR.
 .RE
@@ -447,7 +447,7 @@ and/or added to the local \fBkeytab\fR for multiple DNS domains, enter:
 Note that the \fBkrb5\fR administrative principal used by the administrator
 needs to have only \fBadd\fR, \fBinquire\fR, \fBchange-pwd\fR and \fBmodify\fR
 privileges (for the principals in the KDC database) in order for the
-\fBkclient\fR utility to run. A sample \fBkadm5.acl\fR(4) entry is:
+\fBkclient\fR utility to run. A sample \fBkadm5.acl\fR(5) entry is:
 
 .sp
 .in +2
@@ -563,7 +563,7 @@ DNS resolver configuration file.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -578,12 +578,12 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 \fBencrypt\fR(1), \fBksh93\fR(1), \fBldapdelete\fR(1), \fBldapmodify\fR(1),
-\fBldapsearch\fR(1), \fBdd\fR(1M), \fBsmbadm\fR(1M), \fBkadm5.acl\fR(4),
-\fBkrb5.conf\fR(4), \fBnfssec.conf\fR(4), \fBpam.conf\fR(4),
-\fBresolv.conf\fR(4), \fBattributes\fR(5), \fBpam_krb5\fR(5)
+\fBldapsearch\fR(1), \fBdd\fR(8), \fBsmbadm\fR(8), \fBkadm5.acl\fR(5),
+\fBkrb5.conf\fR(5), \fBnfssec.conf\fR(5), \fBpam.conf\fR(5),
+\fBresolv.conf\fR(5), \fBattributes\fR(7), \fBpam_krb5\fR(7)
 .SH NOTES
 \fBfqdn\fR stands for the Fully Qualified Domain Name of the local host. The
-\fBkclient\fR utility saves copies of both the \fBkrb5.conf\fR(4) and
-\fBnfssec.conf\fR(4) files to files with corresponding names and \fB\&.sav\fR
-extensions. The optional copy of the \fBkrb5.conf\fR(4) master file is neither
+\fBkclient\fR utility saves copies of both the \fBkrb5.conf\fR(5) and
+\fBnfssec.conf\fR(5) files to files with corresponding names and \fB\&.sav\fR
+extensions. The optional copy of the \fBkrb5.conf\fR(5) master file is neither
 encrypted nor integrity-protected and it takes place over regular NFS.
diff --git a/usr/src/man/man8/kdb5_ldap_util.8 b/usr/src/man/man8/kdb5_ldap_util.8
index ec0ef57467..84172a750d 100644
--- a/usr/src/man/man8/kdb5_ldap_util.8
+++ b/usr/src/man/man8/kdb5_ldap_util.8
@@ -191,7 +191,7 @@ See "Common Command-specific Options," above.
 .sp .6
 .RS 4n
 Specifies the key type of the master key in the database; the default is that
-given in \fBkdc.conf\fR(4).
+given in \fBkdc.conf\fR(5).
 .RE
 
 .sp
@@ -1160,7 +1160,7 @@ cn=service-pwd,o=org
 .sp
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1174,4 +1174,4 @@ Interface Stability	Volatile
 .TE
 
 .SH SEE ALSO
-\fBkinit\fR(1), \fBkadmin\fR(1M), \fBkdc.conf\fR(4), \fBattributes\fR(5)
+\fBkinit\fR(1), \fBkadmin\fR(8), \fBkdc.conf\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/kdb5_util.8 b/usr/src/man/man8/kdb5_util.8
index 596e60d321..fcb04aafbd 100644
--- a/usr/src/man/man8/kdb5_util.8
+++ b/usr/src/man/man8/kdb5_util.8
@@ -111,7 +111,7 @@ LDAP and the \fBBerkeley-db2\fR plug-in. These arguments are:
 .sp .6
 .RS 4n
 LDAP simple bind DN for authorization on the directory server. Overrides the
-\fBldap_kadmind_dn\fR parameter setting in \fBkrb5.conf\fR(4).
+\fBldap_kadmind_dn\fR parameter setting in \fBkrb5.conf\fR(5).
 .RE
 
 .sp
@@ -500,7 +500,7 @@ The update log file for incremental propagation.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -514,6 +514,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-\fBkpasswd\fR(1), \fBkadmin\fR(1M), \fBkadmind\fR(1M),
-\fBkadmin.local\fR(1M), \fBkdb5_ldap_util\fR(1M), \fBkproplog\fR(1M),
-\fBkadm5.acl\fR(4), \fBkdc.conf\fR(4), \fBattributes\fR(5), \fBkerberos\fR(5)
+\fBkpasswd\fR(1), \fBkadmin\fR(8), \fBkadmind\fR(8),
+\fBkadmin.local\fR(8), \fBkdb5_ldap_util\fR(8), \fBkproplog\fR(8),
+\fBkadm5.acl\fR(5), \fBkdc.conf\fR(5), \fBattributes\fR(7), \fBkerberos\fR(7)
diff --git a/usr/src/man/man8/kdcmgr.8 b/usr/src/man/man8/kdcmgr.8
index 8da9addeb9..0cd67fcd3f 100644
--- a/usr/src/man/man8/kdcmgr.8
+++ b/usr/src/man/man8/kdcmgr.8
@@ -29,7 +29,7 @@ Configure a master Key Distribution Center (KDC) server.
 .el o
 Configure a slave KDC. This assumes that a master KDC has already been
 configured. The default propagation method configured is incremental
-propagation. See \fBkpropd\fR(1M).
+propagation. See \fBkpropd\fR(8).
 .RE
 .RS +4
 .TP
@@ -116,7 +116,7 @@ the output of \fBlogname\fR(1) appended by \fB/admin\fR.
 .RS 4n
 Specifies the encryption type to be used when creating the key for the master
 key, which is used to encrypt all principal keys in the database. The set of
-valid encryption types used here are described in \fBkrb5.conf\fR(4) under the
+valid encryption types used here are described in \fBkrb5.conf\fR(5) under the
 \fBpermitted_enctypes\fR option. Note that the encryption type specified here
 must be supported on all KDCs or else they will not be able to decrypt any of
 the principal keys. Solaris 9 and earlier releases support only the
@@ -193,8 +193,8 @@ made.
 .ad
 .sp .6
 .RS 4n
-Create a master KDC. Upon successful configuration the \fBkrb5kdc\fR(1M) and
-\fBkadmind\fR(1M) are enabled on the machine.
+Create a master KDC. Upon successful configuration the \fBkrb5kdc\fR(8) and
+\fBkadmind\fR(8) are enabled on the machine.
 .RE
 
 .sp
@@ -204,8 +204,8 @@ Create a master KDC. Upon successful configuration the \fBkrb5kdc\fR(1M) and
 .ad
 .sp .6
 .RS 4n
-Configures a slave KDC. After configuration, the \fBkrb5kdc\fR(1M) and
-\fBkpropd\fR(1M) services are enabled on the machine.
+Configures a slave KDC. After configuration, the \fBkrb5kdc\fR(8) and
+\fBkpropd\fR(8) services are enabled on the machine.
 .sp
 \fImasterkdc\fR specifies the master KDC to authenticate and with which to
 perform administrative tasks. If the \fB-m\fR option is not specified, you are
@@ -238,19 +238,19 @@ of such associated processes as:
 .TP
 .ie t \(bu
 .el o
-\fBkrb5kdc\fR(1M)
+\fBkrb5kdc\fR(8)
 .RE
 .RS +4
 .TP
 .ie t \(bu
 .el o
-\fBkadmind\fR(1M)
+\fBkadmind\fR(8)
 .RE
 .RS +4
 .TP
 .ie t \(bu
 .el o
-\fBkpropd\fR(1M)
+\fBkpropd\fR(8)
 .RE
 The subcommand also displays information on incremental propagation if the
 configuration has this feature enabled, as well as any issues with dependent
@@ -349,7 +349,7 @@ Kerberos administrative access control list (ACL).
 .ad
 .sp .6
 .RS 4n
-Service keys specific to \fBkadmind\fR(1M).
+Service keys specific to \fBkadmind\fR(8).
 .RE
 
 .sp
@@ -385,7 +385,7 @@ Used by slaves to indicate from which server to receive updates.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -405,7 +405,7 @@ Interface.
 .SH SEE ALSO
 .sp
 .LP
-\fBlogname\fR(1), \fBssh\fR(1), \fBkadmin\fR(1M), \fBkadmind\fR(1M),
-\fBkdb5_util\fR(1M), \fBkdb5_ldap_util\fR(1M), \fBkpropd\fR(1M),
-\fBkrb5kdc\fR(1M), \fBping\fR(1M), \fBsvcadm\fR(1M), \fBkdc.conf\fR(4),
-\fBkrb5.conf\fR(4), \fBattributes\fR(5)
+\fBlogname\fR(1), \fBssh\fR(1), \fBkadmin\fR(8), \fBkadmind\fR(8),
+\fBkdb5_util\fR(8), \fBkdb5_ldap_util\fR(8), \fBkpropd\fR(8),
+\fBkrb5kdc\fR(8), \fBping\fR(8), \fBsvcadm\fR(8), \fBkdc.conf\fR(5),
+\fBkrb5.conf\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/kernel.8 b/usr/src/man/man8/kernel.8
index bf1cb576b6..0686457b72 100644
--- a/usr/src/man/man8/kernel.8
+++ b/usr/src/man/man8/kernel.8
@@ -22,13 +22,13 @@ the image files (\fBunix\fR and \fBgenunix\fR) and the modules loaded at any
 instant in time. The system will not function without a kernel to control it.
 .sp
 .LP
-The kernel is loaded by the \fBboot\fR(1M) command in a machine-specific way.
+The kernel is loaded by the \fBboot\fR(8) command in a machine-specific way.
 The kernel may be loaded from disk, \fBCD-ROM\fR, or DVD (\fBdiskfull boot\fR)
 or over the network (\fBdiskless boot\fR). In either case, the directories
 under \fB/platform\fR and \fB/kernel\fR must be readable and must contain
 executable code which is able to perform the required kernel service. If the
 \fB-a\fR flag is given, the user is able to supply different pathnames for the
-default locations of the kernel and modules. See \fBboot\fR(1M) for more
+default locations of the kernel and modules. See \fBboot\fR(8) for more
 information on loading a specific kernel.
 .sp
 .LP
@@ -63,7 +63,7 @@ option of \fBuname\fR(1).
 .sp
 .LP
 The kernel configuration can be controlled using the \fB/etc/system\fR file
-(see \fBsystem\fR(4)).
+(see \fBsystem\fR(5)).
 .sp
 .LP
 \fBgenunix\fR is the platform-independent component of the base kernel.
@@ -84,7 +84,7 @@ itself. Default responses will be contained in square brackets ([ ]), and the
 user may simply enter RETURN to use the default response (note that RETURN is
 labeled ENTER on some keyboards). To help repair a damaged \fB/etc/system\fR
 file, enter \fB/dev/null\fR at the prompt that asks for the pathname of the
-system configuration file. See \fBsystem\fR(4).
+system configuration file. See \fBsystem\fR(5).
 .RE
 
 .sp
@@ -96,7 +96,7 @@ system configuration file. See \fBsystem\fR(4).
 .RS 4n
 Select an alternative executable to be the primordial process. \fIaltinit\fR
 must be a valid path to an executable. The default primordial process is
-\fBinit\fR(1M).
+\fBinit\fR(8).
 .RE
 
 .sp
@@ -110,7 +110,7 @@ The \fIsmf_options\fR include two categories of options to control booting
 behavior of the service management facility: recovery options and messages
 options.
 .sp
-Message options determine the type and amount of messages that \fBsmf\fR(5)
+Message options determine the type and amount of messages that \fBsmf\fR(7)
 displays during boot. Service options determine the services which are used to
 boot the system.
 .sp
@@ -135,7 +135,7 @@ Prints standard per-service output and all \fBsvc.startd\fR messages to log.
 Boot with some SMF services temporarily disabled, as indicated by
 \fImilestone\fR. \fImilestone\fR can be "none", "single-user", "multi-user",
 "multi-user-server", or "all". See the \fBmilestone\fR subcommand of
-\fBsvcadm\fR(1M).
+\fBsvcadm\fR(8).
 .RE
 
 Messages options
@@ -170,8 +170,8 @@ Prints standard per-service output with more informational messages.
 .sp .6
 .RS 4n
 Reconfiguration boot. The system will probe all attached hardware devices and
-configure the logical namespace in \fB/dev\fR. See \fBadd_drv\fR(1M) and
-\fBrem_drv\fR(1M) for additional information about maintaining device drivers.
+configure the logical namespace in \fB/dev\fR. See \fBadd_drv\fR(8) and
+\fBrem_drv\fR(8) for additional information about maintaining device drivers.
 .RE
 
 .sp
@@ -181,7 +181,7 @@ configure the logical namespace in \fB/dev\fR. See \fBadd_drv\fR(1M) and
 .ad
 .sp .6
 .RS 4n
-Boots only to init level 's'. See \fBinit\fR(1M).
+Boots only to init level 's'. See \fBinit\fR(8).
 .RE
 
 .sp
@@ -193,7 +193,7 @@ Boots only to init level 's'. See \fBinit\fR(1M).
 .RS 4n
 Boots with verbose messages enabled. If this flag is not given, the messages
 are still printed, but the output is directed to the system logfile. See
-\fBsyslogd\fR(1M).
+\fBsyslogd\fR(8).
 .RE
 
 .sp
@@ -210,7 +210,7 @@ of Sun Cluster software that supports this option has been installed.
 .SH EXAMPLES
 .sp
 .LP
-See \fBboot\fR(1M) for examples and instructions on how to boot.
+See \fBboot\fR(8) for examples and instructions on how to boot.
 .SH FILES
 .sp
 .ne 2
@@ -372,14 +372,14 @@ subdirectories.
 .SH SEE ALSO
 .sp
 .LP
-\fBuname\fR(1), \fBisainfo\fR(1), \fBadd_drv\fR(1M), \fBboot\fR(1M),
-\fBinit\fR(1M), \fBkadb\fR(1M), \fBrem_drv\fR(1M), \fBsavecore\fR(1M),
-\fBsvc.startd\fR(1M), \fBsvcadm\fR(1M), \fBsyslogd\fR(1M), \fBsystem\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5), \fBdevfs\fR(7FS)
+\fBuname\fR(1), \fBisainfo\fR(1), \fBadd_drv\fR(8), \fBboot\fR(8),
+\fBinit\fR(8), \fBkadb\fR(8), \fBrem_drv\fR(8), \fBsavecore\fR(8),
+\fBsvc.startd\fR(8), \fBsvcadm\fR(8), \fBsyslogd\fR(8), \fBsystem\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7), \fBdevfs\fR(4FS)
 .SS "SPARC Only"
 .sp
 .LP
-\fBmonitor\fR(1M)
+\fBmonitor\fR(8)
 .SH DIAGNOSTICS
 .sp
 .LP
diff --git a/usr/src/man/man8/keyserv.8 b/usr/src/man/man8/keyserv.8
index f92ebbe3ec..0beee82d77 100644
--- a/usr/src/man/man8/keyserv.8
+++ b/usr/src/man/man8/keyserv.8
@@ -149,11 +149,11 @@ settings.
 .SH SEE ALSO
 .LP
 \fBkeylogin\fR(1), \fBsvcs\fR(1), \fBkeylogout\fR(1),
-\fBsvcadm\fR(1M), \fBpublickey\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcadm\fR(8), \fBpublickey\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .LP
 The \fBkeyserv\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -165,5 +165,5 @@ svc:/network/rpc/keyserv:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/killall.8 b/usr/src/man/man8/killall.8
index 5501bbd1eb..a4dd979fb7 100644
--- a/usr/src/man/man8/killall.8
+++ b/usr/src/man/man8/killall.8
@@ -16,7 +16,7 @@ killall \- kill all active processes
 .SH DESCRIPTION
 .sp
 .LP
-\fBkillall\fR is used by \fBshutdown\fR(1M) to kill all active processes not
+\fBkillall\fR is used by \fBshutdown\fR(8) to kill all active processes not
 directly related to the shutdown procedure.
 .sp
 .LP
@@ -32,5 +32,5 @@ The \fBkillall\fR command can be run only by the super-user.
 .SH SEE ALSO
 .sp
 .LP
-\fBkill\fR(1), \fBps\fR(1), \fBfuser\fR(1M), \fBshutdown\fR(1M),
-\fBsignal\fR(3C), \fBattributes\fR(5)
+\fBkill\fR(1), \fBps\fR(1), \fBfuser\fR(8), \fBshutdown\fR(8),
+\fBsignal\fR(3C), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/kprop.8 b/usr/src/man/man8/kprop.8
index 15f9d2fb6c..e5056be2fb 100644
--- a/usr/src/man/man8/kprop.8
+++ b/usr/src/man/man8/kprop.8
@@ -43,7 +43,7 @@ A keytab containing a host principal entry must exist on each slave \fBKDC\fR.
 .ie t \(bu
 .el o
 The database to be propagated must be dumped to a file using
-\fBkdb5_util\fR(1M).
+\fBkdb5_util\fR(8).
 .RE
 .SH OPTIONS
 .sp
@@ -157,10 +157,10 @@ Kerberos database propagated to the KDC slaves.
 .SH SEE ALSO
 .sp
 .LP
-\fBkpasswd\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(1M),
-\fBinetd\fR(1M), \fBkadmind\fR(1M), \fBkadmin.local\fR(1M),
-\fBkdb5_util\fR(1M), \fBsvcadm\fR(1M), \fBkadm5.acl\fR(4), \fBkdc.conf\fR(4),
-\fBattributes\fR(5), \fBkerberos\fR(5), \fBsmf\fR(5)
+\fBkpasswd\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(8),
+\fBinetd\fR(8), \fBkadmind\fR(8), \fBkadmin.local\fR(8),
+\fBkdb5_util\fR(8), \fBsvcadm\fR(8), \fBkadm5.acl\fR(5), \fBkdc.conf\fR(5),
+\fBattributes\fR(7), \fBkerberos\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/kpropd.8 b/usr/src/man/man8/kpropd.8
index fa82b59591..4c6264a56c 100644
--- a/usr/src/man/man8/kpropd.8
+++ b/usr/src/man/man8/kpropd.8
@@ -19,24 +19,24 @@ kpropd \- Kerberos propagation daemon for slave KDCs
 .sp
 .LP
 The \fBkpropd\fR command runs on the slave KDC server. It listens for update
-requests made by \fBkprop\fR(1M) from the master KDC and periodically requests
+requests made by \fBkprop\fR(8) from the master KDC and periodically requests
 incremental updates from the master KDC.
 .sp
 .LP
 When the slave receives a kprop request from the master, \fBkpropd\fR copies
 principal data to a temporary text file. Next, \fBkpropd\fR invokes
-\fBkdb5_util\fR(1M) (unless a different database utility is selected) to load
+\fBkdb5_util\fR(8) (unless a different database utility is selected) to load
 the text file in database format.
 .sp
 .LP
 When the slave periodically requests incremental updates, \fBkpropd\fR update
 its \fBprincipal.ulog\fR file with any updates from the master.
-\fBkproplog\fR(1M) can be used to view a summary of the update entry log on the
+\fBkproplog\fR(8) can be used to view a summary of the update entry log on the
 slave KDC.
 .sp
 .LP
 kpropd is not configured for incremental database propagation by default. These
-settings can be changed in the \fBkdc.conf\fR(4) file:
+settings can be changed in the \fBkdc.conf\fR(5) file:
 .sp
 .ne 2
 .na
@@ -208,7 +208,7 @@ Temporary file used by kpropd before loading this to the principal database.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -224,13 +224,13 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBkdb5_util\fR(1M), \fBkprop\fR(1M), \fBkproplog\fR(1M), \fBkdc.conf\fR(4),
-\fBkrb5.conf\fR(4), \fBattributes\fR(5), \fBkerberos\fR(5)
+\fBkdb5_util\fR(8), \fBkprop\fR(8), \fBkproplog\fR(8), \fBkdc.conf\fR(5),
+\fBkrb5.conf\fR(5), \fBattributes\fR(7), \fBkerberos\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBkprop\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -242,8 +242,8 @@ svc:/network/security/krb5_prop:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/kproplog.8 b/usr/src/man/man8/kproplog.8
index 9f88fd366d..d2e13aa9d8 100644
--- a/usr/src/man/man8/kproplog.8
+++ b/usr/src/man/man8/kproplog.8
@@ -19,7 +19,7 @@ The \fBkproplog\fR displays the contents of the Kerberos principal update log
 to standard output. This command can be used to keep track of the incremental
 updates to the principal database, which is enabled by default. The
 \fB/var/krb5/principal.ulog\fR file contains the update log maintained by the
-\fBkadmind\fR(1M) process on the master KDC server and the \fBkpropd\fR(1M)
+\fBkadmind\fR(8) process on the master KDC server and the \fBkpropd\fR(8)
 process on the slave KDC servers. When updates occur, they are logged to this
 file. Subsequently any KDC slave configured for incremental updates will
 request the current data from the master KDC and update their
@@ -105,7 +105,7 @@ The update log file for incremental propagation.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -121,6 +121,6 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBkpasswd\fR(1), \fBkadmin\fR(1M), \fBkadmind\fR(1M),
-\fBkdb5_util\fR(1M), \fBkprop\fR(1M), \fBkpropd\fR(1M), \fBkadm5.acl\fR(4),
-\fBkdc.conf\fR(4), \fBattributes\fR(5), \fBkerberos\fR(5)
+\fBkpasswd\fR(1), \fBkadmin\fR(8), \fBkadmind\fR(8),
+\fBkdb5_util\fR(8), \fBkprop\fR(8), \fBkpropd\fR(8), \fBkadm5.acl\fR(5),
+\fBkdc.conf\fR(5), \fBattributes\fR(7), \fBkerberos\fR(7)
diff --git a/usr/src/man/man8/krb5kdc.8 b/usr/src/man/man8/krb5kdc.8
index 2bd793bb29..3890ea0ddc 100644
--- a/usr/src/man/man8/krb5kdc.8
+++ b/usr/src/man/man8/krb5kdc.8
@@ -22,7 +22,7 @@ krb5kdc \- KDC daemon
 process the Kerberos tickets. For Kerberos to function properly, \fBkrb5kdc\fR
 must be running on at least one \fBKDC\fR that the Kerberos clients can access.
 Prior to running \fBkrb5kdc\fR, you must initialize the Kerberos database using
-\fBkdb5_util\fR(1M). See the \fI\fR for information regarding how to set up
+\fBkdb5_util\fR(8). See the \fI\fR for information regarding how to set up
 \fBKDC\fRs and initialize the Kerberos database.
 .SH OPTIONS
 .sp
@@ -121,7 +121,7 @@ the LDAP plug-in. These arguments are:
 Specifies the DN of the object used by the KDC server to bind to the LDAP
 server. This object should have the rights to read the realm container,
 principal container and the subtree that is referenced by the realm. Overrides
-the \fBldap_kdc_dn\fR parameter setting in \fBkrb5.conf\fR(4).
+the \fBldap_kdc_dn\fR parameter setting in \fBkrb5.conf\fR(5).
 .RE
 
 .sp
@@ -133,7 +133,7 @@ the \fBldap_kdc_dn\fR parameter setting in \fBkrb5.conf\fR(4).
 .RS 4n
 Specifies the password for the above-mentioned \fIbinddn\fR. It is recommended
 not to use this option. Instead, the password can be stashed using the
-\fBstashsrvpw\fR command of \fBkdb5_ldap_util\fR(1M).
+\fBstashsrvpw\fR command of \fBkdb5_ldap_util\fR(8).
 .RE
 
 .sp
@@ -215,10 +215,10 @@ using \fBkprop\fR.
 .SH SEE ALSO
 .sp
 .LP
-\fBkill\fR(1), \fBkpasswd\fR(1), \fBkadmind\fR(1M),
-\fBkadmin.local\fR(1M), \fBkdb5_util\fR(1M), \fBkdb5_ldap_util\fR(1M),
-\fBlogadm\fR(1M), \fBkrb5.conf\fR(4), \fBattributes\fR(5), \fBkrb5envvar\fR(5),
-\fBkerberos\fR(5),
+\fBkill\fR(1), \fBkpasswd\fR(1), \fBkadmind\fR(8),
+\fBkadmin.local\fR(8), \fBkdb5_util\fR(8), \fBkdb5_ldap_util\fR(8),
+\fBlogadm\fR(8), \fBkrb5.conf\fR(5), \fBattributes\fR(7), \fBkrb5envvar\fR(7),
+\fBkerberos\fR(7),
 .sp
 .LP
 \fI\fR
@@ -235,8 +235,8 @@ using the \fBkill\fR(1)command:
 .sp .6
 .RS 4n
 \fBkrb5kdc\fR closes and re-opens log files that it directly opens. This can be
-useful for external log-rotation utilities such as \fBlogadm\fR(1M). If this
-method is used for log file rotation, set the \fBkrb5.conf\fR(4)
+useful for external log-rotation utilities such as \fBlogadm\fR(8). If this
+method is used for log file rotation, set the \fBkrb5.conf\fR(5)
 \fBkdc_rotate\fR period relation to \fBnever\fR.
 .RE
 
diff --git a/usr/src/man/man8/ksslcfg.8 b/usr/src/man/man8/ksslcfg.8
index 94ee25529f..929376fce5 100644
--- a/usr/src/man/man8/ksslcfg.8
+++ b/usr/src/man/man8/ksslcfg.8
@@ -48,7 +48,7 @@ ksslcfg \- enable and configure SMF instance of Kernel SSL
 .fi
 
 .SH DESCRIPTION
-\fBksslcfg\fR manages \fBsmf\fR(5) instances for the Kernel SSL proxy module.
+\fBksslcfg\fR manages \fBsmf\fR(7) instances for the Kernel SSL proxy module.
 An SSL-enabled web server can use the services of its Kernel SSL proxy to
 improve the performance of the HTTPS packets processing. It does so by creating
 an instance of the Kernel SSL service, specifying the SSL proxy port and
@@ -64,7 +64,7 @@ port, if it is enabled, and deletes the instance from the SMF repository.
 .sp
 .LP
 \fBksslcfg\fR can be run as root or by other users assigned to the Network
-Security profile. See \fBrbac\fR(5) and \fBuser_attr\fR(4). You must run
+Security profile. See \fBrbac\fR(7) and \fBuser_attr\fR(5). You must run
 \fBksslcfg\fR to configure your Kernel SSL proxy before you start your
 application.
 .sp
@@ -158,7 +158,7 @@ token specified by \fB-T\fR. This option is to be used only with \fB-f\fR
 This option is applicable only with the \fBpkcs11\fR key format, when the token
 label is the Sun Software PKCS#11 softtoken. Use this option to override the
 default location of the PKCS#11 softtoken directory (\fB$HOME/.sunw\fR). See
-\fBpkcs11_softtoken\fR(5).
+\fBpkcs11_softtoken\fR(7).
 .RE
 
 .sp
@@ -376,7 +376,7 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -395,9 +395,9 @@ Command line options are Evolving; command output is Unstable. The FMRI service
 name (\fBsvc://network/ssl/proxy\fR) is Unstable, as is the FMRI instance's
 name format. The utility name is Stable.
 .SH SEE ALSO
-\fBnca\fR(1), \fBsvcprop\fR(1), \fBsvcs\fR(1), \fBcryptoadm\fR(1M),
-\fBsvcadm\fR(1M), \fBsvccfg\fR(1M), \fBuser_attr\fR(4), \fBattributes\fR(5),
-\fBpkcs11_softtoken\fR(5), \fBrbac\fR(5), \fBsmf\fR(5)
+\fBnca\fR(1), \fBsvcprop\fR(1), \fBsvcs\fR(1), \fBcryptoadm\fR(8),
+\fBsvcadm\fR(8), \fBsvccfg\fR(8), \fBuser_attr\fR(5), \fBattributes\fR(7),
+\fBpkcs11_softtoken\fR(7), \fBrbac\fR(7), \fBsmf\fR(7)
 .SH NOTES
 \fBksslcfg\fR \fBcreate\fR without an host argument creates an \fBINADDR_ANY\fR
 \fBsmf\fR instance. \fBksslcfg\fR \fBdelete\fR without an host argument deletes
@@ -405,5 +405,5 @@ only the \fBINADDR_ANY\fR instance. \fBksslcfg\fR \fBdelete\fR needs a host
 argument to delete any non-\fBINADDR_ANY\fR instance.
 .sp
 .LP
-On a system with \fBzones\fR(5) installed, the \fBksslcfg\fR command can be
+On a system with \fBzones\fR(7) installed, the \fBksslcfg\fR command can be
 used only in the global zone at this time.
diff --git a/usr/src/man/man8/kstat.8 b/usr/src/man/man8/kstat.8
index f14a3e42bc..7a811e0f9e 100644
--- a/usr/src/man/man8/kstat.8
+++ b/usr/src/man/man8/kstat.8
@@ -32,7 +32,7 @@ and name fields, as well as its actual value.
 Kernel statistics may be published by various kernel subsystems, such as
 drivers or loadable modules; each kstat has a module field that denotes its
 publisher. Since each module might have countable entities (such as multiple
-disks associated with the \fBsd\fR(7D) driver) for which it wishes to report
+disks associated with the \fBsd\fR(4D) driver) for which it wishes to report
 statistics, the kstat also has an instance field to index the statistics for
 each entity; kstat instances are numbered starting from zero. Finally, the
 kstat is given a name unique within its module.
@@ -373,8 +373,8 @@ kernel statistics driver
 .SH SEE ALSO
 .LP
 \fBdate\fR(1), \fBsh\fR(1), \fBtime\fR(2), \fBgmatch\fR(3GEN),
-\fBkstat\fR(3KSTAT), \fBattributes\fR(5), \fBregex\fR(5), \fBkstat\fR(7D),
-\fBsd\fR(7D), \fBkstat\fR(9S)
+\fBkstat\fR(3KSTAT), \fBattributes\fR(7), \fBregex\fR(7), \fBkstat\fR(4D),
+\fBsd\fR(4D), \fBkstat\fR(9S)
 .SH NOTES
 .LP
 If the pattern argument contains glob or RE metacharacters which are also
diff --git a/usr/src/man/man8/ktkt_warnd.8 b/usr/src/man/man8/ktkt_warnd.8
index 5fe76d5e39..11be68df39 100644
--- a/usr/src/man/man8/ktkt_warnd.8
+++ b/usr/src/man/man8/ktkt_warnd.8
@@ -37,7 +37,7 @@ Kerberos warning configuration file
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -53,13 +53,13 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBsvcadm\fR(1M),
-\fBwarn.conf\fR(4), \fBattributes\fR(5), \fBkerberos\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8), \fBsvcadm\fR(8),
+\fBwarn.conf\fR(5), \fBattributes\fR(7), \fBkerberos\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBktkt_warnd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -71,8 +71,8 @@ svc:/network/security/ktkt_warn:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/labelit.8 b/usr/src/man/man8/labelit.8
index 2bb74ba6eb..6d664884e5 100644
--- a/usr/src/man/man8/labelit.8
+++ b/usr/src/man/man8/labelit.8
@@ -84,7 +84,7 @@ be on a remote machine.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBlabelit\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBlabelit\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXIT STATUS
 .sp
@@ -144,8 +144,8 @@ The default partition for a command if no \fIFSType\fR is specified.
 .SH SEE ALSO
 .sp
 .LP
-\fBlabelit_hsfs\fR(1M), \fBlabelit_udfs\fR(1M), \fBlabelit_ufs\fR(1M),
-\fBvolcopy\fR(1M), \fBvfstab\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBlabelit_hsfs\fR(8), \fBlabelit_udfs\fR(8), \fBlabelit_ufs\fR(8),
+\fBvolcopy\fR(8), \fBvfstab\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/labelit_hsfs.8 b/usr/src/man/man8/labelit_hsfs.8
index 8da2844ef8..91322d9cb8 100644
--- a/usr/src/man/man8/labelit_hsfs.8
+++ b/usr/src/man/man8/labelit_hsfs.8
@@ -130,4 +130,4 @@ Volume set identifier, d-characters, 128 maximum.
 .SH SEE ALSO
 .sp
 .LP
-\fBlabelit\fR(1M), \fBvolcopy\fR(1M), \fBattributes\fR(5)
+\fBlabelit\fR(8), \fBvolcopy\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/labelit_udfs.8 b/usr/src/man/man8/labelit_udfs.8
index 57be57b45d..7a47f71538 100644
--- a/usr/src/man/man8/labelit_udfs.8
+++ b/usr/src/man/man8/labelit_udfs.8
@@ -30,7 +30,7 @@ The following options are supported:
 .ad
 .RS 23n
 Specify \fIgeneric_options\fR supported by the generic \fBlabelit\fR command.
-See \fBlabelit\fR(1M) for descriptions of supported options.
+See \fBlabelit\fR(8) for descriptions of supported options.
 .RE
 
 .sp
@@ -142,4 +142,4 @@ An error occurred.
 .SH SEE ALSO
 .sp
 .LP
-\fBlabelit\fR(1M), \fBattributes\fR(5)
+\fBlabelit\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/labelit_ufs.8 b/usr/src/man/man8/labelit_ufs.8
index 06736256e2..868da89018 100644
--- a/usr/src/man/man8/labelit_ufs.8
+++ b/usr/src/man/man8/labelit_ufs.8
@@ -18,7 +18,7 @@ labelit_ufs \- provide and print labels for ufs file systems
 .LP
 \fBlabelit\fR is used to write labels on unmounted disk file systems. Such
 labels may be used to uniquely identify volumes and are used by volume-oriented
-programs such as \fBvolcopy\fR(1M).
+programs such as \fBvolcopy\fR(8).
 .SH OPTIONS
 .sp
 .LP
@@ -30,7 +30,7 @@ The following option is supported:
 .ad
 .RS 19n
 options supported by the generic  \fBlabelit\fR command. See
-\fBlabelit\fR(1M).
+\fBlabelit\fR(8).
 .RE
 
 .SH OPERANDS
@@ -96,4 +96,4 @@ An error occurred.
 .SH SEE ALSO
 .sp
 .LP
-\fBlabelit\fR(1M), \fBvolcopy\fR(1M), \fBattributes\fR(5), \fBufs\fR(7FS)
+\fBlabelit\fR(8), \fBvolcopy\fR(8), \fBattributes\fR(7), \fBufs\fR(4FS)
diff --git a/usr/src/man/man8/latencytop.8 b/usr/src/man/man8/latencytop.8
index 35842aba08..64c999cf94 100644
--- a/usr/src/man/man8/latencytop.8
+++ b/usr/src/man/man8/latencytop.8
@@ -278,7 +278,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -296,7 +296,7 @@ Interface Stability	Volatile
 .SH SEE ALSO
 .sp
 .LP
-\fBdtrace\fR(1M), \fBkstat\fR(1M), \fBattributes\fR(5)
+\fBdtrace\fR(8), \fBkstat\fR(8), \fBattributes\fR(7)
 .SH USAGE
 .sp
 .LP
diff --git a/usr/src/man/man8/ldap_cachemgr.8 b/usr/src/man/man8/ldap_cachemgr.8
index ac6681e42e..0e0b63a9d9 100644
--- a/usr/src/man/man8/ldap_cachemgr.8
+++ b/usr/src/man/man8/ldap_cachemgr.8
@@ -23,9 +23,9 @@ boot.
 The \fBldap_cachemgr\fR utility provides caching for all parameters as
 specified and used by the LDAP naming service clients. The \fBldap_cachemgr\fR
 utility uses the cache files which are originally created by executing the
-\fBldapclient\fR(1M) utility, as cold start files. Updates to the cache files
+\fBldapclient\fR(8) utility, as cold start files. Updates to the cache files
 take place dynamically if profiles are used to configure the client. See the
-\fBinit\fR option to \fBldapclient\fR(1M).
+\fBinit\fR option to \fBldapclient\fR(8).
 .sp
 .LP
 The \fBldap_cachemgr\fR utility helps improve the performance of the clients
@@ -38,7 +38,7 @@ configuration files readable by superuser only.
 The cache maintained by this daemon is shared by all the processes that access
 LDAP Naming information. All processes access this cache through a door call.
 On startup, \fBldap_cachemgr\fR initializes the cache from the cache files. See
-\fBldapclient\fR(1M). Thus, the cache survives machine reboots.
+\fBldapclient\fR(8). Thus, the cache survives machine reboots.
 .sp
 .LP
 The \fBldap_cachemgr\fR daemon also acts as its own administration tool. If an
@@ -124,7 +124,7 @@ Default log file.
 .RS 4n
 Files containing the LDAP configuration of the client. These files are not to
 be modified manually. Their content is not guaranteed to be human readable. Use
-\fBldapclient\fR(1M) to update these files.
+\fBldapclient\fR(8) to update these files.
 .RE
 
 .SH WARNINGS
@@ -136,13 +136,13 @@ release.
 .LP
 \fBldap\fR(1), \fBldapadd\fR(1), \fBldapdelete\fR(1), \fBldaplist\fR(1),
 \fBldapmodify\fR(1), \fBldapmodrdn\fR(1), \fBldapsearch\fR(1), \fBpkill\fR(1),
-\fBsvcs\fR(1), \fBidsconfig\fR(1M), \fBldapaddent\fR(1M), \fBldapclient\fR(1M),
-\fBsvcadm\fR(1M), \fBsignal.h\fR(3HEAD),
-\fBresolv.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBidsconfig\fR(8), \fBldapaddent\fR(8), \fBldapclient\fR(8),
+\fBsvcadm\fR(8), \fBsignal.h\fR(3HEAD),
+\fBresolv.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .LP
 The \fBldap_cachemgr\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -154,5 +154,5 @@ svc:/network/ldap/client
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/ldapaddent.8 b/usr/src/man/man8/ldapaddent.8
index 8c3c49e3e5..47e643089d 100644
--- a/usr/src/man/man8/ldapaddent.8
+++ b/usr/src/man/man8/ldapaddent.8
@@ -61,7 +61,7 @@ addresses), \fBipnodes\fR (alias for \fBhosts\fR), \fBnetgroup\fR,
 \fBnetmasks\fR, \fBnetworks\fR, \fBpasswd\fR, \fBshadow\fR, \fBprotocols\fR,
 \fBpublickey\fR, \fBrpc\fR, and \fBservices\fR. In addition to the preceding,
 the \fIdatabase\fR argument can be one of the RBAC-related files (see
-\fBrbac\fR(5)):
+\fBrbac\fR(7)):
 .RS +4
 .TP
 .ie t \(bu
@@ -228,7 +228,7 @@ ipnodes: dns files
 .fi
 .in -2
 
-See \fBnsswitch.conf\fR(4).
+See \fBnsswitch.conf\fR(5).
 .RE
 
 .sp
@@ -529,12 +529,12 @@ An error occurred.
 .RS 4n
 Files containing the LDAP configuration of the client. These files are not to
 be modified manually. Their content is not guaranteed to be human readable. Use
-\fBldapclient\fR(1M) to update these files.
+\fBldapclient\fR(8) to update these files.
 .RE
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -550,8 +550,8 @@ Interface Stability	Committed
 .SH SEE ALSO
 .LP
 \fBldap\fR(1), \fBldaplist\fR(1), \fBldapmodify\fR(1), \fBldapmodrdn\fR(1),
-\fBldapsearch\fR(1), \fBidsconfig\fR(1M), \fBldapclient\fR(1M),
-\fBnsswitch.conf\fR(4), \fBattributes\fR(5)
+\fBldapsearch\fR(1), \fBidsconfig\fR(8), \fBldapclient\fR(8),
+\fBnsswitch.conf\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/ldapclient.8 b/usr/src/man/man8/ldapclient.8
index 0fe5dcc5ca..8007515c2a 100644
--- a/usr/src/man/man8/ldapclient.8
+++ b/usr/src/man/man8/ldapclient.8
@@ -75,7 +75,7 @@ LDAP client machine, using a profile stored on an LDAP server specified by
 profile to determine the configuration of the LDAP client. Using a
 configuration profile allows for easy installation of LDAP client and
 propagation of configuration changes to LDAP clients. The
-\fBldap_cachemgr\fR(1M) utility will update the LDAP client configuration when
+\fBldap_cachemgr\fR(8) utility will update the LDAP client configuration when
 its cache expires by reading the profile. For more information on the
 configuration profile refer to IETF document \fIA Configuration Schema for LDAP
 Based Directory User Agents\fR.
@@ -152,7 +152,7 @@ initialization are:
 \fBldapclient\fR does not set up a client to resolve hostnames using DNS. It
 simply copies \fB/etc/nsswitch.ldap\fR to \fB/etc/nsswitch.conf\fR. If you
 prefer to use DNS for host resolution, please refer to the DNS documentation
-for information on setting up DNS. See \fBresolv.conf\fR(4). If you want to use
+for information on setting up DNS. See \fBresolv.conf\fR(5). If you want to use
 \fBsasl/GSSAPI\fR as the authentication method, you have to use DNS for
 \fBhosts\fR and \fBipnodes\fR resolution.
 .sp
@@ -658,7 +658,7 @@ is the name of the profile to be generated. The default value is \fBdefault\fR.
 .RS 4n
 Specify the TTL value in seconds for the client information. This is only
 relevant if the machine was initialized with a client profile. If you do not
-want \fBldap_cachemgr\fR(1M) to attempt to refresh the LDAP client
+want \fBldap_cachemgr\fR(8) to attempt to refresh the LDAP client
 configuration from the LDAP server, set \fBprofileTTL\fR to 0 (zero). Valid
 values are either zero 0 (for no expiration) or a positive integer in seconds.
 The default value is 12 hours.
@@ -724,9 +724,9 @@ Three services support this feature: \fBpasswd-cmd\fR, \fBkeyserv\fR, and
 \fBpam_ldap\fR. The \fBpasswd-cmd\fR service is used to define the
 authentication method to be used by \fBpasswd\fR(1) to change the user's
 password and other attributes. The \fBkeyserv\fR service is used to identify
-the authentication method to be used by the \fBchkey\fR(1) and \fBnewkey\fR(1M)
+the authentication method to be used by the \fBchkey\fR(1) and \fBnewkey\fR(8)
 utilities. The \fBpam_ldap\fR service defines the authentication method to be
-used for authenticating users when \fBpam_ldap\fR(5) is configured. If this
+used for authenticating users when \fBpam_ldap\fR(7) is configured. If this
 attribute is not set for any of these services, the \fBauthenticationMethod\fR
 attribute is used to define the authentication method. This is a multivalued
 attribute.
@@ -1087,7 +1087,7 @@ modified manually. Their content is not guaranteed to be human readable. Use
 .sp .6
 .RS 4n
 System default domain name, matching the domain name of the data in the LDAP
-servers. See \fBdefaultdomain\fR(4).
+servers. See \fBdefaultdomain\fR(5).
 .RE
 
 .sp
@@ -1097,7 +1097,7 @@ servers. See \fBdefaultdomain\fR(4).
 .ad
 .sp .6
 .RS 4n
-Configuration file for the name-service switch. See \fBnsswitch.conf\fR(4).
+Configuration file for the name-service switch. See \fBnsswitch.conf\fR(5).
 .RE
 
 .sp
@@ -1112,7 +1112,7 @@ files.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1128,9 +1128,9 @@ Interface Stability	Evolving
 .SH SEE ALSO
 \fBchkey\fR(1), \fBldap\fR(1), \fBldapadd\fR(1), \fBldapdelete\fR(1),
 \fBldaplist\fR(1), \fBldapmodify\fR(1), \fBldapmodrdn\fR(1),
-\fBldapsearch\fR(1), \fBidsconfig\fR(1M), \fBldapaddent\fR(1M),
-\fBldap_cachemgr\fR(1M), \fBdefaultdomain\fR(4),
-\fBnsswitch.conf\fR(4), \fBresolv.conf\fR(4), \fBattributes\fR(5)
+\fBldapsearch\fR(1), \fBidsconfig\fR(8), \fBldapaddent\fR(8),
+\fBldap_cachemgr\fR(8), \fBdefaultdomain\fR(5),
+\fBnsswitch.conf\fR(5), \fBresolv.conf\fR(5), \fBattributes\fR(7)
 .SH CAUTION
 Currently \fBStartTLS\fR is not supported by \fBlibldap.so.5\fR, therefore the
 port number provided refers to the port used during a TLS open, rather than the
diff --git a/usr/src/man/man8/ldmad.8 b/usr/src/man/man8/ldmad.8
index 611cf1e37c..f49b34784c 100644
--- a/usr/src/man/man8/ldmad.8
+++ b/usr/src/man/man8/ldmad.8
@@ -27,7 +27,7 @@ configuration options.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -43,8 +43,8 @@ Interface Stability	Unstable
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBsyslog\fR(3C), \fBsyslog.conf\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBsyslog\fR(3C), \fBsyslog.conf\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH ERRORS
 .sp
 .LP
@@ -58,7 +58,7 @@ messages to the \fB/var/adm/messages\fR log.
 .sp
 .LP
 The \fBldmad\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -70,5 +70,5 @@ svc:/ldoms/agents:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/link.8 b/usr/src/man/man8/link.8
index 4a18c32740..ebea361e21 100644
--- a/usr/src/man/man8/link.8
+++ b/usr/src/man/man8/link.8
@@ -85,13 +85,13 @@ Specifies the name of newly created (linked) file.
 .SH ENVIRONMENT VARIABLES
 .sp
 .LP
-See  \fBenviron\fR(5) for descriptions of the following environment variables
+See  \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of  \fBlink\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .SS "/usr/xpg4/bin/link"
 .sp
 
@@ -108,5 +108,5 @@ Interface Stability	Standard
 .SH SEE ALSO
 .sp
 .LP
-\fBln\fR(1), \fBrm\fR(1), \fBlink\fR(2), \fBunlink\fR(2), \fBattributes\fR(5),
-\fBenviron\fR(5), \fBstandards\fR(5)
+\fBln\fR(1), \fBrm\fR(1), \fBlink\fR(2), \fBunlink\fR(2), \fBattributes\fR(7),
+\fBenviron\fR(7), \fBstandards\fR(7)
diff --git a/usr/src/man/man8/listdgrp.8 b/usr/src/man/man8/listdgrp.8
index 02fdb670ac..829c9dc892 100644
--- a/usr/src/man/man8/listdgrp.8
+++ b/usr/src/man/man8/listdgrp.8
@@ -89,4 +89,4 @@ Device group table.
 .SH SEE ALSO
 .sp
 .LP
-\fBputdgrp\fR(1M), \fBattributes\fR(5)
+\fBputdgrp\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/listen.8 b/usr/src/man/man8/listen.8
index 86e5ae4e59..b362338f1c 100644
--- a/usr/src/man/man8/listen.8
+++ b/usr/src/man/man8/listen.8
@@ -62,7 +62,7 @@ for the connection in a \fBstrrecvfd\fR structure using an \fBI_RECVFD\fR
 .sp
 .LP
 For more details about the listener and its administration, see
-\fBnlsadmin\fR(1M).
+\fBnlsadmin\fR(8).
 .SH OPTIONS
 .sp
 .ne 2
@@ -80,10 +80,10 @@ The listener will use \fIdevstem\fR as the prefix for the pathname.
 .SH SEE ALSO
 .sp
 .LP
-\fBnlsadmin\fR(1M), \fBpmadm\fR(1M), \fBsac\fR(1M), \fBsacadm\fR(1M),
+\fBnlsadmin\fR(8), \fBpmadm\fR(8), \fBsac\fR(8), \fBsacadm\fR(8),
 \fBioctl\fR(2), \fBdoconfig\fR(3NSL), \fBnlsgetcall\fR(3NSL),
-\fBnlsprovider\fR(3NSL), \fBt_sync\fR(3NSL), \fBattributes\fR(5),
-\fBstreamio\fR(7I)
+\fBnlsprovider\fR(3NSL), \fBt_sync\fR(3NSL), \fBattributes\fR(7),
+\fBstreamio\fR(4I)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/locator.8 b/usr/src/man/man8/locator.8
index 96cade618d..99d960230a 100644
--- a/usr/src/man/man8/locator.8
+++ b/usr/src/man/man8/locator.8
@@ -117,4 +117,4 @@ The requested operation failed.
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5)
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/lockfs.8 b/usr/src/man/man8/lockfs.8
index fb3fcba646..e18b4e600b 100644
--- a/usr/src/man/man8/lockfs.8
+++ b/usr/src/man/man8/lockfs.8
@@ -88,7 +88,7 @@ Error-lock (\fBelock\fR) the specified \fIfile-system\fR. elock blocks all
 local access to the locked file system and returns \fBEWOULDBLOCK\fR on all
 remote access. File systems are elocked by \fBUFS\fR on detection of internal
 inconsistency. They may only be unlocked after successful repair by \fBfsck\fR,
-which is usually done automatically (see \fBmount_ufs\fR(1M)). elocked file
+which is usually done automatically (see \fBmount_ufs\fR(8)). elocked file
 systems can be unmounted.
 .RE
 
@@ -103,7 +103,7 @@ Force a synchronous flush of all data that is dirty at the time \fBfsflush\fR
 is run to its backing store for the named file system (or for all file
 systems.)
 .sp
-It is a more reliable method than using \fBsync\fR(1M) because it does not
+It is a more reliable method than using \fBsync\fR(8) because it does not
 return until all possible data has been pushed. In the case of \fBUFS\fR
 filesystems with logging enabled, the log is also rolled before returning.
 Additional data can be modified by the time \fBfsflush\fR exits, so using one
@@ -187,7 +187,7 @@ file system, the \fBlockfs\fR command will take effect on the root file system.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBlockfs\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBlockfs\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXAMPLES
 .LP
@@ -307,8 +307,8 @@ example#
 .SH SEE ALSO
 .sp
 .LP
-\fBkill\fR(1), \fBmount_ufs\fR(1M), \fBsync\fR(1M), \fBattributes\fR(5),
-\fBlargefile\fR(5), \fBufs\fR(7FS),
+\fBkill\fR(1), \fBmount_ufs\fR(8), \fBsync\fR(8), \fBattributes\fR(7),
+\fBlargefile\fR(7), \fBufs\fR(4FS),
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/lockstat.8 b/usr/src/man/man8/lockstat.8
index 4c12986970..19ce163707 100644
--- a/usr/src/man/man8/lockstat.8
+++ b/usr/src/man/man8/lockstat.8
@@ -829,7 +829,7 @@ Count indv cuml rcnt     nsec CPU+PIL          Caller
 
 .SH SEE ALSO
 .LP
-\fBdtrace\fR(1M), \fBplockstat\fR(1M), \fBattributes\fR(5), \fBlockstat\fR(7D),
+\fBdtrace\fR(8), \fBplockstat\fR(8), \fBattributes\fR(7), \fBlockstat\fR(4D),
 \fBmutex\fR(9F), \fBrwlock\fR(9F)
 .sp
 .LP
diff --git a/usr/src/man/man8/logadm.8 b/usr/src/man/man8/logadm.8
index 779549ea79..5146c148fe 100644
--- a/usr/src/man/man8/logadm.8
+++ b/usr/src/man/man8/logadm.8
@@ -18,7 +18,7 @@ logadm \- manage endlessly growing log files
 
 .SH DESCRIPTION
 \fBlogadm\fR is a general log rotation tool that is suitable for running from
-\fBcron\fR(1M).
+\fBcron\fR(8).
 .sp
 .LP
 Without arguments, \fBlogadm\fR reads the \fB/etc/logadm.conf\fR file, and for
@@ -197,7 +197,7 @@ being added automatically, specify \fB\fR\fB-C\fR \fB0\fR .
 .RS 4n
 Send error messages by email to \fImail_addr\fR.
 .sp
-As \fBlogadm\fR is typically run from \fBcron\fR(1M), error messages are
+As \fBlogadm\fR is typically run from \fBcron\fR(8), error messages are
 captured by \fBcron\fR and mailed to the owner of the \fBcrontab\fR.
 .sp
 This option is useful if you want the mail regarding error messages to go to
@@ -875,7 +875,7 @@ configuration file for \fBlogadm\fR command
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -890,8 +890,8 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 \fBchgrp\fR(1), \fBchmod\fR(1), \fBchown\fR(1), \fBcsh\fR(1), \fBgzip\fR(1),
-\fBcron\fR(1M), \fBctime\fR(3C), \fBstrftime\fR(3C), \fBlogadm.conf\fR(4),
-\fBattributes\fR(5)
+\fBcron\fR(8), \fBctime\fR(3C), \fBstrftime\fR(3C), \fBlogadm.conf\fR(5),
+\fBattributes\fR(7)
 .SH NOTES
 When \fBlogadm\fR applies expire conditions (supplied by the \fB-A\fR,
 \fB-C\fR, and \fB-S\fR options), it deletes files, the oldest first, until the
@@ -908,6 +908,6 @@ very time-consuming.
 .sp
 .LP
 By default, \fBlogadm\fR works in \fBGMT\fR. Therefore, all entries written to
-the \fB/etc/logadm.conf\fR file (see \fBlogadm.conf\fR(4)) will have a
+the \fB/etc/logadm.conf\fR file (see \fBlogadm.conf\fR(5)) will have a
 \fBGMT\fR timestamp. Users can use the \fB-l\fR option to set \fBlogadm\fR to
 local time.
diff --git a/usr/src/man/man8/logins.8 b/usr/src/man/man8/logins.8
index 78816a080e..87f27b73a3 100644
--- a/usr/src/man/man8/logins.8
+++ b/usr/src/man/man8/logins.8
@@ -200,4 +200,4 @@ the time interval that the user receives a password expiration warning message
 .SH SEE ALSO
 .sp
 .LP
-\fBpasswd\fR(1), \fBcrypt\fR(3C), \fBattributes\fR(5)
+\fBpasswd\fR(1), \fBcrypt\fR(3C), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/lpadmin.8 b/usr/src/man/man8/lpadmin.8
index 8bf123244d..4b086ab4ae 100644
--- a/usr/src/man/man8/lpadmin.8
+++ b/usr/src/man/man8/lpadmin.8
@@ -548,7 +548,7 @@ conjunction with the \fB-p\fR, \fB-d\fR, \fB-x\fR, or \fB-S\fR options.
 The \fB-o\fR option defines default printer configuration values given to an
 interface program. The default can be explicitly overwritten for individual
 requests by the user (see \fBlp\fR(1)), or taken from a preprinted form
-description (see \fBlpforms\fR(1M) and \fBlp\fR(1)).
+description (see \fBlpforms\fR(8) and \fBlp\fR(1)).
 .sp
 There are several options which are predefined by the system. In addition, any
 number of key-value pairs can be defined. See the section "Predefined Options
@@ -598,7 +598,7 @@ a list of character set name ``mappings'' or aliases. Each ``mapping'' is of
 the form \fIknown-name=alias\fR The \fIknown-name\fR is a character set number
 preceded by \fBcs\fR (such as \fBcs3\fR for character set three) or a character
 set name from the \fBterminfo\fR database entry \fBcsnm\fR. See
-\fBterminfo\fR(4). If this option is not used to specify a list, only the names
+\fBterminfo\fR(5). If this option is not used to specify a list, only the names
 already known from the \fBterminfo\fR database or numbers with a prefix of
 \fBcs\fR is acceptable for the printer. If \fIlist\fR is the word \fBnone\fR,
 any existing print wheel lists or character set aliases are removed.
@@ -1226,7 +1226,7 @@ Sets boolean values \fBfoo=true | foo=false\fR.
 
 .SH EXAMPLES
 In the following examples, \fIprtr\fR can be any name up to 14 characters and
-can be the same name as the \fBping\fR(1M) name.
+can be the same name as the \fBping\fR(8) name.
 .LP
 \fBExample 1 \fRConfiguring an HP Postscript Printer with a Jet Direct Network
 Interface
@@ -1321,7 +1321,7 @@ System printer configuration database
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1336,8 +1336,8 @@ Interface Stability	Obsolete
 
 .SH SEE ALSO
 \fBenable\fR(1), \fBlp\fR(1), \fBlpstat\fR(1), \fBmail\fR(1), \fBstty\fR(1),
-\fBaccept\fR(1M), \fBlpforms\fR(1M), \fBlpsched\fR(1M), \fBlpsystem\fR(1M),
-\fBping\fR(1M), \fBdial\fR(3NSL), \fBterminfo\fR(4), \fBattributes\fR(5)
+\fBaccept\fR(8), \fBlpforms\fR(8), \fBlpsched\fR(8), \fBlpsystem\fR(8),
+\fBping\fR(8), \fBdial\fR(3NSL), \fBterminfo\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/lpfilter.8 b/usr/src/man/man8/lpfilter.8
index 024c86aa67..834870207f 100644
--- a/usr/src/man/man8/lpfilter.8
+++ b/usr/src/man/man8/lpfilter.8
@@ -289,14 +289,14 @@ listed in the table, a single asterisk (\fB*\fR), or a regular expression. If
 is used to generate a filter-specific option. The  \fIreplacement\fR is what
 will be used as the option.
 .sp
-Regular expressions are the same as those found on the \fBregexp\fR(5) manual
+Regular expressions are the same as those found on the \fBregexp\fR(7) manual
 page. This includes the \fB\e(\fR\&...\fB\e)\fR and \fB\e\fR\fIn\fR
 constructions, which can be used to extract portions of the \fIpattern\fR for
 copying into the \fIreplacement\fR, and the \fB&\fR, which can be used to copy
 the entire \fIpattern\fR into the \fIreplacement\fR.
 .sp
 The \fIreplacement\fR can also contain a \fB*\fR; it too, is replaced with the
-entire \fIpattern\fR, just like the \fB&\fR of \fBregexp\fR(5).
+entire \fIpattern\fR, just like the \fB&\fR of \fBregexp\fR(7).
 .RE
 
 .sp
@@ -376,7 +376,7 @@ If the command fails, an error message is sent to standard error.
 .SS "Large File Behavior"
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBlpfilter\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBlpfilter\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXAMPLES
 .LP
@@ -482,8 +482,8 @@ An error occurred.
 .SH SEE ALSO
 .sp
 .LP
-\fBlp\fR(1), \fBsh\fR(1), \fBlpadmin\fR(1M), \fBattributes\fR(5),
-\fBlargefile\fR(5), \fBregexp\fR(5)
+\fBlp\fR(1), \fBsh\fR(1), \fBlpadmin\fR(8), \fBattributes\fR(7),
+\fBlargefile\fR(7), \fBregexp\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/lpforms.8 b/usr/src/man/man8/lpforms.8
index 613a243c9e..177e362d16 100644
--- a/usr/src/man/man8/lpforms.8
+++ b/usr/src/man/man8/lpforms.8
@@ -200,7 +200,7 @@ Before printing the content of a print request needing this form, the generic
 interface program provided with  the LP print service will initialize the
 physical printer to handle pages \fIscaled-decimal-number1\fR long, and
 \fIscaled-decimal-number2\fR wide using the printer type as a key into the
-\fBterminfo\fR(4) database. The page length and page width will also be passed,
+\fBterminfo\fR(5) database. The page length and page width will also be passed,
 if possible, to each filter used in a request needing this form.
 .RE
 
@@ -226,7 +226,7 @@ filter the page subset of 1-\fIinteger\fR.
 Before printing the content of a print request needing this form, the interface
 program provided with the  LP print service will initialize the physical
 printer to handle these pitches, using the printer type as a key into the
-\fBterminfo\fR(4) database.  Also, the pitches will be passed, if possible, to
+\fBterminfo\fR(5) database.  Also, the pitches will be passed, if possible, to
 each filter used in a request needing this form. \fIscaled-decimal-number3\fR
 is in lines-per-centimeter if a \fBc\fR is appended, and lines-per-inch
 otherwise; similarly, \fIscaled-decimal-number4\fR is in
@@ -624,7 +624,7 @@ alert definition for the form will be removed.
 .SS "Large File Behavior"
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBlpforms\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBlpforms\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXIT STATUS
 .sp
@@ -661,8 +661,8 @@ Fault handler for \fBlpform\fR.
 .SH SEE ALSO
 .sp
 .LP
-\fBlp\fR(1), \fBlpstat\fR(1), \fBlpadmin\fR(1M), \fBterminfo\fR(4),
-\fBattributes\fR(5), \fBlargefile\fR(5)
+\fBlp\fR(1), \fBlpstat\fR(1), \fBlpadmin\fR(8), \fBterminfo\fR(5),
+\fBattributes\fR(7), \fBlargefile\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/lpget.8 b/usr/src/man/man8/lpget.8
index c666bd181c..7d4d7f0e1e 100644
--- a/usr/src/man/man8/lpget.8
+++ b/usr/src/man/man8/lpget.8
@@ -18,7 +18,7 @@ The \fBlpget\fR utility reads printing configuration information from the
 configuration databases in \fB$HOME/.printers\fR, \fB/etc/printers.conf\fR,
 and \fBprinters.conf.byname\fR. This
 information, called a \fIconfiguration report\fR, is displayed to the standard
-output. See \fBprinters\fR(4) and \fBprinters.conf\fR(4) for information about
+output. See \fBprinters\fR(5) and \fBprinters.conf\fR(5) for information about
 the printer configuration databases.
 .sp
 .LP
@@ -35,7 +35,7 @@ The following option is supported:
 \fB\fB-k\fR \fIkey\fR\fR
 .ad
 .RS 10n
-Displays a configuration report for \fIkey\fR. See \fBprinters.conf\fR(4) for
+Displays a configuration report for \fIkey\fR. See \fBprinters.conf\fR(5) for
 information about specifying  \fIkey\fR.
 .RE
 
@@ -49,11 +49,11 @@ The following operands are supported:
 .ad
 .RS 15n
 Displays a configuration report for  \fIdestination\fR. Destination can be
-either a printer of a class of printers. See \fBlpadmin\fR(1M). Specify
+either a printer of a class of printers. See \fBlpadmin\fR(8). Specify
 \fIdestination\fR using atomic or POSIX-style
-(\fIserver\fR\fB:\fR\fIdestination\fR) names. See \fBprinters.conf \fR(4) for
+(\fIserver\fR\fB:\fR\fIdestination\fR) names. See \fBprinters.conf\fR(5) for
 information regarding the naming conventions for atomic names and
-\fBstandards\fR(5) for information concerning POSIX.
+\fBstandards\fR(7) for information concerning POSIX.
 .RE
 
 .sp
@@ -147,7 +147,7 @@ User-configurable printer database.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -163,18 +163,18 @@ Stability Level	Stable
 .SH SEE ALSO
 .LP
 \fBldap\fR(1), \fBlp\fR(1), \fBlpc\fR(1B), \fBlpq\fR(1B), \fBlpr\fR(1B),
-\fBlpstat\fR(1), \fBlpadmin\fR(1M), \fBlpset\fR(1M), \fBprinters\fR(4),
-\fBprinters.conf\fR(4), \fBattributes\fR(5), \fBstandards\fR(5)
+\fBlpstat\fR(1), \fBlpadmin\fR(8), \fBlpset\fR(8), \fBprinters\fR(5),
+\fBprinters.conf\fR(5), \fBattributes\fR(7), \fBstandards\fR(7)
 .sp
 .LP
 \fI\fR
 .SH NOTES
 .LP
 Be mindful of the following if the LDAP database is used as the name service.
-If the \fBldapclient\fR(1M) server is a replica LDAP server, LDAP printer
+If the \fBldapclient\fR(8) server is a replica LDAP server, LDAP printer
 database updates may not appear immediately, as the replica server may not not
 have been updated by the master server and can be out of sync. For example, a
-printer that you deleted by using \fBlpset\fR(1M) may still appear in the
+printer that you deleted by using \fBlpset\fR(8) may still appear in the
 printer list you display with \fBlpget\fR until the replica is updated from the
 master. Replica servers vary as to how often they are updated from the master.
 Refer to the \fI\fR for more information on LDAP replication.
diff --git a/usr/src/man/man8/lpmove.8 b/usr/src/man/man8/lpmove.8
index 15cfa3cf16..e4bde98052 100644
--- a/usr/src/man/man8/lpmove.8
+++ b/usr/src/man/man8/lpmove.8
@@ -40,7 +40,7 @@ both support moving requests between queues. The BSD print protocol does not.
 .sp
 .LP
 When moving requests, \fBlpmove\fR does not check the acceptance status of the
-destination to which the print requests are being moved (see \fBaccept\fR(1M)).
+destination to which the print requests are being moved (see \fBaccept\fR(8)).
 \fBlpmove\fR does not move requests that have options (for example, content
 type or requiring a special form) that cannot be handled by the new
 destination.
@@ -64,7 +64,7 @@ identifier associated with a print request as reported by \fBlpstat\fR. See
 \fB\fIdestination\fR\fR
 .ad
 .RS 15n
-The name of the printer or class of printers (see \fBlpadmin\fR(1M)) to which
+The name of the printer or class of printers (see \fBlpadmin\fR(8)) to which
 \fBlpmove\fR moves a \fIspecified\fR print request. Specify \fIdestination\fR
 using atomic, URI-style (\fIscheme\fR://\fIendpoint\fR), POSIX-style
 (\fIserver\fR\fB:\fR\fIdestination\fR) syntax.
@@ -84,8 +84,8 @@ requests. Specify \fIdestination\fR using atomic, URI-style
 
 .sp
 .LP
-See \fBprinters.conf\fR(4) for information regarding the naming conventions for
-atomic names and \fBstandards\fR(5) for information regarding POSIX.
+See \fBprinters.conf\fR(5) for information regarding the naming conventions for
+atomic names and \fBstandards\fR(7) for information regarding POSIX.
 .SH EXIT STATUS
 .LP
 The following exit values are returned:
@@ -145,7 +145,7 @@ LDAP version of \fB/etc/printers.conf\fR
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -160,9 +160,9 @@ Interface Stability	Obsolete
 
 .SH SEE ALSO
 .LP
-\fBlp\fR(1), \fBlpr\fR(1B), \fBlpstat\fR(1), \fBaccept\fR(1M),
-\fBlpadmin\fR(1M), \fBlpsched\fR(1M), \fBprinters.conf\fR(4),
-\fBattributes\fR(5), \fBstandards\fR(5)
+\fBlp\fR(1), \fBlpr\fR(1B), \fBlpstat\fR(1), \fBaccept\fR(8),
+\fBlpadmin\fR(8), \fBlpsched\fR(8), \fBprinters.conf\fR(5),
+\fBattributes\fR(7), \fBstandards\fR(7)
 .sp
 .LP
 \fISystem Administration Guide: Solaris Printing\fR
diff --git a/usr/src/man/man8/lpsched.8 b/usr/src/man/man8/lpsched.8
index 40eac9512a..103282a07a 100644
--- a/usr/src/man/man8/lpsched.8
+++ b/usr/src/man/man8/lpsched.8
@@ -21,11 +21,11 @@ The  \fBlpsched\fR command  starts or restarts the  \fBLP\fR print service.
 .LP
 The  \fBlpshut\fR command stops the  \fBLP\fR print service.  Printers that are
 restarted using \fBlpsched\fR reprint (in their entirety) print requests that
-were stopped by  \fBlpshut\fR. See  \fBlpshut\fR(1M).
+were stopped by  \fBlpshut\fR. See  \fBlpshut\fR(8).
 .sp
 .LP
 It is recommended that you start  and stop the LP print service using
-\fBsvcadm\fR(1M).  See \fBNOTES\fR.
+\fBsvcadm\fR(8).  See \fBNOTES\fR.
 .SH OPTIONS
 .sp
 .LP
@@ -110,9 +110,9 @@ An error occurred.
 .SH SEE ALSO
 .sp
 .LP
-\fBlp\fR(1), \fBsvcs\fR(1), \fBlpstat\fR(1), \fBlpadmin\fR(1M),
-\fBlpmove\fR(1M), \fBlpshut\fR(1M), \fBsvcadm\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBlp\fR(1), \fBsvcs\fR(1), \fBlpstat\fR(1), \fBlpadmin\fR(8),
+\fBlpmove\fR(8), \fBlpshut\fR(8), \fBsvcadm\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
@@ -120,7 +120,7 @@ An error occurred.
 .sp
 .LP
 The \fBlpsched\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -132,5 +132,5 @@ svc:/application/print/server
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/lpset.8 b/usr/src/man/man8/lpset.8
index f8951d8c2f..fc24d51c5a 100644
--- a/usr/src/man/man8/lpset.8
+++ b/usr/src/man/man8/lpset.8
@@ -18,7 +18,7 @@ databases
 The \fBlpset\fR utility sets printing configuration information in  the system
 configuration databases. Use \fBlpset\fR to create and update printing
 configuration in \fB/etc/printers.conf\fR.
-See \fBnsswitch.conf\fR(4) and \fBprinters.conf\fR(4).
+See \fBnsswitch.conf\fR(5) and \fBprinters.conf\fR(5).
 .sp
 .LP
 Only a superuser or a member of Group 14 may execute \fBlpset\fR.
@@ -55,7 +55,7 @@ specified by the \fB-n\fR option.
 .ad
 .RS 26n
 Configure the specified \fIkey\fR\fB=\fR\fIvalue\fR pair for the
-\fIdestination\fR. See \fBprinters.conf\fR(4) for information regarding the
+\fIdestination\fR. See \fBprinters.conf\fR(5) for information regarding the
 specification of \fIkey\fR\fB=\fR\fIvalue\fR pairs.
 .RE
 
@@ -66,7 +66,7 @@ specification of \fIkey\fR\fB=\fR\fIvalue\fR pairs.
 .ad
 .RS 26n
 Delete the configuration option specified by \fIkey\fR for the
-\fIdestination\fR entry. See \fBprinters.conf\fR(4) for information regarding
+\fIdestination\fR entry. See \fBprinters.conf\fR(5) for information regarding
 the specification of \fIkey\fR and  \fIkey\fR\fB=\fR\fIvalue\fR pairs.
 .RE
 
@@ -111,11 +111,11 @@ The following operand is supported:
 .RS 15n
 Specifies the entry in  \fB/etc/printers.conf\fR or
 LDAP, in which to create or modify information. \fIdestination\fR names a
-printer of class of printers. See  \fBlpadmin\fR(1M). Each entry in
+printer of class of printers. See  \fBlpadmin\fR(8). Each entry in
 \fBprinters.conf\fR describes one destination. Specify \fIdestination\fR using
 atomic names. POSIX-style destination names are not acceptable. See
-\fBprinters.conf\fR(4) for information regarding the naming conventions for
-atomic names and \fBstandards\fR(5) for information regarding POSIX.
+\fBprinters.conf\fR(5) for information regarding the naming conventions for
+atomic names and \fBstandards\fR(7) for information regarding POSIX.
 .RE
 
 .SH EXAMPLES
@@ -174,7 +174,7 @@ System configuration database.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -189,9 +189,9 @@ Stability Level	Stable
 
 .SH SEE ALSO
 \fBldap\fR(1), \fBlp\fR(1), \fBlpc\fR(1B), \fBlpq\fR(1B), \fBlpr\fR(1B),
-\fBlpstat\fR(1), \fBldapclient\fR(1M), \fBlpadmin\fR(1M), \fBlpget\fR(1M),
-\fBnsswitch.conf\fR(4), \fBprinters\fR(4), \fBprinters.conf\fR(4),
-\fBattributes\fR(5), \fBstandards\fR(5)
+\fBlpstat\fR(1), \fBldapclient\fR(8), \fBlpadmin\fR(8), \fBlpget\fR(8),
+\fBnsswitch.conf\fR(5), \fBprinters\fR(5), \fBprinters.conf\fR(5),
+\fBattributes\fR(7), \fBstandards\fR(7)
 .sp
 .LP
 \fI\fR
@@ -202,8 +202,8 @@ of the following when updating printer information.
 .TP
 1.
 Because the domain information for the printer being updated is extracted
-from the \fBldapclient\fR(1M) configuration, the LDAP server being updated must
-host the same domain that is used by the current \fBldapclient\fR(1M) server.
+from the \fBldapclient\fR(8) configuration, the LDAP server being updated must
+host the same domain that is used by the current \fBldapclient\fR(8) server.
 .RE
 .RS +4
 .TP
@@ -227,5 +227,5 @@ method is to use \fBlpset\fR. Otherwise, if the \fBldapadd\fR and
 \fBprinter-name\fR attribute value is unique within the \fBou=printers\fR
 container on the LDAP server. If the value is not unique, the result of
 modifications done using \fBlpset\fR or the Solaris Print Manager,
-\fBprintmgr\fR(1M) may be unpredictable.
+\fBprintmgr\fR(8) may be unpredictable.
 .RE
diff --git a/usr/src/man/man8/lpshut.8 b/usr/src/man/man8/lpshut.8
index 4f3fd15e43..d08c4de885 100644
--- a/usr/src/man/man8/lpshut.8
+++ b/usr/src/man/man8/lpshut.8
@@ -19,7 +19,7 @@ The  \fBlpshut\fR command stops the  \fBLP\fR print service.
 .sp
 .LP
 Printers that are printing when \fBlpshut\fR is invoked stop printing. Start or
-restart printers using \fBlpsched\fR(1M).
+restart printers using \fBlpsched\fR(8).
 .SH EXIT STATUS
 .sp
 .LP
@@ -55,8 +55,8 @@ An error occurred.
 .SH SEE ALSO
 .sp
 .LP
-\fBlp\fR(1), \fBlpstat\fR(1), \fBlpadmin\fR(1M), \fBlpmove\fR(1M),
-\fBlpsched\fR(1M), \fBattributes\fR(5)
+\fBlp\fR(1), \fBlpstat\fR(1), \fBlpadmin\fR(8), \fBlpmove\fR(8),
+\fBlpsched\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/lpsystem.8 b/usr/src/man/man8/lpsystem.8
index d70102c5fe..3b12b1081e 100644
--- a/usr/src/man/man8/lpsystem.8
+++ b/usr/src/man/man8/lpsystem.8
@@ -11,12 +11,12 @@ lpsystem \- register remote systems with the print service
 .LP
 The  \fBlpsystem\fR command is obsolete, and could be removed at any time. The
 print system no longer uses the information generated by \fBlpsystem\fR. See
-\fBlpadmin\fR(1M), \fBlpusers\fR(1M) or  \fBprinters.conf\fR(4) for equivalent
+\fBlpadmin\fR(8), \fBlpusers\fR(8) or  \fBprinters.conf\fR(5) for equivalent
 functionality.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -35,5 +35,5 @@ Stability Level	Obsolete*
 .SH SEE ALSO
 .sp
 .LP
-\fBlpadmin\fR(1M), \fBlpusers\fR(1M), \fBprinters.conf\fR(4),
-\fBattributes\fR(5)
+\fBlpadmin\fR(8), \fBlpusers\fR(8), \fBprinters.conf\fR(5),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/lpusers.8 b/usr/src/man/man8/lpusers.8
index 4ca3c36efc..f109e6707b 100644
--- a/usr/src/man/man8/lpusers.8
+++ b/usr/src/man/man8/lpusers.8
@@ -195,4 +195,4 @@ An error occurred.
 .SH SEE ALSO
 .sp
 .LP
-\fBlp\fR(1), \fBattributes\fR(5)
+\fBlp\fR(1), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/luxadm.8 b/usr/src/man/man8/luxadm.8
index fb29619c3c..da208f766a 100644
--- a/usr/src/man/man8/luxadm.8
+++ b/usr/src/man/man8/luxadm.8
@@ -162,7 +162,7 @@ the disk slot number in the Sun Fire 880 internal storage subsystem, \fB0\fR -
 \fB11\fR.
 .sp
 .LP
-See \fBdisks\fR(1M) and \fBdevlinks\fR(1M) for additional information on
+See \fBdisks\fR(8) and \fBdevlinks\fR(8) for additional information on
 logical names for disks and subsystems.
 .SH OPTIONS
 The following options are supported by all subcommands:
@@ -1198,7 +1198,7 @@ example# \fBluxadm release /dev/rdsk/c1t8d0s2\fR
 .sp
 
 .SH ENVIRONMENT VARIABLES
-See \fBenviron\fR(5) for a description of the \fBLANG\fR environment variable
+See \fBenviron\fR(7) for a description of the \fBLANG\fR environment variable
 that affects the execution of \fBluxadm\fR.
 .SH EXIT STATUS
 The following exit values are returned:
@@ -1241,8 +1241,8 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-\fBdevlinks\fR(1M), \fBdisks\fR(1M), \fBattributes\fR(5), \fBenviron\fR(5),
-\fBses\fR(7D)
+\fBdevlinks\fR(8), \fBdisks\fR(8), \fBattributes\fR(7), \fBenviron\fR(7),
+\fBses\fR(4D)
 .SH NOTES
 Currently, only some device drivers
 support hot plugging. If hot plugging is attempted on a disk or bus where it is
diff --git a/usr/src/man/man8/mail.local.8 b/usr/src/man/man8/mail.local.8
index 1058efdf39..4d8b2bd504 100644
--- a/usr/src/man/man8/mail.local.8
+++ b/usr/src/man/man8/mail.local.8
@@ -37,7 +37,7 @@ mail.local \- store mail in a mailbox
 .LP
 \fBmail.local\fR reads the standard input up to an end-of-file and appends it
 to each user's mail file (mailbox). This program is intended to be used by
-\fBsendmail\fR(1M) as a mail delivery agent for local mail. It is not a user
+\fBsendmail\fR(8) as a mail delivery agent for local mail. It is not a user
 interface agent.
 .sp
 .LP
@@ -205,5 +205,5 @@ user's mail file
 .SH SEE ALSO
 .sp
 .LP
-\fBmail\fR(1), \fBcomsat\fR(1M), \fBsendmail\fR(1M),
-\fBgetservbyname\fR(3SOCKET), \fBattributes\fR(5)
+\fBmail\fR(1), \fBcomsat\fR(8), \fBsendmail\fR(8),
+\fBgetservbyname\fR(3SOCKET), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/makedbm.8 b/usr/src/man/man8/makedbm.8
index e831752a5b..6f8e75e3e4 100644
--- a/usr/src/man/man8/makedbm.8
+++ b/usr/src/man/man8/makedbm.8
@@ -49,7 +49,7 @@ The following options are supported:
 .ad
 .RS 27n
 Insert the  \fBYP_INTERDOMAIN\fR into the output.  This key causes
-\fBypserv\fR(1M) to use  \fBDNS\fR for host name and address lookups for hosts
+\fBypserv\fR(8) to use  \fBDNS\fR for host name and address lookups for hosts
 not found in the maps.
 .RE
 
@@ -175,4 +175,4 @@ One of two output files in \fBndbm\fR format: \fIoutfile\fR\fB\&.pag\fR and
 .SH SEE ALSO
 .sp
 .LP
-\fBypserv\fR(1M), \fBndbm\fR(3C), \fBattributes\fR(5)
+\fBypserv\fR(8), \fBndbm\fR(3C), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/makemap.8 b/usr/src/man/man8/makemap.8
index 2aa14c2ec1..92098133b9 100644
--- a/usr/src/man/man8/makemap.8
+++ b/usr/src/man/man8/makemap.8
@@ -38,7 +38,7 @@ makemap \- create database maps for sendmail
 .SH DESCRIPTION
 .LP
 \fBmakemap\fR creates the database maps used by the keyed map lookups in
-\fBsendmail\fR(1M). \fBmakemap\fR reads from the standard input and outputs to
+\fBsendmail\fR(8). \fBmakemap\fR reads from the standard input and outputs to
 the specified \fImapname\fR.
 .sp
 .LP
@@ -242,4 +242,4 @@ Specifies hash format maps.
 
 .SH SEE ALSO
 .LP
-\fBeditmap\fR(1M), \fBsendmail\fR(1M), \fBattributes\fR(5)
+\fBeditmap\fR(8), \fBsendmail\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/mdnsd.8 b/usr/src/man/man8/mdnsd.8
index 5919ed5e2e..85b3c742ee 100644
--- a/usr/src/man/man8/mdnsd.8
+++ b/usr/src/man/man8/mdnsd.8
@@ -99,10 +99,10 @@ For the source code to
 The
 .Nm
 service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .Dl svc:/network/dns/multicast:default
 .sp
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/mkdevalloc.8 b/usr/src/man/man8/mkdevalloc.8
index c56dab8022..eae044957f 100644
--- a/usr/src/man/man8/mkdevalloc.8
+++ b/usr/src/man/man8/mkdevalloc.8
@@ -15,11 +15,11 @@ mkdevalloc \- Make device_allocate entries
 .SH DESCRIPTION
 .LP
 The \fBmkdevalloc\fR command writes to standard out a set of
-\fBdevice_allocate\fR(4) entries describing the system's frame buffer, audio
+\fBdevice_allocate\fR(5) entries describing the system's frame buffer, audio
 and removable media devices.
 .sp
 .LP
-The \fBmkdevalloc\fR command is used by the \fBinit.d\fR(4) scripts to create
+The \fBmkdevalloc\fR command is used by the \fBinit.d\fR(5) scripts to create
 or update the \fB/etc/security/device_allocate\fR file.
 .sp
 .LP
@@ -60,7 +60,7 @@ frame buffer    framebuffer      fb            /bin/true
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -75,7 +75,7 @@ Interface Stability	Obsolete
 
 .SH SEE ALSO
 .LP
-\fBallocate\fR(1), \fBattributes\fR(5)
+\fBallocate\fR(1), \fBattributes\fR(7)
 .SH NOTES
 .LP
 \fBmkdevalloc\fR might not be supported in a future release of the Solaris
diff --git a/usr/src/man/man8/mkdevmaps.8 b/usr/src/man/man8/mkdevmaps.8
index 75454be363..39c39d7eed 100644
--- a/usr/src/man/man8/mkdevmaps.8
+++ b/usr/src/man/man8/mkdevmaps.8
@@ -15,11 +15,11 @@ mkdevmaps \- make device_maps entries
 .SH DESCRIPTION
 .LP
 The \fBmkdevmaps\fR command writes to standard out a set of
-\fBdevice_maps\fR(4) entries describing the system's frame buffer, audio, and
+\fBdevice_maps\fR(5) entries describing the system's frame buffer, audio, and
 removable media devices.
 .sp
 .LP
-The \fBmkdevmaps\fR command is used by the \fBinit.d\fR(4) scripts to create or
+The \fBmkdevmaps\fR command is used by the \fBinit.d\fR(5) scripts to create or
 update the \fB/etc/security/device_maps\fR file.
 .sp
 .LP
@@ -39,7 +39,7 @@ frame buffer    /dev/fb
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -54,7 +54,7 @@ Interface Stability	Obsolete
 
 .SH SEE ALSO
 .LP
-\fBallocate\fR(1), \fBattributes\fR(5)
+\fBallocate\fR(1), \fBattributes\fR(7)
 .SH NOTES
 .LP
 \fBmkdevmaps\fR might not be supported in a future release of the Solaris
diff --git a/usr/src/man/man8/mkfifo.8 b/usr/src/man/man8/mkfifo.8
index e806490895..4fba16865d 100644
--- a/usr/src/man/man8/mkfifo.8
+++ b/usr/src/man/man8/mkfifo.8
@@ -122,10 +122,10 @@ A path name of the \fBFIFO\fR special file to be created.
 .RE
 
 .SH USAGE
-See \fBlargefile\fR(5) for the description of the behavior of \fBmkfifo\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBmkfifo\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH ENVIRONMENT VARIABLES
-See \fBenviron\fR(5) for descriptions of the following environment variables
+See \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of \fBmkfifo\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
@@ -149,7 +149,7 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -163,5 +163,5 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-\fBchmod\fR(1), \fBumask\fR(1), \fBmkfifo\fR(3C), \fBattributes\fR(5),
-\fBenviron\fR(5), \fBlargefile\fR(5), \fBstandards\fR(5)
+\fBchmod\fR(1), \fBumask\fR(1), \fBmkfifo\fR(3C), \fBattributes\fR(7),
+\fBenviron\fR(7), \fBlargefile\fR(7), \fBstandards\fR(7)
diff --git a/usr/src/man/man8/mkfile.8 b/usr/src/man/man8/mkfile.8
index 4478b7ad21..18d2af248f 100644
--- a/usr/src/man/man8/mkfile.8
+++ b/usr/src/man/man8/mkfile.8
@@ -68,12 +68,12 @@ An error occurred.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBmkfile\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBmkfile\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -89,4 +89,4 @@ Interface Stability	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBchmod\fR(1), \fBswap\fR(1M), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBchmod\fR(1), \fBswap\fR(8), \fBattributes\fR(7), \fBlargefile\fR(7)
diff --git a/usr/src/man/man8/mkfs.8 b/usr/src/man/man8/mkfs.8
index 3205355e6e..bc39fc1286 100644
--- a/usr/src/man/man8/mkfs.8
+++ b/usr/src/man/man8/mkfs.8
@@ -22,7 +22,7 @@ calling the specific \fBmkfs\fR module indicated by  \fB-F\fR\fI
 FSType\fR\fB\&.\fR
 .sp
 .LP
-\fBNote\fR: ufs file systems are normally created with the \fBnewfs\fR(1M)
+\fBNote\fR: ufs file systems are normally created with the \fBnewfs\fR(8)
 command.
 .sp
 .LP
@@ -33,7 +33,7 @@ command.
 which to write the file system. It is required and  must be the first argument
 following the  \fIspecific_options\fR (if any). \fIoperands\fR are
 \fIFSType\fR-specific. See the \fIFSType\fR-specific manual page of  \fBmkfs\fR
-(for example,  \fBmkfs_ufs \fR(1M)) for a detailed description.
+(for example,  \fBmkfs_ufs\fR(8)) for a detailed description.
 .SH OPTIONS
 .sp
 .LP
@@ -86,7 +86,7 @@ module specific to the file system type.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBmkfs\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBmkfs\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH FILES
 .sp
@@ -120,8 +120,8 @@ List of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBmkfs_ufs\fR(1M), \fBnewfs\fR(1M), \fBvfstab\fR(4), \fBattributes\fR(5),
-\fBlargefile\fR(5)
+\fBmkfs_ufs\fR(8), \fBnewfs\fR(8), \fBvfstab\fR(5), \fBattributes\fR(7),
+\fBlargefile\fR(7)
 .sp
 .LP
 Manual pages for the  \fIFSType\fR-specific modules of  \fBmkfs\fR.
@@ -133,6 +133,6 @@ This command might not be supported for all \fIFSType\fRs.
 .LP
 You can use \fBlofiadm\fR to create a file that appears to a \fBmkfs\fR command
 as a raw device. You can then use a \fBmkfs\fR command to create a file system
-on that device. See \fBlofiadm\fR(1M) for examples of creating a UFS and a PC
-(FAT) file system (using \fBmkfs_ufs\fR(1M) and \fBmkfs_pcfs\fR(1M)) on a
+on that device. See \fBlofiadm\fR(8) for examples of creating a UFS and a PC
+(FAT) file system (using \fBmkfs_ufs\fR(8) and \fBmkfs_pcfs\fR(8)) on a
 device created by \fBlofiadm\fR.
diff --git a/usr/src/man/man8/mkfs_pcfs.8 b/usr/src/man/man8/mkfs_pcfs.8
index 418c44be09..045e9a2b1d 100644
--- a/usr/src/man/man8/mkfs_pcfs.8
+++ b/usr/src/man/man8/mkfs_pcfs.8
@@ -32,14 +32,14 @@ hidden.
 .LP
 If you want to construct a FAT with \fBmkfs\fR for \fBpcfs\fR on a medium that
 is not formatted, you must first perform a low-level format on the medium with
-\fBfdformat\fR(1) or \fBformat\fR(1M). Non-diskette media must also be
-partitioned with the \fBfdisk\fR(1M) utility. Note that all existing data on
+\fBfdformat\fR(1) or \fBformat\fR(8). Non-diskette media must also be
+partitioned with the \fBfdisk\fR(8) utility. Note that all existing data on
 the diskette or disk partition, if any, is destroyed when a new \fBFAT\fR is
 constructed.
 .sp
 .LP
 \fIgeneric_options\fR are supported by the generic \fBmkfs\fR command. See
-\fBmkfs\fR(1M) for a description of these options.
+\fBmkfs\fR(8) for a description of these options.
 .sp
 .LP
 \fIraw_device_file\fR indicates the device on which to write unless the \fB-o
@@ -48,7 +48,7 @@ are passed from the generic \fBmkfs\fR module.
 .SH OPTIONS
 .sp
 .LP
-See \fBmkfs\fR(1M) for the list of supported generic options.
+See \fBmkfs\fR(8) for the list of supported generic options.
 .sp
 .LP
 The following options are supported:
@@ -147,7 +147,7 @@ origination sector can be modified with the hidden option (\fB-h\fR).
 .ad
 .RS 14n
 The number of sectors per track on the disk. If not specified, the value is
-determined by using a \fBdkio\fR(7I) ioctl to get the disk geometry, or (for
+determined by using a \fBdkio\fR(4I) ioctl to get the disk geometry, or (for
 diskette) from the results of an \fBFDIOGCHAR\fR ioctl.
 .RE
 
@@ -158,7 +158,7 @@ diskette) from the results of an \fBFDIOGCHAR\fR ioctl.
 .ad
 .RS 14n
 The number of tracks per cylinder on the disk. If not specified, the value is
-determined by using a \fBdkio\fR(7I) ioctl to get the disk geometry, or (for
+determined by using a \fBdkio\fR(4I) ioctl to get the disk geometry, or (for
 diskette) from the results of an \fBFDIOGCHAR\fR ioctl.
 .RE
 
@@ -254,7 +254,7 @@ suffix indicates that the first partition on the disk should receive the new
 \fBFAT\fR.
 .sp
 For a file, \fIraw_device_file\fR is the block device name returned by
-\fBlofiadm\fR(1M).
+\fBlofiadm\fR(8).
 .RE
 
 .SH EXAMPLES
@@ -325,7 +325,7 @@ mkfs -F pcfs -o nsect=32,ntrack=64 /dev/rdsk/c0t3d0s2:c
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -341,9 +341,9 @@ Interface Stability	Stable
 .SH SEE ALSO
 .sp
 .LP
-\fBfdformat\fR(1), \fBfdisk\fR(1M), \fBformat\fR(1M), \fBlofiadm\fR(1M),
-\fBmkfs\fR(1M), \fBattributes\fR(5), \fBfd\fR(7D), \fBdkio\fR(7I),
-\fBfdio\fR(7I)
+\fBfdformat\fR(1), \fBfdisk\fR(8), \fBformat\fR(8), \fBlofiadm\fR(8),
+\fBmkfs\fR(8), \fBattributes\fR(7), \fBfd\fR(4D), \fBdkio\fR(4I),
+\fBfdio\fR(4I)
 .SH NOTES
 .sp
 .LP
@@ -371,5 +371,5 @@ the specific \fBMS-DOS\fR system files required by the default boot loader.
 You can use \fBlofiadm\fR to create a file that appears to a \fBmkfs\fR command
 (for example, \fBmkfs_pcfs\fR or \fBmkfs_ufs\fR) as a raw device. You can then
 use a \fBmkfs\fR command to create a file system on that device. See
-\fBlofiadm\fR(1M) for examples of creating a UFS and a PC (FAT) file system on
+\fBlofiadm\fR(8) for examples of creating a UFS and a PC (FAT) file system on
 a device created by \fBlofiadm\fR.
diff --git a/usr/src/man/man8/mkfs_udfs.8 b/usr/src/man/man8/mkfs_udfs.8
index 544a853a1a..cdd8419de5 100644
--- a/usr/src/man/man8/mkfs_udfs.8
+++ b/usr/src/man/man8/mkfs_udfs.8
@@ -22,7 +22,7 @@ root directory.
 .SH OPTIONS
 .sp
 .LP
-See \fBmkfs\fR(1M) for the list of supported \fIgeneric_options\fR.
+See \fBmkfs\fR(8) for the list of supported \fIgeneric_options\fR.
 .sp
 .LP
 The following options are supported:
@@ -85,7 +85,7 @@ Specify the number of 512-byte blocks in the file system.
 .SH SEE ALSO
 .sp
 .LP
-\fBfsck\fR(1M), \fBmkfs\fR(1M), \fBattributes\fR(5)
+\fBfsck\fR(8), \fBmkfs\fR(8), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .sp
 .in +2
@@ -183,5 +183,5 @@ One of the arguments is potentially a bad numeric.
 You can use \fBlofiadm\fR to create a file that appears to a \fBmkfs\fR command
 (for example, \fBmkfs_pcfs\fR or \fBmkfs_ufs\fR) as a raw device. You can then
 use a \fBmkfs\fR command to create a file system on that device. See
-\fBlofiadm\fR(1M) for examples of creating a UFS and a PC (FAT) file system on
+\fBlofiadm\fR(8) for examples of creating a UFS and a PC (FAT) file system on
 a device created by \fBlofiadm\fR.
diff --git a/usr/src/man/man8/mkfs_ufs.8 b/usr/src/man/man8/mkfs_ufs.8
index 08ece331d0..2302522aa2 100644
--- a/usr/src/man/man8/mkfs_ufs.8
+++ b/usr/src/man/man8/mkfs_ufs.8
@@ -18,10 +18,10 @@ mkfs_ufs \- construct a UFS file system
 .sp
 .LP
 The UFS-specific module of \fBmkfs\fR builds a UFS file system with a root
-directory and a \fBlost+found\fR directory (see \fBfsck\fR(1M)).
+directory and a \fBlost+found\fR directory (see \fBfsck\fR(8)).
 .sp
 .LP
-The UFS-specific \fBmkfs\fR is rarely run directly. Use the \fBnewfs\fR(1M)
+The UFS-specific \fBmkfs\fR is rarely run directly. Use the \fBnewfs\fR(8)
 command instead.
 .sp
 .LP
@@ -35,7 +35,7 @@ and is required (even with \fB\fR\fB-o\fR\fB N\fR), unless the \fB-V\fR or
 .sp
 .LP
 \fIgeneric_options\fR are supported by the generic \fBmkfs\fR command. See
-\fBmkfs\fR(1M) for a description of these options.
+\fBmkfs\fR(8) for a description of these options.
 .SH OPTIONS
 .sp
 .LP
@@ -164,7 +164,7 @@ file system.
 The default is ((64 Mbytes/partition size) * 100), rounded down to the nearest
 integer and limited between 1% and 10%, inclusively.
 .sp
-This parameter can be subsequently changed using the \fBtunefs\fR(1M) command.
+This parameter can be subsequently changed using the \fBtunefs\fR(8) command.
 .RE
 
 .sp
@@ -205,7 +205,7 @@ You can set \fBmaxcontig\fR to any positive integer value.
 The actual value will be the lesser of what has been specified and what the
 hardware supports.
 .sp
-You can subsequently change this parameter by using \fBtunefs\fR(1M).
+You can subsequently change this parameter by using \fBtunefs\fR(8).
 .RE
 
 .sp
@@ -292,7 +292,7 @@ The file system can either be instructed to try to minimize the \fBtime\fR
 spent allocating blocks, or to try to minimize the \fBspace\fR fragmentation on
 the disk. The default is \fItime\fR.
 .sp
-This parameter can be subsequently changed with the \fBtunefs\fR(1M) command.
+This parameter can be subsequently changed with the \fBtunefs\fR(8) command.
 .RE
 
 .sp
@@ -331,8 +331,8 @@ The disk partition on which to write.
 .SH SEE ALSO
 .sp
 .LP
-\fBfsck\fR(1M), \fBmkfs\fR(1M), \fBnewfs\fR(1M), \fBtunefs\fR(1M),
-\fBdir_ufs\fR(4), \fBattributes\fR(5), \fBufs\fR(7FS)
+\fBfsck\fR(8), \fBmkfs\fR(8), \fBnewfs\fR(8), \fBtunefs\fR(8),
+\fBdir_ufs\fR(5), \fBattributes\fR(7), \fBufs\fR(4FS)
 .SH DIAGNOSTICS
 .sp
 .LP
@@ -399,7 +399,7 @@ Warning: \fInum\fR sector(s) in last cylinder group unallocated
 You can use \fBlofiadm\fR to create a file that appears to the \fBmkfs\fR
 command (for example, \fBmkfs_pcfs\fR or \fBmkfs_ufs\fR) as a raw device. You
 can then use the \fBmkfs\fR command to create a file system on that device. See
-\fBlofiadm\fR(1M) for examples of creating a \fBUFS\fR and a \fBPC\fR
+\fBlofiadm\fR(8) for examples of creating a \fBUFS\fR and a \fBPC\fR
 (\fBFAT\fR) file system on a device created by \fBlofiadm\fR.
 .sp
 .LP
diff --git a/usr/src/man/man8/mknod.8 b/usr/src/man/man8/mknod.8
index 92e8ccc26d..fa8644d5ab 100644
--- a/usr/src/man/man8/mknod.8
+++ b/usr/src/man/man8/mknod.8
@@ -89,12 +89,12 @@ A special file to be created.
 
 .SH USAGE
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBmknod\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBmknod\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH SEE ALSO
 .LP
 \fBftp\fR(1), \fBmknod\fR(2), \fBsymlink\fR(2),
-\fBattributes\fR(5), \fBlargefile\fR(5)
+\fBattributes\fR(7), \fBlargefile\fR(7)
 .SH NOTES
 .LP
 If \fBmknod\fR(2) is used to create a device, the major and minor device
diff --git a/usr/src/man/man8/mkpwdict.8 b/usr/src/man/man8/mkpwdict.8
index cc4ece8848..6add32f694 100644
--- a/usr/src/man/man8/mkpwdict.8
+++ b/usr/src/man/man8/mkpwdict.8
@@ -17,7 +17,7 @@ mkpwdict \- maintain password-strength checking database
 .sp
 .LP
 The \fBmkpwdict\fR command adds words to the dictionary-lookup database used by
-\fBpam_authtok_check\fR(5) and \fBpasswd\fR(1).
+\fBpam_authtok_check\fR(7) and \fBpasswd\fR(1).
 .sp
 .LP
 Files containing words to be added to the database can be specified on the
@@ -78,7 +78,7 @@ default destination directory
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -94,4 +94,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBpasswd\fR(1), \fBattributes\fR(5), \fBpam_authtok_check\fR(5)
+\fBpasswd\fR(1), \fBattributes\fR(7), \fBpam_authtok_check\fR(7)
diff --git a/usr/src/man/man8/modinfo.8 b/usr/src/man/man8/modinfo.8
index 3eb3b1a99f..074cb81763 100644
--- a/usr/src/man/man8/modinfo.8
+++ b/usr/src/man/man8/modinfo.8
@@ -140,7 +140,7 @@ Id    Loadcnt Module Name                            State
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -156,4 +156,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBmodload\fR(1M), \fBmodunload\fR(1M), \fBattributes\fR(5)
+\fBmodload\fR(8), \fBmodunload\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/modload.8 b/usr/src/man/man8/modload.8
index 569278f1fa..9b25ba3885 100644
--- a/usr/src/man/man8/modload.8
+++ b/usr/src/man/man8/modload.8
@@ -68,7 +68,7 @@ after the module is successfully loaded.  The first argument passed is the
 module ID (in decimal). The other argument is module specific. The module
 specific information is: the block and character major numbers for drivers, the
 system call number for system calls, or, for  other module types, the index
-into the appropriate kernel table. See  \fBmodinfo\fR(1M)
+into the appropriate kernel table. See  \fBmodinfo\fR(8)
 .RE
 
 .sp
@@ -83,8 +83,8 @@ Use the kernel's internal modpath variable as the search path for the module.
 .SH SEE ALSO
 .sp
 .LP
-\fBld\fR(1), \fBadd_drv\fR(1M), \fBkernel\fR(1M), \fBmodinfo\fR(1M),
-\fBmodunload\fR(1M), \fBsystem\fR(4), \fBattributes\fR(5), \fBmodldrv\fR(9S),
+\fBld\fR(1), \fBadd_drv\fR(8), \fBkernel\fR(8), \fBmodinfo\fR(8),
+\fBmodunload\fR(8), \fBsystem\fR(5), \fBattributes\fR(7), \fBmodldrv\fR(9S),
 \fBmodlinkage\fR(9S), \fBmodlstrmod\fR(9S), \fBmodule_info\fR(9S)
 .sp
 .LP
@@ -92,5 +92,5 @@ Use the kernel's internal modpath variable as the search path for the module.
 .SH NOTES
 .sp
 .LP
-Use \fBadd_drv\fR(1M) to add device drivers, not \fBmodload\fR. See \fI\fR for
+Use \fBadd_drv\fR(8) to add device drivers, not \fBmodload\fR. See \fI\fR for
 procedures on adding device drivers.
diff --git a/usr/src/man/man8/modunload.8 b/usr/src/man/man8/modunload.8
index cdab17b310..5528835998 100644
--- a/usr/src/man/man8/modunload.8
+++ b/usr/src/man/man8/modunload.8
@@ -16,9 +16,9 @@ modunload \- unload a module
 .sp
 .LP
 \fBmodunload\fR unloads a loadable module from the running system. The
-\fImodule_id\fR is the \fBID\fR of the module as shown by \fBmodinfo\fR(1M). If
+\fImodule_id\fR is the \fBID\fR of the module as shown by \fBmodinfo\fR(8). If
 \fBID\fR is \fB0\fR, all modules that were autoloaded which are unloadable, are
-unloaded. Modules loaded by \fBmodload\fR(1M) are not affected.
+unloaded. Modules loaded by \fBmodload\fR(8) are not affected.
 .SH OPTIONS
 .sp
 .LP
@@ -54,7 +54,7 @@ Specify the module to be unloaded.
 .SH SEE ALSO
 .sp
 .LP
-\fBmodinfo\fR(1M), \fBmodload\fR(1M), \fBupdate_drv\fR(1M), \fBattributes\fR(5)
+\fBmodinfo\fR(8), \fBmodload\fR(8), \fBupdate_drv\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -63,4 +63,4 @@ to reread the associated driver configuration file. While this works in the
 current Solaris release, it is not the supported way to reread the
 configuration file and is not guaranteed to work in future releases. The
 supported way for rereading driver configuration file is through the
-\fBupdate_drv\fR(1M) command.
+\fBupdate_drv\fR(8) command.
diff --git a/usr/src/man/man8/monitor.8 b/usr/src/man/man8/monitor.8
index 4d38d90eb3..2417416788 100644
--- a/usr/src/man/man8/monitor.8
+++ b/usr/src/man/man8/monitor.8
@@ -77,7 +77,7 @@ configuring the system to act in a given manner under a specific set of
 circumstances.
 .sp
 .LP
-See \fBeeprom\fR(1M) for a description of the parameters and information
+See \fBeeprom\fR(8) for a description of the parameters and information
 regarding setting the parameters from the OS level.
 .sp
 .LP
@@ -1757,7 +1757,7 @@ flush the segment beginning at \fIvirtual_address\fR within context
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1771,4 +1771,4 @@ Architecture	SPARC
 .TE
 
 .SH SEE ALSO
-\fBtip\fR(1), \fBboot\fR(1M), \fBeeprom\fR(1M), \fBattributes\fR(5)
+\fBtip\fR(1), \fBboot\fR(8), \fBeeprom\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/mount.8 b/usr/src/man/man8/mount.8
index d5a952aa6f..48feaddc2d 100644
--- a/usr/src/man/man8/mount.8
+++ b/usr/src/man/man8/mount.8
@@ -55,7 +55,7 @@ system resides.
 The table of currently mounted file systems can be found by examining the
 mounted file system information file. This is provided by a file system that is
 usually mounted on \fB/etc/mnttab\fR. The mounted file system information is
-described in \fBmnttab\fR(4). Mounting a file system adds an entry to the mount
+described in \fBmnttab\fR(5). Mounting a file system adds an entry to the mount
 table; a \fBumount\fR removes an entry from the table.
 .LP
 When invoked with both the \fIspecial\fR and \fImount_point\fR arguments and
@@ -77,7 +77,7 @@ For file system types that support it, a file can be mounted directly as a file
 system by specifying the full path to the file as the special argument.  In
 such a case, the \fBnosuid\fR option is enforced. If specific file system
 support for such loopback file mounts is not present, you can still use
-\fBlofiadm\fR(1M) to mount a file system image. In this case, no special
+\fBlofiadm\fR(8) to mount a file system image. In this case, no special
 options are enforced.
 .LP
 Only a user with sufficient privilege (at least \fBPRIV_SYS_MOUNT\fR) can mount
@@ -205,7 +205,7 @@ effect.
 .RS 4n
 Specify \fIFSType\fR-specific options in a comma separated (without spaces)
 list of suboptions and keyword-attribute pairs for interpretation by the
-\fIFSType\fR-specific module of the command. (See \fBmount_ufs\fR(1M).) When
+\fIFSType\fR-specific module of the command. (See \fBmount_ufs\fR(8).) When
 you use \fB-o\fR with a file system that has an entry in \fB/etc/vfstab\fR, any
 \fBmount\fR options entered for that file system in \fB/etc/vfstab\fR are
 ignored.
@@ -385,7 +385,7 @@ The following commands mount and unmount a DVD image.
 
 .SH USAGE
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBmount\fR and
+See \fBlargefile\fR(7) for the description of the behavior of \fBmount\fR and
 \fBumount\fR when encountering files greater than or equal to 2 Gbyte ( 2^31
 bytes).
 .SH FILES
@@ -431,12 +431,12 @@ List of default parameters for each file system.
 
 .SH SEE ALSO
 .LP
-\fBlofiadm\fR(1M), \fBmount_hsfs\fR(1M), \fBmount_nfs\fR(1M),
-\fBmount_pcfs\fR(1M),  \fBmount_smbfs\fR(1M), \fBmount_tmpfs\fR(1M),
-\fBmount_udfs\fR(1M), \fBmount_ufs\fR(1M), \fBmountall\fR(1M),
-\fBumountall\fR(1M), \fBfcntl\fR(2), \fBmmap\fR(2), \fBmnttab\fR(4),
-\fBvfstab\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5),
-\fBprivileges\fR(5), \fBlofs\fR(7FS), \fBpcfs\fR(7FS)
+\fBlofiadm\fR(8), \fBmount_hsfs\fR(8), \fBmount_nfs\fR(8),
+\fBmount_pcfs\fR(8),  \fBmount_smbfs\fR(8), \fBmount_tmpfs\fR(8),
+\fBmount_udfs\fR(8), \fBmount_ufs\fR(8), \fBmountall\fR(8),
+\fBumountall\fR(8), \fBfcntl\fR(2), \fBmmap\fR(2), \fBmnttab\fR(5),
+\fBvfstab\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7),
+\fBprivileges\fR(7), \fBlofs\fR(4FS), \fBpcfs\fR(4FS)
 .SH NOTES
 .LP
 If the directory on which a file system is to be mounted is a symbolic link,
diff --git a/usr/src/man/man8/mount_hsfs.8 b/usr/src/man/man8/mount_hsfs.8
index 921c2efb0d..31d4ee20c7 100644
--- a/usr/src/man/man8/mount_hsfs.8
+++ b/usr/src/man/man8/mount_hsfs.8
@@ -33,12 +33,12 @@ unmounted.
 If  \fBmount\fR is invoked with  \fIspecial\fR or  \fImount_point\fR as the
 only arguments,  \fBmount\fR will search  \fB/etc/vfstab\fR to fill in the
 missing arguments, including the  \fIFSType-specific_options\fR; see
-\fBmount\fR(1M) for more details.
+\fBmount\fR(8) for more details.
 .sp
 .LP
 The \fBhsfs\fR file system supports direct mounting of files containing the
-file system as well as block devices. See \fBmount\fR(1M) and
-\fBlofiadm\fR(1M).
+file system as well as block devices. See \fBmount\fR(8) and
+\fBlofiadm\fR(8).
 .sp
 .LP
 A file system conforming to ISO 9660 can contain extensions that allow it to
@@ -105,7 +105,7 @@ truncated.
 .ad
 .sp .6
 .RS 4n
-See \fBmount\fR(1M) for the list of supported options.
+See \fBmount\fR(8) for the list of supported options.
 .RE
 
 .sp
@@ -272,8 +272,8 @@ list of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBlofiadm\fR(1M), \fBmount\fR(1M), \fBmountall\fR(1M), \fBmount\fR(2),
-\fBmnttab\fR(4), \fBvfstab\fR(4), \fBattributes\fR(5)
+\fBlofiadm\fR(8), \fBmount\fR(8), \fBmountall\fR(8), \fBmount\fR(2),
+\fBmnttab\fR(5), \fBvfstab\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/mount_pcfs.8 b/usr/src/man/man8/mount_pcfs.8
index c196d50381..e6dd05afc1 100644
--- a/usr/src/man/man8/mount_pcfs.8
+++ b/usr/src/man/man8/mount_pcfs.8
@@ -1,5 +1,5 @@
 '\" te
-.\"  Based on mount_hsfs(1M), which is Copyright 1989 AT&T Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
+.\"  Based on mount_hsfs(8), which is Copyright 1989 AT&T Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
@@ -29,13 +29,13 @@ operation, these are hidden until the file system is unmounted.
 .sp
 .LP
 The \fBpcfs\fR file system supports direct mounting of files containing the
-file system as well as block devices. See \fBmount\fR(1M) and
-\fBlofiadm\fR(1M).
+file system as well as block devices. See \fBmount\fR(8) and
+\fBlofiadm\fR(8).
 .sp
 .LP
 If \fBmount\fR is invoked with \fIspecial\fR or \fImount_point\fR as the only
 arguments, \fBmount\fR will search \fB/etc/vfstab\fR to fill in the missing
-arguments, including the \fIFSType-specific_options\fR; see \fBmount\fR(1M) for
+arguments, including the \fIFSType-specific_options\fR; see \fBmount\fR(8) for
 more details.
 .sp
 .LP
@@ -68,7 +68,7 @@ system with either a 12-bit, 16-bit, or 32-bit File Allocation Table.
 .ad
 .sp .6
 .RS 4n
-See \fBmount\fR(1M) for the list of supported options.
+See \fBmount\fR(8) for the list of supported options.
 .RE
 
 .sp
@@ -153,7 +153,7 @@ which the recording and receiving system use different time zones. Use this
 option to force media timestamps to be interpreted for a specific time zone.
 The \fBmount_pcfs\fR command converts the given time zone name into a numerical
 offset that is passed to the \fBpcfs\fR kernel module, using the same rules as
-described in \fBenviron\fR(5) for the \fBTZ\fR environment variable. By
+described in \fBenviron\fR(7) for the \fBTZ\fR environment variable. By
 default, the \fBtimezone\fR value is taken from the \fBTZ\fR environment
 variable.
 .RE
@@ -184,9 +184,9 @@ list of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBlofiadm\fR(1M), \fBmount\fR(1M), \fBmountall\fR(1M), \fBmount\fR(2),
-\fBstat\fR(2), \fBtime\fR(2), \fBmnttab\fR(4), \fBvfstab\fR(4),
-\fBattributes\fR(5), \fBenviron\fR(5), \fBpcfs\fR(7FS)
+\fBlofiadm\fR(8), \fBmount\fR(8), \fBmountall\fR(8), \fBmount\fR(2),
+\fBstat\fR(2), \fBtime\fR(2), \fBmnttab\fR(5), \fBvfstab\fR(5),
+\fBattributes\fR(7), \fBenviron\fR(7), \fBpcfs\fR(4FS)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/mount_smbfs.8 b/usr/src/man/man8/mount_smbfs.8
index 523fb5aaf6..2d1425175b 100644
--- a/usr/src/man/man8/mount_smbfs.8
+++ b/usr/src/man/man8/mount_smbfs.8
@@ -65,7 +65,7 @@ The \fBnetwork/smb/client\fR service must be enabled to successfully mount a
 CIFS share. This service is enabled, by default.
 .sp
 .LP
-To enable the service, enter the following \fBsvcadm\fR(1M) command:
+To enable the service, enter the following \fBsvcadm\fR(8) command:
 .sp
 .in +2
 .nf
@@ -139,11 +139,11 @@ quotes: \fBmount -F smbfs "//SALES;george@RSERVER" /mnt\fR.
 .RS 4n
 The path to the location where the file system is to be mounted or unmounted.
 The \fBmount\fR command maintains a table of mounted file systems in the
-\fB/etc/mnttab\fR file. See the \fBmnttab\fR(4) man page.
+\fB/etc/mnttab\fR file. See the \fBmnttab\fR(5) man page.
 .RE
 
 .SH OPTIONS
-See the \fBmount\fR(1M) man page for the list of supported
+See the \fBmount\fR(8) man page for the list of supported
 \fIgeneric-options\fR.
 .sp
 .ne 2
@@ -168,7 +168,7 @@ the list. The properties are as follows:
 .sp .6
 .RS 4n
 Enable (or disable) presentation of Access Control Lists (ACLs)
-on files and directories under this \fBsmbfs\fR(7FS) mount.
+on files and directories under this \fBsmbfs\fR(4FS) mount.
 The default behavior is \fBnoacl\fR, which presents files and
 directories as owned by the owner of the mount point and having
 permissions based on \fBfileperms\fR or \fBdirperms\fR.
@@ -227,7 +227,7 @@ the directory where the volume is mounted.
 .ad
 .sp .6
 .RS 4n
-Enable (or disable) cancellation of \fBsmbfs\fR(7FS) I/O operations when the
+Enable (or disable) cancellation of \fBsmbfs\fR(4FS) I/O operations when the
 user interrupts the calling thread (for example, by hitting Ctrl-C while an
 operation is underway). The default is \fBintr\fR (interruption enabled), so
 cancellation is normally allowed.
@@ -295,7 +295,7 @@ directory where the volume is mounted.
 .RS 4n
 Enable (or disable) Solaris Extended Attributes in this mount point. This
 option defaults to \fBxattr\fR (enabled Extended Attributes), but note: if the
-CIFS server does not support CIFS "named streams", \fBsmbfs\fR(7FS) forces this
+CIFS server does not support CIFS "named streams", \fBsmbfs\fR(4FS) forces this
 option to \fBnoxattr\fR. When a mount has the \fBnoxattr\fR option, attempts to
 use Solaris Extended attributes fail with EINVAL.
 .RE
@@ -472,7 +472,7 @@ connection.
 .RE
 
 .SH ATTRIBUTES
-See the \fBattributes\fR(5) man page for descriptions of the following
+See the \fBattributes\fR(7) man page for descriptions of the following
 attributes:
 .sp
 
@@ -488,10 +488,10 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 \fBldap\fR(1), \fBsmbutil\fR(1),
-\fBmount\fR(1M), \fBmountall\fR(1M), \fBsvcadm\fR(1M),
+\fBmount\fR(8), \fBmountall\fR(8), \fBsvcadm\fR(8),
 \fBacl\fR(2), \fBfcntl\fR(2), \fBlink\fR(2), \fBmknod\fR(2), \fBmount\fR(2),
-\fBsymlink\fR(2), \fBumount\fR(2), \fBmnttab\fR(4), \fBnsmbrc\fR(4),
-\fBvfstab\fR(4), \fBattributes\fR(5), \fBpcfs\fR(7FS), \fBsmbfs\fR(7FS)
+\fBsymlink\fR(2), \fBumount\fR(2), \fBmnttab\fR(5), \fBnsmbrc\fR(5),
+\fBvfstab\fR(5), \fBattributes\fR(7), \fBpcfs\fR(4FS), \fBsmbfs\fR(4FS)
 .SH AUTHORS
 This manual page contains material originally authored by Boris Popov,
 \fBbpATbutya.kz\fR, \fBbpATFreeBSD.org\fR.
diff --git a/usr/src/man/man8/mount_tmpfs.8 b/usr/src/man/man8/mount_tmpfs.8
index 5230a252bc..adee4f7757 100644
--- a/usr/src/man/man8/mount_tmpfs.8
+++ b/usr/src/man/man8/mount_tmpfs.8
@@ -90,7 +90,7 @@ pagesize of the system.
 .ad
 .RS 19n
 Allow or disallow the creation and manipulation of extended attributes. The
-default is \fBxattr\fR. See \fBfsattr\fR(5) for a description of extended
+default is \fBxattr\fR. See \fBfsattr\fR(7) for a description of extended
 attributes.
 .RE
 
@@ -119,9 +119,9 @@ Table of mounted file systems
 
 .SH SEE ALSO
 .LP
-\fBmount\fR(1M), \fBmkdir\fR(2), \fBmount\fR(2), \fBopen\fR(2),
-\fBumount\fR(2), \fBmnttab\fR(4), \fBattributes\fR(5), \fBfsattr\fR(5),
-\fBtmpfs\fR(7FS)
+\fBmount\fR(8), \fBmkdir\fR(2), \fBmount\fR(2), \fBopen\fR(2),
+\fBumount\fR(2), \fBmnttab\fR(5), \fBattributes\fR(7), \fBfsattr\fR(7),
+\fBtmpfs\fR(4FS)
 .SH NOTES
 .LP
 If the directory on which a file system is to be mounted is a symbolic link,
diff --git a/usr/src/man/man8/mount_udfs.8 b/usr/src/man/man8/mount_udfs.8
index a207e6b250..e967200855 100644
--- a/usr/src/man/man8/mount_udfs.8
+++ b/usr/src/man/man8/mount_udfs.8
@@ -30,12 +30,12 @@ hidden until the file system is unmounted.
 .LP
 If mount is invoked with either \fIspecial\fR or \fImount_point\fR as the only
 arguments, \fBmount\fR searches \fB/etc/vfstab\fR to fill in the missing
-arguments, including the \fIspecific_options\fR. See \fBmount\fR(1M).
+arguments, including the \fIspecific_options\fR. See \fBmount\fR(8).
 .sp
 .LP
 The \fBudfs\fR file system supports direct mounting of files containing the
-file system as well as block devices. See \fBmount\fR(1M) and
-\fBlofiadm\fR(1M).
+file system as well as block devices. See \fBmount\fR(8) and
+\fBlofiadm\fR(8).
 .sp
 .LP
 If \fIspecial\fR and \fImount_point\fR are specified without any
@@ -48,7 +48,7 @@ rather than on top of the symbolic link itself.
 .SH OPTIONS
 .sp
 .LP
-See \fBmount\fR(1M) for the list of supported \fIgeneric_options\fR.
+See \fBmount\fR(8) for the list of supported \fIgeneric_options\fR.
 .sp
 .LP
 The following options are supported:
@@ -124,9 +124,9 @@ List of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBfsck\fR(1M), \fBfsck_udfs\fR(1M), \fBlofiadm\fR(1M), \fBmount\fR(1M),
-\fBmountall\fR(1M), \fBmount\fR(2), \fBmnttab\fR(4), \fBvfstab\fR(4),
-\fBattributes\fR(5)
+\fBfsck\fR(8), \fBfsck_udfs\fR(8), \fBlofiadm\fR(8), \fBmount\fR(8),
+\fBmountall\fR(8), \fBmount\fR(2), \fBmnttab\fR(5), \fBvfstab\fR(5),
+\fBattributes\fR(7)
 .SH DIAGNOSTICS
 .sp
 .ne 2
diff --git a/usr/src/man/man8/mount_ufs.8 b/usr/src/man/man8/mount_ufs.8
index 5bdc1dd3df..72291e288c 100644
--- a/usr/src/man/man8/mount_ufs.8
+++ b/usr/src/man/man8/mount_ufs.8
@@ -30,12 +30,12 @@ are hidden until the file system is unmounted.
 .sp
 .LP
 The \fBufs\fR file system supports direct mounting of files containing the file
-system as well as block devices. See \fBmount\fR(1M) and \fBlofiadm\fR(1M).
+system as well as block devices. See \fBmount\fR(8) and \fBlofiadm\fR(8).
 .sp
 .LP
 If \fBmount\fR is invoked with \fIspecial\fR or \fImount_point\fR as the only
 arguments, \fBmount\fR will search \fB/etc/vfstab\fR to fill in the missing
-arguments, including the \fIspecific_options\fR. See \fBmount\fR(1M).
+arguments, including the \fIspecific_options\fR. See \fBmount\fR(8).
 .sp
 .LP
 If \fIspecial\fR and \fImount_point\fR are specified without any
@@ -48,7 +48,7 @@ rather than on top of the symbolic link itself.
 .SH OPTIONS
 .sp
 .LP
-See \fBmount\fR(1M) for the list of supported \fIgeneric_options\fR.
+See \fBmount\fR(8) for the list of supported \fIgeneric_options\fR.
 .sp
 .LP
 The following options are supported:
@@ -141,7 +141,7 @@ file system to be mounted has contained a large file (a file whose size is
 greater than or equal to 2 Gbyte) since the last invocation of \fBfsck\fR on
 the file system. The large file need not be present in the file system at the
 time of the mount for the mount to fail; it could have been created previously
-and destroyed. Invoking \fBfsck\fR (see \fBfsck_ufs\fR(1M)) on the file system
+and destroyed. Invoking \fBfsck\fR (see \fBfsck_ufs\fR(8)) on the file system
 will reset the file system state if no large files are present. After invoking
 \fBfsck\fR, a successful mount of the file system with \fBnolargefiles\fR
 specified indicates the absence of large files in the file system; an
@@ -300,7 +300,7 @@ Read-write with quotas turned on. Equivalent to \fBrw, quota\fR.
 .sp .6
 .RS 4n
 Allow or disallow the creation and manipulation of extended attributes. The
-default is \fBxattr\fR. See \fBfsattr\fR(5) for a description of extended
+default is \fBxattr\fR. See \fBfsattr\fR(7) for a description of extended
 attributes.
 .RE
 
@@ -362,10 +362,10 @@ list of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBgetfacl\fR(1), \fBfsck\fR(1M), \fBfsck_ufs\fR(1M), \fBlofiadm\fR(1M),
-\fBmount\fR(1M), \fBmountall\fR(1M), \fBfcntl\fR(2), \fBmount\fR(2),
-\fBstat\fR(2), \fBmnttab\fR(4), \fBvfstab\fR(4), \fBattributes\fR(5),
-\fBfsattr\fR(5), \fBlargefile\fR(5)
+\fBgetfacl\fR(1), \fBfsck\fR(8), \fBfsck_ufs\fR(8), \fBlofiadm\fR(8),
+\fBmount\fR(8), \fBmountall\fR(8), \fBfcntl\fR(2), \fBmount\fR(2),
+\fBstat\fR(2), \fBmnttab\fR(5), \fBvfstab\fR(5), \fBattributes\fR(7),
+\fBfsattr\fR(7), \fBlargefile\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/mountall.8 b/usr/src/man/man8/mountall.8
index 9b5d250603..95e330b258 100644
--- a/usr/src/man/man8/mountall.8
+++ b/usr/src/man/man8/mountall.8
@@ -26,7 +26,7 @@ mountall, umountall \- mount, unmount multiple file systems
 .sp
 .LP
 \fBmountall\fR is used to mount file systems specified in a file system table.
-The file system table must be in \fBvfstab\fR(4) format. If no
+The file system table must be in \fBvfstab\fR(5) format. If no
 \fIfile_system_table\fR is specified, \fB/etc/vfstab\fR is used. If \(mi is
 specified as \fIfile_system_table\fR, \fBmountall\fR reads the file system
 table from the standard input. \fBmountall\fR mounts only those file systems
@@ -43,7 +43,7 @@ be passed later, and all at once, as arguments to the
 systems in its argument list to determine whether they can be safely mounted.
 If no \fB/usr/lib/fs/\fR\fIFSType\fR\fB/fsckall\fR script exists for the
 \fIFSType\fR of the file system, the file system is individually checked using
-\fBfsck\fR(1M). If the file system does not appear mountable, it is fixed using
+\fBfsck\fR(8). If the file system does not appear mountable, it is fixed using
 \fBfsck\fR before the mount is attempted. File systems with a \(mi entry in the
 \fBfsckdev\fR field are mounted without first being checked.
 .sp
@@ -83,7 +83,7 @@ from host.
 \fB\fB-k\fR\fR
 .ad
 .RS 11n
-Use the \fBfuser\fR \fB-k\fR \fImount-point\fR command. See the \fBfuser\fR(1M)
+Use the \fBfuser\fR \fB-k\fR \fImount-point\fR command. See the \fBfuser\fR(8)
 for details. The \fB-k\fR option sends the \fBSIGKILL\fR signal to each process
 using the file. As this option spawns kills for each process, the kill messages
 might not show up immediately. There is no guarantee that \fBumountall\fR
@@ -175,7 +175,7 @@ systems of type \fIFSType\fR
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -193,15 +193,15 @@ Output Stability	Uncommitted
 .SH SEE ALSO
 .sp
 .LP
-\fBfsck\fR(1M), \fBfuser\fR(1M), \fBmount\fR(1M), \fBmnttab\fR(4),
-\fBvfstab\fR(4), \fBattributes\fR(5)
+\fBfsck\fR(8), \fBfuser\fR(8), \fBmount\fR(8), \fBmnttab\fR(5),
+\fBvfstab\fR(5), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .sp
 .LP
 No messages are printed if the file systems are mountable and clean.
 .sp
 .LP
-Error and warning messages come from \fBfsck\fR(1M) and \fBmount\fR(1M).
+Error and warning messages come from \fBfsck\fR(8) and \fBmount\fR(8).
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/mpathadm.8 b/usr/src/man/man8/mpathadm.8
index eee487ea3c..2f299a46fa 100644
--- a/usr/src/man/man8/mpathadm.8
+++ b/usr/src/man/man8/mpathadm.8
@@ -693,7 +693,7 @@ with the specified initiator port, target port, and logical unit.
 .sp
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -707,5 +707,5 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-\fBstmsboot\fR(1M), \fBlibMPAPI\fR(3LIB), \fBexec_attr\fR(4),
-\fBattributes\fR(5)
+\fBstmsboot\fR(8), \fBlibMPAPI\fR(3LIB), \fBexec_attr\fR(5),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/mpstat.8 b/usr/src/man/man8/mpstat.8
index 95d53dd8eb..6e58bee612 100644
--- a/usr/src/man/man8/mpstat.8
+++ b/usr/src/man/man8/mpstat.8
@@ -310,7 +310,7 @@ SET minf mjf xcal intr ithr csw icsw migr smtx srw syscl usr sys wt idl sze
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -329,8 +329,8 @@ Invocation is evolving. Human readable output is unstable.
 .SH SEE ALSO
 .sp
 .LP
-\fBsar\fR(1), \fBdate\fR(1), \fBiostat\fR(1M), \fBsar\fR(1M), \fBvmstat\fR(1M),
-\fBtime\fR(2), \fBattributes\fR(5)
+\fBsar\fR(1), \fBdate\fR(1), \fBiostat\fR(8), \fBsar\fR(8), \fBvmstat\fR(8),
+\fBtime\fR(2), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -347,9 +347,9 @@ pending disk I/O operations.
 Run the \fBiostat\fR command with the \fB-x\fR option to report I/O service
 times in \fBsvc_t\fR output. The \fBiostat\fR utility also reports the same
 \fBwt\fR, user (\fBus\fR), and system (\fBsy\fR) statistics. See
-\fBiostat\fR(1M) for more information.
+\fBiostat\fR(8) for more information.
 .sp
 .LP
 When executing in a \fBzone\fR and if the pools facility is active,
-\fBmpstat\fR(1M) will only provide information for those processors which are a
+\fBmpstat\fR(8) will only provide information for those processors which are a
 member of the processor set of the pool to which the \fBzone\fR is bound.
diff --git a/usr/src/man/man8/msgid.8 b/usr/src/man/man8/msgid.8
index d5293b6e5a..48e0aaa8aa 100644
--- a/usr/src/man/man8/msgid.8
+++ b/usr/src/man/man8/msgid.8
@@ -21,14 +21,14 @@ The \fBmsgid\fR utility generates message \fBID\fRs.
 A message \fBID\fR is a numeric identifier that uniquely identifies a message.
 Although the probability of two distinct messages having the same \fBID\fR is
 high, this can be greatly reduced with the appropriate priority or
-facility.level designator (see \fBsyslogd\fR(1M)). Specifically, the message
+facility.level designator (see \fBsyslogd\fR(8)). Specifically, the message
 \fBID\fR is a hash signature on the message's unexpanded format string,
 generated by \fBSTRLOG_MAKE_MSGID()\fR as defined in \fB<sys/strlog.h>\fR\&.
 .sp
 .LP
-\fBsyslogd\fR(1M) is a simple filter that takes strings as input and produces
+\fBsyslogd\fR(8) is a simple filter that takes strings as input and produces
 those same strings, preceded by their message \fBID\fRs, as output. Every
-message logged by \fBsyslogd\fR(1M) includes the message \fBID\fR. The message
+message logged by \fBsyslogd\fR(8) includes the message \fBID\fR. The message
 \fBID\fR is intended to serve as a small, language-independent identifier.
 .SH EXAMPLES
 .LP
@@ -70,4 +70,4 @@ example# \fBstrings /kernel/fs/ufs | msgid\fR
 .SH SEE ALSO
 .sp
 .LP
-\fBsyslogd\fR(1M), \fBattributes\fR(5), \fBlog\fR(7d)
+\fBsyslogd\fR(8), \fBattributes\fR(7), \fBlog\fR(4D)
diff --git a/usr/src/man/man8/mvdir.8 b/usr/src/man/man8/mvdir.8
index edfcb0026f..dcb0f14b4f 100644
--- a/usr/src/man/man8/mvdir.8
+++ b/usr/src/man/man8/mvdir.8
@@ -57,7 +57,7 @@ as \fBdirname\fR.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBmvdir\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBmvdir\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXIT STATUS
 .sp
@@ -81,4 +81,4 @@ Operation failed.
 .SH SEE ALSO
 .sp
 .LP
-\fBmkdir\fR(1), \fBmv\fR(1), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBmkdir\fR(1), \fBmv\fR(1), \fBattributes\fR(7), \fBlargefile\fR(7)
diff --git a/usr/src/man/man8/ncaconfd.8 b/usr/src/man/man8/ncaconfd.8
index 478356c337..c96d5a3747 100644
--- a/usr/src/man/man8/ncaconfd.8
+++ b/usr/src/man/man8/ncaconfd.8
@@ -17,12 +17,12 @@ ncaconfd \- Solaris Network Cache and Accelerator (NCA) configuration daemon
 .sp
 .LP
 Use the \fBncaconfd\fR utility to set up NCA on a system. At boot time, the
-\fBncakmod\fR initialization script reads in \fBnca.if\fR(4) to determine on
+\fBncakmod\fR initialization script reads in \fBnca.if\fR(5) to determine on
 which interface(s) NCA should run. \fBncaconfd\fR then sets up the interface.
 .sp
 .LP
 \fBncaconfd\fR also operates as a daemon if the \fBnca_active\fR key is set to
-enabled in \fBncakmod.conf\fR(4) file. In this case, \fBncaconfd\fR will
+enabled in \fBncakmod.conf\fR(5) file. In this case, \fBncaconfd\fR will
 continue as a daemon after all the NCA interfaces have been set up, listening
 for routing changes. The changes are then passed to NCA to control which
 interface NCA should use to make active outgoing TCP connnections.
@@ -61,7 +61,7 @@ Enable logging.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -77,5 +77,5 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBnca\fR(1), \fBncakmod\fR(1), \fBnca.if\fR(4), \fBncakmod.conf\fR(4),
-\fBattributes\fR(5)
+\fBnca\fR(1), \fBncakmod\fR(1), \fBnca.if\fR(5), \fBncakmod.conf\fR(5),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/ncheck.8 b/usr/src/man/man8/ncheck.8
index 28bc92a898..dcfef1727d 100644
--- a/usr/src/man/man8/ncheck.8
+++ b/usr/src/man/man8/ncheck.8
@@ -99,7 +99,7 @@ FSType-specific module of the command.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBncheck\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBncheck\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH FILES
 .sp
@@ -114,7 +114,7 @@ list of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBvfstab\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5) Manual pages for the
+\fBvfstab\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7) Manual pages for the
 FSType-specific modules of  \fBncheck\fR
 .SH NOTES
 .sp
diff --git a/usr/src/man/man8/ncheck_ufs.8 b/usr/src/man/man8/ncheck_ufs.8
index 778c061f95..d78a72acc3 100644
--- a/usr/src/man/man8/ncheck_ufs.8
+++ b/usr/src/man/man8/ncheck_ufs.8
@@ -21,7 +21,7 @@ directory files are followed by `\fB/.\fR'.
 .SH OPTIONS
 .sp
 .LP
-See \fBncheck\fR(1M) for the list of \fIgeneric_options\fR supported.
+See \fBncheck\fR(8) for the list of \fIgeneric_options\fR supported.
 .sp
 .ne 2
 .na
@@ -43,7 +43,7 @@ Print mode information.
 .SH SEE ALSO
 .sp
 .LP
-\fBff\fR(1M), \fBncheck\fR(1M), \fBattributes\fR(5)
+\fBff\fR(8), \fBncheck\fR(8), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .sp
 .LP
diff --git a/usr/src/man/man8/ndd.8 b/usr/src/man/man8/ndd.8
index fc6b48100c..42a264713b 100644
--- a/usr/src/man/man8/ndd.8
+++ b/usr/src/man/man8/ndd.8
@@ -83,8 +83,8 @@ example% \fBndd -set /dev/ip ip6_forwarding 0\fR
 .SH SEE ALSO
 .sp
 .LP
-\fBnca\fR(1), \fBdladm\fR(1M), \fBioctl\fR(2), \fBattributes\fR(5),
-\fBarp\fR(7P), \fBip\fR(7P), \fBip6\fR(7P), \fBtcp\fR(7P), \fBudp\fR(7P)
+\fBnca\fR(1), \fBdladm\fR(8), \fBioctl\fR(2), \fBattributes\fR(7),
+\fBarp\fR(4P), \fBip\fR(4P), \fBip6\fR(4P), \fBtcp\fR(4P), \fBudp\fR(4P)
 .SH NOTES
 .sp
 .LP
@@ -100,7 +100,7 @@ dependencies on it.
 .LP
 The use of \fBndd\fR to administer Layer 2 (Data Link layer) drivers is
 strongly discouraged as this capability is to be obsoleted in a future release,
-replaced by \fBdladm\fR(1M). Please refer to the driver-specific man page in
+replaced by \fBdladm\fR(8). Please refer to the driver-specific man page in
 section 4D of the SunOS man pages.
 .sp
 .LP
diff --git a/usr/src/man/man8/ndmpadm.8 b/usr/src/man/man8/ndmpadm.8
index 93a16bc32d..4fccd2d516 100644
--- a/usr/src/man/man8/ndmpadm.8
+++ b/usr/src/man/man8/ndmpadm.8
@@ -15,7 +15,7 @@ ndmpadm \- administer Network Data Management Protocol activities
 
 .SH DESCRIPTION
 .LP
-The \fBndmpadm\fR command can be used to query the \fBndmpd\fR(1M) daemon to
+The \fBndmpadm\fR command can be used to query the \fBndmpd\fR(8) daemon to
 get the status of active sessions, terminate a session, query backup devices,
 and set or get the current NDMP (Network Data Management Protocol) service
 variables and properties. \fBndmpadm\fR is implemented as a set of subcommands,
@@ -188,7 +188,7 @@ The syntax for the \fBset\fR subcommand is:
 .sp
 .LP
 The properties you can set with the \fBset\fR subcommand are described in the
-\fBndmp\fR(4) man page.
+\fBndmp\fR(5) man page.
 .SS "\fBshow-devices\fR Subcommand"
 .LP
 The syntax for the \fBshow-devices\fR subcommand is:
@@ -403,7 +403,7 @@ Invalid command-line options were specified.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -418,13 +418,13 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBdump\fR(1), \fBtar\fR(1), \fBndmpd\fR(1M), \fBndmpstat\fR(1M),
-\fBsvccfg\fR(1M), \fBsyslogd\fR(1M), \fBndmp\fR(4), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBdump\fR(1), \fBtar\fR(1), \fBndmpd\fR(8), \fBndmpstat\fR(8),
+\fBsvccfg\fR(8), \fBsyslogd\fR(8), \fBndmp\fR(5), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .LP
-The \fBndmpd\fR(1M) daemon is managed by the service management facility
-(\fBsmf\fR(5)), under the service identifier:
+The \fBndmpd\fR(8) daemon is managed by the service management facility
+(\fBsmf\fR(7)), under the service identifier:
 .sp
 .in +2
 .nf
@@ -436,7 +436,7 @@ svc:/system/ndmpd
 .sp
 .LP
 Administrative actions on this service, such as setting and getting a property
-can be alternatively performed using \fBsvccfg\fR(1M). For example to enable
+can be alternatively performed using \fBsvccfg\fR(8). For example to enable
 Direct Access Recovery (DAR) mode:
 .sp
 .in +2
diff --git a/usr/src/man/man8/ndmpd.8 b/usr/src/man/man8/ndmpd.8
index a5859c934c..9813b57927 100644
--- a/usr/src/man/man8/ndmpd.8
+++ b/usr/src/man/man8/ndmpd.8
@@ -33,7 +33,7 @@ The following options are supported:
 \fB\fB-d\fR\fR
 .ad
 .RS 4n
-Enables debugging mode. Overrides ndmpd/debug-mode smf(5) property.
+Enables debugging mode. Overrides ndmpd/debug-mode smf(7) property.
 .RE
 
 .sp
@@ -111,7 +111,7 @@ backups.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -127,13 +127,13 @@ Interface Stability	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBndmpadm\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
-\fBsyslogd\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBndmpadm\fR(8), \fBsvcadm\fR(8), \fBsvccfg\fR(8),
+\fBsyslogd\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBndmpd\fR daemon is managed by the service management facility
-(\fBsmf\fR(5)), under the service identifier:
+(\fBsmf\fR(7)), under the service identifier:
 .sp
 .in +2
 .nf
@@ -145,5 +145,5 @@ svc:/system/ndmpd:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/ndmpstat.8 b/usr/src/man/man8/ndmpstat.8
index 684fa5911b..258a096cef 100644
--- a/usr/src/man/man8/ndmpstat.8
+++ b/usr/src/man/man8/ndmpstat.8
@@ -342,7 +342,7 @@ example%
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -361,8 +361,8 @@ Invocation is evolving. Human readable output is unstable.
 .SH SEE ALSO
 .sp
 .LP
-\fBiostat\fR(1M), \fBmpstat\fR(1M), \fBndmpd\fR(1M), \fBndmpadm\fR(1M),
-\fBattributes\fR(5)
+\fBiostat\fR(8), \fBmpstat\fR(8), \fBndmpd\fR(8), \fBndmpadm\fR(8),
+\fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/netstat.8 b/usr/src/man/man8/netstat.8
index 269820979a..4e32bca34d 100644
--- a/usr/src/man/man8/netstat.8
+++ b/usr/src/man/man8/netstat.8
@@ -208,7 +208,7 @@ Selects an output interface. You can specify the interface by name (such as
 used, the filter matches all routes having a specified interface (anything
 other than null). If \fBnone\fR is used, the filter matches all routes having a
 null interface. Note that you can view the index number (\fIifIndex\fR) for an
-interface with the \fB-a\fR option of \fBifconfig\fR(1M).
+interface with the \fB-a\fR option of \fBifconfig\fR(8).
 .RE
 
 .sp
@@ -274,7 +274,7 @@ DISPLAYS, below.
 Show the state of the interfaces that are used for \fBIP\fR traffic. Normally
 this shows statistics for the physical interfaces. When combined with the
 \fB-a\fR option, this will also report information for the logical interfaces.
-See \fBifconfig\fR(1M).
+See \fBifconfig\fR(8).
 .RE
 
 .sp
@@ -440,7 +440,7 @@ table entries. The \fB-R\fR modifier is available only if the system is
 configured with the Solaris Trusted Extensions feature.
 .sp
 With \fB-r\fR only, this option displays the routing entries' gateway security
-attributes. See \fBroute\fR(1M) for more information on security attributes.
+attributes. See \fBroute\fR(8) for more information on security attributes.
 .sp
 When displaying socket information using the first form of the command, this
 option displays additional information for Multi-Level Port(MLP) sockets. This
@@ -532,8 +532,8 @@ to look up the corresponding symbolic hostname or network name in the
 If the network or hostname for an address is not known, or if the \fB-n\fR
 option is specified, the numerical network address is shown. Unspecified, or
 "wildcard", addresses and ports appear as an asterisk (\fB*\fR). For more
-information regarding the Internet naming conventions, refer to \fBinet\fR(7P)
-and \fBinet6\fR(7P).
+information regarding the Internet naming conventions, refer to \fBinet\fR(4P)
+and \fBinet6\fR(4P).
 .LP
 For SCTP sockets, because an endpoint can be represented by multiple addresses,
 the verbose option (\fB-v\fR) displays the list of all the local and remote
@@ -773,7 +773,7 @@ Displays the memory usage, for example, STREAMS mblks.
 .ad
 .RS 6n
 Displays the net to media mapping table. For IPv4, the address resolution table
-is displayed. See \fBarp\fR(1M). For IPv6, the neighbor cache is displayed.
+is displayed. See \fBarp\fR(8). For IPv6, the neighbor cache is displayed.
 .RE
 
 .sp
@@ -825,7 +825,7 @@ interface per line. If an interface is specified using the \fB-I\fR option, it
 displays information for only the specified interface.
 .LP
 The list consists of the interface name, \fBmtu\fR (maximum transmission unit,
-or maximum packet size)(see \fBifconfig\fR(1M)), the network to which the
+or maximum packet size)(see \fBifconfig\fR(8)), the network to which the
 interface is attached, addresses for each interface, and counter associated
 with the interface. The counters show the number of input packets, input
 errors, output packets, output errors, and collisions, respectively. For
@@ -1020,7 +1020,7 @@ The interface is busy with a \fBDHCP\fR transaction.
 .ad
 .RS 11n
 The interface is the primary interface. See \fBdhcpinfo\fR(1) and
-\fBifconfig\fR(1M).
+\fBifconfig\fR(8).
 .RE
 
 .sp
@@ -1051,11 +1051,11 @@ future lease.
 .RE
 
 .SH SEE ALSO
-\fBarp\fR(1M), \fBdhcpinfo\fR(1), \fBdhcpagent\fR(1M), \fBifconfig\fR(1M),
-\fBiostat\fR(1M), \fBkstat\fR(1M), \fBmibiisa\fR(1M), \fBndp\fR(1M), \fBsavecore\fR(1M),
-\fBvmstat\fR(1M), \fBhosts\fR(4), \fBinet_type\fR(4), \fBnetworks\fR(4),
-\fBprotocols\fR(4), \fBservices\fR(4), \fBattributes\fR(5), \fBdhcp\fR(5),
-\fBkstat\fR(7D), \fBinet\fR(7P), \fBinet6\fR(7P)
+\fBarp\fR(8), \fBdhcpinfo\fR(1), \fBdhcpagent\fR(8), \fBifconfig\fR(8),
+\fBiostat\fR(8), \fBkstat\fR(8), \fBmibiisa\fR(8), \fBndp\fR(8), \fBsavecore\fR(8),
+\fBvmstat\fR(8), \fBhosts\fR(5), \fBinet_type\fR(5), \fBnetworks\fR(5),
+\fBprotocols\fR(5), \fBservices\fR(5), \fBattributes\fR(7), \fBdhcp\fR(7),
+\fBkstat\fR(4D), \fBinet\fR(4P), \fBinet6\fR(4P)
 .sp
 .LP
 Droms, R., \fIRFC 2131, Dynamic Host Configuration Protocol\fR, Network Working
@@ -1077,7 +1077,7 @@ the command-line to explicitly request IPv6 information by using the
 \fBDEFAULT_IP\fR setting.
 .LP
 If you need to examine network status information following a kernel crash, use
-the \fBmdb\fR(1) utility on the \fBsavecore\fR(1M) output.
+the \fBmdb\fR(1) utility on the \fBsavecore\fR(8) output.
 .LP
 The \fBnetstat\fR utility obtains TCP statistics from the system by opening
 \fB/dev/tcp\fR and issuing queries. Because of this, \fBnetstat\fR might
@@ -1085,8 +1085,8 @@ display an extra, unused connection in \fBIDLE\fR state when reporting
 connection status.
 .LP
 Previous versions of \fBnetstat\fR had undocumented methods for reporting
-kernel statistics published using the \fBkstat\fR(7D) facility. This
-functionality has been removed. Use \fBkstat\fR(1M) instead.
+kernel statistics published using the \fBkstat\fR(4D) facility. This
+functionality has been removed. Use \fBkstat\fR(8) instead.
 .LP
 \fBnetstat\fR restricts its output to information that is relevant to the zone
 in which \fBnetstat\fR runs. (This is true for both shared-IP and exclusive-IP
diff --git a/usr/src/man/man8/netstrategy.8 b/usr/src/man/man8/netstrategy.8
index 7a9e3a008d..d9ebea225b 100644
--- a/usr/src/man/man8/netstrategy.8
+++ b/usr/src/man/man8/netstrategy.8
@@ -37,7 +37,7 @@ These tokens are described as follows:
 .sp .6
 .RS 4n
 Type of filesystem that contains the bootable kernel, as would be specified in
-the \fIfstype\fR column of the \fBmnttab\fR(4).
+the \fIfstype\fR column of the \fBmnttab\fR(5).
 .RE
 
 .sp
@@ -91,7 +91,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -107,4 +107,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBifconfig\fR(1M), \fBmnttab\fR(4), \fBattributes\fR(5)
+\fBifconfig\fR(8), \fBmnttab\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/newaliases.8 b/usr/src/man/man8/newaliases.8
index 86a23891ad..1c7c301933 100644
--- a/usr/src/man/man8/newaliases.8
+++ b/usr/src/man/man8/newaliases.8
@@ -19,7 +19,7 @@ newaliases \- rebuild the data base for the mail aliases file
 \fB/etc/mail/aliases\fR.
 .sp
 .LP
-\fBnewaliases\fR accepts all the flags that \fBsendmail\fR(1M) accepts.
+\fBnewaliases\fR accepts all the flags that \fBsendmail\fR(8) accepts.
 However, most of these flags have no effect, except for the \fB-C\fR option and
 three of the \fBProcessing\fR \fBOptions\fR that can be set from a
 configuration file with the \fB-o\fR option:
@@ -60,7 +60,7 @@ Set the default log level to \fIn\fR. Defaults to \fB9\fR.
 .ad
 .sp .6
 .RS 4n
-Validate the \fBRHS\fR of aliases when rebuilding the \fBaliases\fR(4)
+Validate the \fBRHS\fR of aliases when rebuilding the \fBaliases\fR(5)
 database.
 .RE
 
@@ -73,7 +73,7 @@ database.
 .sp
 .LP
 The following command runs \fBnewaliases\fR on an alias file different from the
-\fB/etc/mail/aliases\fR default in \fBsendmail\fR(1M):
+\fB/etc/mail/aliases\fR default in \fBsendmail\fR(8):
 
 .sp
 .in +2
@@ -200,4 +200,4 @@ Berkeley DataBase file maintained by newaliases
 .SH SEE ALSO
 .sp
 .LP
-\fBsendmail\fR(1M), \fBaliases\fR(4), \fBattributes\fR(5)
+\fBsendmail\fR(8), \fBaliases\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/newfs.8 b/usr/src/man/man8/newfs.8
index 9f0eaee389..64fd1c5dcf 100644
--- a/usr/src/man/man8/newfs.8
+++ b/usr/src/man/man8/newfs.8
@@ -12,7 +12,7 @@ newfs \- construct a UFS file system
 .SH DESCRIPTION
 .sp
 .LP
-\fBnewfs\fR is a "friendly" front-end to the \fBmkfs\fR(1M) program for making
+\fBnewfs\fR is a "friendly" front-end to the \fBmkfs\fR(8) program for making
 \fBUFS\fR file systems on disk partitions. \fBnewfs\fR calculates the
 appropriate parameters to use and calls \fBmkfs\fR.
 .sp
@@ -22,7 +22,7 @@ for confirmation before making the file system.
 .sp
 .LP
 If the \fB-N\fR option is not specified and the inodes of the device are not
-randomized, \fBnewfs\fR calls \fBfsirand\fR(1M).
+randomized, \fBnewfs\fR calls \fBfsirand\fR(8).
 .sp
 .LP
 You must be super-user or have appropriate write privileges to use this
@@ -58,7 +58,7 @@ The following options are supported:
 .sp .6
 .RS 4n
 Print out the file system parameters that would be used to create the file
-system without actually creating the file system. \fBfsirand\fR(1M) is not
+system without actually creating the file system. \fBfsirand\fR(8) is not
 called here.
 .RE
 
@@ -156,7 +156,7 @@ The default is calculated by dividing the number of sectors in the file system
 by the number of sectors in a gigabyte. Then, the result is multiplied by
 \fB32\fR. The default value is always between \fB16\fR and \fB256\fR.
 .sp
-\fBmkfs\fR can override this value. See \fBmkfs_ufs\fR(1M) for details.
+\fBmkfs\fR can override this value. See \fBmkfs_ufs\fR(8) for details.
 .sp
 This option is not applicable for disks with EFI labels and is ignored.
 .RE
@@ -190,7 +190,7 @@ You can set \fBmaxcontig\fR to any positive integer value.
 The actual value will be the lesser of what has been specified and what the
 hardware supports.
 .sp
-You can subsequently change this parameter by using \fBtunefs\fR(1M).
+You can subsequently change this parameter by using \fBtunefs\fR(8).
 .RE
 
 .sp
@@ -274,7 +274,7 @@ file system.
 The default is ((64 Mbytes/partition size) * 100), rounded down to the nearest
 integer and limited between 1% and 10%, inclusively.
 .sp
-This parameter can be subsequently changed using the \fBtunefs\fR(1M) command.
+This parameter can be subsequently changed using the \fBtunefs\fR(8) command.
 .RE
 
 .sp
@@ -301,7 +301,7 @@ The file system can either be instructed to try to minimize the \fBtime\fR
 spent allocating blocks, or to try to minimize the \fBspace\fR fragmentation on
 the disk. The default is \fItime\fR.
 .sp
-This parameter can subsequently be changed with the \fBtunefs\fR(1M) command.
+This parameter can subsequently be changed with the \fBtunefs\fR(8) command.
 .RE
 
 .sp
@@ -363,7 +363,7 @@ example, \fB/dev/rdsk/c0t0d0s6\fR) on which to create the file system.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBnewfs\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBnewfs\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXAMPLES
 .LP
@@ -476,14 +476,14 @@ the error.
 
 .sp
 .LP
-Other exit values may be returned by \fBmkfs\fR(1M), which is called by
+Other exit values may be returned by \fBmkfs\fR(8), which is called by
 \fBnewfs\fR.
 .SH SEE ALSO
 .sp
 .LP
-\fBfsck\fR(1M), \fBfsck_ufs\fR(1M), \fBfsirand\fR(1M), \fBmkfs\fR(1M),
-\fBmkfs_ufs\fR(1M), \fBtunefs\fR(1M), \fBattributes\fR(5), \fBlargefile\fR(5),
-\fBufs\fR(7FS)
+\fBfsck\fR(8), \fBfsck_ufs\fR(8), \fBfsirand\fR(8), \fBmkfs\fR(8),
+\fBmkfs_ufs\fR(8), \fBtunefs\fR(8), \fBattributes\fR(7), \fBlargefile\fR(7),
+\fBufs\fR(4FS)
 .SH DIAGNOSTICS
 .sp
 .ne 2
diff --git a/usr/src/man/man8/newkey.8 b/usr/src/man/man8/newkey.8
index 81d2debb3c..0ed2fb7bfb 100644
--- a/usr/src/man/man8/newkey.8
+++ b/usr/src/man/man8/newkey.8
@@ -32,7 +32,7 @@ The key pair can be stored in the \fB/etc/publickey\fR file or the NIS
 .sp
 .LP
 \fBnewkey\fR consults the \fBpublickey\fR entry in the name service switch
-configuration file (see \fBnsswitch.conf\fR(4)) to determine which naming
+configuration file (see \fBnsswitch.conf\fR(5)) to determine which naming
 service is used to store the secure \fBRPC\fR keys. If the \fBpublickey\fR
 entry specifies a unique name service, \fBnewkey\fR will add the key in the
 specified name service. However, if there are multiple name services listed,
@@ -90,4 +90,4 @@ available in the future.
 .SH SEE ALSO
 .LP
 \fBchkey\fR(1), \fBkeylogin\fR(1),
-\fBnsswitch.conf\fR(4), \fBpublickey\fR(4), \fBattributes\fR(5)
+\fBnsswitch.conf\fR(5), \fBpublickey\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/nfs4cbd.8 b/usr/src/man/man8/nfs4cbd.8
index ed5aa01653..e93599256b 100644
--- a/usr/src/man/man8/nfs4cbd.8
+++ b/usr/src/man/man8/nfs4cbd.8
@@ -25,13 +25,13 @@ client.
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBmount_nfs\fR(1M), \fBsvcadm\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBmount_nfs\fR(8), \fBsvcadm\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBnfs4cbd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -43,12 +43,12 @@ svc:/network/nfs/cbd
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
-If it is disabled, it will be enabled by \fBmount_nfs\fR(1M) and
-\fBautomountd\fR(1M) on the first NFSv4 mount, unless its
+If it is disabled, it will be enabled by \fBmount_nfs\fR(8) and
+\fBautomountd\fR(8) on the first NFSv4 mount, unless its
 \fBapplication/auto_enable\fR property is set to \fBfalse\fR.
 .sp
 .LP
diff --git a/usr/src/man/man8/nfslogd.8 b/usr/src/man/man8/nfslogd.8
index 262171c53d..f08ca4f350 100644
--- a/usr/src/man/man8/nfslogd.8
+++ b/usr/src/man/man8/nfslogd.8
@@ -20,7 +20,7 @@ The \fBnfslogd\fR daemon provides operational logging to the Solaris \fBNFS\fR
 server. It is the \fBnfslogd\fR daemon's job to generate the activity log by
 analyzing the \fBRPC\fR operations processed by the \fBNFS\fR server. The log
 will only be generated for file systems exported with  logging enabled. This is
-specified at file system export time by means of the \fBshare_nfs\fR(1M)
+specified at file system export time by means of the \fBshare_nfs\fR(8)
 command.
 .sp
 .LP
@@ -36,7 +36,7 @@ basic format of the \fBNFS\fR server log is compatible with the log format
 generated by the Washington University \fBFTPd\fR daemon. The log format can be
 extended to include directory modification operations, such as \fBmkdir\fR,
 \fBrmdir\fR, and \fBremove\fR. The extended format is not compatible with the
-Washington University \fBFTPd\fR daemon format. See \fBnfslog.conf\fR(4) for
+Washington University \fBFTPd\fR daemon format. See \fBnfslog.conf\fR(5) for
 details.
 .sp
 .LP
@@ -44,7 +44,7 @@ The \fBNFS\fR server logging mechanism is divided in two phases. The first
 phase is performed by the \fBNFS\fR kernel module, which records raw \fBRPC\fR
 requests and their results in work buffers backed by permanent storage. The
 location of the work buffers is specified in the /\fBetc/nfs/nfslog.conf\fR
-file. Refer to \fBnfslog.conf\fR(4) for more information. The second phase
+file. Refer to \fBnfslog.conf\fR(5) for more information. The second phase
 involves the \fBnfslogd\fR user-level daemon, which periodically reads the work
 buffers, interprets the raw \fBRPC\fR information, groups related \fBRPC\fR
 operations into single transaction records, and generates the output log. The
@@ -228,14 +228,14 @@ Daemon failed to start.
 
 .SH SEE ALSO
 .LP
-\fBshare_nfs\fR(1M), \fBnfslog.conf\fR(4), \fBattributes\fR(5)
+\fBshare_nfs\fR(8), \fBnfslog.conf\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
 .SH NOTES
 .LP
 The \fBnfslogd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -247,5 +247,5 @@ svc:/network/nfs/log
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/nfsstat.8 b/usr/src/man/man8/nfsstat.8
index e61c54ba9a..2586efdb37 100644
--- a/usr/src/man/man8/nfsstat.8
+++ b/usr/src/man/man8/nfsstat.8
@@ -410,7 +410,7 @@ various calls that were made.
 .LP
 The \fB-m\fR option includes information about mount flags set by mount
 options, mount flags internal to the system, and other mount information. See
-\fBmount_nfs\fR(1M).
+\fBmount_nfs\fR(8).
 .sp
 .LP
 The following mount flags are set by mount options:
@@ -878,7 +878,7 @@ An error occurred.
 
 .SH SEE ALSO
 .LP
-\fBmount_nfs\fR(1M), \fBattributes\fR(5)
+\fBmount_nfs\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/nlsadmin.8 b/usr/src/man/man8/nlsadmin.8
index f44668deb9..a3af5e435d 100644
--- a/usr/src/man/man8/nlsadmin.8
+++ b/usr/src/man/man8/nlsadmin.8
@@ -320,7 +320,7 @@ standard output. It is used as part of the \fBsacadm\fR command line when
 .sp .6
 .RS 4n
 Format the port monitor-specific information to be used as an argument to
-\fBpmadm\fR(1M)
+\fBpmadm\fR(8)
 .sp
 The \fB-c\fR option specifies the full path name of the server and its
 arguments. \fIcmd\fR must appear as a single word to the shell, and its
@@ -374,8 +374,8 @@ fails for any reason, it exits with a status greater than or equal to 2.  See
 .SH SEE ALSO
 .sp
 .LP
-\fBlisten\fR(1M), \fBpmadm\fR(1M), \fBrpcbind\fR(1M), \fBsacadm\fR(1M),
-\fBattributes\fR(5)
+\fBlisten\fR(8), \fBpmadm\fR(8), \fBrpcbind\fR(8), \fBsacadm\fR(8),
+\fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/nscd.8 b/usr/src/man/man8/nscd.8
index 64dcf6dc42..5497464323 100644
--- a/usr/src/man/man8/nscd.8
+++ b/usr/src/man/man8/nscd.8
@@ -17,15 +17,15 @@ nscd \- name service cache daemon
 .LP
 The \fBnscd\fR daemon is a process that provides a cache for most name service
 requests. The default \fIconfiguration-file\fR \fB/etc/nscd.conf\fR determines
-the behavior of the cache daemon. See \fBnscd.conf\fR(4).
+the behavior of the cache daemon. See \fBnscd.conf\fR(5).
 .sp
 .LP
-\fBnscd\fR provides caching for the \fBpasswd\fR(4), \fBgroup\fR(4),
-\fBhosts\fR(4), \fBipnodes\fR(4), \fBexec_attr\fR(4), \fBprof_attr\fR(4),
-\fBuser_attr\fR(4), \fBethers\fR(4), \fBrpc\fR(4), \fBprotocols\fR(4),
-\fBnetworks\fR(4), \fBbootparams\fR(4),
-\fBauth_attr\fR(4), \fBservices\fR(4), \fBnetmasks\fR(4), \fBprinters\fR(4),
-\fBproject\fR(4) databases through standard \fBlibc\fR interfaces, such as
+\fBnscd\fR provides caching for the \fBpasswd\fR(5), \fBgroup\fR(5),
+\fBhosts\fR(5), \fBipnodes\fR(5), \fBexec_attr\fR(5), \fBprof_attr\fR(5),
+\fBuser_attr\fR(5), \fBethers\fR(5), \fBrpc\fR(5), \fBprotocols\fR(5),
+\fBnetworks\fR(5), \fBbootparams\fR(5),
+\fBauth_attr\fR(5), \fBservices\fR(5), \fBnetmasks\fR(5), \fBprinters\fR(5),
+\fBproject\fR(5) databases through standard \fBlibc\fR interfaces, such as
 \fBgethostbyname\fR(3NSL), \fBgetipnodebyname\fR(3SOCKET),
 \fBgethostbyaddr\fR(3NSL), and others. Each cache has a separate time-to-live
 for its data; modifying the local database (\fB/etc/hosts\fR,
@@ -39,7 +39,7 @@ upon the next call to \fBnscd\fR. The shadow file is specifically not cached.
 transparently.
 .sp
 .LP
-When running with per-user lookups enabled (see \fBnscd.conf\fR(4)), \fBnscd\fR
+When running with per-user lookups enabled (see \fBnscd.conf\fR(5)), \fBnscd\fR
 forks one and only one child process (that is, a per-user \fBnscd\fR) on behalf
 of the user making the request. The per-user \fBnscd\fR will use the
 credentials of the user to open a per-user connection to the name repository
@@ -53,7 +53,7 @@ terminates itself after the inactivity TTL expires.
 .sp
 .LP
 The maximum number of per-user \fBnscd\fRs that can be created by the main
-\fBnscd\fR is configurable (see \fBnscd.conf\fR(4)). After the maximum number
+\fBnscd\fR is configurable (see \fBnscd.conf\fR(5)). After the maximum number
 of them are created, the main \fBnscd\fR will use an LRU algorithm to terminate
 less active child \fBnscd\fRs as needed.
 .sp
@@ -143,13 +143,13 @@ Determines athe behavior of the cache daemon
 
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBgetspnam\fR(3C), \fBgethostbyname\fR(3NSL),
-\fBgetipnodebyname\fR(3SOCKET), \fBauth_attr\fR(4),
-\fBbootparams\fR(4), \fBethers\fR(4), \fBexec_attr\fR(4), \fBgroup\fR(4),
-\fBhosts\fR(4), \fBnetmasks\fR(4), \fBnetworks\fR(4), \fBnscd.conf\fR(4),
-\fBnsswitch.conf\fR(4), \fBpasswd\fR(4), \fBprinters\fR(4), \fBprof_attr\fR(4),
-\fBproject\fR(4), \fBprotocols\fR(4), \fBrpc\fR(4), \fBservices\fR(4),
-\fBuser_attr\fR(4), \fBattributes\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBgetspnam\fR(3C), \fBgethostbyname\fR(3NSL),
+\fBgetipnodebyname\fR(3SOCKET), \fBauth_attr\fR(5),
+\fBbootparams\fR(5), \fBethers\fR(5), \fBexec_attr\fR(5), \fBgroup\fR(5),
+\fBhosts\fR(5), \fBnetmasks\fR(5), \fBnetworks\fR(5), \fBnscd.conf\fR(5),
+\fBnsswitch.conf\fR(5), \fBpasswd\fR(5), \fBprinters\fR(5), \fBprof_attr\fR(5),
+\fBproject\fR(5), \fBprotocols\fR(5), \fBrpc\fR(5), \fBservices\fR(5),
+\fBuser_attr\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .LP
 The output from the \fB-g\fR option to \fBnscd\fR is subject to change. Do not
@@ -157,7 +157,7 @@ rely upon it as a programming interface.
 .sp
 .LP
 The \fBnscd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -169,5 +169,5 @@ svc:/system/name-service-cache
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/nwamd.8 b/usr/src/man/man8/nwamd.8
index b906902e93..4ef5494360 100644
--- a/usr/src/man/man8/nwamd.8
+++ b/usr/src/man/man8/nwamd.8
@@ -206,7 +206,7 @@ change in a future release.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -222,16 +222,16 @@ Interface Stability	Volatile
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
-See also \fBnwam-manager(1M)\fR, available in the JDS/GNOME man page
+See also \fBnwam-manager(8)\fR, available in the JDS/GNOME man page
 collection.
 .SH NOTES
 .sp
 .LP
 The networking service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -243,5 +243,5 @@ svc:/network/physical
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/obpsym.8 b/usr/src/man/man8/obpsym.8
index 2a8db76fac..a3a141818e 100644
--- a/usr/src/man/man8/obpsym.8
+++ b/usr/src/man/man8/obpsym.8
@@ -38,7 +38,7 @@ Placing the command
 \fBforceload: misc/obpsym\fR
 .sp
 .LP
-into the \fBsystem\fR(4) file forces the kernel module \fBmisc/obpsym\fR to be
+into the \fBsystem\fR(5) file forces the kernel module \fBmisc/obpsym\fR to be
 loaded and activates the kernel callbacks during the kernel startup sequence.
 .sp
 .LP
@@ -92,8 +92,8 @@ system configuration information file
 .SH SEE ALSO
 .sp
 .LP
-\fBkadb\fR(1M), \fBkernel\fR(1M), \fBmodload\fR(1M), \fBmodunload\fR(1M),
-\fBuname\fR(1), \fBsystem\fR(4), \fBattributes\fR(5)
+\fBkadb\fR(8), \fBkernel\fR(8), \fBmodload\fR(8), \fBmodunload\fR(8),
+\fBuname\fR(1), \fBsystem\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/oplhpd.8 b/usr/src/man/man8/oplhpd.8
index 2109604ace..b10c9e1824 100644
--- a/usr/src/man/man8/oplhpd.8
+++ b/usr/src/man/man8/oplhpd.8
@@ -17,7 +17,7 @@ oplhpd \- Hot plug daemon for SPARC Enterprise Server line
 .LP
 The hot plug daemon for \fBSPARC\fR Enterprise Servers is a daemon process that
 runs on the \fBSUNW\fR,\fBSPARC\fR-Enterprise family of servers. The daemon is
-started by the service management facility (see \fBsmf\fR(5)) and communicates
+started by the service management facility (see \fBsmf\fR(7)) and communicates
 with the service processor when hot plug \fBPCI\fR cassettes change their
 dynamic reconfiguration state.
 .sp
@@ -48,7 +48,7 @@ priority. The default entries in the \fB/etc/syslog.conf\fR file log all of the
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -64,5 +64,5 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBsvcadm\fR(1M), \fBsyslog\fR(3C),
-\fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBinetadm\fR(8), \fBsvcadm\fR(8), \fBsyslog\fR(3C),
+\fBsyslog.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
diff --git a/usr/src/man/man8/passmgmt.8 b/usr/src/man/man8/passmgmt.8
index 804823d6d9..d636bc44a2 100644
--- a/usr/src/man/man8/passmgmt.8
+++ b/usr/src/man/man8/passmgmt.8
@@ -107,10 +107,10 @@ defaults to \fB/usr/\fR\fIname\fR.
 \fB\fB-K\fR \fIkey=value\fR\fR
 .ad
 .RS 16n
-Set a \fIkey=value\fR pair. See \fBuser_attr\fR(4), \fBauth_attr\fR(4), and
-\fBprof_attr\fR(4). The valid \fIkey=value\fR pairs are defined in
-\fBuser_attr\fR(4), but the "type" key is subject to the \fBusermod\fR(1M) and
-\fBrolemod\fR(1M) restrictions. Multiple \fIkey=value\fR pairs may be added
+Set a \fIkey=value\fR pair. See \fBuser_attr\fR(5), \fBauth_attr\fR(5), and
+\fBprof_attr\fR(5). The valid \fIkey=value\fR pairs are defined in
+\fBuser_attr\fR(5), but the "type" key is subject to the \fBusermod\fR(8) and
+\fBrolemod\fR(8) restrictions. Multiple \fIkey=value\fR pairs may be added
 with multiple \fB-K\fR options.
 .RE
 
@@ -184,7 +184,7 @@ greater than 99. Without the \fB-o\fR option, it enforces the uniqueness of a
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -199,9 +199,9 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBpasswd\fR(1), \fBrolemod\fR(1M), \fBuseradd\fR(1M), \fBuserdel\fR(1M),
-\fBusermod\fR(1M), \fBauth_attr\fR(4), \fBpasswd\fR(4), \fBprof_attr\fR(4),
-\fBshadow\fR(4), \fBuser_attr\fR(4), \fBattributes\fR(5)
+\fBpasswd\fR(1), \fBrolemod\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8),
+\fBusermod\fR(8), \fBauth_attr\fR(5), \fBpasswd\fR(5), \fBprof_attr\fR(5),
+\fBshadow\fR(5), \fBuser_attr\fR(5), \fBattributes\fR(7)
 .SH EXIT STATUS
 .LP
 The \fBpassmgmt\fR command exits with one of the following values:
diff --git a/usr/src/man/man8/pbind.8 b/usr/src/man/man8/pbind.8
index 9a21f788c7..d77a4edac8 100644
--- a/usr/src/man/man8/pbind.8
+++ b/usr/src/man/man8/pbind.8
@@ -58,7 +58,7 @@ example, binds all commands executed by the shell.
 .sp
 .LP
 The \fIprocessor_id\fR must be present and on-line. Use the
-\fBpsrinfo(1M)\fR command to determine which processors are
+\fBpsrinfo\fR(8) command to determine which processors are
 available.
 .sp
 .LP
@@ -313,8 +313,8 @@ An error occurred.
 
 .SH SEE ALSO
 .LP
-\fBpsradm\fR(1M), \fBpsrinfo\fR(1M), \fBpsrset\fR(1M), \fBprocessor_bind\fR(2),
-\fBprocessor_info\fR(2), \fBsysconf\fR(3C), \fBattributes\fR(5)
+\fBpsradm\fR(8), \fBpsrinfo\fR(8), \fBpsrset\fR(8), \fBprocessor_bind\fR(2),
+\fBprocessor_info\fR(2), \fBsysconf\fR(3C), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .ne 2
 .na
diff --git a/usr/src/man/man8/picld.8 b/usr/src/man/man8/picld.8
index 6d259849e5..a163b4a957 100644
--- a/usr/src/man/man8/picld.8
+++ b/usr/src/man/man8/picld.8
@@ -105,12 +105,12 @@ for accessing the \fBPICL\fR tree.
 .RE
 
 .SH SEE ALSO
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBdlopen\fR(3C), \fBlibpicl\fR(3PICL),
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBdlopen\fR(3C), \fBlibpicl\fR(3PICL),
 \fBlibpicltree\fR(3PICLTREE), \fBpicld_log\fR(3PICLTREE),
-\fBpicld_plugin_register\fR(3PICLTREE), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBpicld_plugin_register\fR(3PICLTREE), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 The \fBpicld\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -122,5 +122,5 @@ svc:/system/picl
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/ping.8 b/usr/src/man/man8/ping.8
index a8629e687a..6b502b3c75 100644
--- a/usr/src/man/man8/ping.8
+++ b/usr/src/man/man8/ping.8
@@ -309,7 +309,7 @@ packets to this base and increments it by one at each probe.
 Bypass the normal routing tables and send directly to a host on an attached
 network. If the host is not on a directly attached network, an error is
 returned. This option can be used to \fBping\fR a local host through an
-interface that has been dropped by the router daemon. See \fBin.routed\fR(1M).
+interface that has been dropped by the router daemon. See \fBin.routed\fR(8).
 .RE
 
 .sp
@@ -332,7 +332,7 @@ packets. The default time to live (hop limit) for unicast packets can be set
 with the \fBndd\fR module, \fB/dev/icmp\fR, using the \fBicmp_ipv4_ttl\fR
 variable for IPv4 and the \fBicmp_ipv6_hoplimit\fR variable for IPv6. The
 default time to live (hop limit) for multicast is one hop. See \fBEXAMPLES\fR.
-For further information, see \fBndd\fR(1M).
+For further information, see \fBndd\fR(8).
 .RE
 
 .sp
@@ -421,9 +421,9 @@ machine was not alive.
 
 .SH SEE ALSO
 .LP
-\fBifconfig\fR(1M), \fBin.routed\fR(1M), \fBndd\fR(1M), \fBnetstat\fR(1M),
-\fBrpcinfo\fR(1M), \fBtraceroute\fR(1M), \fBattributes\fR(5), \fBicmp\fR(7P),
-\fBicmp6\fR(7P)
+\fBifconfig\fR(8), \fBin.routed\fR(8), \fBndd\fR(8), \fBnetstat\fR(8),
+\fBrpcinfo\fR(8), \fBtraceroute\fR(8), \fBattributes\fR(7), \fBicmp\fR(4P),
+\fBicmp6\fR(4P)
 
 .SH DIAGNOSTICS
 .ne 2
diff --git a/usr/src/man/man8/pkgadd.8 b/usr/src/man/man8/pkgadd.8
index 214ec5d3ba..6e0118e36b 100644
--- a/usr/src/man/man8/pkgadd.8
+++ b/usr/src/man/man8/pkgadd.8
@@ -56,8 +56,8 @@ interaction throughout the installation and package request scripts are run as
 .LP
 If you have package request scripts that require running as user \fBroot\fR
 (instead of \fBnoaccess\fR [the default] or user \fBinstall\fR), use the
-\fBrscript_alt\fR parameter in the \fBadmin\fR(4) file to make an appropriate
-selection. See \fBadmin\fR(4).
+\fBrscript_alt\fR parameter in the \fBadmin\fR(5) file to make an appropriate
+selection. See \fBadmin\fR(5).
 .sp
 .LP
 Note that, in Solaris 8 and Solaris 9, the default user when running a request
@@ -66,14 +66,14 @@ system's patch level. In the current release, the default user is
 \fBnoaccess\fR.
 .sp
 .LP
-When running \fBpkgadd\fR in the global zone (see \fBzones\fR(5)), a package
-that contains a request script (see \fBpkgask\fR(1M)) is added only to the
+When running \fBpkgadd\fR in the global zone (see \fBzones\fR(7)), a package
+that contains a request script (see \fBpkgask\fR(8)) is added only to the
 global zone. The package is not propagated to any current or
 yet-to-be-installed non-global zone. This behavior mimics the effect of the
 \fB-G\fR option, described below.
 .sp
 .LP
-Package commands are \fBlargefile\fR(5)-aware. They handle files larger than 2
+Package commands are \fBlargefile\fR(7)-aware. They handle files larger than 2
 GB in the same way they handle smaller files. In their current implementations,
 \fBpkgadd\fR, \fBpkgtrans\fR(1) and other package commands can process a
 datastream of  up to 4 GB.
@@ -114,7 +114,7 @@ or yet-to-be-created non-global zone. When used in a non-global zone, the
 package(s) are added to the non-global zone only.
 .sp
 This option causes package installation to fail if, in the \fBpkginfo\fR file
-for a package, \fBSUNW_PKG_ALLZONES\fR is set to true. See \fBpkginfo\fR(4).
+for a package, \fBSUNW_PKG_ALLZONES\fR is set to true. See \fBpkginfo\fR(5).
 .RE
 
 .sp
@@ -149,7 +149,7 @@ installed files. The default mode is interactive.
 .sp .6
 .RS 4n
 Identify a file or directory which contains output from a previous
-\fBpkgask\fR(1M) session. This file supplies the interaction responses that
+\fBpkgask\fR(8) session. This file supplies the interaction responses that
 would be requested by the package in interactive mode. \fIresponse\fR must be a
 full pathname.
 .RE
@@ -173,7 +173,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -291,7 +291,7 @@ quotes (\fB\&'\fR) or preceded by a backslash (\fB\e\fR).
 .sp .6
 .RS 4n
 Install packages based on the value of the \fBCATEGORY\fR parameter stored in
-the package's \fBpkginfo\fR(4) file. All packages on the source medium whose
+the package's \fBpkginfo\fR(5) file. All packages on the source medium whose
 \fBCATEGORY\fR matches one of the specified categories will be selected for
 installation or spooling.
 .RE
@@ -425,7 +425,7 @@ Location where \fBpkgadd\fR logs an instance of software installation.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -441,9 +441,9 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .LP
 \fBpkginfo\fR(1), \fBpkgmk\fR(1), \fBpkgparam\fR(1), \fBpkgproto\fR(1),
-\fBpkgtrans\fR(1), \fBinstallf\fR(1M), \fBpkgadm\fR(1M), \fBpkgask\fR(1M),
-\fBpkgchk\fR(1M), \fBpkgrm\fR(1M), \fBremovef\fR(1M), \fBadmin\fR(4),
-\fBpkginfo\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5), \fBzones\fR(5)
+\fBpkgtrans\fR(1), \fBinstallf\fR(8), \fBpkgadm\fR(8), \fBpkgask\fR(8),
+\fBpkgchk\fR(8), \fBpkgrm\fR(8), \fBremovef\fR(8), \fBadmin\fR(5),
+\fBpkginfo\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7), \fBzones\fR(7)
 
 .SH NOTES
 .LP
@@ -467,4 +467,4 @@ needed to complete it.
 .LP
 If the default \fIadmin\fR file is too restrictive, the administration file may
 need to be modified to allow for total non-interaction during a package
-installation. See \fBadmin\fR(4) for details.
+installation. See \fBadmin\fR(5) for details.
diff --git a/usr/src/man/man8/pkgadm.8 b/usr/src/man/man8/pkgadm.8
index 9d21e9347c..08f9123286 100644
--- a/usr/src/man/man8/pkgadm.8
+++ b/usr/src/man/man8/pkgadm.8
@@ -53,7 +53,7 @@ an internal database. The \fBpkgadm\fR subcommand \fBdbstatus\fR is used to
 determine how the package internal database is implemented. The \fBdbstatus\fR
 command returns a string that indicates the type of internal database in use.
 In the current implementation, the \fBdbstatus\fR command always returns the
-string \fBtext\fR, which indicates that the \fBcontents\fR(4) package database
+string \fBtext\fR, which indicates that the \fBcontents\fR(5) package database
 is in use. Future releases of Solaris might supply alternative database
 implementations.
 .SH OPTIONS
@@ -84,7 +84,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -113,7 +113,7 @@ Print help message.
 \fBExample 1 \fRSynchronizing the contents file
 .sp
 .LP
-The following example forces any pending changes to the contents(4) file to be flushed and the pkgserv daemon to shut down.
+The following example forces any pending changes to the contents(5) file to be flushed and the pkgserv daemon to shut down.
 
 .sp
 .in +2
@@ -145,7 +145,7 @@ fatal error
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -161,17 +161,17 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .LP
 \fBpkginfo\fR(1), \fBpkgmk\fR(1), \fBpkgparam\fR(1), \fBpkgproto\fR(1),
-\fBpkgtrans\fR(1), \fBsvcs\fR(1), \fBinstallf\fR(1M), \fBpkgadd\fR(1M),
-\fBpkgask\fR(1M), \fBpkgrm\fR(1M), \fBremovef\fR(1M), \fBsvcadm\fR(1M),
-\fBadmin\fR(4), \fBcontents\fR(4), \fBexec_attr\fR(4), \fBpkginfo\fR(4),
-\fBattributes\fR(5), \fBrbac\fR(5), \fBsmf\fR(5)
+\fBpkgtrans\fR(1), \fBsvcs\fR(1), \fBinstallf\fR(8), \fBpkgadd\fR(8),
+\fBpkgask\fR(8), \fBpkgrm\fR(8), \fBremovef\fR(8), \fBsvcadm\fR(8),
+\fBadmin\fR(5), \fBcontents\fR(5), \fBexec_attr\fR(5), \fBpkginfo\fR(5),
+\fBattributes\fR(7), \fBrbac\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
 .SH NOTES
 .LP
 The service for \fBpkgadm\fR is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -183,5 +183,5 @@ svc:/system/pkgserv
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/pkgask.8 b/usr/src/man/man8/pkgask.8
index b8eb4726cc..c21743c17b 100644
--- a/usr/src/man/man8/pkgask.8
+++ b/usr/src/man/man8/pkgask.8
@@ -53,7 +53,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -65,7 +65,7 @@ zone's file system. See \fBzones\fR(5).
 .RS 16n
 Identify a file or directory which should be created to contain the responses
 to interaction with the package. The name must be a full pathname. The file, or
-directory of files, can later be used as input to the \fBpkgadd\fR(1M) command.
+directory of files, can later be used as input to the \fBpkgadd\fR(8) command.
 .RE
 
 .SH OPERANDS
@@ -106,8 +106,8 @@ An error occurred.
 .sp
 .LP
 \fBpkginfo\fR(1), \fBpkgmk\fR(1), \fBpkgparam\fR(1), \fBpkgproto\fR(1),
-\fBpkgtrans\fR(1), \fBinstallf\fR(1M), \fBpkgadd\fR(1M), \fBpkgchk\fR(1M),
-\fBpkgrm\fR(1M), \fBremovef\fR(1M), \fBadmin\fR(4), \fBattributes\fR(5)
+\fBpkgtrans\fR(1), \fBinstallf\fR(8), \fBpkgadd\fR(8), \fBpkgchk\fR(8),
+\fBpkgrm\fR(8), \fBremovef\fR(8), \fBadmin\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
@@ -118,14 +118,14 @@ The \fB-r\fR option can be used to indicate a directory name as well as a
 filename. The directory name is used to create numerous response files, each
 sharing the name of the package with which it should be associated. This would
 be used, for example, when you will be adding multiple interactive packages
-with one invocation of \fBpkgadd\fR(1M). Each package would need a response
+with one invocation of \fBpkgadd\fR(8). Each package would need a response
 file. To create multiple response files with the same name as the package
 instance, name the directory in which the files should be created and supply
 multiple instance names with the \fBpkgask\fR command. When installing the
-packages, you will be able to identify this directory to the \fBpkgadd\fR(1M)
+packages, you will be able to identify this directory to the \fBpkgadd\fR(8)
 command.
 .sp
 .LP
 If the default \fBadmin\fR file is too restrictive, the administration file may
 need to be modified to allow for total non-interaction during a package
-installation. See \fBadmin\fR(4) for details.
+installation. See \fBadmin\fR(5) for details.
diff --git a/usr/src/man/man8/pkgchk.8 b/usr/src/man/man8/pkgchk.8
index db89ee0648..57bf56bc10 100644
--- a/usr/src/man/man8/pkgchk.8
+++ b/usr/src/man/man8/pkgchk.8
@@ -223,7 +223,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -268,7 +268,7 @@ installation software database or the indicated \fBpkgmap\fR file.
 .sp .6
 .RS 4n
 Check packages based on the value of the \fBCATEGORY\fR parameter stored in the
-installed or spooled package's \fBpkginfo\fR(4) file.
+installed or spooled package's \fBpkginfo\fR(5) file.
 .RE
 
 .SH OPERANDS
@@ -400,15 +400,15 @@ An error occurred.
 .SH SEE ALSO
 .sp
 .LP
-\fBpkginfo\fR(1), \fBpkgtrans\fR(1), \fBpkgadd\fR(1M), \fBpkgask\fR(1M),
-\fBpkgrm\fR(1M), \fBpkginfo\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBpkginfo\fR(1), \fBpkgtrans\fR(1), \fBpkgadd\fR(8), \fBpkgask\fR(8),
+\fBpkgrm\fR(8), \fBpkginfo\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7)
 .sp
 .LP
 \fI\fR
 .SH NOTES
 .sp
 .LP
-Package commands are \fBlargefile\fR(5)-aware. They handle files larger than 2
+Package commands are \fBlargefile\fR(7)-aware. They handle files larger than 2
 GB in the same way they handle smaller files. In their current implementations,
-\fBpkgadd\fR(1M), \fBpkgtrans\fR(1) and other package commands can process a
+\fBpkgadd\fR(8), \fBpkgtrans\fR(1) and other package commands can process a
 datastream of  up to 4 GB.
diff --git a/usr/src/man/man8/pkgrm.8 b/usr/src/man/man8/pkgrm.8
index fb4f14dd17..9c0b35b78d 100644
--- a/usr/src/man/man8/pkgrm.8
+++ b/usr/src/man/man8/pkgrm.8
@@ -124,7 +124,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -171,7 +171,7 @@ non-existent or unreliable.
 .sp .6
 .RS 4n
 Remove packages based on the value of the \fBCATEGORY\fR parameter stored in
-the installed or spooled package's \fBpkginfo\fR(4) file. No package with the
+the installed or spooled package's \fBpkginfo\fR(5) file. No package with the
 \fBCATEGORY\fR value of \fBsystem\fR can removed from the file system with this
 option.
 .RE
@@ -294,16 +294,16 @@ Reboot after removal of this package.
 .sp
 .LP
 \fBpkginfo\fR(1), \fBpkgmk\fR(1), \fBpkgparam\fR(1), \fBpkgproto\fR(1),
-\fBpkgtrans\fR(1), \fBinstallf\fR(1M), \fBpkgadd\fR(1M), \fBpkgask\fR(1M),
-\fBpkgchk\fR(1M), \fBremovef\fR(1M), \fBadmin\fR(4), \fBpkginfo\fR(4),
-\fBattributes\fR(5), \fBlargefile\fR(5)
+\fBpkgtrans\fR(1), \fBinstallf\fR(8), \fBpkgadd\fR(8), \fBpkgask\fR(8),
+\fBpkgchk\fR(8), \fBremovef\fR(8), \fBadmin\fR(5), \fBpkginfo\fR(5),
+\fBattributes\fR(7), \fBlargefile\fR(7)
 .sp
 .LP
 \fI\fR
 .SH NOTES
 .sp
 .LP
-Package commands are \fBlargefile\fR(5)-aware. They handle files larger than 2
+Package commands are \fBlargefile\fR(7)-aware. They handle files larger than 2
 GB in the same way they handle smaller files. In their current implementations,
-\fBpkgadd\fR(1M), \fBpkgtrans\fR(1) and other package commands can process a
+\fBpkgadd\fR(8), \fBpkgtrans\fR(1) and other package commands can process a
 datastream of  up to 4 GB.
diff --git a/usr/src/man/man8/plockstat.8 b/usr/src/man/man8/plockstat.8
index b73a835e57..03aedd17ad 100644
--- a/usr/src/man/man8/plockstat.8
+++ b/usr/src/man/man8/plockstat.8
@@ -128,7 +128,7 @@ the option name and value with an equals sign (\fB=\fR).
 .ad
 .RS 16n
 Print the DTrace commands used to gather the data. The output can then be used
-directly with the \fBdtrace\fR(1M) command.
+directly with the \fBdtrace\fR(8) command.
 .RE
 
 .SH OPERANDS
@@ -199,7 +199,7 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -216,10 +216,10 @@ Interface Stability	See below.
 .LP
 The command-line syntax is Evolving. The human-readable output is Unstable.
 .SH SEE ALSO
-\fBdtrace\fR(1M), \fBlockstat\fR(1M), \fBmutex_init\fR(3C),
+\fBdtrace\fR(8), \fBlockstat\fR(8), \fBmutex_init\fR(3C),
 \fBpthread_mutex_lock\fR(3C), \fBpthread_rwlock_rdlock\fR(3C),
 \fBpthread_rwlock_wrlock\fR(3C), \fBpthread_rwlock_unlock\fR(3C),
-\fBrwlock\fR(3C), \fBattributes\fR(5), \fBfasttrap\fR(7D)
+\fBrwlock\fR(3C), \fBattributes\fR(7), \fBfasttrap\fR(4D)
 .sp
 .LP
 \fIDynamic Tracing Guide\fR:
diff --git a/usr/src/man/man8/pmadm.8 b/usr/src/man/man8/pmadm.8
index fbe6c07395..008a58fabd 100644
--- a/usr/src/man/man8/pmadm.8
+++ b/usr/src/man/man8/pmadm.8
@@ -583,4 +583,4 @@ Operation failed.
 .SH SEE ALSO
 .sp
 .LP
-\fBsac\fR(1M), \fBsacadm\fR(1M), \fBdoconfig\fR(3NSL), \fBattributes\fR(5)
+\fBsac\fR(8), \fBsacadm\fR(8), \fBdoconfig\fR(3NSL), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/pmconfig.8 b/usr/src/man/man8/pmconfig.8
index 6c341b480c..30ab7a552a 100644
--- a/usr/src/man/man8/pmconfig.8
+++ b/usr/src/man/man8/pmconfig.8
@@ -138,7 +138,7 @@ The default values are \fBPMCHANGEPERM=console-owner\fR and
 \fBCPRCHANGEPERM=console-owner\fR.
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -153,15 +153,15 @@ Interface Stability 	Unstable
 
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBpowerd\fR(1M), \fBpower.conf\fR(4), \fBsvcadm\fR(1M),
-\fBattributes\fR(5), \fBsmf\fR(5), \fBcpr\fR(7), \fBpm\fR(7D)
+\fBsvcs\fR(1), \fBpowerd\fR(8), \fBpower.conf\fR(5), \fBsvcadm\fR(8),
+\fBattributes\fR(7), \fBsmf\fR(7), \fBcpr\fR(4), \fBpm\fR(4D)
 .sp
 .LP
 \fIUsing Power Management\fR
 .SH NOTES
 .LP
 The \fBpmconfig\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -173,7 +173,7 @@ svc:/system/power:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .SH DIAGNOSTICS
 .LP
diff --git a/usr/src/man/man8/polkit-is-privileged.8 b/usr/src/man/man8/polkit-is-privileged.8
index 5b1b963da8..0abdd05e9f 100644
--- a/usr/src/man/man8/polkit-is-privileged.8
+++ b/usr/src/man/man8/polkit-is-privileged.8
@@ -21,7 +21,7 @@ can be omitted. On the Solaris operating system, RBAC authorizations names
 should be used as privilege names.
 .sp
 .LP
-Currently, the only consumer of PolicyKit is \fBhald\fR(1M).
+Currently, the only consumer of PolicyKit is \fBhald\fR(8).
 .SH OPTIONS
 .sp
 .LP
@@ -90,7 +90,7 @@ Displays version number.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -106,6 +106,6 @@ Interface Stability	Volatile
 .SH SEE ALSO
 .sp
 .LP
-\fBauths\fR(1), \fBprofiles\fR(1), \fBhald\fR(1M), \fBgetauthattr\fR(3SECDB),
-\fBauth_attr\fR(4), \fBpolicy.conf\fR(4), \fBprof_attr\fR(4),
-\fBuser_attr\fR(4), \fBattributes\fR(5)
+\fBauths\fR(1), \fBprofiles\fR(1), \fBhald\fR(8), \fBgetauthattr\fR(3SECDB),
+\fBauth_attr\fR(5), \fBpolicy.conf\fR(5), \fBprof_attr\fR(5),
+\fBuser_attr\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/pooladm.8 b/usr/src/man/man8/pooladm.8
index 5c3530031f..ff9d0b82f4 100644
--- a/usr/src/man/man8/pooladm.8
+++ b/usr/src/man/man8/pooladm.8
@@ -177,7 +177,7 @@ example# \fB/usr/sbin/pooladm -e\fR
 .sp
 .LP
 The following command enables the pool facility through use of the Service
-Management Facility. See \fBsmf\fR(5).
+Management Facility. See \fBsmf\fR(7).
 
 .sp
 .in +2
@@ -215,7 +215,7 @@ Configuration file for \fBpooladm\fR.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -234,8 +234,8 @@ The invocation is Evolving. The output is Unstable.
 .SH SEE ALSO
 .sp
 .LP
-\fBpoolcfg\fR(1M), \fBpoolbind\fR(1M), \fBpsrset\fR(1M), \fBsvcadm\fR(1M),
-\fBpset_destroy\fR(2), \fBlibpool\fR(3LIB), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBpoolcfg\fR(8), \fBpoolbind\fR(8), \fBpsrset\fR(8), \fBsvcadm\fR(8),
+\fBpset_destroy\fR(2), \fBlibpool\fR(3LIB), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
@@ -254,9 +254,9 @@ is active. See \fBlibpool\fR(3LIB).
 .sp
 .LP
 You cannot enable the pools facility on a system where processor sets have been
-created. Use the \fBpsrset\fR(1M) command or \fBpset_destroy\fR(2) to destroy
+created. Use the \fBpsrset\fR(8) command or \fBpset_destroy\fR(2) to destroy
 processor sets manually before you enable the pools facility.
 .sp
 .LP
-Because the Resource Pools facility is an \fBsmf\fR(5) service, it can also be
+Because the Resource Pools facility is an \fBsmf\fR(7) service, it can also be
 enabled and disabled using the standard SMF interfaces.
diff --git a/usr/src/man/man8/poolbind.8 b/usr/src/man/man8/poolbind.8
index fadb68634e..5172eb0bae 100644
--- a/usr/src/man/man8/poolbind.8
+++ b/usr/src/man/man8/poolbind.8
@@ -87,7 +87,7 @@ IDs to the specified pool.
 .RS 10n
 \fIidlist\fR is a list of project \fBID\fRs. Bind all processes within the list
 of projects to the specified pool. Each project \fBID\fR can be specified as
-either a project name or a numerical project \fBID\fR. See \fBproject\fR(4).
+either a project name or a numerical project \fBID\fR. See \fBproject\fR(5).
 .RE
 
 .sp
@@ -98,7 +98,7 @@ either a project name or a numerical project \fBID\fR. See \fBproject\fR(4).
 .RS 10n
 \fIidlist\fR is a list of zone \fBID\fRs. Bind all processes within the list of
 zones to the specified pool. Each zone \fBID\fR can be specified as either a
-zone name or a numerical zone \fBID\fR. See \fBzones\fR(5).
+zone name or a numerical zone \fBID\fR. See \fBzones\fR(7).
 .RE
 
 .RE
@@ -230,7 +230,7 @@ Invalid command line options were specified.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -249,8 +249,8 @@ The invocation is Evolving. The output is Unstable.
 .SH SEE ALSO
 .sp
 .LP
-\fBpooladm\fR(1M), \fBpoolcfg\fR(1M), \fBlibpool\fR(3LIB), \fBproject\fR(4),
-\fBattributes\fR(5), \fBzones\fR(5)
+\fBpooladm\fR(8), \fBpoolcfg\fR(8), \fBlibpool\fR(3LIB), \fBproject\fR(5),
+\fBattributes\fR(7), \fBzones\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/poolcfg.8 b/usr/src/man/man8/poolcfg.8
index aff733b177..73b1dab468 100644
--- a/usr/src/man/man8/poolcfg.8
+++ b/usr/src/man/man8/poolcfg.8
@@ -29,7 +29,7 @@ The \fBpoolcfg\fR utility provides configuration operations on pools and sets.
 These operations are performed upon an existing configuration and take the form
 of modifications to the specified configuration file. If you use the \fB-d\fR
 option, the modifications occur to the kernel state. Actual activation of the
-resulting configuration is achieved by way of the \fBpooladm\fR(1M) utility.
+resulting configuration is achieved by way of the \fBpooladm\fR(8) utility.
 .sp
 .LP
 Pools configuration files are structured files that must have been constructed
@@ -191,7 +191,7 @@ This command is a NO-OP when \fBpoolcfg\fR operates directly on the kernel. See
 the \fB-d\fR option.
 .sp
 You should avoid use of this command. The preferred method for creating a
-configuration is to export the dynamic configuration using \fBpooladm\fR(1M)
+configuration is to export the dynamic configuration using \fBpooladm\fR(8)
 with the \fB-s\fR option.
 .RE
 
@@ -314,7 +314,7 @@ A 64-bit unsigned integer value.
 .ad
 .RS 11n
 Strings are delimited by quotes (\fB"\fR), and support the character escape
-sequences defined in \fBformats\fR(5).
+sequences defined in \fBformats\fR(7).
 .RE
 
 .sp
@@ -453,7 +453,7 @@ processor set \fBpset2\fR in the kernel:
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -472,8 +472,8 @@ The invocation is Committed. The output is Uncommitted.
 .SH SEE ALSO
 .sp
 .LP
-\fBpooladm\fR(1M), \fBpoolbind\fR(1M), \fBlibpool\fR(3LIB),
-\fBattributes\fR(5), \fBformats\fR(5)
+\fBpooladm\fR(8), \fBpoolbind\fR(8), \fBlibpool\fR(3LIB),
+\fBattributes\fR(7), \fBformats\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/poold.8 b/usr/src/man/man8/poold.8
index 1e915a50cf..deb645e1f9 100644
--- a/usr/src/man/man8/poold.8
+++ b/usr/src/man/man8/poold.8
@@ -16,7 +16,7 @@ poold \- automated resource pools partitioning daemon
 .LP
 \fBpoold\fR provides automated resource partitioning facilities. \fBpoold\fR
 can be enabled or disabled using the Solaris Service Management Facility,
-\fBsmf\fR(5). \fBpoold\fR requires the Resource Pools facility to be active in
+\fBsmf\fR(7). \fBpoold\fR requires the Resource Pools facility to be active in
 order to operate.
 .sp
 .LP
@@ -177,7 +177,7 @@ The following command enables dynamic resource pools:
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -195,9 +195,9 @@ Interface Stability	See below.
 The invocation is Evolving. The output is Unstable.
 .SH SEE ALSO
 .LP
-\fBpooladm\fR(1M), \fBpoolbind\fR(1M), \fBpoolcfg\fR(1M), \fBpoolstat\fR(1M),
-\fBsvcadm\fR(1M), \fBpool_set_status\fR(3POOL), \fBlibpool\fR(3LIB),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBpooladm\fR(8), \fBpoolbind\fR(8), \fBpoolcfg\fR(8), \fBpoolstat\fR(8),
+\fBsvcadm\fR(8), \fBpool_set_status\fR(3POOL), \fBlibpool\fR(3LIB),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/poolstat.8 b/usr/src/man/man8/poolstat.8
index 2009ed4587..e3c29fd556 100644
--- a/usr/src/man/man8/poolstat.8
+++ b/usr/src/man/man8/poolstat.8
@@ -368,7 +368,7 @@ Invalid command line options were specified.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -384,7 +384,7 @@ Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBlibpool\fR(3LIB), \fBattributes\fR(5)
+\fBlibpool\fR(3LIB), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/ports.8 b/usr/src/man/man8/ports.8
index 6f6325cae2..a92d377053 100644
--- a/usr/src/man/man8/ports.8
+++ b/usr/src/man/man8/ports.8
@@ -16,7 +16,7 @@ ports \- creates /dev entries and inittab entries for serial lines
 .SH DESCRIPTION
 .sp
 .LP
-\fBdevfsadm\fR(1M) is now the preferred command for \fB/dev\fR and
+\fBdevfsadm\fR(8) is now the preferred command for \fB/dev\fR and
 \fB/devices\fR and should be used instead of \fBports\fR.
 .sp
 .LP
@@ -53,7 +53,7 @@ Creates new \fB/dev/term\fR and \fB/dev/cua\fR links for new serial devices.
 .RS +4
 .TP
 4.
-Invokes \fBsacadm\fR(1M) to make new port monitor entries for the new
+Invokes \fBsacadm\fR(8) to make new port monitor entries for the new
 devices. This is not done automatically for on-board ports; on workstations
 these ports are often not used for dial-in sessions, so a port-monitor for one
 of these ports must be created explicitly.
@@ -122,7 +122,7 @@ The following options are supported:
 .RS 14n
 Causes \fBports\fR to presume that the \fB/dev/term\fR, \fB/dev/cua\fR, and
 \fB/devices\fR directories are found under \fIrootdir\fR, not directly under
-\fB/\fR. If this argument is specified, \fBsacadm\fR(1M) is not invoked, since
+\fB/\fR. If this argument is specified, \fBsacadm\fR(8) is not invoked, since
 it would update terminal administration files under \fB/etc\fR without regard
 to the \fIrootdir\fR.
 .RE
@@ -286,8 +286,8 @@ Logical dialout port devices
 .SH SEE ALSO
 .sp
 .LP
-\fBadd_drv\fR(1M), \fBdevfsadm\fR(1M), \fBdrvconfig\fR(1M), \fBpmadm\fR(1M),
-\fBsacadm\fR(1M), \fBattributes\fR(5), \fBdevfs\fR(7FS), \fBattach\fR(9E),
+\fBadd_drv\fR(8), \fBdevfsadm\fR(8), \fBdrvconfig\fR(8), \fBpmadm\fR(8),
+\fBsacadm\fR(8), \fBattributes\fR(7), \fBdevfs\fR(4FS), \fBattach\fR(9E),
 \fBddi_create_minor_node\fR(9F)
 .sp
 .LP
diff --git a/usr/src/man/man8/powerd.8 b/usr/src/man/man8/powerd.8
index 3aac1c5911..bc408e4132 100644
--- a/usr/src/man/man8/powerd.8
+++ b/usr/src/man/man8/powerd.8
@@ -14,7 +14,7 @@ powerd \- power manager daemon
 
 .SH DESCRIPTION
 .LP
-The \fBpowerd\fR daemon is started by \fBpmconfig\fR(1M) to monitor system
+The \fBpowerd\fR daemon is started by \fBpmconfig\fR(8) to monitor system
 activity and perform an automatic shutdown using the suspend-resume feature.
 When the system is suspended, complete current state is saved on the disk
 before power is removed. On reboot, the system automatically starts a resume
@@ -22,7 +22,7 @@ operation and the system is restored to the same state it was in immediately
 prior to suspend.
 .sp
 .LP
-Immediately prior to system shutdown, the daemon notifies \fBsyslogd\fR(1M) of
+Immediately prior to system shutdown, the daemon notifies \fBsyslogd\fR(8) of
 the shutdown, which broadcasts a notification.
 .SH OPTIONS
 .LP
@@ -34,7 +34,7 @@ The following option is supported:
 .ad
 .RS 6n
 No broadcast mode. The daemon silently shuts down the system without notifying
-\fBsyslogd\fR(1M).
+\fBsyslogd\fR(8).
 .RE
 
 .SH FILES
@@ -48,7 +48,7 @@ Power Management configuration information file
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -63,8 +63,8 @@ Interface Stability 	Unstable
 
 .SH SEE ALSO
 .LP
-\fBpmconfig\fR(1M), \fBsyslogd\fR(1M), \fBpower.conf\fR(4),
-\fBattributes\fR(5), \fBcpr\fR(7), \fBpm\fR(7D)
+\fBpmconfig\fR(8), \fBsyslogd\fR(8), \fBpower.conf\fR(5),
+\fBattributes\fR(7), \fBcpr\fR(4), \fBpm\fR(4D)
 .sp
 .LP
 \fIUsing Power Management\fR
diff --git a/usr/src/man/man8/powertop.8 b/usr/src/man/man8/powertop.8
index 10088a1f93..4cfb444f9b 100644
--- a/usr/src/man/man8/powertop.8
+++ b/usr/src/man/man8/powertop.8
@@ -57,7 +57,7 @@ This feature is most useful when invoked while the application being analyzed
 is running.
 .sp
 .LP
-\fBPowerTOP\fR runs on \fBxVM\fR(5) domains. However, the report for idle state
+\fBPowerTOP\fR runs on \fBxVM\fR(7) domains. However, the report for idle state
 transitions might or might not be accurate as the physical CPU can be shared by
 different virtual CPUs. Both wakeup count and event report displays information
 regarding the current virtualized environment.
@@ -206,7 +206,7 @@ Incorrect usage.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -223,9 +223,9 @@ Interface Stability	Volatile
 
 .SH SEE ALSO
 .LP
-\fBkstat\fR(1M), \fBpmconfig\fR(1M), \fBpowerd\fR(1M), \fBpsrinfo\fR(1M),
-\fBuadmin\fR(2), \fBlibdevinfo\fR(3LIB), \fBattributes\fR(5), \fBxVM\fR(5),
-\fBcpr\fR(7), \fBpm\fR(7D), \fBpm-components\fR(9P), \fBremovable-media\fR(9P)
+\fBkstat\fR(8), \fBpmconfig\fR(8), \fBpowerd\fR(8), \fBpsrinfo\fR(8),
+\fBuadmin\fR(2), \fBlibdevinfo\fR(3LIB), \fBattributes\fR(7), \fBxVM\fR(7),
+\fBcpr\fR(4), \fBpm\fR(4D), \fBpm-components\fR(9P), \fBremovable-media\fR(9P)
 .SH USAGE
 .LP
 You must have \fBDTrace\fR privileges to run \fBPowerTOP\fR and root
diff --git a/usr/src/man/man8/ppdmgr.8 b/usr/src/man/man8/ppdmgr.8
index 7d4506812d..c0178ea3f0 100644
--- a/usr/src/man/man8/ppdmgr.8
+++ b/usr/src/man/man8/ppdmgr.8
@@ -28,7 +28,7 @@ ppdmgr \- utility for managing PPD files
 The PPD File Manager adds PPD files to the print system's PPD file
 repositories. When changes in the PPD file repositories are made by the
 utility, they are reflected in the Solaris Print Manager (see
-\fBprintmgr\fR(1M)) GUI printer driver field when adding or modifying local
+\fBprintmgr\fR(8)) GUI printer driver field when adding or modifying local
 attached or network attached printers.
 .sp
 .LP
@@ -38,7 +38,7 @@ are supplied by third party vendors may be available in the "\fBvendor\fR"
 repository. PPD files that are supplied by system administrators may be
 available in the "\fBadmin\fR" repository, and PPD files that are added using
 this utility are available in the "user" repository. When this utility is used
-to update or rebuild printer information reflected in the \fBprintmgr\fR(1M),
+to update or rebuild printer information reflected in the \fBprintmgr\fR(8),
 the special reserved repository name "\fBall\fR" can be used to specify all of
 the available PPD file repositories.
 .sp
@@ -298,7 +298,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -314,4 +314,4 @@ Interface Stability	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBprintmgr\fR(1M), \fBattributes\fR(5)
+\fBprintmgr\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/pppd.8 b/usr/src/man/man8/pppd.8
index b6c47981c5..378c88cb1d 100644
--- a/usr/src/man/man8/pppd.8
+++ b/usr/src/man/man8/pppd.8
@@ -126,7 +126,7 @@ Request a callback to the given telephone number using Microsoft CBCP.
 .ad
 .RS 23n
 Use the executable or shell command specified by \fIscript\fR to set up the
-serial line. This script would typically use the \fBchat\fR(1M) program to dial
+serial line. This script would typically use the \fBchat\fR(8) program to dial
 the modem and start the remote \fBPPP\fR session. A value for this option
 originating from a privileged source cannot be overridden by a non-privileged
 user.
@@ -208,7 +208,7 @@ of the use of this option.
 .ad
 .RS 23n
 Run the executable or shell command specified by \fIscript\fR to initialize the
-serial line. This script would typically use the \fBchat\fR(1M) program to
+serial line. This script would typically use the \fBchat\fR(8) program to
 configure the modem to enable auto-answer. A value for this option from a
 privileged source cannot be overridden by a non-privileged user.
 .RE
@@ -771,7 +771,7 @@ Enable debugging code in the kernel-level PPP driver. Argument \fIn\fR is the
 sum of the following values: \fB1\fR to enable general debug messages, \fB2\fR
 to request that contents of received packets be printed, and \fB4\fR to request
 contents of transmitted packets be printed. Messages printed by the kernel are
-logged by \fBsyslogd\fR(1M) to a file directed in the \fB/etc/syslog.conf\fR
+logged by \fBsyslogd\fR(8) to a file directed in the \fB/etc/syslog.conf\fR
 configuration file. Do not use the \fBkdebug\fR option to debug failed links.
 Use the \fBdebug\fR option instead.
 .RE
@@ -1265,8 +1265,8 @@ the \fBpersist\fR or \fBdemand\fR option is specified.
 .RS 4n
 Cause \fBpppd\fR to use I_LINK instead of I_PLINK. This is the default. When
 I_LINK is used, the system cleans up terminated interfaces (even when SIGKILL
-is used) but does not allow \fBifconfig\fR(1M) to unplumb PPP streams or insert
-or remove modules dynamically. Use the \fBplink\fR option if \fBifconfig\fR(1M)
+is used) but does not allow \fBifconfig\fR(8) to unplumb PPP streams or insert
+or remove modules dynamically. Use the \fBplink\fR option if \fBifconfig\fR(8)
 modinsert, modremove or unplumb support is needed.
 .RE
 
@@ -1425,8 +1425,8 @@ connection.
 .RS 4n
 Cause \fBpppd\fR to use I_PLINK instead of I_LINK. The default is to use
 I_LINK, which cleans up terminated interface (even if SIGKILL is used), but
-does not allow \fBifconfig\fR(1M) to unplumb PPP streams or insert or remove
-modules dynamically. Use this option if \fBifconfig\fR(1M)
+does not allow \fBifconfig\fR(8) to unplumb PPP streams or insert or remove
+modules dynamically. Use this option if \fBifconfig\fR(8)
 modinsert/modremove/unplumb support is needed. See also the \fBplumbed\fR
 option.
 .RE
@@ -1456,7 +1456,7 @@ that for the session. If IPv4 addresses or IPv6 interface IDs or link MTU are
 otherwise unspecified, they are copied from the interface selected. This mode
 mimics some of the functionality of the older \fBaspppd\fR implementation and
 may be helpful when \fBpppd\fR is used with external applications that use
-\fBifconfig\fR(1M).
+\fBifconfig\fR(8).
 .RE
 
 .sp
@@ -1541,7 +1541,7 @@ user-ID and permissions. Because this option uses a pseudo-tty and a process to
 transfer characters between the pseudo-tty and the real serial device, it
 increases the latency and CPU overhead of transferring data over the PPP
 interface. Characters are stored in a tagged format with timestamps that can be
-displayed in readable form using the \fBpppdump\fR(1M) program. This option is
+displayed in readable form using the \fBpppdump\fR(8) program. This option is
 generally used when debugging the kernel portion of \fBpppd\fR (especially CCP
 compression algorithms) and not for debugging link configuration problems. See
 the \fBdebug\fR option.
@@ -1725,7 +1725,7 @@ Set PPP interface unit number to \fIn\fR, if possible.
 .RS 4n
 With this option, \fBpppd\fR detaches from its controlling terminal after
 establishing the PPP connection. When this is specified, messages sent to
-\fBstderr\fR by the connect script, usually \fBchat\fR(1M), and debugging
+\fBstderr\fR by the connect script, usually \fBchat\fR(8), and debugging
 messages from the debug option are directed to \fBpppd\fR's standard output.
 .RE
 
@@ -2262,7 +2262,7 @@ cua/a 19200 crtscts connect '/usr/bin/chat -f /etc/ppp/chat-isp' noauth
 
 .sp
 .LP
-For this example, \fBchat\fR(1M) is used to dial the ISP's modem and process
+For this example, \fBchat\fR(8) is used to dial the ISP's modem and process
 any login sequence required. The \fB/etc/ppp/chat-isp\fR file is used by
 \fBchat\fR and could contain the following:
 
@@ -2287,7 +2287,7 @@ OK "atdt2468135"
 
 .sp
 .LP
-See the \fBchat\fR(1M) man page for details of \fBchat\fR scripts.
+See the \fBchat\fR(8) man page for details of \fBchat\fR scripts.
 
 .LP
 \fBExample 2 \fRUsing \fBpppd\fR with \fBproxyarp\fR
@@ -2616,7 +2616,7 @@ but only to certain trusted peers.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -2630,8 +2630,8 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-\fBchat\fR(1M), \fBifconfig\fR(1M), \fBcrypt\fR(3C), \fBpam\fR(3PAM),
-\fBattributes\fR(5)
+\fBchat\fR(8), \fBifconfig\fR(8), \fBcrypt\fR(3C), \fBpam\fR(3PAM),
+\fBattributes\fR(7)
 .sp
 .LP
 Haskin, D., Allen, E. \fIRFC 2472 - IP Version 6 Over PPP\fR. Network Working
diff --git a/usr/src/man/man8/pppdump.8 b/usr/src/man/man8/pppdump.8
index 0810c3922e..ac6023845a 100644
--- a/usr/src/man/man8/pppdump.8
+++ b/usr/src/man/man8/pppdump.8
@@ -61,4 +61,4 @@ Use \fImru\fR as the MRU (maximum receive unit) for both directions of
 the link when checking for over-length PPP packets (with the \fB-p\fR
 option).
 .SH SEE ALSO
-pppd(1m)
+pppd(8)
diff --git a/usr/src/man/man8/pppoec.8 b/usr/src/man/man8/pppoec.8
index e7db28863f..9cb6f6d93c 100644
--- a/usr/src/man/man8/pppoec.8
+++ b/usr/src/man/man8/pppoec.8
@@ -22,8 +22,8 @@ pppoec \- PPPoE chat utility
 .sp
 .LP
 The \fBpppoec\fR utility implements the client-side negotiation of PPPoE. It is
-intended to be used with the \fBpppd\fR(1M) \fBconnect\fR option, in the same
-manner as the \fBchat\fR(1M) utility is used for asynchronous dial-up PPP.
+intended to be used with the \fBpppd\fR(8) \fBconnect\fR option, in the same
+manner as the \fBchat\fR(8) utility is used for asynchronous dial-up PPP.
 .sp
 .LP
 When given with the \fB-i\fR flag, \fBpppoec\fR sends out a broadcast query on
@@ -34,7 +34,7 @@ services are displayed on standard output.
 .LP
 Otherwise, when given without the \fB-i\fR flag, \fBpppoec\fR does the full
 PPPoE client-side negotiation. The \fIdevice\fR parameter is the intended
-Ethernet interface, and must already be plumbed with \fBsppptun\fR(1M). The
+Ethernet interface, and must already be plumbed with \fBsppptun\fR(8). The
 optional \fIservice\fR parameter specifies a particular service desired; other
 offered services will be ignored. The optional \fIserver\fR parameter specifies
 a specific server desired. You can specify \fIserver\fR as an Ethernet address
@@ -253,7 +253,7 @@ usual location of error output (see DIAGNOSTICS, below)
 .SH SEE ALSO
 .sp
 .LP
-\fBpppd\fR(1M), \fBsppptun\fR(1M), \fBpppoed\fR(1M), \fBsppptun\fR(7M)
+\fBpppd\fR(8), \fBsppptun\fR(8), \fBpppoed\fR(8), \fBsppptun\fR(4M)
 .sp
 .LP
 \fIRFC 2516, Method for Transmitting PPP Over Ethernet (PPPoE)\fR, Mamakos et
diff --git a/usr/src/man/man8/pppoed.8 b/usr/src/man/man8/pppoed.8
index 3218ee25e9..6e108efe6c 100644
--- a/usr/src/man/man8/pppoed.8
+++ b/usr/src/man/man8/pppoed.8
@@ -16,7 +16,7 @@ pppoed \- PPPoE server daemon
 .sp
 .LP
 The \fBpppoed\fR daemon implements the server-side negotiation of PPPoE. When a
-client requests service from this daemon, a copy of \fBpppd\fR(1M) is invoked
+client requests service from this daemon, a copy of \fBpppd\fR(8) is invoked
 to handle the actual PPP communication.
 .sp
 .LP
@@ -50,7 +50,7 @@ delimit tokens, quotes to enclose strings that can contain whitespace, and
 escape sequences for special characters. Environment variables are substituted
 using familiar \fB$VAR\fR and \fB${VAR}\fR syntax and set using
 \fBNEWVAR=\fIstring\fR\fR. Variables are both usable in subsequent options and
-provided to the \fBpppd\fR(1M) processes spawned for each client, but they are
+provided to the \fBpppd\fR(8) processes spawned for each client, but they are
 interpreted as they are encountered during option processing. Thus, all set
 variables are seen by all processes spawned; position in the configuration
 files has no effect on this.
@@ -127,7 +127,7 @@ per-device \fB/etc/ppp/pppoe.\fIdevice\fR\fR files.
 .ad
 .sp .6
 .RS 4n
-Specifies extra options to \fBpppd\fR(1M). It defaults to "\fBplugin pppoe.so
+Specifies extra options to \fBpppd\fR(8). It defaults to "\fBplugin pppoe.so
 directtty\fR" and usually does not need to be overridden.
 .RE
 
@@ -405,7 +405,7 @@ ASCII text file containing dumped \fBpppoed\fR state information
 .SH SEE ALSO
 .sp
 .LP
-\fBpppd\fR(1M), \fBpppoec\fR(1M), \fBsppptun\fR(1M), \fBsppptun\fR(7M)
+\fBpppd\fR(8), \fBpppoec\fR(8), \fBsppptun\fR(8), \fBsppptun\fR(4M)
 .sp
 .LP
 Mamakos, L., et al. \fIRFC 2516, A Method for Transmitting PPP Over Ethernet
@@ -419,7 +419,7 @@ are ignored.
 .sp
 .LP
 The Ethernet interfaces to be used must be plumbed for PPPoE using the
-\fBsppptun\fR(1M) utility before services can be offered.
+\fBsppptun\fR(8) utility before services can be offered.
 .sp
 .LP
 The daemon operate runs even if there are no services to offer. If you want to
diff --git a/usr/src/man/man8/pppstats.8 b/usr/src/man/man8/pppstats.8
index 7bdf40abf3..9ede9b8376 100644
--- a/usr/src/man/man8/pppstats.8
+++ b/usr/src/man/man8/pppstats.8
@@ -380,7 +380,7 @@ Recent compression ratio for outgoing packets.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5)  for descriptions of the following attributes:
+See \fBattributes\fR(7)  for descriptions of the following attributes:
 .sp
 
 .sp
@@ -396,4 +396,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBpppd\fR(1M), \fBattributes\fR(5)
+\fBpppd\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/praudit.8 b/usr/src/man/man8/praudit.8
index 71d77c6fc3..9e97b22fe9 100644
--- a/usr/src/man/man8/praudit.8
+++ b/usr/src/man/man8/praudit.8
@@ -15,7 +15,7 @@ praudit \- print contents of an audit trail file
 .SH DESCRIPTION
 \fBpraudit\fR reads the listed \fIfilename\fRs (or standard input, if no
 \fIfilename\fR is specified) and interprets the data as audit trail records as
-defined in \fBaudit.log\fR(4). By default, times, user and group \fBID\fRs
+defined in \fBaudit.log\fR(5). By default, times, user and group \fBID\fRs
 (\fBUID\fRs and \fBGID\fRs, respectively) are converted to their \fBASCII\fR
 representation. Record type and event fields are converted to their \fBASCII\fR
 representation. A maximum of 100 audit files can be specified on the command
@@ -67,7 +67,7 @@ exclusive. If both are used, a format usage error message is output.
 .RS 4n
 Display records in their short form. Numeric fields' ASCII equivalents are
 looked up by means of the sources specified in the \fB/etc/nsswitch.conf\fR
-file (see \fBnsswitch.conf\fR(4)). All numeric fields are converted to ASCII
+file (see \fBnsswitch.conf\fR(5)). All numeric fields are converted to ASCII
 and then displayed. The short \fBASCII\fR representations for the record type
 and event fields are used. This option and the \fB-r\fR option are exclusive.
 If both are used, a format usage error message is output.
@@ -162,7 +162,7 @@ example, \fBadt_record.xsl.1\fR.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -179,8 +179,8 @@ Interface Stability	See below
 .LP
 The command stability is evolving. The output format is unstable.
 .SH SEE ALSO
-\fBgetent\fR(1M), \fBaudit\fR(2), \fBgetauditflags\fR(3BSM),
+\fBgetent\fR(8), \fBaudit\fR(2), \fBgetauditflags\fR(3BSM),
 \fBgetpwuid\fR(3C), \fBgethostbyaddr\fR(3NSL), \fBethers\fR(3SOCKET),
-\fBgetipnodebyaddr\fR(3SOCKET), \fBaudit.log\fR(4), \fBaudit_class\fR(4),
-\fBaudit_event\fR(4), \fBgroup\fR(4), \fBnsswitch.conf\fR(4), \fBpasswd\fR(4),
-\fBattributes\fR(5)
+\fBgetipnodebyaddr\fR(3SOCKET), \fBaudit.log\fR(5), \fBaudit_class\fR(5),
+\fBaudit_event\fR(5), \fBgroup\fR(5), \fBnsswitch.conf\fR(5), \fBpasswd\fR(5),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/print-service.8 b/usr/src/man/man8/print-service.8
index 1e393dcaa0..b83d7fb8d9 100644
--- a/usr/src/man/man8/print-service.8
+++ b/usr/src/man/man8/print-service.8
@@ -157,7 +157,7 @@ An error occurred.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -172,7 +172,7 @@ Interface Stability	Obsolete
 
 .SH SEE ALSO
 .LP
-\fBIntro\fR(1), \fBattributes\fR(5)
+\fBIntro\fR(1), \fBattributes\fR(7)
 .SH NOTES
 .LP
 The print queue configuration saved and restored during export, import, and
diff --git a/usr/src/man/man8/printmgr.8 b/usr/src/man/man8/printmgr.8
index ea2ec15062..56abf34973 100644
--- a/usr/src/man/man8/printmgr.8
+++ b/usr/src/man/man8/printmgr.8
@@ -107,7 +107,7 @@ print server or from the name service environment.
 
 .SH SEE ALSO
 .LP
-\fBldap\fR(1), \fBlpget\fR(1M), \fBlpset\fR(1M), \fBattributes\fR(5)
+\fBldap\fR(1), \fBlpget\fR(8), \fBlpset\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 \fISystem Administration Guide: Solaris Printing\fR for information on LDAP
diff --git a/usr/src/man/man8/projadd.8 b/usr/src/man/man8/projadd.8
index 1f48e560e9..070d29691f 100644
--- a/usr/src/man/man8/projadd.8
+++ b/usr/src/man/man8/projadd.8
@@ -74,7 +74,7 @@ specified to set values on multiple keys, such as:
 Resource control attributes use parentheses to specify values for a key.
 Because many user shells interpret parentheses as special characters, it is
 best to enclose an argument to \fB-K\fR that contains parentheses with double
-quotes, as shown above and in EXAMPLES, below. See \fBresource_controls\fR(5)
+quotes, as shown above and in EXAMPLES, below. See \fBresource_controls\fR(7)
 for a description of the resource controls you can specify for a project.
 .RE
 
@@ -183,7 +183,7 @@ Comparing the \fBprojadd\fR command and resulting output in \fB/etc/project\fR,
 note the effect of the scaling factor in the resource cap
 (\fBrcap.max-rss=10GB\fR) and the resource control
 (\fBprocess.max-file-size=(priv,50MB,deny)\fR). Modifiers, such as B, KB, and
-MB, and scaling factors are specified in \fBresource_controls\fR(5).
+MB, and scaling factors are specified in \fBresource_controls\fR(7).
 
 .SH EXIT STATUS
 .LP
@@ -230,7 +230,7 @@ The \fIprojid\fR given with the \fB-p\fR option is already in use.
 \fB\fB5\fR\fR
 .ad
 .RS 6n
-The project files contain an error. See \fBproject\fR(4).
+The project files contain an error. See \fBproject\fR(5).
 .RE
 
 .sp
@@ -271,7 +271,7 @@ System project file
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -289,10 +289,10 @@ Interface Stability	See below.
 Invocation is evolving. Human readable output is unstable.
 .SH SEE ALSO
 .LP
-\fBprojects\fR(1), \fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBgroupmod\fR(1M),
-\fBgrpck\fR(1M), \fBprojdel\fR(1M), \fBprojmod\fR(1M), \fBuseradd\fR(1M),
-\fBuserdel\fR(1M), \fBusermod\fR(1M), \fBproject\fR(4), \fBattributes\fR(5),
-\fBresource_controls\fR(5)
+\fBprojects\fR(1), \fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8),
+\fBgrpck\fR(8), \fBprojdel\fR(8), \fBprojmod\fR(8), \fBuseradd\fR(8),
+\fBuserdel\fR(8), \fBusermod\fR(8), \fBproject\fR(5), \fBattributes\fR(7),
+\fBresource_controls\fR(7)
 .SH NOTES
 .LP
 In case of an error, \fBprojadd\fR prints an error message and exits with a
diff --git a/usr/src/man/man8/projdel.8 b/usr/src/man/man8/projdel.8
index e56c225567..7f8dded660 100644
--- a/usr/src/man/man8/projdel.8
+++ b/usr/src/man/man8/projdel.8
@@ -87,7 +87,7 @@ The \fIprojid\fR given with the \fB-p\fR option is already in use.
 \fB\fB5\fR\fR
 .ad
 .RS 6n
-The project files contain an error. See \fBproject\fR(4).
+The project files contain an error. See \fBproject\fR(5).
 .RE
 
 .sp
@@ -128,7 +128,7 @@ System project file
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -146,10 +146,10 @@ Interface Stability	See below.
 Invocation is evolving. Human readable output is unstable.
 .SH SEE ALSO
 .LP
-\fBprojects\fR(1), \fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBgroupmod\fR(1M),
-\fBgrpck\fR(1M), \fBlogins\fR(1M), \fBprojadd\fR(1M), \fBprojmod\fR(1M),
-\fBuseradd\fR(1M), \fBuserdel\fR(1M), \fBusermod\fR(1M), \fBproject\fR(4),
-\fBattributes\fR(5)
+\fBprojects\fR(1), \fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8),
+\fBgrpck\fR(8), \fBlogins\fR(8), \fBprojadd\fR(8), \fBprojmod\fR(8),
+\fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8), \fBproject\fR(5),
+\fBattributes\fR(7)
 .SH DIAGNOSTICS
 .LP
 In case of an error, \fBprojdel\fR prints an error message and exits with a
diff --git a/usr/src/man/man8/projmod.8 b/usr/src/man/man8/projmod.8
index b45cab8373..2ec0d34525 100644
--- a/usr/src/man/man8/projmod.8
+++ b/usr/src/man/man8/projmod.8
@@ -108,7 +108,7 @@ multiple keys, such as:
 Resource control attributes use parentheses to specify values for a key.
 Because many user shells interpret parentheses as special characters, it is
 best to enclose an argument to \fB-K\fR that contains parentheses with double
-quotes, as shown above and in EXAMPLES, below. See \fBresource_controls\fR(5)
+quotes, as shown above and in EXAMPLES, below. See \fBresource_controls\fR(7)
 for a description of the resource controls you can specify for a project.
 .RE
 
@@ -221,7 +221,7 @@ project.
 \fBExample 1\fR Using the \fB-K\fR Option for Addition of an Attribute Value
 .sp
 .LP
-Consider the following \fBproject\fR(4) entry:
+Consider the following \fBproject\fR(5) entry:
 
 .sp
 .in +2
@@ -278,7 +278,7 @@ task.max-lwps=(priv,100,deny),(priv,1000,signal=KILL)
 Value
 .sp
 .LP
-Assume an attributes field in a \fBproject\fR(4) entry for the project
+Assume an attributes field in a \fBproject\fR(5) entry for the project
 \fBsalesaudit\fR that lists the following resource control:
 
 .sp
@@ -315,7 +315,7 @@ task.max-lwps=(priv,500,signal=SIGSTOP)
 \fBExample 3\fR Using the \fB-K\fR Option for Removal of an Attribute Value
 .sp
 .LP
-Assume an attributes field in a \fBproject\fR(4) entry for a project
+Assume an attributes field in a \fBproject\fR(5) entry for a project
 \fBsalesaudit\fR that lists the following resource control:
 
 .sp
@@ -415,7 +415,7 @@ process.max-file-size=(priv,52428800,deny)
 .LP
 That is, \fB50MB\fR is expanded to \fB52428800\fR. The modifiers, such as MB,
 and scaling factors you can use for resource controls are specified in
-\fBresource_controls\fR(5).
+\fBresource_controls\fR(7).
 
 .LP
 \fBExample 5\fR Binding a Pool to a Project
@@ -494,7 +494,7 @@ The \fIprojid\fR given with the \fB-p\fR option is already in use.
 \fB\fB5\fR\fR
 .ad
 .RS 6n
-The project files contain an error. See \fBproject\fR(4).
+The project files contain an error. See \fBproject\fR(5).
 .RE
 
 .sp
@@ -562,7 +562,7 @@ System file containing users' encrypted passwords and related information
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -580,10 +580,10 @@ Interface Stability	See below.
 Invocation is evolving. Human readable output is unstable.
 .SH SEE ALSO
 .LP
-\fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBgroupmod\fR(1M), \fBprojadd\fR(1M),
-\fBprojdel\fR(1M), \fBuseradd\fR(1M), \fBuserdel\fR(1M), \fBusermod\fR(1M),
-\fBpasswd\fR(4), \fBproject\fR(4), \fBattributes\fR(5),
-\fBresource_controls\fR(5)
+\fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBprojadd\fR(8),
+\fBprojdel\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8),
+\fBpasswd\fR(5), \fBproject\fR(5), \fBattributes\fR(7),
+\fBresource_controls\fR(7)
 .SH NOTES
 .LP
 The \fBprojmod\fR utility modifies project definitions only in the local
diff --git a/usr/src/man/man8/prstat.8 b/usr/src/man/man8/prstat.8
index a9bb718f78..f32c9c7deb 100644
--- a/usr/src/man/man8/prstat.8
+++ b/usr/src/man/man8/prstat.8
@@ -68,7 +68,7 @@ Long names are not truncated in this mode.
 .RS 4n
 Report only processes or lwps that are bound to processor sets in the given
 list. Each processor set is identified by an integer as reported by
-\fBpsrset\fR(1M). The load averages displayed are the sum of the load averages
+\fBpsrset\fR(8). The load averages displayed are the sum of the load averages
 of the specified processor sets (see \fBpset_getloadavg\fR(3C)). Processes with
 one or more LWPs bound to processor sets in the given list are reported even
 when the \fB-L\fR option is not used.
@@ -117,7 +117,7 @@ extra column showing process or lwps home \fIlgroup\fR with the header LGRP.
 .RS 4n
 Report only processes or lwps whose project \fBID\fR is in the given list. Each
 project \fBID\fR can be specified as either a project name or a numerical
-project \fBID\fR. See \fBproject\fR(4).
+project \fBID\fR. See \fBproject\fR(5).
 .RE
 
 .sp
@@ -205,7 +205,7 @@ Report only processes whose process \fBID\fR is in the given list.
 .RS 4n
 Report only processes or \fBlwp\fRs which have most recently executed on a
 \fBCPU\fR in the given list. Each \fBCPU\fR is identified by an integer as
-reported by \fBpsrinfo\fR(1M).
+reported by \fBpsrinfo\fR(8).
 .RE
 
 .sp
@@ -384,7 +384,7 @@ to fit the column.
 .RS 4n
 Report only processes or LWPs whose zone ID is in the given list. Each zone ID
 can be specified as either a zone name or a numerical zone ID. See
-\fBzones\fR(5).
+\fBzones\fR(7).
 .RE
 
 .sp
@@ -446,7 +446,7 @@ devices, in kilobytes (\fBK\fR), megabytes (\fBM\fR), or gigabytes (\fBG\fR).
 .RS 4n
 The resident set size of the process (\fBRSS\fR), in kilobytes (\fBK\fR),
 megabytes (\fBM\fR), or gigabytes (\fBG\fR). The RSS value is an estimate
-provided by \fBproc\fR(4) that might underestimate the actual resident set
+provided by \fBproc\fR(5) that might underestimate the actual resident set
 size. Users who want to get more accurate usage information for capacity
 planning should use the \fB-x\fR option to \fBpmap\fR(1) instead.
 .RE
@@ -487,7 +487,7 @@ Sleeping: process is waiting for an event to complete.
 .sp .6
 .RS 4n
 Waiting: process is waiting for CPU usage to drop to the CPU-caps enforced
-limits. See the description of \fBCPU-caps\fR in \fBresource_controls\fR(5).
+limits. See the description of \fBCPU-caps\fR in \fBresource_controls\fR(7).
 .RE
 
 .sp
@@ -863,16 +863,16 @@ An error occurred.
 .SH SEE ALSO
 .LP
 \fBdate\fR(1), \fBlgrpinfo\fR(1), \fBplgrp\fR(1), \fBproc\fR(1), \fBps\fR(1),
-\fBtime\fR(2), \fBpsrinfo\fR(1M), \fBpsrset\fR(1M), \fBsar\fR(1M),
-\fBpset_getloadavg\fR(3C), \fBproc\fR(4), \fBproject\fR(4),
-\fBattributes\fR(5), \fBresource_controls\fR(5), \fBzones\fR(5)
+\fBtime\fR(2), \fBpsrinfo\fR(8), \fBpsrset\fR(8), \fBsar\fR(8),
+\fBpset_getloadavg\fR(3C), \fBproc\fR(5), \fBproject\fR(5),
+\fBattributes\fR(7), \fBresource_controls\fR(7), \fBzones\fR(7)
 .SH NOTES
 .LP
 The snapshot of system usage displayed by \fBprstat\fR is true only for a
 split-second, and it may not be accurate by the time it is displayed. When the
 \fB-m\fR option is specified, \fBprstat\fR tries to turn on microstate
 accounting for each process; the original state is restored when \fBprstat\fR
-exits. See \fBproc\fR(4) for additional information about the microstate
+exits. See \fBproc\fR(5) for additional information about the microstate
 accounting facility.
 .sp
 .LP
diff --git a/usr/src/man/man8/prtconf.8 b/usr/src/man/man8/prtconf.8
index 1a095bd2c9..ce80f58c27 100644
--- a/usr/src/man/man8/prtconf.8
+++ b/usr/src/man/man8/prtconf.8
@@ -195,7 +195,7 @@ non-zero return value means that an error occurred.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -208,8 +208,8 @@ Interface Stability	Unstable
 .TE
 
 .SH SEE ALSO
-\fBfuser\fR(1M), \fBmodinfo\fR(1M), \fBsysdef\fR(1M), \fBattributes\fR(5),
-\fBopenprom\fR(7D)
+\fBfuser\fR(8), \fBmodinfo\fR(8), \fBsysdef\fR(8), \fBattributes\fR(7),
+\fBopenprom\fR(4D)
 .SH NOTES
 The output of the \fBprtconf\fR command is highly dependent on the version of
 the \fBPROM\fR installed in the system. The output will be affected in
diff --git a/usr/src/man/man8/prtdiag.8 b/usr/src/man/man8/prtdiag.8
index 4cddd9abbe..2a17bf875e 100644
--- a/usr/src/man/man8/prtdiag.8
+++ b/usr/src/man/man8/prtdiag.8
@@ -35,7 +35,7 @@ The following options are supported:
 .ad
 .RS 6n
 Log output. If failures or errors exist in the system, output this information
-to \fBsyslogd\fR(1M) only.
+to \fBsyslogd\fR(8) only.
 .RE
 
 .sp
@@ -82,7 +82,7 @@ An internal \fBprtdiag\fR error occurred, for example, out of memory.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -100,8 +100,8 @@ Interface Stability	Unstable*
 *The output is unstable.
 .SH SEE ALSO
 .LP
-\fBmodinfo\fR(1M), \fBprtconf\fR(1M), \fBpsrinfo\fR(1M), \fBsysdef\fR(1M),
-\fBsyslogd\fR(1M), \fBattributes\fR(5), \fBopenprom\fR(7D)
+\fBmodinfo\fR(8), \fBprtconf\fR(8), \fBpsrinfo\fR(8), \fBsysdef\fR(8),
+\fBsyslogd\fR(8), \fBattributes\fR(7), \fBopenprom\fR(4D)
 .SH NOTES
 .LP
 Not all diagnostic and system information is available on every
diff --git a/usr/src/man/man8/prtdscp.8 b/usr/src/man/man8/prtdscp.8
index ccfa9717a5..812b61a857 100644
--- a/usr/src/man/man8/prtdscp.8
+++ b/usr/src/man/man8/prtdscp.8
@@ -129,7 +129,7 @@ The following example display the remote \fBSP\fR's \fBIP\fR address:
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -145,4 +145,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5)
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/prtfru.8 b/usr/src/man/man8/prtfru.8
index a04bef5e83..9d23e6630f 100644
--- a/usr/src/man/man8/prtfru.8
+++ b/usr/src/man/man8/prtfru.8
@@ -106,4 +106,4 @@ An error has occurred.
 
 .SH SEE ALSO
 .LP
-\fBfruadm\fR(1M), \fBattributes\fR(5)
+\fBfruadm\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/prtpicl.8 b/usr/src/man/man8/prtpicl.8
index fd4c00787a..d444ec4cee 100644
--- a/usr/src/man/man8/prtpicl.8
+++ b/usr/src/man/man8/prtpicl.8
@@ -66,4 +66,4 @@ An error occurred.
 .SH SEE ALSO
 .sp
 .LP
-\fBpicld\fR(1M), \fBattributes\fR(5)
+\fBpicld\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/prtvtoc.8 b/usr/src/man/man8/prtvtoc.8
index 57bf07a7bb..fc70ad0dcb 100644
--- a/usr/src/man/man8/prtvtoc.8
+++ b/usr/src/man/man8/prtvtoc.8
@@ -197,7 +197,7 @@ example# prtvtoc /dev/rdsk/c1t1d0s2
 .sp
 
 .SH SEE ALSO
-\fBdevinfo\fR(1M), \fBfmthard\fR(1M), \fBformat\fR(1M), \fBmount\fR(1M),
-\fBattributes\fR(5)
+\fBdevinfo\fR(8), \fBfmthard\fR(8), \fBformat\fR(8), \fBmount\fR(8),
+\fBattributes\fR(7)
 .SH WARNINGS
 The \fBmount\fR command does not check the "not mountable" bit.
diff --git a/usr/src/man/man8/psradm.8 b/usr/src/man/man8/psradm.8
index 9bc50e68f2..3aa5aa45f2 100644
--- a/usr/src/man/man8/psradm.8
+++ b/usr/src/man/man8/psradm.8
@@ -119,7 +119,7 @@ of the specified processors was in the faulted state. Set the specified
 processors to faulted, if no other transition option was specified. Forced
 transitions can only be made to \fBfaulted\fR, \fBspare\fR, or \fBoff-line\fR
 states. Administrators are encouraged to use the \fB-Q\fR option for
-\fBpbind\fR(1M) to find out which threads will be affected by forced a
+\fBpbind\fR(8) to find out which threads will be affected by forced a
 processor state transition.
 .RE
 
@@ -288,8 +288,8 @@ Records logging processor status changes
 
 .SH SEE ALSO
 .LP
-\fBpbind\fR(1M), \fBpsrinfo\fR(1M), \fBpsrset\fR(1M), \fBp_online\fR(2),
-\fBprocessor_bind\fR(2), \fBattributes\fR(5)
+\fBpbind\fR(8), \fBpsrinfo\fR(8), \fBpsrset\fR(8), \fBp_online\fR(2),
+\fBprocessor_bind\fR(2), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .ne 2
 .na
diff --git a/usr/src/man/man8/psrinfo.8 b/usr/src/man/man8/psrinfo.8
index 34d14e2fbf..a2772a5cd0 100644
--- a/usr/src/man/man8/psrinfo.8
+++ b/usr/src/man/man8/psrinfo.8
@@ -234,8 +234,8 @@ An error occurred.
 
 .SH SEE ALSO
 .LP
-\fBpsradm\fR(1M), \fBp_online\fR(2), \fBprocessor_info\fR(2),
-\fBattributes\fR(5)
+\fBpsradm\fR(8), \fBp_online\fR(2), \fBprocessor_info\fR(2),
+\fBattributes\fR(7)
 .SH DIAGNOSTICS
 .ne 2
 .na
diff --git a/usr/src/man/man8/psrset.8 b/usr/src/man/man8/psrset.8
index de93407d6b..03614c6049 100644
--- a/usr/src/man/man8/psrset.8
+++ b/usr/src/man/man8/psrset.8
@@ -92,7 +92,7 @@ only LWPs that have been bound to that processor set.
 .sp
 .LP
 This command cannot be used to modify processor disposition when pools are
-enabled. Use \fBpooladm\fR(1M) and \fBpoolcfg\fR(1M) to modify processor set
+enabled. Use \fBpooladm\fR(8) and \fBpoolcfg\fR(8) to modify processor set
 configuration through the resource pools facility.
 .SH OPTIONS
 .LP
@@ -202,7 +202,7 @@ privilege.
 .ad
 .RS 6n
 Disables interrupts for all processors within the specified processor set. See
-\fBpsradm\fR(1M).
+\fBpsradm\fR(8).
 .sp
 If some processors in the set cannot have their interrupts disabled, the other
 processors still have their interrupts disabled, and the command reports an
@@ -221,7 +221,7 @@ privilege.
 Forces the specified processor set operation by unbinding all threads bound to
 the specified processor. Only the \fB-a\fR or the \fB-r\fR option can be used
 in combination with this option. Administrators are encouraged to use the
-\fB-Q\fR option for \fBpbind\fR(1M) to find out which threads will be affected
+\fB-Q\fR option for \fBpbind\fR(8) to find out which threads will be affected
 by such operation.
 .RE
 
@@ -244,7 +244,7 @@ command is not given an option.
 .ad
 .RS 6n
 Enable interrupts for all processors within the specified processor set. See
-\fBpsradm\fR(1M).
+\fBpsradm\fR(8).
 .sp
 This option is restricted to users with the \fBPRIV_SYS_RES_CONFIG\fR
 privilege.
@@ -294,7 +294,7 @@ with processor set bindings.
 Remove a list of processors from their current processor sets. Processors that
 are removed return to the general pool of processors.
 .sp
-Processors with \fBLWP\fRs bound to them using \fBpbind\fR(1M) can be assigned
+Processors with \fBLWP\fRs bound to them using \fBpbind\fR(8) can be assigned
 to or removed from processor sets using the \fB-F\fR option.
 .sp
 This option is restricted to users with the \fBPRIV_SYS_RES_CONFIG\fR
@@ -405,7 +405,7 @@ An error occurred.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -420,11 +420,11 @@ Stability Level	Stable
 
 .SH SEE ALSO
 .LP
-\fBpbind\fR(1M), \fBpooladm\fR(1M), \fBpoolcfg\fR(1M), \fBpsradm\fR(1M),
-\fBpsrinfo\fR(1M), \fBprocessor_bind\fR(2), \fBprocessor_info\fR(2),
+\fBpbind\fR(8), \fBpooladm\fR(8), \fBpoolcfg\fR(8), \fBpsradm\fR(8),
+\fBpsrinfo\fR(8), \fBprocessor_bind\fR(2), \fBprocessor_info\fR(2),
 \fBpset_bind\fR(2), \fBpset_create\fR(2), \fBpset_info\fR(2),
-\fBsysconf\fR(3C), \fBlibpool\fR(3LIB), \fBattributes\fR(5),
-\fBprivileges\fR(5)
+\fBsysconf\fR(3C), \fBlibpool\fR(3LIB), \fBattributes\fR(7),
+\fBprivileges\fR(7)
 .SH DIAGNOSTICS
 .LP
 The following output indicates that the specified process did not exist or has
diff --git a/usr/src/man/man8/putdev.8 b/usr/src/man/man8/putdev.8
index 114b72fd7a..3bd8d883b9 100644
--- a/usr/src/man/man8/putdev.8
+++ b/usr/src/man/man8/putdev.8
@@ -117,7 +117,7 @@ Designates the value to be assigned to a device's attribute.
 .sp
 .LP
 The following list shows the standard device attributes, used by applications
-such as \fBufsdump\fR(1M) and \fBufsrestore\fR(1M), which can be defined for a
+such as \fBufsdump\fR(8) and \fBufsrestore\fR(8), which can be defined for a
 device. You are not limited to this list, you can define any attribute you
 like.
 .sp
@@ -408,8 +408,8 @@ attributes were not defined for the device.
 .SH SEE ALSO
 .sp
 .LP
-\fBdevattr\fR(1M), \fBputdgrp\fR(1M), \fBufsdump\fR(1M), \fBufsrestore\fR(1M),
-\fBattributes\fR(5)
+\fBdevattr\fR(8), \fBputdgrp\fR(8), \fBufsdump\fR(8), \fBufsrestore\fR(8),
+\fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/putdgrp.8 b/usr/src/man/man8/putdgrp.8
index 0afe950392..222cb99c53 100644
--- a/usr/src/man/man8/putdgrp.8
+++ b/usr/src/man/man8/putdgrp.8
@@ -200,4 +200,4 @@ example#  \fBputdgrp \fR\fB-d\fR\fB floppies diskette2\fR
 .SH SEE ALSO
 .sp
 .LP
-\fBlistdgrp\fR(1M), \fBputdev\fR(1M), \fBattributes\fR(5)
+\fBlistdgrp\fR(8), \fBputdev\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/pwck.8 b/usr/src/man/man8/pwck.8
index 3583936fd7..3375a62a36 100644
--- a/usr/src/man/man8/pwck.8
+++ b/usr/src/man/man8/pwck.8
@@ -32,7 +32,7 @@ login names belong to more than \fBNGROUPS_MAX\fR groups, and that all login
 names appear in the password file. \fBgrpck\fR also issues a warning if it
 finds an entry (a single line) in the \fBgroup\fR file longer than  2047
 characters.  Such an entry causes group maintenance commands, such as
-\fBgroupdel\fR(1M) and \fBgroupmod\fR(1M), to fail.
+\fBgroupdel\fR(8) and \fBgroupmod\fR(8), to fail.
 .sp
 .LP
 The default group file is \fB/etc/group\fR.
@@ -56,8 +56,8 @@ stream.
 .SH SEE ALSO
 .sp
 .LP
-\fBgroupdel\fR(1M), \fBgroupmod\fR(1M), \fBgetpwent\fR(3C), \fBgroup\fR(4),
-\fBpasswd\fR(4), \fBattributes\fR(5)
+\fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBgetpwent\fR(3C), \fBgroup\fR(5),
+\fBpasswd\fR(5), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .sp
 .LP
diff --git a/usr/src/man/man8/pwconv.8 b/usr/src/man/man8/pwconv.8
index d2ecdddfe1..6bf1b41dd1 100644
--- a/usr/src/man/man8/pwconv.8
+++ b/usr/src/man/man8/pwconv.8
@@ -112,8 +112,8 @@ The \fBpwconv\fR command can only be used by the super-user.
 .SH SEE ALSO
 .sp
 .LP
-\fBpasswd\fR(1), \fBpassmgmt\fR(1M), \fBusermod\fR(1M), \fBpasswd\fR(4),
-\fBattributes\fR(5)
+\fBpasswd\fR(1), \fBpassmgmt\fR(8), \fBusermod\fR(8), \fBpasswd\fR(5),
+\fBattributes\fR(7)
 .SH DIAGNOSTICS
 .sp
 .LP
diff --git a/usr/src/man/man8/quot.8 b/usr/src/man/man8/quot.8
index f814324dca..0571ec2b7e 100644
--- a/usr/src/man/man8/quot.8
+++ b/usr/src/man/man8/quot.8
@@ -109,7 +109,7 @@ mount-point of the filesystem(s) being checked
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBquot\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBquot\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXIT STATUS
 .sp
@@ -152,8 +152,8 @@ Used to obtain user names
 .SH SEE ALSO
 .sp
 .LP
-\fBdu\fR(1), \fBmnttab\fR(4), \fBpasswd\fR(4), \fBattributes\fR(5),
-\fBlargefile\fR(5)
+\fBdu\fR(1), \fBmnttab\fR(5), \fBpasswd\fR(5), \fBattributes\fR(7),
+\fBlargefile\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/quota.8 b/usr/src/man/man8/quota.8
index ff99a1eff9..9442d87b68 100644
--- a/usr/src/man/man8/quota.8
+++ b/usr/src/man/man8/quota.8
@@ -39,7 +39,7 @@ Display user's quota on all mounted file systems where quotas exist.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBquota\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBquota\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH FILES
 .sp
@@ -54,13 +54,13 @@ list of currently mounted filesystems
 .SH SEE ALSO
 .sp
 .LP
-\fBedquota\fR(1M), \fBquotaon\fR(1M), \fBquotacheck\fR(1M), \fBrepquota\fR(1M),
-\fBrquotad\fR(1M), \fBattributes\fR(5), \fBlargefile\fR(5), \fBzones\fR(5)
+\fBedquota\fR(8), \fBquotaon\fR(8), \fBquotacheck\fR(8), \fBrepquota\fR(8),
+\fBrquotad\fR(8), \fBattributes\fR(7), \fBlargefile\fR(7), \fBzones\fR(7)
 .SH NOTES
 .sp
 .LP
 \fBquota\fR displays quotas for NFS mounted UFS- or ZFS-based file systems if
-the \fBrquotad\fR daemon is running. See \fBrquotad\fR(1M). In a \fBzones\fR(5)
+the \fBrquotad\fR daemon is running. See \fBrquotad\fR(8). In a \fBzones\fR(7)
 environment, \fBquota\fR displays quotas only for the zone in which it is
 invoked.
 .sp
diff --git a/usr/src/man/man8/quotacheck.8 b/usr/src/man/man8/quotacheck.8
index 3408ac7038..165a14eb44 100644
--- a/usr/src/man/man8/quotacheck.8
+++ b/usr/src/man/man8/quotacheck.8
@@ -86,7 +86,7 @@ Indicate the calculated disk quotas for each user on a particular file system.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBquotacheck\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBquotacheck\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH FILES
 .sp
@@ -110,6 +110,6 @@ List of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBedquota\fR(1M), \fBquota\fR(1M), \fBquotaon\fR(1M), \fBrepquota\fR(1M),
-\fBattributes\fR(5), \fBlargefile\fR(5), \fBquotactl\fR(7I),
-\fBmount_ufs\fR(1M)
+\fBedquota\fR(8), \fBquota\fR(8), \fBquotaon\fR(8), \fBrepquota\fR(8),
+\fBattributes\fR(7), \fBlargefile\fR(7), \fBquotactl\fR(4I),
+\fBmount_ufs\fR(8)
diff --git a/usr/src/man/man8/quotaon.8 b/usr/src/man/man8/quotaon.8
index b4214ed3d3..9a848b77f2 100644
--- a/usr/src/man/man8/quotaon.8
+++ b/usr/src/man/man8/quotaon.8
@@ -36,7 +36,7 @@ quotaon, quotaoff \- turn ufs file system quotas on and off
 .LP
 Before a file system may have quotas enabled, a file named \fBquotas\fR, owned
 by root, must exist in the root directory of the file system. See
-\fBedquota\fR(1M) for details on how to modify the contents of this file.
+\fBedquota\fR(8) for details on how to modify the contents of this file.
 .sp
 .LP
 \fBquotaoff\fR turns off disk quotas for one or more ufs file systems.
@@ -98,7 +98,7 @@ Display a message for each file system affected.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBquotaon\fR and
+See \fBlargefile\fR(7) for the description of the behavior of \fBquotaon\fR and
 \fBquotaoff\fR when encountering files greater than or equal to 2 Gbyte ( 2^31
 bytes).
 .SH FILES
@@ -123,6 +123,6 @@ list of default parameters for each file system
 .SH SEE ALSO
 .sp
 .LP
-\fBedquota\fR(1M), \fBquota\fR(1M), \fBquotacheck\fR(1M), \fBrepquota\fR(1M),
-\fBmnttab\fR(4), \fBvfstab\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5),
-\fBquotactl\fR(7I)
+\fBedquota\fR(8), \fBquota\fR(8), \fBquotacheck\fR(8), \fBrepquota\fR(8),
+\fBmnttab\fR(5), \fBvfstab\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7),
+\fBquotactl\fR(4I)
diff --git a/usr/src/man/man8/raidctl.8 b/usr/src/man/man8/raidctl.8
index ccb4480383..97948751ff 100644
--- a/usr/src/man/man8/raidctl.8
+++ b/usr/src/man/man8/raidctl.8
@@ -1039,7 +1039,7 @@ Request operation failed.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1055,7 +1055,7 @@ Interface Stability 	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBmpt\fR(7D)
+\fBattributes\fR(7), \fBmpt\fR(4D)
 .sp
 .LP
 System Administration Guide: Basic Administration
diff --git a/usr/src/man/man8/ramdiskadm.8 b/usr/src/man/man8/ramdiskadm.8
index 798d0bb16c..f783e30e41 100644
--- a/usr/src/man/man8/ramdiskadm.8
+++ b/usr/src/man/man8/ramdiskadm.8
@@ -25,7 +25,7 @@ ramdiskadm \- administer ramdisk pseudo device
 .SH DESCRIPTION
 .sp
 .LP
-The \fBramdiskadm\fR command administers \fBramdisk\fR(7D), the ramdisk driver.
+The \fBramdiskadm\fR command administers \fBramdisk\fR(4D), the ramdisk driver.
 Use \fBramdiskadm\fR to create a new named ramdisk device, delete an existing
 named ramdisk, or list information about existing ramdisks.
 .sp
@@ -128,7 +128,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -144,7 +144,7 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBramdisk\fR(7D)
+\fBattributes\fR(7), \fBramdisk\fR(4D)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/rcapadm.8 b/usr/src/man/man8/rcapadm.8
index 39988ef26b..b1ba1c6fc5 100644
--- a/usr/src/man/man8/rcapadm.8
+++ b/usr/src/man/man8/rcapadm.8
@@ -24,7 +24,7 @@ rcapadm \- configure resource capping daemon
 The \fBrcapadm\fR command allows a user with the privileges described below to
 configure various attributes of the resource capping daemon. If used without
 arguments, \fBrcapadm\fR displays the current status of the resource capping
-daemon if it has been configured. See \fBrcapd\fR(1M) for more information.
+daemon if it has been configured. See \fBrcapd\fR(8) for more information.
 .sp
 .LP
 In the current release of the Solaris operating environment, \fBrcapadm\fR is
@@ -173,7 +173,7 @@ are dynamically specifying a cap on physical memory usage (using \fB-m\fR).
 Note -
 .sp
 .RS 2
-To set a persistent cap on memory usage within a zone, use \fBzonecfg\fR(1M).
+To set a persistent cap on memory usage within a zone, use \fBzonecfg\fR(8).
 .RE
 .SH EXAMPLES
 .LP
@@ -190,7 +190,7 @@ Enforcement
 .LP
 The command shown below specifies the maximum amount of memory that can be
 consumed by a specified zone. Note that this value lasts only until the next
-reboot. To set a persistent cap, use \fBzonecfg\fR(1M).
+reboot. To set a persistent cap, use \fBzonecfg\fR(8).
 
 .sp
 .in +2
@@ -234,7 +234,7 @@ Invalid command-line options were specified.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -252,8 +252,8 @@ Interface Stability	Evolving
 The \fB-z\fR and \fB-m\fR options are committed interfaces.
 .SH SEE ALSO
 .LP
-\fBrcapstat\fR(1), \fBrcapd\fR(1M), \fBzonecfg\fR(1M), \fBproject\fR(4),
-\fBattributes\fR(5), \fBzones\fR(5)
+\fBrcapstat\fR(1), \fBrcapd\fR(8), \fBzonecfg\fR(8), \fBproject\fR(5),
+\fBattributes\fR(7), \fBzones\fR(7)
 .sp
 .LP
 "Physical Memory Control Using the Resource Capping Daemon" in \fISystem
diff --git a/usr/src/man/man8/rcapd.8 b/usr/src/man/man8/rcapd.8
index 3a2b139ff7..8acd07a298 100644
--- a/usr/src/man/man8/rcapd.8
+++ b/usr/src/man/man8/rcapd.8
@@ -17,7 +17,7 @@ rcapd \- resource cap enforcement daemon
 .LP
 The \fBrcapd\fR daemon enforces resource caps on collections of processes.
 Per-project and per-zone physical memory caps are supported. For information
-about projects, see \fBproject\fR(4). For zones information, see \fBzones\fR(5)
+about projects, see \fBproject\fR(5). For zones information, see \fBzones\fR(7)
 .sp
 .LP
 When the resident set size (RSS) of a collection of processes exceeds its cap,
@@ -44,18 +44,18 @@ project's member processes
 
 .sp
 .LP
-See \fBproject\fR(4) for a description of project attributes.
+See \fBproject\fR(5) for a description of project attributes.
 .sp
 .LP
 For a system with one or more zones, you can dynamically set the
-\fBrcap.max-rss\fR value for a zone with \fBrcapadm\fR(1M). To set a persistent
-cap on memory usage within a zone, you use \fBzonecfg\fR(1M).
+\fBrcap.max-rss\fR value for a zone with \fBrcapadm\fR(8). To set a persistent
+cap on memory usage within a zone, you use \fBzonecfg\fR(8).
 .sp
 .LP
-You configure \fBrcapd\fR through the use of \fBrcapadm\fR(1M). The daemon can
+You configure \fBrcapd\fR through the use of \fBrcapadm\fR(8). The daemon can
 be monitored with \fBrcapstat\fR(1). Configuration changes are incorporated
 into \fBrcapd\fR by sending it \fBSIGHUP\fR (see \fBkill\fR(1)), or according
-to the configuration interval (see \fBrcapadm\fR(1M)).
+to the configuration interval (see \fBrcapadm\fR(8)).
 .SH OPTIONS
 .sp
 .LP
@@ -128,7 +128,7 @@ Project database.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -144,9 +144,9 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBrcapstat\fR(1), \fBsvcs\fR(1), \fBrcapadm\fR(1M), \fBzonecfg\fR(1M),
-\fBsvcadm\fR(1M), \fBproject\fR(4), \fBattributes\fR(5), \fBsmf\fR(5),
-\fBzones\fR(5)
+\fBrcapstat\fR(1), \fBsvcs\fR(1), \fBrcapadm\fR(8), \fBzonecfg\fR(8),
+\fBsvcadm\fR(8), \fBproject\fR(5), \fBattributes\fR(7), \fBsmf\fR(7),
+\fBzones\fR(7)
 .sp
 .LP
 "Physical Memory Control Using the Resource Capping Daemon" in \fISystem
@@ -165,7 +165,7 @@ reduced by shortening the RSS sampling interval with \fBrcapadm\fR.
 .sp
 .LP
 The \fBrcapd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -177,5 +177,5 @@ svc:/system/rcap:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/rctladm.8 b/usr/src/man/man8/rctladm.8
index 5c69e12511..cfaf29fea6 100644
--- a/usr/src/man/man8/rctladm.8
+++ b/usr/src/man/man8/rctladm.8
@@ -18,7 +18,7 @@ rctladm \- display or modify global state of system resource controls
 The \fBrctladm\fR command allows the examination and modification of active
 resource controls on the running system. An instance of a resource control is
 referred to as an \fBrctl\fR. See \fBsetrctl\fR(2) for a description of an
-\fBrctl\fR; see \fBresource_controls\fR(5) for a list of the \fBrctl\fRs
+\fBrctl\fR; see \fBresource_controls\fR(7) for a list of the \fBrctl\fRs
 supported in the current release of the Solaris operating system. Logging of
 \fBrctl\fR violations can be activated or deactivated system-wide and active
 \fBrctl\fRs (and their state) can be listed.
@@ -51,7 +51,7 @@ severity level. To do this, specify \fBsyslog=\fIlevel\fR\fR, where \fIlevel\fR
 is one of the string tokens given as valid severity levels in \fBsyslog\fR(3C).
 You can omit the common \fBLOG_\fR prefix on the severity level. Note that not
 all \fBrctl\fRs support the \fBsyslog\fR action. See
-\fBresource_controls\fR(5).
+\fBresource_controls\fR(7).
 .RE
 
 .sp
@@ -181,7 +181,7 @@ Each time \fBrctladm\fR is executed, it updates the contents of
 .LP
 \fBsetrctl\fR(2), \fBgetrctl\fR(2), \fBprctl\fR(1),
 \fBrctlblk_get_global_flags\fR(3C), \fBrctlblk_get_global_action\fR(3C),
-\fBattributes\fR(5), \fBresource_controls\fR(5)
+\fBattributes\fR(7), \fBresource_controls\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/rdate.8 b/usr/src/man/man8/rdate.8
index fcf4b83ce3..2433d6c6f2 100644
--- a/usr/src/man/man8/rdate.8
+++ b/usr/src/man/man8/rdate.8
@@ -35,8 +35,8 @@ svcadm enable time:dgram
 .SH USAGE
 .sp
 .LP
-The \fBrdate\fR command is IPv6-enabled. See \fBip6\fR(7P).
+The \fBrdate\fR command is IPv6-enabled. See \fBip6\fR(4P).
 .SH SEE ALSO
 .sp
 .LP
-\fBinetd\fR(1M), \fBinetd.conf\fR(4), \fBattributes\fR(5), \fBip6\fR(7P)
+\fBinetd\fR(8), \fBinetd.conf\fR(5), \fBattributes\fR(7), \fBip6\fR(4P)
diff --git a/usr/src/man/man8/reboot.8 b/usr/src/man/man8/reboot.8
index 0fe53e2a22..580412332f 100644
--- a/usr/src/man/man8/reboot.8
+++ b/usr/src/man/man8/reboot.8
@@ -28,18 +28,18 @@ kernel. This form of \fBreboot\fR is shown in the second synopsis, above.
 .sp
 .LP
 Although \fBreboot\fR can be run by the super-user at any time,
-\fBshutdown\fR(1M) is normally used first to warn all users logged in of the
-impending loss of service. See \fBshutdown\fR(1M) for details.
+\fBshutdown\fR(8) is normally used first to warn all users logged in of the
+impending loss of service. See \fBshutdown\fR(8) for details.
 .sp
 .LP
-The \fBreboot\fR utility performs a \fBsync\fR(1M) operation on the disks, and
-then a multi-user reboot is initiated. See \fBinit\fR(1M) for details. On x86
+The \fBreboot\fR utility performs a \fBsync\fR(8) operation on the disks, and
+then a multi-user reboot is initiated. See \fBinit\fR(8) for details. On x86
 systems, reboot may also update the boot archive as needed to ensure a
 successful reboot.
 .sp
 .LP
 The \fBreboot\fR utility normally logs the reboot to the system log daemon,
-\fBsyslogd\fR(1M), and places a shutdown record in the login accounting file
+\fBsyslogd\fR(8), and places a shutdown record in the login accounting file
 \fB/var/adm/wtmpx\fR. These actions are inhibited if the \fB-n\fR or \fB-q\fR
 options are present.
 .sp
@@ -54,7 +54,7 @@ The following options are supported:
 .ad
 .sp .6
 .RS 4n
-Force a system crash dump before rebooting. See \fBdumpadm\fR(1M) for
+Force a system crash dump before rebooting. See \fBdumpadm\fR(8) for
 information on configuring system crash dumps.
 .RE
 
@@ -86,7 +86,7 @@ Service \fBsvc:/system/boot-config:default\fR is enabled by default. It
 requires \fBsolaris.system.shutdown\fR as \fBaction_authorization\fR and
 \fBvalue_authorization\fR. When the \fBconfig/fastreboot_default\fR property is
 set to \fBtrue\fR, \fBreboot\fR will behave as \fBreboot\fR \fB-f\fR. The value
-of this property can be changed using \fBsvccfg\fR(1M) and \fBsvcadm\fR(1M), to
+of this property can be changed using \fBsvccfg\fR(8) and \fBsvcadm\fR(8), to
 control the default reboot behavior.
 .sp
 See \fBEXAMPLES\fR for details.
@@ -99,7 +99,7 @@ See \fBEXAMPLES\fR for details.
 .ad
 .sp .6
 .RS 4n
-Suppress sending a message to the system log daemon, \fBsyslogd\fR(1M) about
+Suppress sending a message to the system log daemon, \fBsyslogd\fR(8) about
 who executed \fBreboot\fR.
 .RE
 
@@ -110,7 +110,7 @@ who executed \fBreboot\fR.
 .ad
 .sp .6
 .RS 4n
-Avoid calling \fBsync\fR(2) and do not log the reboot to \fBsyslogd\fR(1M) or
+Avoid calling \fBsync\fR(2) and do not log the reboot to \fBsyslogd\fR(8) or
 to \fB/var/adm/wtmpx\fR. The kernel still attempts to sync filesystems prior to
 reboot, except if the \fB-d\fR option is also present. If \fB-d\fR is used with
 \fB-n\fR, the kernel does not attempt to sync file systems.
@@ -154,7 +154,7 @@ The following operands are supported:
 .RS 4n
 An optional \fIboot_arguments\fR specifies arguments to the \fBuadmin\fR(2)
 function that are passed to the boot program and kernel upon restart. The form
-and list of arguments is described in the \fBboot\fR(1M) and \fBkernel\fR(1M)
+and list of arguments is described in the \fBboot\fR(8) and \fBkernel\fR(8)
 man pages. If the arguments are specified, whitespace between them is replaced
 by single spaces unless the whitespace is quoted for the shell. If the
 \fIboot_arguments\fR begin with a hyphen, they must be preceded by the \fB--\fR
@@ -166,7 +166,7 @@ delimiter (two hyphens) to denote the end of the \fBreboot\fR argument list.
 .sp
 .LP
 In the following example, the delimiter \fB--\fR (two hyphens) must be used to
-separate the options of \fBreboot\fR from the arguments of \fBboot\fR(1M).
+separate the options of \fBreboot\fR from the arguments of \fBboot\fR(8).
 
 .sp
 .in +2
@@ -349,12 +349,12 @@ login accounting file
 .RE
 
 .SH SEE ALSO
-\fBmdb\fR(1), \fBboot\fR(1M), \fBdumpadm\fR(1M), \fBfsck\fR(1M),
-\fBhalt\fR(1M), \fBinit\fR(1M), \fBkernel\fR(1M), \fBshutdown\fR(1M),
-\fBsvcadm\fR(1M), \fBsvccfg\fR(1M), \fBsync\fR(1M), \fBsyslogd\fR(1M),
-\fBsync\fR(2), \fBuadmin\fR(2), \fBreboot\fR(3C), \fBattributes\fR(5)
+\fBmdb\fR(1), \fBboot\fR(8), \fBdumpadm\fR(8), \fBfsck\fR(8),
+\fBhalt\fR(8), \fBinit\fR(8), \fBkernel\fR(8), \fBshutdown\fR(8),
+\fBsvcadm\fR(8), \fBsvccfg\fR(8), \fBsync\fR(8), \fBsyslogd\fR(8),
+\fBsync\fR(2), \fBuadmin\fR(2), \fBreboot\fR(3C), \fBattributes\fR(7)
 .SH NOTES
 The \fBreboot\fR utility does not execute the scripts in
-\fB/etc/rc\fInum\fR.d\fR or execute shutdown actions in \fBinittab\fR(4). To
-ensure a complete shutdown of system services, use \fBshutdown\fR(1M) or
-\fBinit\fR(1M) to reboot a Solaris system.
+\fB/etc/rc\fInum\fR.d\fR or execute shutdown actions in \fBinittab\fR(5). To
+ensure a complete shutdown of system services, use \fBshutdown\fR(8) or
+\fBinit\fR(8) to reboot a Solaris system.
diff --git a/usr/src/man/man8/rem_drv.8 b/usr/src/man/man8/rem_drv.8
index 7883161f53..35158515e1 100644
--- a/usr/src/man/man8/rem_drv.8
+++ b/usr/src/man/man8/rem_drv.8
@@ -22,7 +22,7 @@ configuration files.
 .sp
 .LP
 If \fBrem_drv\fR has been executed, the next time the system is rebooted it
-automatically performs a reconfiguration boot (see \fBkernel\fR(1M)).
+automatically performs a reconfiguration boot (see \fBkernel\fR(8)).
 .SH OPTIONS
 .sp
 .LP
@@ -44,7 +44,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-b\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -100,5 +100,5 @@ option, above.
 .SH SEE ALSO
 .sp
 .LP
-\fBadd_drv\fR(1M), \fBkernel\fR(1M), \fBupdate_drv\fR(1M), \fBattributes\fR(5),
-\fBzones\fR(5), \fBdevfs\fR(7FS)
+\fBadd_drv\fR(8), \fBkernel\fR(8), \fBupdate_drv\fR(8), \fBattributes\fR(7),
+\fBzones\fR(7), \fBdevfs\fR(4FS)
diff --git a/usr/src/man/man8/remove_allocatable.8 b/usr/src/man/man8/remove_allocatable.8
index 94e2d68941..d3c3d668a9 100644
--- a/usr/src/man/man8/remove_allocatable.8
+++ b/usr/src/man/man8/remove_allocatable.8
@@ -113,7 +113,7 @@ Permission denied. User does not have DAC or MAC access to database.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -133,8 +133,8 @@ Not-an-Interface.
 .SH SEE ALSO
 .sp
 .LP
-\fBallocate\fR(1), \fBdeallocate\fR(1), \fBadd_allocatable\fR(1M),
-\fBattributes\fR(5), \fBdevice_clean\fR(5)
+\fBallocate\fR(1), \fBdeallocate\fR(1), \fBadd_allocatable\fR(8),
+\fBattributes\fR(7), \fBdevice_clean\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/removef.8 b/usr/src/man/man8/removef.8
index ccec10aa52..ec5df5a335 100644
--- a/usr/src/man/man8/removef.8
+++ b/usr/src/man/man8/removef.8
@@ -66,8 +66,8 @@ specified when installing to a client from a server (for example,
 .sp
 \fBremovef\fR inherits the value of the \fBPKG_INSTALL_ROOT\fR environment
 variable. (See ENVIRONMENT VARIABLES, below.) If \fBPKG_INSTALL_ROOT\fR is set,
-such as when the \fB-R\fR option is used with \fBpkgadd\fR(1M) or
-\fBpkgrm\fR(1M), there is no need to use the \fBremovef\fR \fB-R\fR option.
+such as when the \fB-R\fR option is used with \fBpkgadd\fR(8) or
+\fBpkgrm\fR(8), there is no need to use the \fBremovef\fR \fB-R\fR option.
 .LP
 Note -
 .sp
@@ -75,7 +75,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -143,7 +143,7 @@ removef \fB-f\fR $PKGINST || exit 2
 .sp
 .LP
 \fBremovef\fR inherits the value of the following environment variable. This
-variable is set when \fBpkgadd\fR(1M) or \fBpkgrm\fR(1M) is invoked with the
+variable is set when \fBpkgadd\fR(8) or \fBpkgrm\fR(8) is invoked with the
 \fB-R\fR option.
 .sp
 .ne 2
@@ -184,15 +184,15 @@ An error occurred.
 .sp
 .LP
 \fBpkginfo\fR(1), \fBpkgmk\fR(1), \fBpkgparam\fR(1), \fBpkgproto\fR(1),
-\fBpkgtrans\fR(1), \fBinstallf\fR(1M), \fBpkgadd\fR(1M), \fBpkgask\fR(1M),
-\fBpkgchk\fR(1M), \fBpkgrm\fR(1M), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBpkgtrans\fR(1), \fBinstallf\fR(8), \fBpkgadd\fR(8), \fBpkgask\fR(8),
+\fBpkgchk\fR(8), \fBpkgrm\fR(8), \fBattributes\fR(7), \fBlargefile\fR(7)
 .sp
 .LP
 \fI\fR
 .SH NOTES
 .sp
 .LP
-Package commands are \fBlargefile\fR(5)-aware. They handle files larger than 2
+Package commands are \fBlargefile\fR(7)-aware. They handle files larger than 2
 GB in the same way they handle smaller files. In their current implementations,
-\fBpkgadd\fR(1M), \fBpkgtrans\fR(1) and other package commands can process a
+\fBpkgadd\fR(8), \fBpkgtrans\fR(1) and other package commands can process a
 datastream of  up to 4 GB.
diff --git a/usr/src/man/man8/repquota.8 b/usr/src/man/man8/repquota.8
index b65f5a13a5..2a5fc10276 100644
--- a/usr/src/man/man8/repquota.8
+++ b/usr/src/man/man8/repquota.8
@@ -23,7 +23,7 @@ repquota \- summarize quotas for a ufs file system
 \fBrepquota\fR prints a summary of the disk usage and quotas for the specified
 ufs file systems. The current number of files and amount of space (in
 kilobytes) is printed for each user along with any quotas created with
-\fBedquota\fR(1M).
+\fBedquota\fR(8).
 .sp
 .LP
 The \fIfilesystem\fR must have the file  \fBquotas\fR in its root directory.
@@ -56,10 +56,10 @@ Report quotas for all users, even those who do not consume resources.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBrepquota\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBrepquota\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH SEE ALSO
 .sp
 .LP
-\fBedquota\fR(1M), \fBquota\fR(1M), \fBquotacheck\fR(1M), \fBquotaon\fR(1M),
-\fBattributes\fR(5), \fBlargefile\fR(5), \fBquotactl\fR(7I)
+\fBedquota\fR(8), \fBquota\fR(8), \fBquotacheck\fR(8), \fBquotaon\fR(8),
+\fBattributes\fR(7), \fBlargefile\fR(7), \fBquotactl\fR(4I)
diff --git a/usr/src/man/man8/rmmount.8 b/usr/src/man/man8/rmmount.8
index b35833513b..d8e1a37c4b 100644
--- a/usr/src/man/man8/rmmount.8
+++ b/usr/src/man/man8/rmmount.8
@@ -232,7 +232,7 @@ and other media without file systems.
 .LP
 If a file system type has been determined, it is then checked to see that it is
 "clean." If the file system is "dirty," \fBfsck\fR \fB-p\fR (see
-\fBfsck\fR(1M)) is run in an attempt to clean it. If \fBfsck\fR fails, the file
+\fBfsck\fR(8)) is run in an attempt to clean it. If \fBfsck\fR fails, the file
 system is mounted read-only.
 .sp
 .LP
@@ -281,8 +281,8 @@ shared objects used by \fBrmmount\fR.
 .SH SEE ALSO
 .sp
 .LP
-\fBvolcheck\fR(1), \fBvolrmmount\fR(1), \fBfsck\fR(1M), \fBdlopen\fR(3C),
-\fBattributes\fR(5)
+\fBvolcheck\fR(1), \fBvolrmmount\fR(1), \fBfsck\fR(8), \fBdlopen\fR(3C),
+\fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/rmt.8 b/usr/src/man/man8/rmt.8
index 3962319286..f717fd7928 100644
--- a/usr/src/man/man8/rmt.8
+++ b/usr/src/man/man8/rmt.8
@@ -143,9 +143,9 @@ value is returned from the \fBwrite\fR(9E) call.
 Any other command causes \fBrmt\fR to exit.
 .SH SEE ALSO
 .LP
-\fBufsdump\fR(1M), \fBufsrestore\fR(1M), \fBIntro\fR(3), \fBioctl\fR(2),
+\fBufsdump\fR(8), \fBufsrestore\fR(8), \fBIntro\fR(3), \fBioctl\fR(2),
 \fBlseek\fR(2), \fBperror\fR(3C), \fBrcmd\fR(3SOCKET), \fBrexec\fR(3SOCKET),
-\fBattributes\fR(5), \fBmtio\fR(7I), \fBopen\fR(9E), \fBread\fR(9E),
+\fBattributes\fR(7), \fBmtio\fR(4I), \fBopen\fR(9E), \fBread\fR(9E),
 \fBwrite\fR(9E)
 .SH DIAGNOSTICS
 .LP
diff --git a/usr/src/man/man8/rmvolmgr.8 b/usr/src/man/man8/rmvolmgr.8
index d19c9ae636..fb09c07622 100644
--- a/usr/src/man/man8/rmvolmgr.8
+++ b/usr/src/man/man8/rmvolmgr.8
@@ -21,12 +21,12 @@ unmount removable media and hot-pluggable storage. The default mount point is
 .sp
 .LP
 \fBrmvolmgr\fR is one of a number of Hardware Abstraction Layer (HAL)-aware
-tools that are shipped with the Solaris operating system. See \fBhald\fR(1M).
+tools that are shipped with the Solaris operating system. See \fBhald\fR(8).
 .sp
 .LP
 Multiple instances of \fBrmvolmgr\fR can be run simultaneously. A system
 instance of \fBrmvolmgr\fR runs by default as a service management facility
-(SMF) service (see \fBsmf\fR(5)). Its fault management resource identifier
+(SMF) service (see \fBsmf\fR(7)). Its fault management resource identifier
 (FMRI) is:
 .sp
 .in +2
@@ -103,7 +103,7 @@ Invoke in system instance mode.
 \fBExample 1 \fRUsing SMF Properties to Set Options
 .sp
 .LP
-The following \fBsvccfg\fR(1M) command and subcommands use SMF properties to
+The following \fBsvccfg\fR(8) command and subcommands use SMF properties to
 set the \fB-c\fR and \fB-n\fR options.
 
 .sp
@@ -126,7 +126,7 @@ example#
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -142,5 +142,5 @@ Interface Stability	Volatile
 .SH SEE ALSO
 .sp
 .LP
-\fBhald\fR(1M), \fBsvccfg\fR(1M), \fBattributes\fR(5), \fBhal\fR(5),
-\fBsmf\fR(5)
+\fBhald\fR(8), \fBsvccfg\fR(8), \fBattributes\fR(7), \fBhal\fR(7),
+\fBsmf\fR(7)
diff --git a/usr/src/man/man8/roleadd.8 b/usr/src/man/man8/roleadd.8
index 06cc866d88..2ee9cac15f 100644
--- a/usr/src/man/man8/roleadd.8
+++ b/usr/src/man/man8/roleadd.8
@@ -54,8 +54,8 @@ this limit.
 .sp
 .LP
 \fBroleadd\fR requires that usernames be in the format described in
-\fBpasswd\fR(4). A warning message is displayed if these restrictions are not
-met. See \fBpasswd\fR(4) for the requirements for usernames.
+\fBpasswd\fR(5). A warning message is displayed if these restrictions are not
+met. See \fBpasswd\fR(5) for the requirements for usernames.
 .LP
 To change the action of \fBroleadd\fR when the traditional login name
 length limit of eight characters is exceeded, edit the file
@@ -71,7 +71,7 @@ The following options are supported:
 .ad
 .sp .6
 .RS 4n
-One or more comma separated authorizations defined in \fBauth_attr\fR(4). Only
+One or more comma separated authorizations defined in \fBauth_attr\fR(5). Only
 a user or role who has \fBgrant\fR rights to the authorization can assign it to
 a role.
 .RE
@@ -227,7 +227,7 @@ Null
 .sp
 .ne 2
 .na
-\fBkey=value\fR (pairs defined in \fBuser_attr\fR(4))
+\fBkey=value\fR (pairs defined in \fBuser_attr\fR(5))
 .ad
 .sp .6
 .RS 4n
@@ -317,7 +317,7 @@ this purpose.
 A \fIkey=value\fR pair to add to the role's attributes. Multiple \fB-K\fR
 options may be used to add multiple \fIkey=value\fR pairs. The generic \fB-K\fR
 option with the appropriate key may be used instead of the specific implied key
-options (\fB-A\fR, \fB-p\fR, \fB-P\fR). See \fBuser_attr\fR(4) for a
+options (\fB-A\fR, \fB-p\fR, \fB-P\fR). See \fBuser_attr\fR(5) for a
 list of valid \fIkey=value\fR pairs. The "type" key is not a valid key for this
 option. Keys cannot be repeated.
 .RE
@@ -362,7 +362,7 @@ This option allows a \fBUID\fR to be duplicated (non-unique).
 .sp .6
 .RS 4n
 Name of the project with which the added role is associated. See the
-\fIprojname\fR field as defined in \fBproject\fR(4).
+\fIprojname\fR field as defined in \fBproject\fR(5).
 .RE
 
 .sp
@@ -372,7 +372,7 @@ Name of the project with which the added role is associated. See the
 .ad
 .sp .6
 .RS 4n
-One or more comma-separated execution profiles defined in \fBprof_attr\fR(4).
+One or more comma-separated execution profiles defined in \fBprof_attr\fR(5).
 .RE
 
 .sp
@@ -428,7 +428,7 @@ reserved for allocation by the Operating System.
 \fB/etc/user_attr\fR
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -444,10 +444,10 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .LP
 \fBpasswd\fR(1), \fBpfsh\fR(1), \fBprofiles\fR(1), \fBroles\fR(1),
-\fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBgroupmod\fR(1M),
-\fBgrpck\fR(1M), \fBlogins\fR(1M), \fBpwck\fR(1M), \fBuserdel\fR(1M),
-\fBusermod\fR(1M), \fBzfs\fR(1M), \fBgetdate\fR(3C), \fBauth_attr\fR(4),
-\fBpasswd\fR(4), \fBprof_attr\fR(4), \fBuser_attr\fR(4), \fBattributes\fR(5)
+\fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8),
+\fBgrpck\fR(8), \fBlogins\fR(8), \fBpwck\fR(8), \fBuserdel\fR(8),
+\fBusermod\fR(8), \fBzfs\fR(8), \fBgetdate\fR(3C), \fBauth_attr\fR(5),
+\fBpasswd\fR(5), \fBprof_attr\fR(5), \fBuser_attr\fR(5), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .LP
 In case of an error, \fBroleadd\fR prints an error message and exits with a
diff --git a/usr/src/man/man8/roledel.8 b/usr/src/man/man8/roledel.8
index fd2233b12c..b1669fd790 100644
--- a/usr/src/man/man8/roledel.8
+++ b/usr/src/man/man8/roledel.8
@@ -154,10 +154,10 @@ system file containing additional role attributes
 .SH SEE ALSO
 .LP
 \fBauths\fR(1), \fBpasswd\fR(1), \fBprofiles\fR(1), \fBroles\fR(1),
-\fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBgroupmod\fR(1M),
-\fBlogins\fR(1M), \fBroleadd\fR(1M), \fBrolemod\fR(1M), \fBuseradd\fR(1M),
-\fBuserdel\fR(1M), \fBusermod\fR(1M), \fBzfs\fR(1M), \fBpasswd\fR(4),
-\fBprof_attr\fR(4), \fBuser_attr\fR(4), \fBattributes\fR(5)
+\fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8),
+\fBlogins\fR(8), \fBroleadd\fR(8), \fBrolemod\fR(8), \fBuseradd\fR(8),
+\fBuserdel\fR(8), \fBusermod\fR(8), \fBzfs\fR(8), \fBpasswd\fR(5),
+\fBprof_attr\fR(5), \fBuser_attr\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .LP
 The \fBroledel\fR utility only deletes an account definition that is in the
diff --git a/usr/src/man/man8/rolemod.8 b/usr/src/man/man8/rolemod.8
index 8e9a9272fe..411e3618e5 100644
--- a/usr/src/man/man8/rolemod.8
+++ b/usr/src/man/man8/rolemod.8
@@ -37,7 +37,7 @@ The following options are supported:
 .ad
 .sp .6
 .RS 4n
-One or more comma separated authorizations as defined in \fBauth_attr\fR(4).
+One or more comma separated authorizations as defined in \fBauth_attr\fR(5).
 Only a user or role who has \fBgrant\fR rights to the \fBauthorization\fR can
 assign it to an account. This replaces any existing authorization setting. If
 an empty authorization list is specified, the existing setting is removed.
@@ -132,7 +132,7 @@ Replace existing or add to a role's \fIkey=value\fR pair attributes. Multiple
 \fB-K\fR options can be used to replace or add multiple \fIkey=value\fR pairs.
 However, keys must not be repeated. The generic \fB-K\fR option with the
 appropriate key may be used instead of the specific implied key options
-(\fB-A\fR and \fB-P\fR). See \fBuser_attr\fR(4) for a list of valid
+(\fB-A\fR and \fB-P\fR). See \fBuser_attr\fR(5) for a list of valid
 \fIkey=value\fR pairs.
 .sp
 The keyword \fBtype\fR can be specified with the value \fBrole\fR or the value
@@ -203,7 +203,7 @@ This option allows the specified \fBUID\fR to be duplicated (non-unique).
 .ad
 .sp .6
 .RS 4n
-One or more comma-separated execution profiles defined in \fBprof_attr\fR(4).
+One or more comma-separated execution profiles defined in \fBprof_attr\fR(5).
 This replaces any existing profile setting. If an empty profile list is
 specified, the existing setting is removed.
 .RE
@@ -288,8 +288,8 @@ The \fIuid\fR given with the \fB-u\fR option is already in use.
 .ad
 .sp .6
 .RS 4n
-The password files contain an error. \fBpwconv\fR(1M) can be used to correct
-possible errors. See \fBpasswd\fR(4).
+The password files contain an error. \fBpwconv\fR(8) can be used to correct
+possible errors. See \fBpasswd\fR(5).
 .RE
 
 .sp
@@ -417,7 +417,7 @@ system file containing additional user and role attributes
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -432,8 +432,8 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBchown\fR(1), \fBpasswd\fR(1), \fBgroupadd\fR(1M),
-\fBgroupdel\fR(1M), \fBgroupmod\fR(1M), \fBlogins\fR(1M), \fBpwconv\fR(1M),
-\fBroleadd\fR(1M), \fBroledel\fR(1M), \fBuseradd\fR(1M), \fBuserdel\fR(1M),
-\fBusermod\fR(1M), \fBzfs\fR(1M), \fBgetdate\fR(3C), \fBauth_attr\fR(4),
-\fBpasswd\fR(4), \fBprof_attr\fR(4), \fBuser_attr\fR(4), \fBattributes\fR(5)
+\fBchown\fR(1), \fBpasswd\fR(1), \fBgroupadd\fR(8),
+\fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBlogins\fR(8), \fBpwconv\fR(8),
+\fBroleadd\fR(8), \fBroledel\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8),
+\fBusermod\fR(8), \fBzfs\fR(8), \fBgetdate\fR(3C), \fBauth_attr\fR(5),
+\fBpasswd\fR(5), \fBprof_attr\fR(5), \fBuser_attr\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/root_archive.8 b/usr/src/man/man8/root_archive.8
index fc0b2880de..127333447a 100644
--- a/usr/src/man/man8/root_archive.8
+++ b/usr/src/man/man8/root_archive.8
@@ -27,7 +27,7 @@ The utility can pack and unpack boot archives and image miniroots. Both \fBufs\f
 is generated when packing.
 .sp
 .LP
-For normal, boot-related system administration, \fBbootadm\fR(1M) is recommended.
+For normal, boot-related system administration, \fBbootadm\fR(8) is recommended.
 .SH SUBCOMMANDS
 .sp
 .LP
@@ -77,7 +77,7 @@ The command exited due to an error.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -93,5 +93,5 @@ Interface Stability	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBcpio\fR(1), \fBbootadm\fR(1M), \fBmount\fR(1M), \fBattributes\fR(5),
-\fBlofi\fR(7D)
+\fBcpio\fR(1), \fBbootadm\fR(8), \fBmount\fR(8), \fBattributes\fR(7),
+\fBlofi\fR(4D)
diff --git a/usr/src/man/man8/route.8 b/usr/src/man/man8/route.8
index de2b3453f9..c9f7e28708 100644
--- a/usr/src/man/man8/route.8
+++ b/usr/src/man/man8/route.8
@@ -41,13 +41,13 @@ route \- manually manipulate the routing tables
 
 .SH DESCRIPTION
 \fBroute\fR manually manipulates the network routing tables. These tables are
-normally maintained by the system routing daemon, such as \fBin.routed\fR(1M)
-and \fBin.ripngd\fR(1M).
+normally maintained by the system routing daemon, such as \fBin.routed\fR(8)
+and \fBin.ripngd\fR(8).
 .sp
 .LP
 \fBroute\fR supports a limited number of general options, but a rich command
 language. Users can specify an arbitrary request that can be delivered by means
-of the programmatic interface discussed in \fBroute\fR(7P).
+of the programmatic interface discussed in \fBroute\fR(4P).
 .sp
 .LP
 \fBroute\fR uses a routing socket and the new message types \fBRTM_ADD\fR,
@@ -644,11 +644,11 @@ List of network names and addresses
 .RE
 
 .SH SEE ALSO
-\fBuname\fR(1), \fBin.ripngd\fR(1M), \fBin.routed\fR(1M), \fBnetstat\fR(1M),
-\fBrouted\fR(1M), \fBioctl\fR(2), \fBgetipnodebyname\fR(3SOCKET),
-\fBgetnetbyname\fR(3SOCKET), \fBinet_addr\fR(3C), \fBdefaultrouter\fR(4),
-\fBhosts\fR(4), \fBnetworks\fR(4), \fBattributes\fR(5), \fBARP\fR(7P),
-\fBip\fR(7P), \fBroute\fR(7P), \fBrouting\fR(7P)
+\fBuname\fR(1), \fBin.ripngd\fR(8), \fBin.routed\fR(8), \fBnetstat\fR(8),
+\fBrouted\fR(8), \fBioctl\fR(2), \fBgetipnodebyname\fR(3SOCKET),
+\fBgetnetbyname\fR(3SOCKET), \fBinet_addr\fR(3C), \fBdefaultrouter\fR(5),
+\fBhosts\fR(5), \fBnetworks\fR(5), \fBattributes\fR(7), \fBARP\fR(4P),
+\fBip\fR(4P), \fBroute\fR(4P), \fBrouting\fR(4P)
 .SH DIAGNOSTICS
 .ne 2
 .na
@@ -750,7 +750,7 @@ Specifying that destinations are local (with the \fB-interface\fR modifier)
 assumes that the routers implement \fBproxy ARP\fR, meaning that they respond
 to ARP queries for all reachable destinations. Normally, using either router
 discovery or RIP is more reliable and scalable than using proxy ARP. See
-\fBin.routed\fR(1M) for information related to RIP.
+\fBin.routed\fR(8) for information related to RIP.
 .sp
 .LP
 Combining the all destinations are local route with subnet or network routes
diff --git a/usr/src/man/man8/routeadm.8 b/usr/src/man/man8/routeadm.8
index b7c5ed0ec1..0e71aba11f 100644
--- a/usr/src/man/man8/routeadm.8
+++ b/usr/src/man/man8/routeadm.8
@@ -43,7 +43,7 @@ routes.
 .LP
 IP forwarding and routing functions are also represented as services within the
 service management facility (SMF), and can be administered by means of
-\fBsvcadm\fR(1M) also, using the following fault management resource
+\fBsvcadm\fR(8) also, using the following fault management resource
 identifiers (FMRIs):
 .sp
 .in +2
@@ -107,7 +107,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -317,7 +317,7 @@ packets to and from interfaces when appropriate. The SMF service associated
 with this configuration variable is \fBsvc:/network/routing/ipv4-forwarding\fR.
 This service will be enabled or disabled as appropriate when \fBrouteadm\fR is
 called with the \fBu\fR option. As an alternative, you can use
-\fBsvcadm\fR(1M). Services that require \fBipv4-forwarding\fR to be enabled
+\fBsvcadm\fR(8). Services that require \fBipv4-forwarding\fR to be enabled
 should specify a dependency on this service.
 .RE
 
@@ -330,10 +330,10 @@ should specify a dependency on this service.
 .RS 4n
 Determines whether an IPv4 routing daemon is run. The system default is
 \fBenabled\fR unless the \fB/etc/defaultrouter\fR file exists (see
-\fBdefaultrouter\fR(4)), in which case the default is \fBdisabled\fR. The value
+\fBdefaultrouter\fR(5)), in which case the default is \fBdisabled\fR. The value
 of this option reflects the state of all IPv4 routing services, such that if
 any IPv4 routing service is enabled, \fBipv4-routing\fR is enabled. This allows
-users to interact with routing services using \fBsvcadm\fR(1M), as well as
+users to interact with routing services using \fBsvcadm\fR(8), as well as
 through \fBrouteadm\fR. IPv4 routing services, specified by means of the
 \fBrouting-svcs\fR variable, will be prepared for enable on next boot when the
 user explicitly enables \fBipv4-routing\fR. The SMF routing daemon service for
@@ -354,7 +354,7 @@ and from interfaces when appropriate. If disabled, IP will not forward IPv6
 packets to and from interfaces when appropriate. The SMF service associated
 with this configuration variable is \fBsvc:/network/routing/ipv6-forwarding\fR.
 This service will be enabled or disabled as appropriate when \fBrouteadm\fR is
-called with the \fB-u\fR option, or \fBsvcadm\fR(1M) is used. Services that
+called with the \fB-u\fR option, or \fBsvcadm\fR(8) is used. Services that
 require \fBipv6-forwarding\fR to be enabled should specify a dependency on this
 service.
 .RE
@@ -370,7 +370,7 @@ Determines whether an IPv6 routing daemon is run. The system default is
 \fBdisabled\fR. The value of this option reflects the state of all IPv6 routing
 services, such that, if any IPv6 routing service is enabled, \fBipv6-routing\fR
 is enabled. This allows users to interact with routing services via
-\fBsvcadm\fR(1M) as well as through \fBrouteadm\fR. IPv6 routing services,
+\fBsvcadm\fR(8) as well as through \fBrouteadm\fR. IPv6 routing services,
 specified by means of the \fBrouting-svcs\fR variable, will be prepared for
 enable on next boot when the user explicitly enables \fBipv6-routing\fR. The
 SMF routing daemon service for \fBin.ripngd\fR
@@ -390,7 +390,7 @@ router's routing table with static routes.
 The forwarding settings are global settings. Each interface also has an
 \fBIFF_ROUTER\fR forwarding flag that determines whether packets can be
 forwarded to or from a particular interface. That flag can be independently
-controlled by means of \fBifconfig\fR(1M)'s router option. When the global
+controlled by means of \fBifconfig\fR(8)'s router option. When the global
 forwarding setting is changed (that is, \fB-u\fR is issued to change the value
 from \fBenabled\fR to \fBdisabled\fR or vice-versa), all interface flags in the
 system are changed simultaneously to reflect the new global policy. Interfaces
@@ -493,7 +493,7 @@ example# \fBrouteadm -e ipv4-routing -u\fR
 
 .sp
 .LP
-See \fBin.routed\fR(1M) for details of property names and how they relate to
+See \fBin.routed\fR(8) for details of property names and how they relate to
 daemon behavior.
 
 .SH EXIT STATUS
@@ -528,7 +528,7 @@ Parameters for IP forwarding and routing. (Not to be edited.)
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -543,5 +543,5 @@ Interface Stability	Stable
 
 .SH SEE ALSO
 .LP
-\fBifconfig\fR(1M), \fBin.routed\fR(1M), \fBsvcadm\fR(1M), \fBgateways\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBifconfig\fR(8), \fBin.routed\fR(8), \fBsvcadm\fR(8), \fBgateways\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
diff --git a/usr/src/man/man8/rpc.bootparamd.8 b/usr/src/man/man8/rpc.bootparamd.8
index 907c786b33..6038cb00b4 100644
--- a/usr/src/man/man8/rpc.bootparamd.8
+++ b/usr/src/man/man8/rpc.bootparamd.8
@@ -18,11 +18,11 @@ rpc.bootparamd, bootparamd \- boot parameter server
 .LP
 \fBrpc.bootparamd\fR is a server process that provides information from a
 \fBbootparams\fR database to diskless clients at boot time. See
-\fBbootparams\fR(4)
+\fBbootparams\fR(5)
 .sp
 .LP
 The source for the \fBbootparams\fR database is determined by the
-\fBnsswitch.conf\fR(4) file (on the machine running the \fBrpc.bootparamd\fR
+\fBnsswitch.conf\fR(5) file (on the machine running the \fBrpc.bootparamd\fR
 process).
 .SH OPTIONS
 .sp
@@ -59,8 +59,8 @@ configuration file for the name-service switch
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBbootparams\fR(4), \fBnsswitch.conf\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBbootparams\fR(5), \fBnsswitch.conf\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -76,7 +76,7 @@ and attempt the request again.
 .sp
 .LP
 The \fBrpc.bootparamd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -88,5 +88,5 @@ svc:/network/rpc/bootparams
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/rpc.rstatd.8 b/usr/src/man/man8/rpc.rstatd.8
index 50882bf822..226c612bed 100644
--- a/usr/src/man/man8/rpc.rstatd.8
+++ b/usr/src/man/man8/rpc.rstatd.8
@@ -24,13 +24,13 @@ information that it displays.
 .SH SEE ALSO
 .sp
 .LP
-\fBrup\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M),
-\fBsvcadm\fR(1M), \fBservices\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBrup\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8),
+\fBsvcadm\fR(8), \fBservices\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBrpc.rstatd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -42,8 +42,8 @@ svc:/network/rpc/rstat:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/rpc.rusersd.8 b/usr/src/man/man8/rpc.rusersd.8
index d10c1699ed..feaddb6bed 100644
--- a/usr/src/man/man8/rpc.rusersd.8
+++ b/usr/src/man/man8/rpc.rusersd.8
@@ -16,18 +16,18 @@ rpc.rusersd, rusersd \- network username server
 .sp
 .LP
 \fBrpc.rusersd\fR is a server that returns a list of users on the host. The
-\fBrpc.rusersd\fR daemon may be started by \fBinetd\fR(1M) or \fBlisten\fR(1M).
+\fBrpc.rusersd\fR daemon may be started by \fBinetd\fR(8) or \fBlisten\fR(8).
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBlisten\fR(1M),
-\fBpmadm\fR(1M), \fBsacadm\fR(1M), \fBsvcadm\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8), \fBlisten\fR(8),
+\fBpmadm\fR(8), \fBsacadm\fR(8), \fBsvcadm\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBrpc.rusersd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -39,8 +39,8 @@ svc:/network/rpc/rusers:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/rpc.rwalld.8 b/usr/src/man/man8/rpc.rwalld.8
index 7a973eb297..ee9602aa63 100644
--- a/usr/src/man/man8/rpc.rwalld.8
+++ b/usr/src/man/man8/rpc.rwalld.8
@@ -15,21 +15,21 @@ rpc.rwalld, rwalld \- network rwall server
 .SH DESCRIPTION
 .sp
 .LP
-\fBrpc.rwalld\fR is a server that handles \fBrwall\fR(1M) requests. It is
-implemented by calling \fBwall\fR(1M) on all the appropriate network machines.
-The \fBrpc.rwalld\fR daemon may be started by \fBinetd\fR(1M) or
-\fBlisten\fR(1M).
+\fBrpc.rwalld\fR is a server that handles \fBrwall\fR(8) requests. It is
+implemented by calling \fBwall\fR(8) on all the appropriate network machines.
+The \fBrpc.rwalld\fR daemon may be started by \fBinetd\fR(8) or
+\fBlisten\fR(8).
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBlisten\fR(1M),
-\fBrwall\fR(1M), \fBsvcadm\fR(1M), \fBwall\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8), \fBlisten\fR(8),
+\fBrwall\fR(8), \fBsvcadm\fR(8), \fBwall\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBrpc.rwalld\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -41,8 +41,8 @@ svc:/network/rpc/wall:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/rpc.smserverd.8 b/usr/src/man/man8/rpc.smserverd.8
index 9a90c7d185..94269932a7 100644
--- a/usr/src/man/man8/rpc.smserverd.8
+++ b/usr/src/man/man8/rpc.smserverd.8
@@ -18,7 +18,7 @@ rpc.smserverd \- removable media device server
 applications, such as volume management software or \fBrmformat\fR(1),
 for access to removable media
 devices. The \fBrpc.smserverd\fR daemon is started by
-\fBinetd\fR(1M) when a client makes a call to a Solaris-internal library to
+\fBinetd\fR(8) when a client makes a call to a Solaris-internal library to
 access a SCSI, IDE, or USB device. The daemon is not started if a client
 attempts to access a floppy or PCMCIA device. Once started, the daemon remains
 active until such time as it is idle for three minutes or more.
@@ -29,12 +29,12 @@ applications mentioned above. It has no external, customer-accessible
 interfaces, including no configuration file.
 .SH SEE ALSO
 .LP
-\fBrmformat\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M),
-\fBsvcadm\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBrmformat\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8),
+\fBsvcadm\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .LP
 The \fBrpc.smserverd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -46,8 +46,8 @@ svc:/network/rpc/smserver
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/rpc.sprayd.8 b/usr/src/man/man8/rpc.sprayd.8
index 17f6ad9fa6..a83b67a904 100644
--- a/usr/src/man/man8/rpc.sprayd.8
+++ b/usr/src/man/man8/rpc.sprayd.8
@@ -15,9 +15,9 @@ rpc.sprayd, sprayd \- spray server
 .SH DESCRIPTION
 .sp
 .LP
-\fBrpc.sprayd\fR is a server that records the packets sent by \fBspray\fR(1M).
-The \fBrpc.sprayd\fR daemon may be started by \fBinetd\fR(1M) or
-\fBlisten\fR(1M).
+\fBrpc.sprayd\fR is a server that records the packets sent by \fBspray\fR(8).
+The \fBrpc.sprayd\fR daemon may be started by \fBinetd\fR(8) or
+\fBlisten\fR(8).
 .sp
 .LP
 The service provided by \fBrpc.sprayd\fR is not useful as a networking
@@ -28,14 +28,14 @@ the packets get to the network medium).
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M) \fBlisten\fR(1M),
-\fBpmadm\fR(1M), \fBsacadm\fR(1M), \fBspray\fR(1M), \fBsvcadm\fR(1M),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBinetadm\fR(8), \fBinetd\fR(8) \fBlisten\fR(8),
+\fBpmadm\fR(8), \fBsacadm\fR(8), \fBspray\fR(8), \fBsvcadm\fR(8),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBrpc.sprayd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -47,8 +47,8 @@ svc:/network/rpc/spray:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/rpc.yppasswdd.8 b/usr/src/man/man8/rpc.yppasswdd.8
index 3cd8f520aa..604352efb0 100644
--- a/usr/src/man/man8/rpc.yppasswdd.8
+++ b/usr/src/man/man8/rpc.yppasswdd.8
@@ -66,7 +66,7 @@ full pathname of the \fBpasswd\fR, \fBpasswd.adjunct\fR files and use the
 .sp
 .LP
 The daemon is started automatically on the master server of the passwd map by
-\fBypstart\fR(1M), which is invoked at boot time by the
+\fBypstart\fR(8), which is invoked at boot time by the
 \fBsvcs:/network/nis/server:default\fR service.
 .sp
 .LP
@@ -89,7 +89,7 @@ Any deviation causes a password update to fail.
 .LP
 If you remove or add a \fBshadow\fR or \fBpasswd.adjunct\fR file after
 \fBrpc.yppasswdd\fR has started, you must stop and restart the daemon to enable
-it to recognize the change. See \fBypstart\fR(1m) for information on restarting
+it to recognize the change. See \fBypstart\fR(8) for information on restarting
 the daemon.
 .sp
 .LP
@@ -98,7 +98,7 @@ with 'r' to be a restricted shell. By default, the daemon does not check
 whether a shell begins with an '\fBr\fR'. However, you can tell it to do so by
 uncommenting the \fBcheck_restricted_shell_name=1\fR line in
 \fB/etc/default/yppasswdd\fR. The result will be to restrict a user's ability
-to change from his default shell. See \fByppasswdd\fR(4).
+to change from his default shell. See \fByppasswdd\fR(5).
 .sp
 .LP
 On start up, \fByppasswdd\fR checks for the existence of a NIS to LDAP (N2L)
@@ -112,7 +112,7 @@ In N2L mode, changes are written directly to the Directory Information Tree
 source files, \fBpasswd\fR, \fBshadow\fR, and \fBpasswd.adjunct\fR, for
 example, are not updated. Thus, in N2L mode, the \fB-D\fR option is
 meaningless. In N2L mode, \fByppasswdd\fR propagates changes by calling
-\fByppush\fR(1M) instead of \fBypmake\fR(1M). The \fB-m\fR option is thus
+\fByppush\fR(8) instead of \fBypmake\fR(8). The \fB-m\fR option is thus
 unused.
 .sp
 .LP
@@ -124,10 +124,10 @@ information to the DIT. If you are not using password aging, then the
 .sp
 .LP
 \fBsvcs\fR(1), \fBmake\fR(1S), \fBpasswd\fR(1), \fByppasswd\fR(1),
-\fBinetd\fR(1M), \fBsvcadm\fR(1M), \fBypmake\fR(1M), \fByppush\fR(1M),
-\fBypstart\fR(1M), \fBNISLDAPmapping\fR(4), \fBpasswd\fR(4), \fBshadow\fR(4),
-\fBypfiles\fR(4), \fByppasswdd\fR(4), \fBypserv\fR(4), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBinetd\fR(8), \fBsvcadm\fR(8), \fBypmake\fR(8), \fByppush\fR(8),
+\fBypstart\fR(8), \fBNISLDAPmapping\fR(5), \fBpasswd\fR(5), \fBshadow\fR(5),
+\fBypfiles\fR(5), \fByppasswdd\fR(5), \fBypserv\fR(5), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -151,7 +151,7 @@ permission.
 .sp
 .LP
 The NIS server service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -163,5 +163,5 @@ svcs:/network/nis/server:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/rpc.ypupdated.8 b/usr/src/man/man8/rpc.ypupdated.8
index c85b8e4f75..e42dc8b2e1 100644
--- a/usr/src/man/man8/rpc.ypupdated.8
+++ b/usr/src/man/man8/rpc.ypupdated.8
@@ -16,7 +16,7 @@ rpc.ypupdated, ypupdated \- server for changing NIS information
 .sp
 .LP
 \fBypupdated\fR is a daemon that updates information in the Network Information
-Service (NIS). \fBypupdated\fR consults the  \fBupdaters\fR(4) file in the
+Service (NIS). \fBypupdated\fR consults the  \fBupdaters\fR(5) file in the
 \fB/var/yp\fR directory to determine which \fBNIS\fR maps should be updated and
 how to change them.
 .sp
@@ -73,7 +73,7 @@ Configuration file for N2L
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -89,8 +89,8 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBkeyserv\fR(1M), \fBupdaters\fR(4), \fBNISLDAPmapping\fR(4),
-\fBattributes\fR(5)
+\fBkeyserv\fR(8), \fBupdaters\fR(5), \fBNISLDAPmapping\fR(5),
+\fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/rpcbind.8 b/usr/src/man/man8/rpcbind.8
index 5101fce73b..6e9e456117 100644
--- a/usr/src/man/man8/rpcbind.8
+++ b/usr/src/man/man8/rpcbind.8
@@ -44,7 +44,7 @@ for indirect calls. This is the \fBUDP\fR port on most systems.
 .sp
 .LP
 The \fBrpcbind\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -56,12 +56,12 @@ svc:/network/rpc/bind
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). \fBrpcbind\fR can
+requesting restart, can be performed using \fBsvcadm\fR(8). \fBrpcbind\fR can
 only be started by the superuser or someone in the Primary Administrator role.
 .sp
 .LP
 The configuration properties of this service can be modified with
-\fBsvccfg\fR(1M).
+\fBsvccfg\fR(8).
 .sp
 .LP
 The following SMF property is used to allow or disallow access to \fBrpcbind\fR
@@ -94,11 +94,11 @@ parameter is enabled, then all calls to \fBrpcbind\fR originating from
 non-local addresses are automatically wrapped by the TCP wrappers facility. The
 \fBsyslog\fR facility code daemon is used to log allowed connections (using the
 \fBinfo\fR severity level) and denied traffic (using the \fBwarning\fR severity
-level). See \fBsyslog.conf\fR(4) for a description of \fBsyslog\fR codes and
+level). See \fBsyslog.conf\fR(5) for a description of \fBsyslog\fR codes and
 severity levels. The stability level of the TCP wrappers facility and its
 configuration files is External. As the TCP wrappers facility is not controlled
 by Sun, intrarelease incompatibilities are not uncommon. See
-\fBattributes\fR(5).
+\fBattributes\fR(7).
 .RE
 
 .sp
@@ -228,7 +228,7 @@ purposes.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -246,9 +246,9 @@ Interface Stability	See below.
 TCP wrappers is External.
 .SH SEE ALSO
 .LP
-\fBsmf\fR(5), \fBrpcinfo\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
-\fBrpcbind\fR(3NSL), \fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5),
-\fBhosts_access\fR(4)
+\fBsmf\fR(7), \fBrpcinfo\fR(8), \fBsvcadm\fR(8), \fBsvccfg\fR(8),
+\fBrpcbind\fR(3NSL), \fBsyslog.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7),
+\fBhosts_access\fR(5)
 .SH NOTES
 .LP
 Terminating \fBrpcbind\fR with \fBSIGKILL\fR prevents the warm-start files from
diff --git a/usr/src/man/man8/rpcinfo.8 b/usr/src/man/man8/rpcinfo.8
index b92178fdff..71e51e2afd 100644
--- a/usr/src/man/man8/rpcinfo.8
+++ b/usr/src/man/man8/rpcinfo.8
@@ -81,7 +81,7 @@ call to the remote \fBrpcbind\fR.
 .sp
 .LP
 The \fIprognum\fR argument is a number that represents an \fBRPC\fR program
-number (see \fBrpc\fR(4)).
+number (see \fBrpc\fR(5)).
 .sp
 .LP
 If a \fIversnum\fR is specified, \fBrpcinfo\fR attempts to call that version of
@@ -103,7 +103,7 @@ The \fBEXAMPLES\fR section describe other ways of using \fBrpcinfo\fR.
 Specify the transport on which the service is required. If this option is not
 specified, \fBrpcinfo\fR uses the transport specified in the \fBNETPATH\fR
 environment variable, or if that is unset or \fINULL,\fR the transport in the
-\fBnetconfig\fR(4) database is used. This is a generic option, and can be used
+\fBnetconfig\fR(5) database is used. This is a generic option, and can be used
 in conjunction with other options as shown in the \fBSYNOPSIS\fR.
 .RE
 
@@ -347,5 +347,5 @@ or
 
 .SH SEE ALSO
 .LP
-\fBrpcbind\fR(1M), \fBrpc\fR(3NSL), \fBnetconfig\fR(4), \fBrpc\fR(4),
-\fBattributes\fR(5)
+\fBrpcbind\fR(8), \fBrpc\fR(3NSL), \fBnetconfig\fR(5), \fBrpc\fR(5),
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/rquotad.8 b/usr/src/man/man8/rquotad.8
index 326357bd54..bf69e7aed0 100644
--- a/usr/src/man/man8/rquotad.8
+++ b/usr/src/man/man8/rquotad.8
@@ -15,14 +15,14 @@ rquotad \- remote quota server
 .SH DESCRIPTION
 .sp
 .LP
-\fBrquotad\fR is an \fBrpc\fR(4) server which returns quotas for a user of a
+\fBrquotad\fR is an \fBrpc\fR(5) server which returns quotas for a user of a
 local file system which is mounted by a remote machine over the \fBNFS.\fR The
-results are used by \fBquota\fR(1M) to display user quotas for remote file
-systems. The \fBrquotad\fR daemon is normally invoked by \fBinetd\fR(1M).
+results are used by \fBquota\fR(8) to display user quotas for remote file
+systems. The \fBrquotad\fR daemon is normally invoked by \fBinetd\fR(8).
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBrquotad\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBrquotad\fR
 when encountering files greater than or equal to 2 Gbyte (2^31 bytes).
 .SH FILES
 .sp
@@ -37,10 +37,10 @@ quota file at a UFS file system root
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBautomountd\fR(1M), \fBinetadm\fR(1M), \fBinetd\fR(1M),
-\fBmount_nfs\fR(1M), \fBquota\fR(1M), \fBshare_nfs\fR(1M), \fBsvcadm\fR(1M),
-\fBrpc\fR(4), \fBservices\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBautomountd\fR(8), \fBinetadm\fR(8), \fBinetd\fR(8),
+\fBmount_nfs\fR(8), \fBquota\fR(8), \fBshare_nfs\fR(8), \fBsvcadm\fR(8),
+\fBrpc\fR(5), \fBservices\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7),
+\fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
@@ -48,7 +48,7 @@ quota file at a UFS file system root
 .sp
 .LP
 The \fBrquotad\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -60,13 +60,13 @@ svc:/network/nfs/rquota
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
+requesting restart, can be performed using \fBsvcadm\fR(8). Responsibility for
+initiating and restarting this service is delegated to \fBinetd\fR(8). Use
+\fBinetadm\fR(8) to make configuration changes and to view configuration
 information for this service. The service's status can be queried using the
 \fBsvcs\fR(1) command.
 .sp
 .LP
-If it is disabled, it will be enabled by \fBmount_nfs\fR(1M),
-\fBshare_nfs\fR(1M), and \fBautomountd\fR(1M) unless its
+If it is disabled, it will be enabled by \fBmount_nfs\fR(8),
+\fBshare_nfs\fR(8), and \fBautomountd\fR(8) unless its
 \fBapplication/auto_enable\fR property is set to \fBfalse\fR.
diff --git a/usr/src/man/man8/rsh.8 b/usr/src/man/man8/rsh.8
index d6ab1502d6..ac99a153c7 100644
--- a/usr/src/man/man8/rsh.8
+++ b/usr/src/man/man8/rsh.8
@@ -61,7 +61,7 @@ A restricted shell can be invoked in one of the following ways:
 .TP
 1.
 \fBrsh\fR is the file name part of the last entry in the \fB/etc/passwd\fR
-file (see \fBpasswd\fR(4));
+file (see \fBpasswd\fR(5));
 .RE
 .RS +4
 .TP
@@ -90,7 +90,7 @@ end-user does not have write and execute permissions in the same directory.
 .sp
 .LP
 The net effect of these rules is that the writer of the \fI\&.profile\fR (see
-\fBprofile\fR(4)) has complete control over user actions by performing
+\fBprofile\fR(5)) has complete control over user actions by performing
 guaranteed setup actions and leaving the user in an appropriate directory
 (probably \fInot\fR the login directory).
 .sp
@@ -107,7 +107,7 @@ the last command executed.
 .SH SEE ALSO
 .LP
 \fBIntro\fR(1), \fBcd\fR(1), \fBlogin\fR(1), \fBrsh\fR(1), \fBsh\fR(1),
-\fBexec\fR(2), \fBpasswd\fR(4), \fBprofile\fR(4), \fBattributes\fR(5)
+\fBexec\fR(2), \fBpasswd\fR(5), \fBprofile\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .LP
 The restricted shell, \fB/usr/lib/rsh\fR, should not be confused with the
diff --git a/usr/src/man/man8/rtquery.8 b/usr/src/man/man8/rtquery.8
index 2c15dcb7f4..01f3508495 100644
--- a/usr/src/man/man8/rtquery.8
+++ b/usr/src/man/man8/rtquery.8
@@ -22,7 +22,7 @@ rtquery \- query routing daemons for their routing tables
 .sp
 .LP
 The \fBrtquery\fR command is used to query a RIP network routing daemon,
-\fBin.routed\fR(1M) or \fBGateD\fR, for its routing table by sending a request
+\fBin.routed\fR(8) or \fBGateD\fR, for its routing table by sending a request
 or poll command. The routing information in any routing response packets
 returned is displayed numerically and symbolically.
 .sp
@@ -179,8 +179,8 @@ An error occurred.
 .SH SEE ALSO
 .sp
 .LP
-\fBin.routed\fR(1M),  \fBroute\fR(1M), \fBgateways\fR(4), \fBattributes\fR(5),
-\fBicmp\fR(7P), \fBinet\fR(7P), \fBudp\fR(7P)
+\fBin.routed\fR(8),  \fBroute\fR(8), \fBgateways\fR(5), \fBattributes\fR(7),
+\fBicmp\fR(4P), \fBinet\fR(4P), \fBudp\fR(4P)
 .sp
 .LP
 \fIRouting Information Protocol, RIPv1, RFC 1058\fR
diff --git a/usr/src/man/man8/runacct.8 b/usr/src/man/man8/runacct.8
index b85848f300..53b881f3c0 100644
--- a/usr/src/man/man8/runacct.8
+++ b/usr/src/man/man8/runacct.8
@@ -274,10 +274,10 @@ History of user access and administration information
 .SH SEE ALSO
 .sp
 .LP
-\fBacctcom\fR(1), \fBmail\fR(1), \fBacct\fR(1M), \fBacctcms\fR(1M),
-\fBacctcon\fR(1M), \fBacctmerg\fR(1M), \fBacctprc\fR(1M), \fBacctsh\fR(1M),
-\fBcron\fR(1M), \fBfwtmp\fR(1M), \fBacct\fR(2), \fBacct.h\fR(3HEAD),
-\fButmpx\fR(4), \fBattributes\fR(5)
+\fBacctcom\fR(1), \fBmail\fR(1), \fBacct\fR(8), \fBacctcms\fR(8),
+\fBacctcon\fR(8), \fBacctmerg\fR(8), \fBacctprc\fR(8), \fBacctsh\fR(8),
+\fBcron\fR(8), \fBfwtmp\fR(8), \fBacct\fR(2), \fBacct.h\fR(3HEAD),
+\fButmpx\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/rwall.8 b/usr/src/man/man8/rwall.8
index 533b36a522..8979ef7d65 100644
--- a/usr/src/man/man8/rwall.8
+++ b/usr/src/man/man8/rwall.8
@@ -63,8 +63,8 @@ Specify the \fBhostname\fR, the name of the host machine.
 .SH SEE ALSO
 .sp
 .LP
-\fBinetd\fR(1M), \fBlisten\fR(1M), \fBpmadm\fR(1M), \fBsacadm\fR(1M),
-\fBwall\fR(1M), \fBattributes\fR(5)
+\fBinetd\fR(8), \fBlisten\fR(8), \fBpmadm\fR(8), \fBsacadm\fR(8),
+\fBwall\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/sac.8 b/usr/src/man/man8/sac.8
index b6b58b889c..48cce14d8d 100644
--- a/usr/src/man/man8/sac.8
+++ b/usr/src/man/man8/sac.8
@@ -71,7 +71,7 @@ states:
 .ad
 .RS 14n
 The port monitor is currently running and is accepting connections. See
-\fBsacadm\fR(1M) with the \fB-e\fR option.
+\fBsacadm\fR(8) with the \fB-e\fR option.
 .RE
 
 .sp
@@ -215,23 +215,23 @@ monitors on the system.
 .SH SEE ALSO
 .sp
 .LP
-\fBpmadm\fR(1M), \fBsacadm\fR(1M), \fBfork\fR(2) \fBpam\fR(3PAM),
-\fBpam.conf\fR(4), \fBattributes\fR(5), \fBpam_authtok_check\fR(5),
-\fBpam_authtok_get\fR(5), \fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5),
-\fBpam_passwd_auth\fR(5), \fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5),
-\fBpam_unix_session\fR(5)
+\fBpmadm\fR(8), \fBsacadm\fR(8), \fBfork\fR(2) \fBpam\fR(3PAM),
+\fBpam.conf\fR(5), \fBattributes\fR(7), \fBpam_authtok_check\fR(7),
+\fBpam_authtok_get\fR(7), \fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7),
+\fBpam_passwd_auth\fR(7), \fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7),
+\fBpam_unix_session\fR(7)
 .SH NOTES
 .sp
 .LP
-The \fBpam_unix\fR(5) module is no longer supported. Similar functionality is
-provided by \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5), and
-\fBpam_unix_session\fR(5).
+The \fBpam_unix\fR(7) module is no longer supported. Similar functionality is
+provided by \fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7), and
+\fBpam_unix_session\fR(7).
 .sp
 .LP
 The service access controller service is managed by the service management
-facility, \fBsmf\fR(5), under the service identifier:
+facility, \fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -243,5 +243,5 @@ svc:/system/sac:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/sacadm.8 b/usr/src/man/man8/sacadm.8
index a8d12c032d..5e1fe1facb 100644
--- a/usr/src/man/man8/sacadm.8
+++ b/usr/src/man/man8/sacadm.8
@@ -546,4 +546,4 @@ monitor whose tag is \fBpmtag\fR with the contents of the file
 .SH SEE ALSO
 .sp
 .LP
-\fBpmadm\fR(1M), \fBsac\fR(1M), \fBdoconfig\fR(3NSL), \fBattributes\fR(5)
+\fBpmadm\fR(8), \fBsac\fR(8), \fBdoconfig\fR(3NSL), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/saf.8 b/usr/src/man/man8/saf.8
index 829884aaa4..ad26bce480 100644
--- a/usr/src/man/man8/saf.8
+++ b/usr/src/man/man8/saf.8
@@ -26,7 +26,7 @@ a controlling process, the service access controller (SAC), and two
 administrative levels corresponding to two levels in the supporting directory
 structure. The top administrative level is concerned with port monitor
 administration, the lower level with service administration. The \fBSAC\fR is
-documented in the \fBsac\fR(1M) man page. The administrative levels and
+documented in the \fBsac\fR(8) man page. The administrative levels and
 associated utilities are documented in the \fISystem Administration Guide -
 Volume II\fR. The requirements for writing port monitors and the functions a
 port monitor must perform to run under the \fBSAF\fR and the \fBSAC\fR are
@@ -103,7 +103,7 @@ A port monitor must be able to restrict access to the system without disturbing
 services that are still running. In order to do this, a port monitor must
 maintain two internal states: enabled and disabled. The port monitor starts in
 the state indicated by the \fBISTATE\fR environment variable provided by the
-\fBsac.\fR See sac(1M) for details. Enabling or disabling a port monitor
+\fBsac.\fR See sac(8) for details. Enabling or disabling a port monitor
 affects all ports for which the port monitor is responsible. If a port monitor
 is responsible for a single port, only that port will be affected. If a port
 monitor is responsible for multiple ports, the entire collection of ports will
@@ -210,8 +210,8 @@ A port monitor's current directory contains an administrative file named
 conjunction with a port monitor-specific administrative command.
 .sp
 The port monitor administrative command for a listen port monitor is
-\fBnlsadmin\fR(1M); the port monitor administrative command for ttymon is
-\fBttyadm\fR(1M). Any port monitor written by a user must be provided with an
+\fBnlsadmin\fR(8); the port monitor administrative command for ttymon is
+\fBttyadm\fR(8). Any port monitor written by a user must be provided with an
 administrative command specific to that port monitor to perform similar
 functions.
 .RE
@@ -472,8 +472,8 @@ all the port monitors for which the \fBSAC\fR is responsible. This file exists
 on the delivered system. Initially, it is empty except for a single comment
 line that contains the version number of the \fBSAC.\fR Port monitors are added
 to the system by making entries in the \fBSAC's\fR administrative file. These
-entries should be made using the administrative command \fBsacadm\fR(1M) with a
-\fB-a\fR option. \fBsacadm\fR(1M) is also used to remove entries from the
+entries should be made using the administrative command \fBsacadm\fR(8) with a
+\fB-a\fR option. \fBsacadm\fR(8) is also used to remove entries from the
 \fBSAC's\fR administrative file. Each entry in the \fBSAC's\fR administrative
 file contains the following information.
 .sp
@@ -564,9 +564,9 @@ directory will contain files defined by the \fBSAF\fR (\fB_pmtab\fR,
 \fB_pid\fR) and the per-service configuration scripts, if they exist. The
 directory \fB/var/saf/\fR\fIpmtag,\fR where \fIpmtag\fR is the tag of the port
 monitor, is available for the port monitor's private files. Each port monitor
-has its own administrative file. The \fBpmadm\fR(1M) command should be used to
+has its own administrative file. The \fBpmadm\fR(8) command should be used to
 add, remove, or modify service entries in this file. Each time a change is made
-using \fBpmadm\fR(1M), the corresponding port monitor rereads its
+using \fBpmadm\fR(8), the corresponding port monitor rereads its
 administrative file. Each entry in a port monitor's administrative file defines
 how the port monitor treats a specific port and what service is to be invoked
 on that port. Some fields must be present for all types of port monitors. Each
@@ -581,7 +581,7 @@ specific data (for example, for a ttymon port monitor, this will include the
 prompt string which is meaningful to ttymon). Each type of port monitor must
 provide a command that takes the necessary port monitor-specific data as
 arguments and outputs these data in a form suitable for storage in the file.
-The \fBttyadm\fR(1M) command does this for ttymon and \fBnlsadmin\fR(1M) does
+The \fBttyadm\fR(8) command does this for ttymon and \fBnlsadmin\fR(8) does
 it for listen. For a user-defined port monitor, a similar administrative
 command must also be supplied. Each service entry in the port monitor
 administrative file must have the following format and contain the information
@@ -807,8 +807,8 @@ monitor.
 .ad
 .RS 17n
 The port monitor's configuration script. The port monitor configuration script
-is run by the SAC. The \fBSAC\fR is started by \fBinit\fR(1M) as a result of an
-entry in \fB/etc/inittab\fR that calls \fBsac\fR(1M).
+is run by the SAC. The \fBSAC\fR is started by \fBinit\fR(8) as a result of an
+entry in \fB/etc/inittab\fR that calls \fBsac\fR(8).
 .RE
 
 .sp
@@ -856,7 +856,7 @@ The per-service configuration script for the service with the tag \fIsvctag\fR.
 .ad
 .RS 17n
 The \fBFIFO\fR through which the port monitor will send messages to
-\fBsac\fR(1M).
+\fBsac\fR(8).
 .RE
 
 .RE
@@ -1485,7 +1485,7 @@ The following administrative commands relate to \fBSAF.\fR
 .sp
 .ne 2
 .na
-\fB\fBsacadm\fR(1M)\fR
+\fB\fBsacadm\fR(8)\fR
 .ad
 .RS 14n
 port monitor administrative command
@@ -1494,7 +1494,7 @@ port monitor administrative command
 .sp
 .ne 2
 .na
-\fB\fBpmadm\fR(1M)\fR
+\fB\fBpmadm\fR(8)\fR
 .ad
 .RS 14n
 service administration command
@@ -1503,6 +1503,6 @@ service administration command
 .SH SEE ALSO
 .sp
 .LP
-\fBexec\fR(1), \fBsh\fR(1), \fBinit\fR(1M), \fBnlsadmin\fR(1M),
-\fBpmadm\fR(1M), \fBsac\fR(1M), \fBsacadm\fR(1M), \fBttyadm\fR(1M),
-\fBfork\fR(2), \fBdoconfig\fR(3NSL), \fBattributes\fR(5)
+\fBexec\fR(1), \fBsh\fR(1), \fBinit\fR(8), \fBnlsadmin\fR(8),
+\fBpmadm\fR(8), \fBsac\fR(8), \fBsacadm\fR(8), \fBttyadm\fR(8),
+\fBfork\fR(2), \fBdoconfig\fR(3NSL), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/sar.8 b/usr/src/man/man8/sar.8
index 112a8d54b6..d93e72b98e 100644
--- a/usr/src/man/man8/sar.8
+++ b/usr/src/man/man8/sar.8
@@ -32,7 +32,7 @@ system actions occur. These include counters for \fBCPU\fR utilization, buffer
 usage, disk and tape \fBI/O\fR activity, \fBTTY\fR device activity, switching
 and system-call activity, file-access, queue activity, inter-process
 communications, and paging. For more general system statistics, use
-\fBiostat\fR(1M), \fBsar\fR(1), or \fBvmstat\fR(1M).
+\fBiostat\fR(8), \fBsar\fR(1), or \fBvmstat\fR(8).
 .sp
 .LP
 \fBsadc\fR and two shell procedures, \fBsa1\fR and \fBsa2\fR, are used to
@@ -134,15 +134,15 @@ Daily report file
 .SH SEE ALSO
 .LP
 \fBcrontab\fR(1), \fBsar\fR(1), \fBsvcs\fR(1), \fBtimex\fR(1),
-\fBiostat\fR(1M), \fBsvcadm\fR(1M), \fBvmstat\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBiostat\fR(8), \fBsvcadm\fR(8), \fBvmstat\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
 .SH NOTES
 .LP
 The \fBsar\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -154,5 +154,5 @@ svc:/system/sar
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/sasinfo.8 b/usr/src/man/man8/sasinfo.8
index e2ff250e10..2dafd3bd8f 100644
--- a/usr/src/man/man8/sasinfo.8
+++ b/usr/src/man/man8/sasinfo.8
@@ -715,7 +715,7 @@ OS Device Name: /dev/rdsk/c4t50020F230000B4AFd0s2
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -730,4 +730,4 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBattributes\fR(5)
+\fBattributes\fR(7)
diff --git a/usr/src/man/man8/savecore.8 b/usr/src/man/man8/savecore.8
index 884b715819..4a9220a04a 100644
--- a/usr/src/man/man8/savecore.8
+++ b/usr/src/man/man8/savecore.8
@@ -19,7 +19,7 @@ was made) and writes a reboot message in the shutdown log. By default, it is
 invoked by the \fBdumpadm\fR service each time the system boots.
 .sp
 .LP
-Depending on the \fBdumpadm\fR(1M) configuration \fBsavecore\fR saves either
+Depending on the \fBdumpadm\fR(8) configuration \fBsavecore\fR saves either
 the compressed or uncompressed crash dump. The compressed crash dump is saved in
 the file \fIdirectory\fR\fB/vmdump.\fR\fIn\fR.
 \fBsavecore\fR saves the uncompressed crash dump data in the file
@@ -64,7 +64,7 @@ the dump has already been saved.
 Attempt to save a crash dump from the specified file instead of from the
 system's current dump device. This option may be useful if the information
 stored on the dump device has been copied to an on-disk file by means of the
-\fBdd\fR(1M) command.
+\fBdd\fR(8) command.
 .RE
 
 .sp
@@ -79,7 +79,7 @@ to save a live snapshot of the system to the dump device, and then immediately
 to retrieve the data and to write it out to a new set of crash dump files in
 the specified directory. Live system crash dumps can only be performed if you
 have configured your system to have a dedicated dump device using
-\fBdumpadm\fR(1M).
+\fBdumpadm\fR(8).
 .sp
 \fBsavecore\fR \fB-L\fR does not suspend the system, so the contents of memory
 continue to change while the dump is saved. This means that live crash dumps
@@ -118,7 +118,7 @@ The following operands are supported:
 .RS 13n
 Save the crash dump files to the specified directory. If \fIdirectory\fR is not
 specified, \fBsavecore\fR saves the crash dump files to the default
-\fBsavecore\fR \fIdirectory\fR, configured by \fBdumpadm\fR(1M).
+\fBsavecore\fR \fIdirectory\fR, configured by \fBdumpadm\fR(8).
 .RE
 
 .SH FILES
@@ -177,12 +177,12 @@ default crash dump directory
 
 .SH SEE ALSO
 .LP
-\fBadb\fR(1), \fBmdb\fR(1), \fBsvcs\fR(1), \fBdd\fR(1M), \fBdumpadm\fR(1M),
-\fBsvcadm\fR(1M), \fBsyslog\fR(3C), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBadb\fR(1), \fBmdb\fR(1), \fBsvcs\fR(1), \fBdd\fR(8), \fBdumpadm\fR(8),
+\fBsvcadm\fR(8), \fBsyslog\fR(3C), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .LP
 The system crash dump service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -194,7 +194,7 @@ svc:/system/dumpadm:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
diff --git a/usr/src/man/man8/sbdadm.8 b/usr/src/man/man8/sbdadm.8
index 7365dadd7d..ec5e071df5 100644
--- a/usr/src/man/man8/sbdadm.8
+++ b/usr/src/man/man8/sbdadm.8
@@ -248,7 +248,7 @@ An error occurred.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -263,4 +263,4 @@ Interface Stability	Obsolete Committed
 
 .SH SEE ALSO
 .LP
-\fBstmfadm\fR(1M), \fBattributes\fR(5)
+\fBstmfadm\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/scadm.8 b/usr/src/man/man8/scadm.8
index 5e75650c15..e511e2171f 100644
--- a/usr/src/man/man8/scadm.8
+++ b/usr/src/man/man8/scadm.8
@@ -1055,7 +1055,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1071,4 +1071,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBuname\fR(1), \fBsyslog\fR(3C), \fBattributes\fR(5)
+\fBuname\fR(1), \fBsyslog\fR(3C), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/sckmd.8 b/usr/src/man/man8/sckmd.8
index 36ccec7f89..5e4173dfcd 100644
--- a/usr/src/man/man8/sckmd.8
+++ b/usr/src/man/man8/sckmd.8
@@ -19,13 +19,13 @@ sckmd \- Sun cryptographic key management daemon
 maintain the Internet Protocol Security (\fBIPsec\fR) Security Associations
 (\fBSAs\fR) needed to secure communications between a Service Processor or
 System Controller (SC) and platform management software running within a
-domain. The \fBdcs\fR(1M) daemon uses these Security
-Associations. See \fBipsec\fR(7P) for a description of Security Associations.
+domain. The \fBdcs\fR(8) daemon uses these Security
+Associations. See \fBipsec\fR(4P) for a description of Security Associations.
 .sp
 .LP
 The \fBsckmd\fR daemon receives \fBSA\fRs from the Service Processor or
 \fBSC\fR and installs these \fBSA\fRs in a domain's Security Association
-Database (\fBSADB\fR) using \fBpf_key\fR(7P).
+Database (\fBSADB\fR) using \fBpf_key\fR(4P).
 .sp
 .LP
 \fBsckmd\fR starts up at system boot time as an \fBSMF\fR service. The
@@ -43,7 +43,7 @@ svc:/platform/sun4u/sckmd:default
 A domain supports only one running \fBsckmd\fR process at a time.
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -58,9 +58,9 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBdcs\fR(1M), \fBipsecconf\fR(1M), \fBipsecalgs\fR(1M),
-\fBattributes\fR(5), \fBipsec\fR(7P), \fBipsecah\fR(7P), \fBipsecesp\fR(7P),
-\fBpf_key\fR(7P)
+\fBdcs\fR(8), \fBipsecconf\fR(8), \fBipsecalgs\fR(8),
+\fBattributes\fR(7), \fBipsec\fR(4P), \fBipsecah\fR(4P), \fBipsecesp\fR(4P),
+\fBpf_key\fR(4P)
 .SH NOTES
 .LP
 The \fBsckmd\fR service is used only on Sun Fire high-end systems.
@@ -68,7 +68,7 @@ It provides a mechanism for exchanging
 \fBIPsec\fR keys between a domain and its System Controller (\fBSC\fR) or
 Service Processor. These platforms use \fBIPsec\fR to secure the communications
 between the \fBSC\fR or Service Processor and a platform-specific daemon
-in the domain, such as \fBdcs\fR(1M).
+in the domain, such as \fBdcs\fR(8).
 .sp
 .LP
 The documentation for each platform that supports \fBsckmd\fR describes how to
diff --git a/usr/src/man/man8/sdpadm.8 b/usr/src/man/man8/sdpadm.8
index 845ca7f1d1..defef5ad49 100644
--- a/usr/src/man/man8/sdpadm.8
+++ b/usr/src/man/man8/sdpadm.8
@@ -17,7 +17,7 @@ sdpadm \- SDP system configuration administration
 .LP
 The \fBsdpadm\fR command is used to display the system state of the Sockets
 Direct Protocol (SDP) protocol. The \fBsdpadm\fR command can optionally be used
-to set the state of the SDP protocol. See \fBsdp\fR(7D).
+to set the state of the SDP protocol. See \fBsdp\fR(4D).
 .sp
 .LP
 By default the SDP protocol is disabled on the system.  It can be enabled by
@@ -63,7 +63,7 @@ without having changed the state.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -79,7 +79,7 @@ Interface Stability	Uncommitted
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBsdp\fR(7D)
+\fBattributes\fR(7), \fBsdp\fR(4D)
 .sp
 .LP
 Infiniband Specification Volume 1 (\fBhttp://www.infinibandta.org\fR)
diff --git a/usr/src/man/man8/sendmail.8 b/usr/src/man/man8/sendmail.8
index b80f6db3b5..9d5487ef4b 100644
--- a/usr/src/man/man8/sendmail.8
+++ b/usr/src/man/man8/sendmail.8
@@ -40,8 +40,8 @@ addresses listed. It determines the network to use based on the syntax and
 contents of the addresses.
 .sp
 .LP
-Local addresses are looked up in the local \fBaliases\fR(4) file, or in a name
-service as defined by the \fBnsswitch.conf\fR(4) file, and aliased
+Local addresses are looked up in the local \fBaliases\fR(5) file, or in a name
+service as defined by the \fBnsswitch.conf\fR(5) file, and aliased
 appropriately. In addition, if there is a \fB\&.forward\fR file in a
 recipient's home directory, \fBsendmail\fR forwards a copy of each message to
 the list of recipients that file contains. Refer to the \fBNOTES\fR section for
@@ -61,7 +61,7 @@ message is placed in a \fBdead.letter\fR file in the sender's home directory.
 .SS "Service Management"
 .LP
 The \fBsendmail\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifiers:
+\fBsmf\fR(7), under the service identifiers:
 .sp
 .in +2
 .nf
@@ -75,7 +75,7 @@ svc:/network/sendmail-client:default
 .sp
 .LP
 Administrative actions on these services, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The services'
+requesting restart, can be performed using \fBsvcadm\fR(8). The services'
 status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
@@ -114,7 +114,7 @@ general service.
 .SS "Enabling Access to Remote Clients"
 .LP
 On an unmodified system, access to \fBsendmail\fR by remote clients is enabled
-and disabled through the service management facility (see \fBsmf\fR(5)). In
+and disabled through the service management facility (see \fBsmf\fR(7)). In
 particular, remote access is determined by the value of the \fBlocal_only\fR
 SMF property:
 .sp
@@ -144,26 +144,26 @@ The following example shows the sequence of SMF commands used to enable
 
 .sp
 .LP
-See \fBsvcadm\fR(1M) and \fBsvccfg\fR(1M).
+See \fBsvcadm\fR(8) and \fBsvccfg\fR(8).
 .sp
 .LP
-Note, however, on a system where any of the \fBsendmail\fR(4) files have been
+Note, however, on a system where any of the \fBsendmail\fR(5) files have been
 customized, setting this property might not have the intended effect. See
-\fBsendmail\fR(4) for details.
+\fBsendmail\fR(5) for details.
 .SS "Automated Rebuilding of Configuration Files"
 .LP
-See \fBsendmail\fR(4) for details on which service properties can be set to
+See \fBsendmail\fR(5) for details on which service properties can be set to
 automate (re)building of configuration files when the service is started.
 .SS "Restricting Host Access"
 .LP
 \fBsendmail\fR uses TCP Wrappers to restrict access to hosts. It uses the
 service name of \fBsendmail\fR for \fBhosts_access()\fR. For more information
-on TCP Wrappers, see \fBtcpd\fR(1M) and \fBhosts_access\fR(4).
+on TCP Wrappers, see \fBtcpd\fR(8) and \fBhosts_access\fR(5).
 .SS "Startup Options"
 .LP
 The \fB/etc/default/sendmail\fR file stores startup options for \fBsendmail\fR
 so that the options are not removed when a host is upgraded. See also
-\fBsendmail\fR(4) for details on which service properties can be set to
+\fBsendmail\fR(5) for details on which service properties can be set to
 automate (re)building of configuration files when the service is started.
 .sp
 .LP
@@ -209,7 +209,7 @@ client-only queue, then acts as a client queue processor.
 Enables an SMTP client and server to interact immediately without waiting for
 the queue run intervals, which are periodic. The server can immediately deliver
 the portion of its queue that goes to the specified hosts. For more
-information, refer to the \fBetrn\fR(1M) man page.
+information, refer to the \fBetrn\fR(8) man page.
 .RE
 
 .sp
@@ -330,7 +330,7 @@ Runs as a daemon in the foreground, waiting for incoming SMTP connections.
 .ad
 .sp .6
 .RS 4n
-Initializes the \fBaliases\fR(4) database. Root must own \fIand\fR have
+Initializes the \fBaliases\fR(5) database. Root must own \fIand\fR have
 exclusive write permission to the \fB/etc/mail/aliases*\fR files for successful
 use of this option.
 .RE
@@ -809,7 +809,7 @@ Specifies possible alias files.
 .sp .6
 .RS 4n
 If set, waits up to \fIN\fR minutes for an "@:@" entry to exist in the
-\fBaliases\fR(4) database before starting up. If it does not appear in \fIN\fR
+\fBaliases\fR(5) database before starting up. If it does not appear in \fIN\fR
 minutes, issues a warning. Defaults to 10 minutes.
 .RE
 
@@ -873,7 +873,7 @@ Path to directory with certs of CAs.
 .ad
 .sp .6
 .RS 4n
-Validates the RHS of aliases when rebuilding the \fBaliases\fR(4) database.
+Validates the RHS of aliases when rebuilding the \fBaliases\fR(5) database.
 .RE
 
 .sp
@@ -2444,7 +2444,7 @@ is sent. If it is missing or \fB0\fR, then no warning messages are sent.
 .RS 4n
 File containing random data (use prefix \fBfile:\fR) or the name of the UNIX
 socket if EGD is used (use prefix \fBegd:\fR). Note that Solaris supports
-\fBrandom\fR(7D), so this does not need to be specified.
+\fBrandom\fR(4D), so this does not need to be specified.
 .RE
 
 .sp
@@ -3177,7 +3177,7 @@ address of an intended recipient of the message being sent.
 
 .SH USAGE
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBsendmail\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBsendmail\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXIT STATUS
 .LP
@@ -3266,9 +3266,9 @@ Message could not be sent immediately, but was queued.
 .SH ENVIRONMENT VARIABLES
 .LP
 No environment variables are used. However, sendmail's start-up script, invoked
-by \fBsvcadm\fR(1M), reads \fB/etc/default/sendmail\fR. In this file, if the
+by \fBsvcadm\fR(8), reads \fB/etc/default/sendmail\fR. In this file, if the
 variable \fBETRN_HOSTS\fR is set, the start-up script parses this variable and
-invokes \fBetrn\fR(1M) appropriately. \fBETRN_HOSTS\fR should be of the form:
+invokes \fBetrn\fR(8) appropriately. \fBETRN_HOSTS\fR should be of the form:
 .sp
 .in +2
 .nf
@@ -3386,7 +3386,7 @@ Lists users that are "trusted", that is, able to set their envelope from
 address using \fB-f\fR without generating a warning message. Note that this
 file is consulted by the default \fBsendmail.cf\fR, but not by the default
 \fBsubmit.cf\fR, in which the line referring to \fB/etc/mail/trusted-users\fR
-is commented out. See \fBsendmail\fR(4) for instructions on making changes to
+is commented out. See \fBsendmail\fR(5) for instructions on making changes to
 \fBsubmit.cf\fR and \fBsendmail.cf\fR.
 .RE
 
@@ -3433,12 +3433,12 @@ Describes the steps needed to compile and run a filter
 .SH SEE ALSO
 .LP
 \fBsvcs\fR(1), \fBbiff\fR(1B), \fBmail\fR(1), \fBmailq\fR(1), \fBmailx\fR(1),
-\fBnice\fR(1), \fBcheck-hostname\fR(1M), \fBcheck-permissions\fR(1M),
-\fBetrn\fR(1M), \fBnewaliases\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
+\fBnice\fR(1), \fBcheck-hostname\fR(8), \fBcheck-permissions\fR(8),
+\fBetrn\fR(8), \fBnewaliases\fR(8), \fBsvcadm\fR(8), \fBsvccfg\fR(8),
 \fBfork\fR(2), \fBgetpwnam\fR(3C), \fBgetusershell\fR(3C),
-\fBresolver\fR(3RESOLV), \fBaliases\fR(4), \fBhosts\fR(4), \fBsendmail\fR(4),
-\fBshells\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5), \fBsmf\fR(5),
-\fBrandom\fR(7D), \fBtcpd\fR(1M), \fBhosts_access\fR(4)
+\fBresolver\fR(3RESOLV), \fBaliases\fR(5), \fBhosts\fR(5), \fBsendmail\fR(5),
+\fBshells\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7), \fBsmf\fR(7),
+\fBrandom\fR(4D), \fBtcpd\fR(8), \fBhosts_access\fR(5)
 .sp
 .LP
 \fBRFC\fR 2821 \fISimple Mail Transfer Protocol\fR, John Klensin, April 2001.
@@ -3459,7 +3459,7 @@ http://www.milter.org
 .LP
 The \fBsendmail\fR program requires a fully qualified host name when starting.
 A script has been included to help verify if the host name is defined properly
-(see \fBcheck-hostname\fR(1M)).
+(see \fBcheck-hostname\fR(8)).
 .sp
 .LP
 The permissions and the ownership of several directories have been changed in
@@ -3475,7 +3475,7 @@ restriction does not affect mail that is being redirected to another alias.
 .LP
 Additional restrictions have been put in place on \fB\&.forward\fR and
 \fB:include:\fR files. These files and the directory structure that they are
-placed in cannot be group- or world-writable. See \fBcheck-permissions\fR(1M).
+placed in cannot be group- or world-writable. See \fBcheck-permissions\fR(8).
 .sp
 .LP
 If you have interfaces that map to domains that have MX records that point to
diff --git a/usr/src/man/man8/setuname.8 b/usr/src/man/man8/setuname.8
index 593b243501..8f7c559358 100644
--- a/usr/src/man/man8/setuname.8
+++ b/usr/src/man/man8/setuname.8
@@ -65,7 +65,7 @@ Temporary change. No attempt will be made to create a permanent change.
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5)
+\fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/sf880drd.8 b/usr/src/man/man8/sf880drd.8
index e7c0062103..7050990caf 100644
--- a/usr/src/man/man8/sf880drd.8
+++ b/usr/src/man/man8/sf880drd.8
@@ -37,13 +37,13 @@ manages various aspects of \fBCPU\fR/memory hotplug.
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBcfgadm\fR(1M), \fBcfgadm_pci\fR(1M), \fBcfgadm_sbd\fR(1M),
-\fBsvcadm\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBcfgadm\fR(8), \fBcfgadm_pci\fR(8), \fBcfgadm_sbd\fR(8),
+\fBsvcadm\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBsf880drd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -55,5 +55,5 @@ svc:/platform/sun4u/sf880drd
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/share.8 b/usr/src/man/man8/share.8
index b936f70dd2..cc89cdafd5 100644
--- a/usr/src/man/man8/share.8
+++ b/usr/src/man/man8/share.8
@@ -21,7 +21,7 @@ The \fBshare\fR command exports, or makes a resource available for mounting,
 through a remote file system of type \fIFSType\fR. If the option \fB-F\fR
 \fIFSType\fR is omitted, the first file system type listed in
 \fB/etc/dfs/fstypes\fR is used as default. For a description of NFS specific
-options, see \fBshare_nfs\fR(1M). \fIpathname\fR is the pathname of the
+options, see \fBshare_nfs\fR(8). \fIpathname\fR is the pathname of the
 directory to be shared. When invoked with no arguments, \fBshare\fR displays
 all shared file systems.
 .SH OPTIONS
@@ -54,7 +54,7 @@ Specify the filesystem type.
 .sp .6
 .RS 4n
 The \fIspecific_options\fR are used to control access of the shared resource.
-(See \fBshare_nfs\fR(1M) for the NFS specific options.) They may be any of the
+(See \fBshare_nfs\fR(8) for the NFS specific options.) They may be any of the
 following:
 .sp
 .ne 2
@@ -180,8 +180,8 @@ System record of shared file systems.
 .SH SEE ALSO
 .sp
 .LP
-\fBmountd\fR(1M), \fBnfsd\fR(1M), \fBshare_nfs\fR(1M), \fBshareall\fR(1M),
-\fBunshare\fR(1M), \fBattributes\fR(5)
+\fBmountd\fR(8), \fBnfsd\fR(8), \fBshare_nfs\fR(8), \fBshareall\fR(8),
+\fBunshare\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/shareall.8 b/usr/src/man/man8/shareall.8
index d5921787c6..d7ca4519c4 100644
--- a/usr/src/man/man8/shareall.8
+++ b/usr/src/man/man8/shareall.8
@@ -57,4 +57,4 @@ Specify file system type. Defaults to the first entry in
 .SH SEE ALSO
 .sp
 .LP
-\fBshare\fR(1M), \fBunshare\fR(1M), \fBattributes\fR(5)
+\fBshare\fR(8), \fBunshare\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/sharemgr.8 b/usr/src/man/man8/sharemgr.8
index 64a0e5380a..eb92e5bb37 100644
--- a/usr/src/man/man8/sharemgr.8
+++ b/usr/src/man/man8/sharemgr.8
@@ -93,7 +93,7 @@ within them.
 .sp
 .LP
 A group name must conform to service management facility (SMF) (see
-\fBsmf\fR(5)) service-naming conventions, thus is limited to starting with an
+\fBsmf\fR(7)) service-naming conventions, thus is limited to starting with an
 alphabetic character, with the rest of the name consisting only of alphanumeric
 characters plus \fB-\fR (hyphen) and \fB_\fR (underbar).
 .sp
@@ -313,7 +313,7 @@ The \fB-P\fR option is required and must specify a valid protocol.
 .sp
 Optionsets are protocol-specific sets of properties that can be negotiated by
 the protocol client. For NFS, optionsets are equivalent to security modes as
-defined in \fBnfssec\fR(5). If \fB-S\fR \fIoptionset\fR is specified, the
+defined in \fBnfssec\fR(7). If \fB-S\fR \fIoptionset\fR is specified, the
 properties are applied to the selected optionset. Otherwise they are applied to
 the general optionset.
 .sp
@@ -410,7 +410,7 @@ subgroup. Any ZFS sub-filesystems under the ZFS filesystem designated by
 The effect of the \fBadd-share\fR subcommand on a ZFS dataset is determined by
 the values of the \fBsharesmb\fR and \fBsharenfs\fR properties of that dataset.
 .sp
-See \fBzfs\fR(1M) for a description of the \fBsharesmb\fR and \fBsharenfs\fR
+See \fBzfs\fR(8) for a description of the \fBsharesmb\fR and \fBsharenfs\fR
 properties.
 .sp
 The following are examples of the \fBadd-share\fR subcommand.
@@ -539,7 +539,7 @@ SMF to start sharing at system boot.
 A group will not start sharing if it is in the \fBsharemgr\fR \fBdisabled\fR
 state. However, the corresponding SMF service instance will be started.
 .sp
-Note that the \fBstart\fR subcommand is similar to the \fBshareall\fR(1M)
+Note that the \fBstart\fR subcommand is similar to the \fBshareall\fR(8)
 command in that it starts up only the configured shares. That is, the enabled
 shares will start being shared, but the configuration state is left the same.
 The command:
@@ -574,7 +574,7 @@ subcommand is similar to \fBdisable\fR in that all shares are no longer shared,
 but it works only on groups that are enabled. \fBstop\fR is used by the SMF to
 stop sharing at system shutdown.
 .sp
-Note that the \fBstop\fR subcommand is similar to the \fBunshareall\fR(1M)
+Note that the \fBstop\fR subcommand is similar to the \fBunshareall\fR(8)
 command in that all active shares are unshared, but the configuration is left
 the same. That is, the shares are stopped but the service instances are left
 enabled. The command:
@@ -606,7 +606,7 @@ enabled. The command:
 .sp .6
 .RS 4n
 Shares the specified path in the \fBdefault\fR share group. This subcommand
-implements the \fBshare\fR(1M) functionality. Shares that are shared in this
+implements the \fBshare\fR(8) functionality. Shares that are shared in this
 manner will be transient shares. Use of the \fB-p\fR option causes the shares
 to be persistent.
 .RE
@@ -619,7 +619,7 @@ to be persistent.
 .ad
 .sp .6
 .RS 4n
-Unshares the specified share. This subcommand implements the \fBunshare\fR(1M)
+Unshares the specified share. This subcommand implements the \fBunshare\fR(8)
 functionality. By default, the \fBunshare\fR is temporary. The \fB-p\fR option
 is provided to remove the share from the configuration in a way that persists
 across reboots.
@@ -870,7 +870,7 @@ Set the guest access policy for the share. When set to \fBtrue\fR guest access
 is allowed on this share. When set to \fBfalse\fR or not defined guest access
 is not allowed on this share. This property is not defined by default.
 .sp
-An \fBidmap\fR(1M) name-based rule can be used to map \fBguest\fR to any local
+An \fBidmap\fR(8) name-based rule can be used to map \fBguest\fR to any local
 username, such as \fBguest\fR or \fBnobody\fR. If the local account has a
 password in \fB/var/smb/smbpasswd\fR the guest connection will be authenticated
 against that password. Any connection made using an account that maps to the
@@ -964,7 +964,7 @@ only to a share and not to a group.
 .sp
 .LP
 NFS also supports negotiated optionsets for supported security modes. The
-security modes are documented in \fBnfssec\fR(5). The properties supported for
+security modes are documented in \fBnfssec\fR(7). The properties supported for
 these optionsets are:
 .sp
 .ne 2
@@ -1051,7 +1051,7 @@ user id.
 .ad
 .sp .6
 .RS 4n
-When sharing with \fBsec=dh\fR (see \fBnfssec\fR(5)), set the maximum lifetime
+When sharing with \fBsec=dh\fR (see \fBnfssec\fR(7)), set the maximum lifetime
 (in seconds) of the RPC request's credential (in the authentication header)
 that the NFS server allows. If a credential arrives with a lifetime larger than
 what is allowed, the NFS server rejects the request. The default value is 30000
@@ -1137,7 +1137,7 @@ following:
 .sp .6
 .RS 4n
 The name of a host. With a server configured for DNS or LDAP naming in the
-\fBnsswitch.conf\fR(4) \fBhosts\fR entry, a hostname must be represented as a
+\fBnsswitch.conf\fR(5) \fBhosts\fR entry, a hostname must be represented as a
 fully qualified DNS or LDAP name.
 .RE
 
@@ -1149,7 +1149,7 @@ fully qualified DNS or LDAP name.
 .sp .6
 .RS 4n
 A \fInetgroup\fR contains a number of hostnames. With a server configured for
-DNS or LDAP naming in the \fBnsswitch.conf\fR(4) \fBhosts\fR entry, any
+DNS or LDAP naming in the \fBnsswitch.conf\fR(5) \fBhosts\fR entry, any
 hostname in a netgroup must be represented as a fully qualified DNS or LDAP
 name.
 .RE
@@ -1163,7 +1163,7 @@ name.
 .RS 4n
 To use domain membership the server must use DNS or LDAP, rather than, for
 example, NIS, to resolve hostnames to IP addresses. That is, the
-\fBhosts\fR entry in the \fBnsswitch.conf\fR(4) must specify \fBdns\fR or
+\fBhosts\fR entry in the \fBnsswitch.conf\fR(5) must specify \fBdns\fR or
 \fBldap\fR ahead of \fBnis\fR, because only DNS and LDAP
 return the full domain name of the host. Other name services, such as NIS,
 cannot be used to resolve hostnames on the server because, when mapping
@@ -1316,7 +1316,7 @@ Error codes used for exit status.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1330,5 +1330,5 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-\fBidmap\fR(1M), \fBsharectl\fR(1M), \fBzfs\fR(1M), \fBattributes\fR(5),
-\fBnfssec\fR(5), \fBsmf\fR(5), \fBstandards\fR(5)
+\fBidmap\fR(8), \fBsharectl\fR(8), \fBzfs\fR(8), \fBattributes\fR(7),
+\fBnfssec\fR(7), \fBsmf\fR(7), \fBstandards\fR(7)
diff --git a/usr/src/man/man8/showmount.8 b/usr/src/man/man8/showmount.8
index 13939fcffa..8ce27562ea 100644
--- a/usr/src/man/man8/showmount.8
+++ b/usr/src/man/man8/showmount.8
@@ -16,7 +16,7 @@ showmount \- show remote mounts
 .sp
 .LP
 \fBshowmount\fR lists the clients that have remotely mounted a filesystem from
-\fIhost\fR. This information is maintained by the \fBmountd\fR(1M) server on
+\fIhost\fR. This information is maintained by the \fBmountd\fR(8) server on
 \fIhost\fR, and is saved across crashes in the file \fB/etc/rmtab\fR. The
 default value for \fIhost\fR is the value returned by \fBhostname\fR(1).
 .sp
@@ -69,7 +69,7 @@ Print the list of shared file systems.
 .SH SEE ALSO
 .sp
 .LP
-\fBhostname\fR(1), \fBmountd\fR(1M), \fBattributes\fR(5)
+\fBhostname\fR(1), \fBmountd\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/shutdown.8 b/usr/src/man/man8/shutdown.8
index bf7790797c..8121cd2896 100644
--- a/usr/src/man/man8/shutdown.8
+++ b/usr/src/man/man8/shutdown.8
@@ -171,13 +171,13 @@ controls process dispatching by \fBinit\fR
 .SH SEE ALSO
 .sp
 .LP
-\fBboot\fR(1M), \fBhalt\fR(1M), \fBinit\fR(1M), \fBkillall\fR(1M),
-\fBreboot\fR(1M), \fBufsdump\fR(1M), \fBinit.d\fR(4), \fBinittab\fR(4),
-\fBnologin\fR(4), \fBattributes\fR(5)
+\fBboot\fR(8), \fBhalt\fR(8), \fBinit\fR(8), \fBkillall\fR(8),
+\fBreboot\fR(8), \fBufsdump\fR(8), \fBinit.d\fR(5), \fBinittab\fR(5),
+\fBnologin\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
 When a system transitions down to the \fBS\fR or \fBs\fR state, the
-\fB/etc/nologin\fR file (see \fBnologin\fR(4)) is created. Upon subsequent
+\fB/etc/nologin\fR file (see \fBnologin\fR(5)) is created. Upon subsequent
 transition to state 2 (multi-user state), this file is removed by a script in
 the \fB/etc/rc2.d\fR directory.
diff --git a/usr/src/man/man8/slpd.8 b/usr/src/man/man8/slpd.8
index d78269dc83..3ab6e7863e 100644
--- a/usr/src/man/man8/slpd.8
+++ b/usr/src/man/man8/slpd.8
@@ -79,7 +79,7 @@ All configuration options are available from the configuration file. \fBslpd\fR
 reads its configuration file upon startup.
 .sp
 .LP
-Stop and start the slpd daemon using \fBsvcadm\fR(1M).  Use the command
+Stop and start the slpd daemon using \fBsvcadm\fR(8).  Use the command
 \fBsvcadm enable network/slp\fR to start the slpd daemon.  Use the command
 \fBsvcadm disable network/slp\fR to stop it.
 .sp
@@ -152,7 +152,7 @@ The proxy registration file
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5)  for descriptions of the following attributes:
+See \fBattributes\fR(7)  for descriptions of the following attributes:
 .sp
 
 .sp
@@ -170,8 +170,8 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBslp_api\fR(3SLP), \fBslp.conf\fR(4),
-\fBslpd.reg\fR(4), \fBattributes\fR(5), \fBsmf\fR(5), \fBslp\fR(7P)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBslp_api\fR(3SLP), \fBslp.conf\fR(5),
+\fBslpd.reg\fR(5), \fBattributes\fR(7), \fBsmf\fR(7), \fBslp\fR(4P)
 .sp
 .LP
 \fI\fR
@@ -183,7 +183,7 @@ Location Protocol, Version 2\fR, The Internet Society, June 1999.
 .sp
 .LP
 The \fBslpd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -195,5 +195,5 @@ svc:/network/slp
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/smbd.8 b/usr/src/man/man8/smbd.8
index 711766b54a..37469c976a 100644
--- a/usr/src/man/man8/smbd.8
+++ b/usr/src/man/man8/smbd.8
@@ -86,7 +86,7 @@ Daemon exited with a configuration error.
 .SH ATTRIBUTES
 .sp
 .LP
-See the \fBattributes\fR(5) man page for descriptions of the following
+See the \fBattributes\fR(7) man page for descriptions of the following
 attributes:
 .sp
 
@@ -103,9 +103,9 @@ Interface Stability	Uncommitted
 .SH SEE ALSO
 .sp
 .LP
-\fBps\fR(1), \fBsvcs\fR(1), \fBsharectl\fR(1M), \fBsharemgr\fR(1M),
-\fBsmbadm\fR(1M), \fBsmbstat\fR(1M), \fBsvcadm\fR(1M), \fBsmb\fR(4),
-\fBsmbautohome\fR(4), \fBsystem\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBps\fR(1), \fBsvcs\fR(1), \fBsharectl\fR(8), \fBsharemgr\fR(8),
+\fBsmbadm\fR(8), \fBsmbstat\fR(8), \fBsvcadm\fR(8), \fBsmb\fR(5),
+\fBsmbautohome\fR(5), \fBsystem\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -119,5 +119,5 @@ service identifier \fBsvc:/network/smb/server\fR.
 .sp
 .LP
 If the \fBsmbd\fR service is disabled, it will be enabled by the
-\fBsharemgr\fR(1M) command,  unless its \fBauto_enable\fR  property is set to
+\fBsharemgr\fR(8) command,  unless its \fBauto_enable\fR  property is set to
 false.
diff --git a/usr/src/man/man8/smbiod.8 b/usr/src/man/man8/smbiod.8
index ba34872ac0..338b7c9084 100644
--- a/usr/src/man/man8/smbiod.8
+++ b/usr/src/man/man8/smbiod.8
@@ -95,7 +95,7 @@ File on which to instantiate a door service for superuser.
 .SH ATTRIBUTES
 .sp
 .LP
-See the \fBattributes\fR(5) man page for descriptions of the following
+See the \fBattributes\fR(7) man page for descriptions of the following
 attributes:
 .sp
 
@@ -112,5 +112,5 @@ Interface Stability	Uncommitted
 .SH SEE ALSO
 .sp
 .LP
-\fBps\fR(1), \fBsmbutil\fR(1), \fBmount_smbfs\fR(1M), \fBattributes\fR(5),
-\fBsmbfs\fR(7FS)
+\fBps\fR(1), \fBsmbutil\fR(1), \fBmount_smbfs\fR(8), \fBattributes\fR(7),
+\fBsmbfs\fR(4FS)
diff --git a/usr/src/man/man8/smbios.8 b/usr/src/man/man8/smbios.8
index 4307ab3729..f3ff7a0d1f 100644
--- a/usr/src/man/man8/smbios.8
+++ b/usr/src/man/man8/smbios.8
@@ -191,7 +191,7 @@ snapshot of the current system SMBIOS image.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -210,7 +210,7 @@ The command-line options are Evolving. The human-readable output is Unstable.
 .SH SEE ALSO
 .sp
 .LP
-\fBprtdiag\fR(1M), \fBattributes\fR(5), \fBsmbios\fR(7D)
+\fBprtdiag\fR(8), \fBattributes\fR(7), \fBsmbios\fR(4D)
 .sp
 .LP
 \fISystem Management BIOS Reference Specification\fR (see http://www.dmtf.org)
diff --git a/usr/src/man/man8/smrsh.8 b/usr/src/man/man8/smrsh.8
index fc2b451763..2f99c49261 100644
--- a/usr/src/man/man8/smrsh.8
+++ b/usr/src/man/man8/smrsh.8
@@ -33,7 +33,7 @@ smrsh \- restricted shell for sendmail
 
 .SH DESCRIPTION
 The \fBsmrsh\fR program is intended as a replacement for the \fBsh\fR command
-in the \fBprog\fR mailer in \fBsendmail\fR(1M) configuration files. The
+in the \fBprog\fR mailer in \fBsendmail\fR(8) configuration files. The
 \fBsmrsh\fR program sharply limits commands that can be run using the
 \fB|program\fR syntax of \fBsendmail\fR. This improves overall system security.
 \fBsmrsh\fR limits the set of programs that a programmer can execute, even if
@@ -82,4 +82,4 @@ directory for restricted programs
 .RE
 
 .SH SEE ALSO
-\fBsendmail\fR(1M), \fBattributes\fR(5)
+\fBsendmail\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/snoop.8 b/usr/src/man/man8/snoop.8
index 70bcc44485..aa97de7e81 100644
--- a/usr/src/man/man8/snoop.8
+++ b/usr/src/man/man8/snoop.8
@@ -19,8 +19,8 @@ snoop \- capture and inspect network packets
 From a datalink or IP interface, \fBsnoop\fR captures packets and displays
 their contents. If the datalink or IP interface is not specified, \fBsnoop\fR
 will pick a datalink to use, giving priority to datalinks that have been
-plumbed for IP traffic. \fBsnoop\fR uses the \fBpfmod\fR(7M) and
-\fBbufmod\fR(7M) STREAMS modules to provide efficient capture of packets from
+plumbed for IP traffic. \fBsnoop\fR uses the \fBpfmod\fR(4M) and
+\fBbufmod\fR(4M) STREAMS modules to provide efficient capture of packets from
 the network. Captured packets can be displayed as they are received or saved to
 a file (which is \fIRFC 1761\fR-compliant) for later inspection.
 .sp
@@ -86,7 +86,7 @@ are not displayed when this flag is used.
 .sp .6
 .RS 4n
 Capture IP packets from the network using the IP interface specified by
-\fIinterface\fR, for example, \fBlo0\fR. The \fBifconfig\fR(1M) command can be
+\fIinterface\fR, for example, \fBlo0\fR. The \fBifconfig\fR(8) command can be
 used to list available IP interfaces. The \fB-I\fR and \fB-d\fR options are
 mutually exclusive.
 .RE
@@ -159,7 +159,7 @@ there is no disk space left or until interrupted with Control-C.
 .sp .6
 .RS 4n
 Capture link-layer packets from the network using the DLPI datalink specified
-by \fIdatalink\fR, for example, \fBbge0\fR or \fBnet0\fR. The \fBdladm\fR(1M)
+by \fIdatalink\fR, for example, \fBbge0\fR or \fBnet0\fR. The \fBdladm\fR(8)
 \fBshow-link\fR subcommand can be used to list available datalinks. The
 \fB-d\fR and \fB-I\fR options are mutually exclusive.
 .RE
@@ -1136,9 +1136,9 @@ Internet services and aliases.
 .RE
 
 .SH SEE ALSO
-\fBdladm\fR(1M), \fBifconfig\fR(1M), \fBnetstat\fR(1M), \fBhosts\fR(4),
-\fBrpc\fR(4), \fBservices\fR(4), \fBattributes\fR(5), \fBaudio\fR(7I),
-\fBipnet\fR(7D), \fBbufmod\fR(7M), \fBdlpi\fR(7P), \fBpfmod\fR(7M)
+\fBdladm\fR(8), \fBifconfig\fR(8), \fBnetstat\fR(8), \fBhosts\fR(5),
+\fBrpc\fR(5), \fBservices\fR(5), \fBattributes\fR(7), \fBaudio\fR(4I),
+\fBipnet\fR(4D), \fBbufmod\fR(4M), \fBdlpi\fR(4P), \fBpfmod\fR(4M)
 .sp
 .LP
 Callaghan, B. and Gilligan, R. \fIRFC 1761, Snoop Version 2 Packet Capture File
diff --git a/usr/src/man/man8/soconfig.8 b/usr/src/man/man8/soconfig.8
index e059496764..428997e15e 100644
--- a/usr/src/man/man8/soconfig.8
+++ b/usr/src/man/man8/soconfig.8
@@ -38,7 +38,7 @@ as \fB/dev/tcp\fR. This utility can be used to add an additional mapping or
 remove a previous mapping.
 .sp
 .LP
-The \fBinit\fR(1M) utility uses \fBsoconfig\fR with the \fBsock2path.d\fR(4)
+The \fBinit\fR(8) utility uses \fBsoconfig\fR with the \fBsock2path.d\fR(5)
 directory during the booting sequence.
 .SH OPTIONS
 .sp
@@ -197,7 +197,7 @@ sockets  to transport providers.
 .SH SEE ALSO
 .sp
 .LP
-\fBinit\fR(1M), \fBsock2path.d\fR(4), \fBattributes\fR(5)
+\fBinit\fR(8), \fBsock2path.d\fR(5), \fBattributes\fR(7)
 .sp
 .LP
 \fINetwork Interface Guide\fR
diff --git a/usr/src/man/man8/sppptun.8 b/usr/src/man/man8/sppptun.8
index a57f36f985..ff7db59f46 100644
--- a/usr/src/man/man8/sppptun.8
+++ b/usr/src/man/man8/sppptun.8
@@ -38,7 +38,7 @@ to specify Ethernet interfaces that are to be used for PPPoE, and the
 .sp
 .LP
 The use of \fBsppptun\fR to add interfaces is similar to the use of
-\fBifconfig\fR(1M) to add interfaces to IP. The plumbing is done once for each
+\fBifconfig\fR(8) to add interfaces to IP. The plumbing is done once for each
 interface, preferably at system start-up time, and is not normally manipulated
 on a running system. If multiple instances of PPP are run over a single
 interface, they share the plumbing to that interface. Plumbing for each session
@@ -86,7 +86,7 @@ This plumbs a new interface into the driver. The \fIprotocol\fR parameter is
 the PPPoE "Discovery Stage" connection. Both connections must be present for
 each Ethernet interface that is to be used for PPPoE. The \fIdevice\fR
 parameter is the path name of the Ethernet interface to use (use
-\fBifconfig\fR(1M) to list available devices). If the path begins with
+\fBifconfig\fR(8) to list available devices). If the path begins with
 \fB/dev/\fR, then this portion may be omitted.
 .sp
 The \fB-s\fR \fIsap\fR option can be specified to use an alternate Ethertype
@@ -229,7 +229,7 @@ Solaris PPP tunneling device driver
 .SH SEE ALSO
 .sp
 .LP
-\fBpppd\fR(1M), \fBpppoec\fR(1M), \fBpppoed\fR(1M), \fBsppptun\fR(7M)
+\fBpppd\fR(8), \fBpppoec\fR(8), \fBpppoed\fR(8), \fBsppptun\fR(4M)
 .sp
 .LP
 \fIRFC 2516, Method for Transmitting PPP Over Ethernet (PPPoE)\fR, Mamakos et
diff --git a/usr/src/man/man8/spray.8 b/usr/src/man/man8/spray.8
index 9d017ddad3..9620cf4ec8 100644
--- a/usr/src/man/man8/spray.8
+++ b/usr/src/man/man8/spray.8
@@ -78,4 +78,4 @@ for a description of supported classes.
 .SH SEE ALSO
 .sp
 .LP
-\fBrpc\fR(3NSL), \fBattributes\fR(5)
+\fBrpc\fR(3NSL), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/statd.8 b/usr/src/man/man8/statd.8
index 8792122d2b..467bb2488a 100644
--- a/usr/src/man/man8/statd.8
+++ b/usr/src/man/man8/statd.8
@@ -16,7 +16,7 @@ statd \- network status monitor
 .sp
 .LP
 \fBstatd\fR is an intermediate version of the status monitor. It interacts with
-\fBlockd\fR(1M) to provide the crash and recovery functions for the locking
+\fBlockd\fR(8) to provide the crash and recovery functions for the locking
 services on NFS. \fBstatd\fR keeps track of the clients with processes which
 hold locks on a server. When the server reboots after a crash, \fBstatd\fR
 sends a message to the \fBstatd\fR on each client indicating that the server
@@ -32,8 +32,8 @@ rebooting client should be released, allowing other processes to lock those
 files.
 .sp
 .LP
-\fBlockd\fR is started by \fBautomountd\fR(1M), \fBmount_nfs\fR(1M), and
-\fBshare\fR(1M) if NFS automounts are needed.
+\fBlockd\fR is started by \fBautomountd\fR(8), \fBmount_nfs\fR(8), and
+\fBshare\fR(8) if NFS automounts are needed.
 .SH FILES
 .sp
 .ne 2
@@ -79,8 +79,8 @@ statd daemon.
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBautomountd\fR(1M), \fBlockd\fR(1M), \fBmount_nfs\fR(1M),
-\fBshare\fR(1M), \fBsvcadm\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBautomountd\fR(8), \fBlockd\fR(8), \fBmount_nfs\fR(8),
+\fBshare\fR(8), \fBsvcadm\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
@@ -91,7 +91,7 @@ The crash of a server is only detected upon its recovery.
 .sp
 .LP
 The \fBstatd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -103,10 +103,10 @@ svc:/network/nfs/status
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
-If it is disabled, it will be enabled by \fBmount_nfs\fR(1M),
-\fBshare_nfs\fR(1M), and \fBautomountd\fR(1M) unless  its
+If it is disabled, it will be enabled by \fBmount_nfs\fR(8),
+\fBshare_nfs\fR(8), and \fBautomountd\fR(8) unless  its
 \fBapplication/auto_enable\fR property is set to \fBfalse\fR.
diff --git a/usr/src/man/man8/stmsboot.8 b/usr/src/man/man8/stmsboot.8
index 3f64d1ab9d..278cfd964c 100644
--- a/usr/src/man/man8/stmsboot.8
+++ b/usr/src/man/man8/stmsboot.8
@@ -23,7 +23,7 @@ formerly known as Sun StorEdge Traffic Manager (STMS) or MPxIO.
 .LP
 The \fBstmsboot\fR program is an administrative command to manage enumeration
 of multipath-capable devices with Solaris I/O multipathing. Solaris I/O
-multipathing-enabled devices are enumerated under \fBscsi_vhci\fR(7D),
+multipathing-enabled devices are enumerated under \fBscsi_vhci\fR(4D),
 providing multipathing capabilities. Solaris I/O multipathing-disabled devices
 are enumerated under the physical controller.
 .sp
@@ -48,8 +48,8 @@ The following options are supported:
 .sp .6
 .RS 4n
 Enables Solaris I/O multipathing on all supported multipath-capable controller
-ports. Multipath-capable ports include fibre channel (\fBfp\fR(7D)) controller
-ports and SAS (\fBmpt\fR(7D)) controller ports. Following this enabling, you
+ports. Multipath-capable ports include fibre channel (\fBfp\fR(4D)) controller
+ports and SAS (\fBmpt\fR(4D)) controller ports. Following this enabling, you
 are prompted to reboot. During the reboot, \fBvfstab\fR and the dump
 configuration will be updated to reflect the device name changes. Specifying
 either \fB-D\fR \fBmpt\fR or \fB-D\fR \fBfp\fR limits the enabling operation to
@@ -64,8 +64,8 @@ ports attached using the specified driver.
 .sp .6
 .RS 4n
 Disables Solaris I/O multipathing on all supported multipath-capable controller
-ports. Multipath-capable ports include fibre channel (\fBfp\fR(7D)) controller
-ports and SAS (\fBmpt\fR(7D)) controller ports. Following this disabling, you
+ports. Multipath-capable ports include fibre channel (\fBfp\fR(4D)) controller
+ports and SAS (\fBmpt\fR(4D)) controller ports. Following this disabling, you
 are prompted to reboot. During the reboot, \fBvfstab\fR and the dump
 configuration will be updated to reflect the device name changes. Specifying
 either \fB-D\fR \fBmpt\fR or \fB-D\fR \fBfp\fR limits the disabling operation
@@ -116,7 +116,7 @@ Solaris I/O multipathing is not enabled, then no mappings are displayed.
 .LP
 The primary function of \fBstmsboot\fR is to control the enabling and disabling
 of Solaris I/O multipathing on the host. The utility automatically updates
-\fBvfstab\fR(4) and \fBdumpadm\fR(1M) configuration to reflect device name
+\fBvfstab\fR(5) and \fBdumpadm\fR(8) configuration to reflect device name
 changes. The system administrator is responsible for modifying application
 configuration (for example, backup software, DBMS, and so forth) to reflect
 updated device names.
@@ -147,7 +147,7 @@ To enable Solaris I/O multipathing for all multipath-capable controllers, run:
 
 .sp
 .LP
-To enable Solaris I/O multipathing on multipath-capable \fBmpt\fR(7D)
+To enable Solaris I/O multipathing on multipath-capable \fBmpt\fR(4D)
 controller ports, enter:
 
 .sp
@@ -188,7 +188,7 @@ enter:
 
 .sp
 .LP
-To disable Solaris I/O multipathing on multipath-capable \fBmpt\fR(7D)
+To disable Solaris I/O multipathing on multipath-capable \fBmpt\fR(4D)
 controller ports, enter:
 
 .sp
@@ -218,8 +218,8 @@ controller ports, enter:
 .LP
 To enable Solaris I/O multipathing on specific fibre channel controller ports
 and disable the feature on others, manually edit the \fB/kernel/drv/fp.conf\fR
-file. (See \fBfp\fR(7D).) The following command will update \fBvfstab\fR(4) and
-\fBdumpadm\fR(1M) configurations to reflect the changed device names:
+file. (See \fBfp\fR(4D).) The following command will update \fBvfstab\fR(5) and
+\fBdumpadm\fR(8) configurations to reflect the changed device names:
 
 .sp
 .in +2
@@ -232,12 +232,12 @@ file. (See \fBfp\fR(7D).) The following command will update \fBvfstab\fR(4) and
 .sp
 .LP
 A similar procedure involving the \fB/kernel/drv/mpt.conf\fR file should be
-followed for devices attached by means of the \fBmpt\fR(7D) driver.
+followed for devices attached by means of the \fBmpt\fR(4D) driver.
 
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -253,10 +253,10 @@ Interface Stability	Obsolete
 .SH SEE ALSO
 .sp
 .LP
-\fBdumpadm\fR(1M), \fBfsck\fR(1M), \fBmpathadm\fR(1M), \fBufsdump\fR(1M),
-\fBzfs\fR(1M), \fBzpool\fR(1M), \fBdumpdates\fR(4), \fBvfstab\fR(4),
-\fBemlxs\fR(7D), \fBfcp\fR(7D), \fBfp\fR(7D), \fBmpt\fR(7D), \fBqlc\fR(7D),
-\fBscsi_vhci\fR(7D)
+\fBdumpadm\fR(8), \fBfsck\fR(8), \fBmpathadm\fR(8), \fBufsdump\fR(8),
+\fBzfs\fR(8), \fBzpool\fR(8), \fBdumpdates\fR(5), \fBvfstab\fR(5),
+\fBemlxs\fR(4D), \fBfcp\fR(4D), \fBfp\fR(4D), \fBmpt\fR(4D), \fBqlc\fR(4D),
+\fBscsi_vhci\fR(4D)
 .sp
 .LP
 \fISolaris SAN Configuration and Multipathing Guide\fR (see
@@ -297,8 +297,8 @@ more details.
 .SS "Using \fBufsdump\fR"
 .sp
 .LP
-The \fBufsdump\fR(1M) command records details of filesystem dumps in
-\fB/etc/dumpdates\fR (see \fBdumpdates\fR(4)). Among other items, the entries
+The \fBufsdump\fR(8) command records details of filesystem dumps in
+\fB/etc/dumpdates\fR (see \fBdumpdates\fR(5)). Among other items, the entries
 contain device names. An effect of the "active" \fBstmsboot\fR options
 (\fB-e\fR, \fB-d\fR, and \fB-u\fR) is to change the device name of a storage
 device.
@@ -377,11 +377,11 @@ To view mappings between the old and new device names, run \fBstmsboot\fR
 .LP
 With active-passive storage arrays, it is possible that while your host is
 rebooting the array controller could failover the path that a particular target
-is using. In this scenario, \fBfsck\fR(1M) will fail to open the physical path
+is using. In this scenario, \fBfsck\fR(8) will fail to open the physical path
 listed in \fB/etc/vfstab\fR. The \fBsvc:/system/filesystem/local:default\fR SMF
 service will transition to a maintenance state as a result. To rectify this,
 consult the documentation for your storage array to failback the path. The
-\fBmpathadm\fR(1M) can assist with determining the active and passive path(s).
+\fBmpathadm\fR(8) can assist with determining the active and passive path(s).
 .SH LIMITATIONS
 .sp
 .LP
@@ -389,7 +389,7 @@ On x86 platforms, the current Solaris release does not support disabling
 Solaris I/O multipathing of boot devices attached by means of fibre channel.
 Solaris I/O multipathing is always enabled for supported fibre channel-attached
 boot devices. Disabling Solaris I/O multipathing in this situation must be
-performed on a per-port basis. See \fBfp\fR(7D).
+performed on a per-port basis. See \fBfp\fR(4D).
 .sp
 .LP
 Executing \fBdevfsadm\fR \fB-C\fR removes obsolete device entries that
diff --git a/usr/src/man/man8/strace.8 b/usr/src/man/man8/strace.8
index 395600f735..4642d62ba5 100644
--- a/usr/src/man/man8/strace.8
+++ b/usr/src/man/man8/strace.8
@@ -17,7 +17,7 @@ strace \- print STREAMS trace messages
 .LP
 \fBstrace\fR without arguments writes all STREAMS event trace messages from all
 drivers and modules to its standard output. These messages are obtained from
-the STREAMS log driver (see \fBlog\fR(7D)). If arguments are provided, they
+the STREAMS log driver (see \fBlog\fR(4D)). If arguments are provided, they
 must be in triplets of the form \fImid, sid, level\fR, where \fImid\fR is a
 STREAMS module  \fBID\fR number, \fIsid\fR is a sub-ID number,  and \fIlevel\fR
 is a tracing priority level. Each triplet indicates that tracing messages are
@@ -147,7 +147,7 @@ of  \fB0\fR.
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBlog\fR(7D)
+\fBattributes\fR(7), \fBlog\fR(4D)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/strclean.8 b/usr/src/man/man8/strclean.8
index 1effda39c3..86dca1c786 100644
--- a/usr/src/man/man8/strclean.8
+++ b/usr/src/man/man8/strclean.8
@@ -65,7 +65,7 @@ example%  \fBstrclean \fR\fB-d\fR\fB /var/adm/streams \fR\fB-a\fR\fB 3\fR
 .SH SEE ALSO
 .sp
 .LP
-\fBcron\fR(1M), \fBstrerr\fR(1M), \fBattributes\fR(5)
+\fBcron\fR(8), \fBstrerr\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/strerr.8 b/usr/src/man/man8/strerr.8
index 4a5f6aeeb6..50717cb130 100644
--- a/usr/src/man/man8/strerr.8
+++ b/usr/src/man/man8/strerr.8
@@ -16,7 +16,7 @@ strerr \- STREAMS error logger daemon
 .sp
 .LP
 \fBstrerr\fR receives error log messages from the STREAMS-based log driver (see
-\fBlog\fR(7D)) and appends them to a log file. The resultant error log files
+\fBlog\fR(4D)) and appends them to a log file. The resultant error log files
 reside in the directory \fB/var/adm/streams\fR, and are named
 \fBerror.\fR\fImm\fR\fB-\fR\fBdd\fR, where \fImm\fR is the month and \fBdd\fR
 is the day of the messages contained in each log file.
@@ -119,7 +119,7 @@ error log file.
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBlog\fR(7D)
+\fBattributes\fR(7), \fBlog\fR(4D)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/sttydefs.8 b/usr/src/man/man8/sttydefs.8
index 3d9671c11c..a102af297e 100644
--- a/usr/src/man/man8/sttydefs.8
+++ b/usr/src/man/man8/sttydefs.8
@@ -68,10 +68,10 @@ user's intervention.
 .RS 20n
 Specify the value to be used in the \fIfinal-flags\fR field in
 \fB/etc/ttydefs\fR. \fIfinal-flags\fR must be in a format recognized by the
-\fBstty\fR command. \fIfinal-flags\fR are the \fBtermio\fR(7I) settings used by
+\fBstty\fR command. \fIfinal-flags\fR are the \fBtermio\fR(4I) settings used by
 \fBttymon\fR after receiving a successful connection request and immediately
 before invoking the service on the port. If this option is not specified,
-\fBsttydefs\fR will set \fIfinal-flags\fR equal to the \fBtermio\fR(7I) flags
+\fBsttydefs\fR will set \fIfinal-flags\fR equal to the \fBtermio\fR(4I) flags
 \fB9600\fR and \fBsane\fR.
 .RE
 
@@ -86,7 +86,7 @@ Specify the value to be used in the \fIinitial-flags\fR field in
 \fBstty\fR command. These flags are used by \fBttymon\fR when searching for the
 correct baud rate. They are set prior to writing the prompt. If this option is
 not specified, \fBsttydefs\fR will set \fIinitial-flags\fR equal to the
-\fBtermio\fR(7I) flag \fB9600\fR.
+\fBtermio\fR(4I) flag \fB9600\fR.
 .RE
 
 .sp
@@ -189,4 +189,4 @@ sttydefs \fB-a\fR 9600 \fB-n\fR 1200 \fB-i\fR 9600 \fB-f\fR "9600 sane"
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBtermio\fR(7I)
+\fBattributes\fR(7), \fBtermio\fR(4I)
diff --git a/usr/src/man/man8/su.8 b/usr/src/man/man8/su.8
index 11671618ff..cccfa248ee 100644
--- a/usr/src/man/man8/su.8
+++ b/usr/src/man/man8/su.8
@@ -28,7 +28,7 @@ and supplementary group list set to those of the specified \fIusername\fR.
 Additionally, the new shell's project ID is set to the default project ID of
 the specified user. See \fBgetdefaultproj\fR(3PROJECT),
 \fBsetproject\fR(3PROJECT). The new shell will be the shell specified in the
-shell field of \fIusername\fR's password file entry (see \fBpasswd\fR(4)). If
+shell field of \fIusername\fR's password file entry (see \fBpasswd\fR(5)). If
 no shell is specified, \fB/usr/bin/sh\fR is used (see \fBsh\fR(1)). If
 superuser privilege is requested and the shell for the superuser cannot be
 invoked using \fBexec\fR(2), \fB/sbin/sh\fR is used as a fallback. To return to
@@ -75,7 +75,7 @@ of \fB$\fR\fBPATH\fR\fB, \fR which is controlled by \fBPATH\fR and
 .sp
 .LP
 All attempts to become another user using \fBsu\fR are logged in the log file
-\fB/var/adm/sulog\fR (see \fBsulog\fR(4)).
+\fB/var/adm/sulog\fR (see \fBsulog\fR(5)).
 .SH SECURITY
 .sp
 .LP
@@ -140,7 +140,7 @@ while becoming user \fBbin\fR.
 .LP
 If any of the \fBLC_*\fR variables ( \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR,
 \fBLC_TIME\fR, \fBLC_COLLATE\fR, \fBLC_NUMERIC\fR, and \fBLC_MONETARY\fR) (see
-\fBenviron\fR(5)) are not set in the environment, the operational behavior of
+\fBenviron\fR(7)) are not set in the environment, the operational behavior of
 \fBsu\fR for each corresponding locale category is determined by the value of
 the \fBLANG\fR environment variable. If \fBLC_ALL\fR is set, its contents are
 used to override both the \fBLANG\fR and the other \fBLC_*\fR variables. If
@@ -292,8 +292,8 @@ Sets the TZ environment variable of the shell.
 .sp
 .LP
 \fBcsh\fR(1), \fBenv\fR(1), \fBksh\fR(1), \fBlogin\fR(1), \fBroles\fR(1),
-\fBsh\fR(1), \fBsyslogd\fR(1M), \fBexec\fR(2), \fBgetdefaultproj\fR(3PROJECT),
+\fBsh\fR(1), \fBsyslogd\fR(8), \fBexec\fR(2), \fBgetdefaultproj\fR(3PROJECT),
 \fBsetproject\fR(3PROJECT), \fBpam\fR(3PAM), \fBpam_authenticate\fR(3PAM),
-\fBpam_acct_mgmt\fR(3PAM), \fBpam_setcred\fR(3PAM), \fBpam.conf\fR(4),
-\fBpasswd\fR(4), \fBprofile\fR(4), \fBsulog\fR(4), \fBsyslog\fR(3C),
-\fBattributes\fR(5), \fBenviron\fR(5)
+\fBpam_acct_mgmt\fR(3PAM), \fBpam_setcred\fR(3PAM), \fBpam.conf\fR(5),
+\fBpasswd\fR(5), \fBprofile\fR(5), \fBsulog\fR(5), \fBsyslog\fR(3C),
+\fBattributes\fR(7), \fBenviron\fR(7)
diff --git a/usr/src/man/man8/sulogin.8 b/usr/src/man/man8/sulogin.8
index 5128ce9d8c..9cbd8a810c 100644
--- a/usr/src/man/man8/sulogin.8
+++ b/usr/src/man/man8/sulogin.8
@@ -25,7 +25,7 @@ directly invoke \fBsulogin\fR. The user must have the
 .LP
 The \fBsulogin\fR utility can prompt the user to enter the root password on a
 variable number of serial console devices, in addition to the traditional
-console device. See \fBconsadm\fR(1M) and \fBmsglog\fR(7D) for a description of
+console device. See \fBconsadm\fR(8) and \fBmsglog\fR(4D) for a description of
 how to configure a serial device to display the single-user login prompt.
 .SH FILES
 .sp
@@ -67,7 +67,7 @@ If present, sets the number of seconds to wait before login failure is printed
 to the screen and another login attempt is allowed. Default is \fB4\fR seconds.
 Minimum is \fB0\fR seconds. Maximum is \fB5\fR seconds.
 .sp
-Both \fBsu\fR(1M) and \fBlogin\fR(1) are affected by the value of
+Both \fBsu\fR(8) and \fBlogin\fR(1) are affected by the value of
 \fBSLEEPTIME\fR.
 .RE
 
@@ -76,8 +76,8 @@ Both \fBsu\fR(1M) and \fBlogin\fR(1) are affected by the value of
 .SH SEE ALSO
 .sp
 .LP
-\fBauths\fR(1), \fBlogin\fR(1), \fBconsadm\fR(1M), \fBinit\fR(1M),
-\fBsu\fR(1M), \fBattributes\fR(5), \fBmsglog\fR(7D)
+\fBauths\fR(1), \fBlogin\fR(1), \fBconsadm\fR(8), \fBinit\fR(8),
+\fBsu\fR(8), \fBattributes\fR(7), \fBmsglog\fR(4D)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/svc.configd.8 b/usr/src/man/man8/svc.configd.8
index 0a8f78e6c5..327685bad7 100644
--- a/usr/src/man/man8/svc.configd.8
+++ b/usr/src/man/man8/svc.configd.8
@@ -21,10 +21,10 @@ if any failures occur. \fBsvc.configd\fR should never be invoked directly.
 .sp
 .LP
 Interaction with \fBsvc.configd\fR is by way of \fBlibscf\fR(3LIB) and the
-command line tools: \fBsvcs\fR(1), \fBsvcprop\fR(1), \fBsvcadm\fR(1M), and
-\fBsvccfg\fR(1M).
+command line tools: \fBsvcs\fR(1), \fBsvcprop\fR(1), \fBsvcadm\fR(8), and
+\fBsvccfg\fR(8).
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcprop\fR(1), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
-\fBlibscf\fR(3LIB), \fBattributes\fR(5)
+\fBsvcs\fR(1), \fBsvcprop\fR(1), \fBsvcadm\fR(8), \fBsvccfg\fR(8),
+\fBlibscf\fR(3LIB), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/svc.ipfd.8 b/usr/src/man/man8/svc.ipfd.8
index 96d2da6a10..65c78ad0f0 100644
--- a/usr/src/man/man8/svc.ipfd.8
+++ b/usr/src/man/man8/svc.ipfd.8
@@ -64,7 +64,7 @@ For non-\fBinetd\fR services. The IANA name or RPC name, equivalent to the
 For non-\fBinetd\fR services. A boolean property where a \fBtrue\fR value
 indicates an RPC service, equivalent to the \fBinetd/isrpc\fR property. For RPC
 services, the value of \fBfirewall_context/name\fR is not an IANA name but is
-either an RPC program number or name. See \fBrpc\fR(4).
+either an RPC program number or name. See \fBrpc\fR(5).
 .RE
 
 .sp
@@ -106,7 +106,7 @@ installation of an updated service definition.
 A per-service property group, \fBfirewall_config\fR, stores the services'
 firewall policy configuration. Because \fBnetwork/ipfilter:default\fR is
 responsible for two firewall policies, the Global Default and Global Override
-system-wide policies (as explained in \fBipfilter\fR(5)), it has two property
+system-wide policies (as explained in \fBipfilter\fR(7)), it has two property
 groups, \fBfirewall_config_default\fR and \fBfirewall_config_override\fR, to
 store the respective system-wide policies.
 .sp
@@ -423,7 +423,7 @@ Initially, the system-wide policies are set to \fBnone\fR and network services'
 policies are set to \fBuse_global\fR. Enabling \fBnetwork/ipfilter\fR activates
 the firewall with an empty set of IP Filter rules, since system-wide policy is
 \fBnone\fR and all services inherit that policy. To configure a more
-restrictive policy, use \fBsvccfg\fR(1M) to modify network services and
+restrictive policy, use \fBsvccfg\fR(8) to modify network services and
 system-wide policies.
 .sp
 .LP
@@ -599,7 +599,7 @@ svc:/network/ntp:default
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -614,6 +614,6 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBsvcprop\fR(1), \fBsvcs\fR(1), \fBipf\fR(1M), \fBsvcadm\fR(1M),
-\fBsvccfg\fR(1M), \fBgetservbyname\fR(3SOCKET), \fBrpc\fR(4),
-\fBattributes\fR(5), \fBipfilter\fR(5), \fBsmf\fR(5)
+\fBsvcprop\fR(1), \fBsvcs\fR(1), \fBipf\fR(8), \fBsvcadm\fR(8),
+\fBsvccfg\fR(8), \fBgetservbyname\fR(3SOCKET), \fBrpc\fR(5),
+\fBattributes\fR(7), \fBipfilter\fR(7), \fBsmf\fR(7)
diff --git a/usr/src/man/man8/svc.startd.8 b/usr/src/man/man8/svc.startd.8
index d6e0822d4f..53715752cc 100644
--- a/usr/src/man/man8/svc.startd.8
+++ b/usr/src/man/man8/svc.startd.8
@@ -33,12 +33,12 @@ restarted if any failures occur. \fBsvc.startd\fR should never be invoked
 directly.
 .sp
 .LP
-See \fBsmf_restarter\fR(5) for information on configuration and behavior common
+See \fBsmf_restarter\fR(7) for information on configuration and behavior common
 to all restarters.
 .sp
 .LP
 \fBsvcs\fR(1) reports status for all services managed by the Service
-Configuration Facility. \fBsvcadm\fR(1M) allows manipulation of service
+Configuration Facility. \fBsvcadm\fR(8) allows manipulation of service
 instances with respect to the service's restarter.
 .SS "Environment Variables"
 Environment variables with the "SMF_" prefix are reserved and may be
@@ -46,9 +46,9 @@ overwritten.
 .sp
 .LP
 \fBsvc.startd\fR supplies the "SMF_" environment variables specified in
-\fBsmf_method\fR(5) to the method. PATH is set to "\fB/usr/sbin:/usr/bin\fR" by
+\fBsmf_method\fR(7) to the method. PATH is set to "\fB/usr/sbin:/usr/bin\fR" by
 default. By default, all other environment variables supplied to
-\fBsvc.startd\fR are those inherited from \fBinit\fR(1M).
+\fBsvc.startd\fR are those inherited from \fBinit\fR(8).
 .sp
 .LP
 Duplicate entries are reduced to a single entry. The value used is undefined.
@@ -56,7 +56,7 @@ Environment entries that are not prefixed with "<\fIname\fR>=" are ignored.
 .SS "Restarter Options"
 \fBsvc.startd\fR is not configured by command line options. Instead,
 configuration is read from the service configuration repository. You can use
-\fBsvccfg\fR(1M) to set all options and properties.
+\fBsvccfg\fR(8) to set all options and properties.
 .sp
 .LP
 The following configuration variables in the \fBoptions\fR property group are
@@ -75,7 +75,7 @@ print to the console during boot. The supported message options include
 to console during boot. The \fBverbose\fR option prints a single message per
 service started to indicate success or failure. You can use the \fBboot\fR
 \fB-m\fR option to override the \fBboot_messages\fR setting at boot time. See
-\fBkernel\fR(1M).
+\fBkernel\fR(8).
 .RE
 
 .sp
@@ -128,7 +128,7 @@ milestone where no services are running apart from the master
 \fBsvc:/system/svc/restarter:default\fR. By default, \fBsvc.startd\fR uses
 \fBall\fR, a synthetic milestone that depends on every service. If this
 property is specified, it overrides any \fBinitdefault\fR setting in
-\fBinittab\fR(4).
+\fBinittab\fR(5).
 .RE
 
 .sp
@@ -153,7 +153,7 @@ Configuration errors, such as disabling \fBsvc.startd\fR are logged by
 \fBsyslog\fR, but ignored.
 .SS "SERVICE STATES"
 Services managed by \fBsvc.startd\fR can appear in any of the states described
-in \fBsmf\fR(5). The state definitions are unmodified by this restarter.
+in \fBsmf\fR(7). The state definitions are unmodified by this restarter.
 .SS "SERVICE REPORTING"
 In addition to any logging done by the managed service, \fBsvc.startd\fR
 provides a common set of service reporting and logging mechanisms.
@@ -247,7 +247,7 @@ instance and the restarter.
 .sp
 .LP
 The general form of methods for the fork/exec model provided by
-\fBsvc.startd\fR are presented in \fBsmf_method\fR(5). The following methods
+\fBsvc.startd\fR are presented in \fBsmf_method\fR(7). The following methods
 are supported as required or optional by services managed by \fBsvc.startd\fR.
 .sp
 .ne 2
@@ -296,14 +296,14 @@ specify the \fB:true\fR token for that method.
 .sp
 .LP
 \fBsvc.startd\fR honors any method context specified for the service or any
-specific method. The method expansion tokens described in \fBsmf_method\fR(5)
+specific method. The method expansion tokens described in \fBsmf_method\fR(7)
 are available for use in all methods invoked by \fBsvc.startd\fR.
 .sp
 .LP
 \fBProperties\fR
 .sp
 .LP
-An overview of the general properties is available in \fBsmf\fR(5). The
+An overview of the general properties is available in \fBsmf\fR(7). The
 specific way in which these general properties interacts with \fBsvc.startd\fR
 follows:
 .sp
@@ -421,7 +421,7 @@ code or if fails to complete before the timeout specified expires. If
 \fBsvc.startd\fR immediately places the service in the maintenance state. For
 all other failures, \fBsvc.startd\fR places the service in the offline state.
 If a service is offline and its dependencies are satisfied, \fBsvc.startd\fR
-tries again to start the service (see \fBsmf\fR(5)).
+tries again to start the service (see \fBsmf\fR(7)).
 .sp
 .LP
 If a contract or transient service does not return from its start method before
@@ -568,8 +568,8 @@ svc:/system/svc/restarter:default> exit
 This request will take effect on the next restart of \fBsvc.startd\fR.
 
 .SH SEE ALSO
-\fBsvcs\fR(1), \fBsvcprop\fR(1), \fBkernel\fR(1M), \fBinit\fR(1M),
-\fBsvcadm\fR(1M), \fBsvccfg\fR(1M), \fBsvc.configd\fR(1M), \fBsetsid\fR(2),
+\fBsvcs\fR(1), \fBsvcprop\fR(1), \fBkernel\fR(8), \fBinit\fR(8),
+\fBsvcadm\fR(8), \fBsvccfg\fR(8), \fBsvc.configd\fR(8), \fBsetsid\fR(2),
 \fBsyslog\fR(3C), \fBlibscf\fR(3LIB), \fBscf_value_is_type\fR(3SCF),
-\fBcontract\fR(4), \fBinit.d\fR(4), \fBprocess\fR(4), \fBinittab\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5), \fBsmf_method\fR(5)
+\fBcontract\fR(5), \fBinit.d\fR(5), \fBprocess\fR(5), \fBinittab\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7), \fBsmf_method\fR(7)
diff --git a/usr/src/man/man8/svcadm.8 b/usr/src/man/man8/svcadm.8
index 81278232f2..d3206bfbb6 100644
--- a/usr/src/man/man8/svcadm.8
+++ b/usr/src/man/man8/svcadm.8
@@ -50,9 +50,9 @@ svcadm \- manipulate service instances
 
 .SH DESCRIPTION
 \fBsvcadm\fR issues requests for actions on services executing within the
-service management facility (see \fBsmf\fR(5)). Actions for a service are
+service management facility (see \fBsmf\fR(7)). Actions for a service are
 carried out by its assigned service restarter agent. The default service
-restarter is \fBsvc.startd\fR (see \fBsvc.startd\fR(1M)).
+restarter is \fBsvc.startd\fR (see \fBsvc.startd\fR(8)).
 .SH OPTIONS
 The following options are supported:
 .sp
@@ -82,7 +82,7 @@ Print actions verbosely to standard output.
 .ad
 .RS 20n
 Administer services in all zones.  This option is only applicable
-from the global zone, see \fBzones\fR(5).
+from the global zone, see \fBzones\fR(7).
 .RE
 
 .sp
@@ -92,7 +92,7 @@ from the global zone, see \fBzones\fR(5).
 .ad
 .RS 20n
 Administer services in the specified zone.  This option is only applicable
-from the global zone, see \fBzones\fR(5).
+from the global zone, see \fBzones\fR(7).
 .RE
 
 .SH SUBCOMMANDS
@@ -107,7 +107,7 @@ For subcommands taking one or more operands, if the operand specifies a service
 management resource identifier) matches more than one service or instance, a
 warning message is displayed and that operand is ignored.
 If a pattern matches more than one service or instance, the subcommand is
-applied to all matches. See \fBsmf\fR(5).
+applied to all matches. See \fBsmf\fR(7).
 .sp
 .LP
 In the case that the service has more than one instance, \fBsvcadm\fR return a
@@ -122,7 +122,7 @@ non-zero exit status.
 Enables the service instances specified by the operands. For each service
 instance, the assigned restarter will try to bring it to the online state. This
 action requires permission to modify the "general" property group of the
-service instance (see \fBsmf_security\fR(5)).
+service instance (see \fBsmf_security\fR(7)).
 .sp
 If the \fB-r\fR option is specified, \fBsvcadm\fR enables each service instance
 and recursively enables its dependencies.
@@ -135,7 +135,7 @@ service cannot reach these states without administrator intervention.
 If the \fB-t\fR option is specified, \fBsvcadm\fR temporarily enables each
 service instance. Temporary enable only lasts until reboot. This action
 requires permission to modify the "restarter_actions" property group of the
-service instance (see \fBsmf_security\fR(5)). By default, \fBenable\fR is
+service instance (see \fBsmf_security\fR(7)). By default, \fBenable\fR is
 persistent across reboot.
 .RE
 
@@ -149,7 +149,7 @@ persistent across reboot.
 Disables the service instance specified by the operands. For each service
 instance, the assigned restarter will try to bring it to the disabled state.
 This action requires permission to modify the "general" property group of the
-service instance (see \fBsmf_security\fR(5)).
+service instance (see \fBsmf_security\fR(7)).
 .sp
 If the \fB-s\fR option is specified, \fBsvcadm\fR disables each service
 instance and then waits for each service instance to enter the disabled state.
@@ -159,7 +159,7 @@ this state without administrator intervention.
 If the \fB-t\fR option is specified, \fBsvcadm\fR temporarily disables each
 service instance. Temporary disable only lasts until reboot. This action
 requires permission to modify the "restarter_actions" property group of the
-service instance (see \fBsmf_security\fR(5)). By default, \fBdisable\fR is
+service instance (see \fBsmf_security\fR(7)). By default, \fBdisable\fR is
 persistent across reboot.
 .sp
 If the \fB-c\fR option is specified, the given free-form comment is recorded
@@ -177,10 +177,10 @@ and is reported by \fBsvcs\fR(1).
 .RS 4n
 Requests that the service instances specified by the operands be restarted.
 This action requires permission to modify the "restarter_actions" property
-group of the service instance (see \fBsmf_security\fR(5)).
+group of the service instance (see \fBsmf_security\fR(7)).
 .sp
 This subcommand can restart only those services that are in the online or
-degraded states, as those states are defined in \fBsmf\fR(5).
+degraded states, as those states are defined in \fBsmf\fR(7).
 .sp
 If the \fB-d\fR option is specified, the restarter sends a \fBSIGABRT\fR to all
 members of the contract, which should cause a core dump, before restarting
@@ -201,12 +201,12 @@ from the current configuration. Some of these values take effect immediately
 next service \fBrestart\fR. See the restarter and service documentation for
 more information.
 .sp
-If the service is managed by \fBsvc.startd\fR(1M), the \fBrefresh\fR method
+If the service is managed by \fBsvc.startd\fR(8), the \fBrefresh\fR method
 will be invoked if it exists to request the service reread its own
 configuration. For other restarters, see the restarter documentation.
 .sp
 This action requires permission to modify the "restarter_actions" property
-group of the service instance (see \fBsmf_security\fR(5)).
+group of the service instance (see \fBsmf_security\fR(7)).
 .RE
 
 .sp
@@ -221,7 +221,7 @@ For each service instance specified by the operands, if the instance is in the
 been repaired. If the instance is in the \fBdegraded\fR state, request that the
 assigned restarter take the service to the \fBonline\fR state. This action
 requires permission to modify the "restarter_actions" property group of the
-service instance (see \fBsmf_security\fR(5)).
+service instance (see \fBsmf_security\fR(7)).
 .RE
 
 .SS "Exceptional Operations"
@@ -237,8 +237,8 @@ administrative manipulation.
 .RS 4n
 If \fIinstance_state\fR is "maintenance", then for each service specified by
 the operands, \fBsvcadm\fR requests that the assigned restarter place the
-service in the \fBmaintenance\fR state. See \fBsvc.startd\fR(1M) and
-\fBinetd\fR(1M) for a detailed description of the actions taken for each
+service in the \fBmaintenance\fR state. See \fBsvc.startd\fR(8) and
+\fBinetd\fR(8) for a detailed description of the actions taken for each
 restarter.
 .sp
 If \fIinstance_state\fR is "degraded", then for services specified by the
@@ -287,7 +287,7 @@ level, invoke \fB/sbin/init\fR directly.
 .sp
 This action requires permission to modify the "options_ovr" property group of
 the \fBsvc:/system/svc/restarter:default\fR service instance (see
-\fBsmf_security\fR(5)).
+\fBsmf_security\fR(7)).
 .sp
 The \fB-d\fR option immediately changes the milestone to the requested
 milestone, as above. Additionally, it makes the specified milestone the default
@@ -296,7 +296,7 @@ by the \fBoptions/milestone\fR property on the master restarter,
 \fBsvc:/system/svc/restarter:default\fR. If this property is absent, "all" is
 the default. This action requires permission to modify the "options" property
 group of the \fBsvc:/system/svc/restarter:default\fR service instance (see
-\fBsmf_security\fR(5)).
+\fBsmf_security\fR(7)).
 .RE
 
 .SS "Operands"
@@ -354,7 +354,7 @@ should not be used in scripts or other permanent tools.
 .ad
 .RS 11n
 A pattern that is matched against the \fIFMRIs\fR of service instances
-according to the "globbing" rules described by \fBfnmatch\fR(5). If the pattern
+according to the "globbing" rules described by \fBfnmatch\fR(7). If the pattern
 does not begin with "svc:", then "svc:/" is prepended.
 .RE
 
@@ -508,7 +508,7 @@ with the service's dependencies.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -526,9 +526,9 @@ Interface Stability	See below.
 The interactive output is Uncommitted. The invocation and non-interactive
 output are Committed.
 .SH SEE ALSO
-\fBsvcprop\fR(1), \fBsvcs\fR(1), \fBinetd\fR(1M), \fBinit\fR(1M),
-\fBsvccfg\fR(1M), \fBsvc.startd\fR(1M), \fBlibscf\fR(3LIB), \fBcontract\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5), \fBsmf_security\fR(5), \fBzones\fR(5)
+\fBsvcprop\fR(1), \fBsvcs\fR(1), \fBinetd\fR(8), \fBinit\fR(8),
+\fBsvccfg\fR(8), \fBsvc.startd\fR(8), \fBlibscf\fR(3LIB), \fBcontract\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7), \fBsmf_security\fR(7), \fBzones\fR(7)
 .SH NOTES
 The amount of time \fBsvcadm\fR will spend waiting for services and their
 dependencies to change state is implicitly limited by their method timeouts.
diff --git a/usr/src/man/man8/svccfg.8 b/usr/src/man/man8/svccfg.8
index 09d9fdf51a..777a45312b 100644
--- a/usr/src/man/man8/svccfg.8
+++ b/usr/src/man/man8/svccfg.8
@@ -33,7 +33,7 @@ subcommands.
 .LP
 Changes made to an existing service in the repository typically do not take
 effect for that service until the next time the service instance is refreshed.
-See the \fBrefresh\fR subcommand on the \fBsvcadm\fR(1M) man page for more
+See the \fBrefresh\fR subcommand on the \fBsvcadm\fR(8) man page for more
 details.
 .SH OPTIONS
 .LP
@@ -56,7 +56,7 @@ Reads and executes \fBsvccfg\fR subcommands from \fIcommand-file\fR.
 .sp .6
 .RS 4n
 Selects the entity indicated by \fIFMRI\fR (a fault management resource
-identifier) before executing any subcommands. See \fBsmf\fR(5).
+identifier) before executing any subcommands. See \fBsmf\fR(7).
 .RE
 
 .sp
@@ -145,7 +145,7 @@ Exits immediately.
 .ad
 .sp .6
 .RS 4n
-Uses \fIrepfile\fR as a repository. By default, \fBsvccfg\fR(1M) uses the
+Uses \fIrepfile\fR as a repository. By default, \fBsvccfg\fR(8) uses the
 system repository.
 .sp
 Use repository only with files from the identical version of Solaris, including
@@ -200,9 +200,9 @@ their type changed by the profile. Nonexistent services and instances are
 ignored. Services and instances modified by the profile will be refreshed. If
 \fB-n\fR is specified, the profile is processed and no changes are applied to
 the SMF repository. Any syntax error found will be reported on stderr and an
-exit code of \fB1\fR will be returned. See \fBsmf\fR(5) for a description of
+exit code of \fB1\fR will be returned. See \fBsmf\fR(7) for a description of
 service profiles. This command requires privileges to modify properties in the
-service and instance. See \fBsmf_security\fR(5) for the privileges required to
+service and instance. See \fBsmf_security\fR(7) for the privileges required to
 modify properties. If \fIfile\fR is not a service profile, the subcommand
 fails.
 .RE
@@ -233,7 +233,7 @@ backup.
 .sp
 Without the \fB-a\fR option, property groups containing protected information
 (identified by the presence of the \fBread_authorization\fR property\(emsee
-\fBsmf_security\fR(5)) will be archived without their property values. When the
+\fBsmf_security\fR(7)) will be archived without their property values. When the
 \fB-a\fR option is specified, all values will be archived. An error results if
 there are insufficient privileges to read these values.
 .RE
@@ -252,7 +252,7 @@ created on behalf of another service.
 .sp
 Without the \fB-a\fR option, property groups containing protected information
 (identified by the presence of the \fBread_authorization\fR property\(emsee
-\fBsmf_security\fR(5)) will be exported without their property values. When the
+\fBsmf_security\fR(7)) will be exported without their property values. When the
 \fB-a\fR option is specified, all values will be archived. An error results if
 there are insufficient privileges to read these values.
 .sp
@@ -272,13 +272,13 @@ is exported and a warning is issued.  If you specify an abbreviation, such as
 .RS 4n
 If \fIfile\fR is a service manifest, then the services and instances it
 specifies are imported into the repository. According to the file, dependencies
-may be created in other services. See \fBsmf\fR(5) for a description of service
-manifests. See \fBsmf_security\fR(5) for the privileges required to create and
+may be created in other services. See \fBsmf\fR(7) for a description of service
+manifests. See \fBsmf_security\fR(7) for the privileges required to create and
 modify service configurations.
 .sp
 Services and instances in the manifest will be validated against template data
 in the manifest and the repository, and warnings will be issued for all
-template violations. See \fBsmf_template\fR(5) for a description of templates.
+template violations. See \fBsmf_template\fR(7) for a description of templates.
 If the \fB-V\fR option is specified, manifests that violate the defined
 templates will fail to import. In interactive invocations of \fBsvccfg\fR,
 \fB-V\fR is the default behavior.
@@ -315,7 +315,7 @@ Restores the contents of the repository from a full XML service description
 previously created by the \fBarchive\fR subcommand. If the archive was
 generated without the use of the \fB-a\fR option, the contents of the
 repository following completion of the restore will not include the values of
-any read-protected properties (see \fBsmf_security\fR(5)). If these are
+any read-protected properties (see \fBsmf_security\fR(7)). If these are
 required, they must be restored manually.
 .sp
 Restoring an archive which is inconsistent with currently installed software
@@ -347,10 +347,10 @@ status.
 .sp
 For an instance \fIfmri\fR, instance entity selection, or snapshot entity
 selection, the specified instance in its composed form (see "Properties and
-Property Groups" in \fBsmf\fR(5)) will be validated against template data in
+Property Groups" in \fBsmf\fR(7)) will be validated against template data in
 the repository. Instance FMRIs and instance entity selections use the "running"
 snapshot for validation. Warnings will be issued for all template violations.
-See \fBsmf_template\fR(5) for a description of templates.
+See \fBsmf_template\fR(7) for a description of templates.
 .RE
 
 .SS "Entity Selection, Modification, and Navigation Subcommands"
@@ -364,7 +364,7 @@ An "entity" refers to a scope, service, or service instance.
 .sp .6
 .RS 4n
 A new entity with the given name is created as a child of the current
-selection. See \fBsmf_security\fR(5) for the privileges required to create
+selection. See \fBsmf_security\fR(7) for the privileges required to create
 entities.
 .RE
 
@@ -382,7 +382,7 @@ instance has a "dependents" property group of type "framework", then for each
 of its properties with type "astring" or "fmri", if the property has a single
 value which names a service or service instance then the dependency property
 group in the indicated service or service instance with the same name as the
-property will be deleted. See \fBsmf_security\fR(5) for the privileges required
+property will be deleted. See \fBsmf_security\fR(7) for the privileges required
 to delete service configurations.
 .RE
 
@@ -394,7 +394,7 @@ to delete service configurations.
 .sp .6
 .RS 4n
 The child entities of the current selection whose names match the glob pattern
-\fIpattern\fR are displayed (see \fBfnmatch\fR(5)). \&':properties' is also
+\fIpattern\fR are displayed (see \fBfnmatch\fR(7)). \&':properties' is also
 listed for property-bearing entities, namely services and service instances.
 .RE
 
@@ -431,7 +431,7 @@ Adds a property group with the given \fIname\fR and type to the current
 selection. \fIflags\fR is a string of characters which designates the flags
 with which to create the property group. 'P' represents
 \fBSCF_PG_FLAG_NONPERSISTENT\fR (see \fBscf_service_add_pg\fR(3SCF)). See
-\fBsmf_security\fR(5) for the privileges required to create property groups.
+\fBsmf_security\fR(7) for the privileges required to create property groups.
 .RE
 
 .sp
@@ -448,7 +448,7 @@ containing double-quotes or backslashes must be enclosed by double-quotes and
 the contained double-quotes and backslashes must be quoted by backslashes.
 Nonexistent properties are created, in which case the \fItype\fR specifier must
 be present. See \fBscf_value_create\fR(3SCF) for a list of available property
-types. See \fBsmf_security\fR(5) for the privileges required to modify
+types. See \fBsmf_security\fR(7) for the privileges required to modify
 properties. The new value will be appended to the end of the list of property
 values associated with the property.
 .RE
@@ -461,7 +461,7 @@ values associated with the property.
 .sp .6
 .RS 4n
 Deletes the property group \fIname\fR of the current selection. See
-\fBsmf_security\fR(5) for the privileges required to delete property groups.
+\fBsmf_security\fR(7) for the privileges required to delete property groups.
 .RE
 
 .sp
@@ -472,7 +472,7 @@ Deletes the property group \fIname\fR of the current selection. See
 .sp .6
 .RS 4n
 Deletes the named property group or property of the current selection. See
-\fBsmf_security\fR(5) for the privileges required to delete properties.
+\fBsmf_security\fR(7) for the privileges required to delete properties.
 .RE
 
 .sp
@@ -483,7 +483,7 @@ Deletes the named property group or property of the current selection. See
 .sp .6
 .RS 4n
 Deletes all values matching the given \fIglob\fR pattern in the named property.
-Succeeds even if no values match. See \fBsmf_security\fR(5) for the privileges
+Succeeds even if no values match. See \fBsmf_security\fR(7) for the privileges
 required to modify properties.
 .RE
 
@@ -506,7 +506,7 @@ The \fB-v\fR option gives all information available, including descriptions for
 current settings, constraints, and other possible setting choices.
 .sp
 The \fB-t\fR option shows only the template data for the selection (see
-\fBsmf_template\fR(5)), and does not display the current settings for property
+\fBsmf_template\fR(7)), and does not display the current settings for property
 groups and properties.
 .RE
 
@@ -521,7 +521,7 @@ Comments of commands to reproduce the property groups and properties of the
 current selection are placed in a temporary file and the program named by the
 \fBEDITOR\fR environment variable is invoked to edit it. Upon completion, the
 commands in the temporary file are executed. The default editor is \fBvi\fR(1).
-See \fBsmf_security\fR(5) for the privileges required to create, modify, or
+See \fBsmf_security\fR(7) for the privileges required to create, modify, or
 delete properties.
 .RE
 
@@ -577,7 +577,7 @@ located, it is searched for in a similar manner.
 .sp
 Once the property is located, all values which begin with \fIenvvar\fR followed
 by a "=" are removed, and the value "\fIenvvar\fR=\fIvalue\fR" is added. See
-\fBsmf_security\fR(5) for the privileges required to modify properties.
+\fBsmf_security\fR(7) for the privileges required to modify properties.
 .RE
 
 .sp
@@ -599,7 +599,7 @@ property already exists and the \fItype\fR disagrees with the existing
 double-quotes. String values which contain double-quotes or backslashes must be
 enclosed by double-quotes and the contained double-quotes and backslashes must
 be quoted by backslashes. If the named property does not exist, it is created,
-as long as the type is specified. See \fBsmf_security\fR(5) for the privileges
+as long as the type is specified. See \fBsmf_security\fR(7) for the privileges
 required to create or modify properties. Multiple values will be stored in the
 order in which they are specified.
 .RE
@@ -626,7 +626,7 @@ its parent is also searched. If the "inetd_start" property group is not
 located, it is searched for in a similar manner.
 .sp
 Once the property is located, all values which begin with \fIenvvar\fR followed
-by "=" are removed. See \fBsmf_security\fR(5) for the privileges required to
+by "=" are removed. See \fBsmf_security\fR(7) for the privileges required to
 modify properties.
 .RE
 
@@ -650,8 +650,8 @@ Displays snapshots available for the currently selected instance.
 Reverts the properties of the currently selected instance and its service to
 those recorded in the named snapshot. If no argument is given, use the
 currently selected snapshot and deselect it on success. The changed property
-values can be made active via the \fBrefresh\fR subcommand of \fBsvcadm\fR(1M).
-See \fBsmf_security\fR(5) for the privileges required to change properties.
+values can be made active via the \fBrefresh\fR subcommand of \fBsvcadm\fR(8).
+See \fBsmf_security\fR(7) for the privileges required to change properties.
 .RE
 
 .sp
@@ -698,7 +698,7 @@ service in the XML manifest specified on the command line.
 .sp
 .LP
 Note that the manifest must follow the format specified in
-\fBservice_bundle\fR(4).
+\fBservice_bundle\fR(5).
 
 .LP
 \fBExample 2 \fRExporting a Service Description
@@ -833,7 +833,7 @@ Invalid command line options were specified.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -852,8 +852,8 @@ The interactive output is Uncommitted. The invocation and non-interactive
 output are Committed.
 .SH SEE ALSO
 .LP
-\fBsvcprop\fR(1), \fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBsvc.configd\fR(1M),
+\fBsvcprop\fR(1), \fBsvcs\fR(1), \fBsvcadm\fR(8), \fBsvc.configd\fR(8),
 \fBlibscf\fR(3LIB), \fBlibumem\fR(3LIB), \fBscf_service_add_pg\fR(3SCF),
-\fBscf_value_create\fR(3SCF), \fBcontract\fR(4), \fBservice_bundle\fR(4),
-\fBattributes\fR(5), \fBfnmatch\fR(5), \fBsmf\fR(5), \fBsmf_method\fR(5),
-\fBsmf_security\fR(5), \fBsmf_template\fR(5)
+\fBscf_value_create\fR(3SCF), \fBcontract\fR(5), \fBservice_bundle\fR(5),
+\fBattributes\fR(7), \fBfnmatch\fR(7), \fBsmf\fR(7), \fBsmf_method\fR(7),
+\fBsmf_security\fR(7), \fBsmf_template\fR(7)
diff --git a/usr/src/man/man8/swap.8 b/usr/src/man/man8/swap.8
index 21460dfa64..0a049a9039 100644
--- a/usr/src/man/man8/swap.8
+++ b/usr/src/man/man8/swap.8
@@ -67,10 +67,10 @@ swap file. If \fIswaplen\fR is not specified, an area will be added starting at
 except for the first page. Swap areas are normally added automatically during
 system startup by the \fB/sbin/swapadd\fR script. This script adds all swap
 areas which have been specified in the \fB/etc/vfstab\fR file; for the syntax
-of these specifications, see \fBvfstab\fR(4).
+of these specifications, see \fBvfstab\fR(5).
 .sp
 To use an \fBNFS\fR or local file system \fIswapname\fR, you should first
-create a file using \fBmkfile\fR(1M). A local file system swap file can now be
+create a file using \fBmkfile\fR(8). A local file system swap file can now be
 added to the running system by just running the \fBswap\fR \fB-a\fR command.
 For \fBNFS\fR mounted swap files, the server needs to export the file. Do this
 by performing the following steps:
@@ -90,7 +90,7 @@ rw=\fIclientname\fR,root=\fIclientname path-to-swap-file\fR
 .RS +4
 .TP
 2.
-Run \fBshareall\fR(1M).
+Run \fBshareall\fR(8).
 .RE
 .RS +4
 .TP
@@ -296,11 +296,11 @@ the \fB-l\fR option, as well as swap space in the form of physical memory.
 .SH USAGE
 A block device up to 2^63 \(mi1 bytes can be fully utilized for swap.
 .SH ENVIRONMENT VARIABLES
-See \fBenviron\fR(5) for descriptions of the following environment variables
+See \fBenviron\fR(7) for descriptions of the following environment variables
 that affect the execution of \fBswap\fR: \fBLC_CTYPE\fR and \fBLC_MESSAGE\fR.
 .SH SEE ALSO
-\fBpagesize\fR(1), \fBmkfile\fR(1M), \fBshareall\fR(1M), \fBgetpagesize\fR(3C),
-\fBvfstab\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBpagesize\fR(1), \fBmkfile\fR(8), \fBshareall\fR(8), \fBgetpagesize\fR(3C),
+\fBvfstab\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7)
 .SH NOTES
 For information about setting up a swap area with \fBZFS\fR, see the \fIZFS
 Administration Guide\fR.
diff --git a/usr/src/man/man8/sync.8 b/usr/src/man/man8/sync.8
index f378495107..bccbc2b273 100644
--- a/usr/src/man/man8/sync.8
+++ b/usr/src/man/man8/sync.8
@@ -24,4 +24,4 @@ details.
 .SH SEE ALSO
 .sp
 .LP
-\fBsync\fR(2), \fBattributes\fR(5)
+\fBsync\fR(2), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/syncinit.8 b/usr/src/man/man8/syncinit.8
index b361d7ae77..3082352cf1 100644
--- a/usr/src/man/man8/syncinit.8
+++ b/usr/src/man/man8/syncinit.8
@@ -138,8 +138,8 @@ speed=0, loopback=no, echo=no, nrzi=no, txc=txc, rxc=rxc
 
 .SH SEE ALSO
 .LP
-\fBsyncloop\fR(1M), \fBsyncstat\fR(1M), \fBIntro\fR(2), \fBioctl\fR(2),
-\fBattributes\fR(5), \fBzsh\fR(7D)
+\fBsyncloop\fR(8), \fBsyncstat\fR(8), \fBIntro\fR(2), \fBioctl\fR(2),
+\fBattributes\fR(7), \fBzsh\fR(4D)
 .SH DIAGNOSTICS
 .ne 2
 .na
diff --git a/usr/src/man/man8/syncloop.8 b/usr/src/man/man8/syncloop.8
index c7edffd31a..4b94315c5d 100644
--- a/usr/src/man/man8/syncloop.8
+++ b/usr/src/man/man8/syncloop.8
@@ -97,7 +97,7 @@ T}
 Sets verbose mode.  If data errors occur, the expected and received data is displayed.
 T}
 \fB-t\fR	\fItest_type\fR	\fInone\fR	T{
-A number, from 1 to 4, that specifies which test to perform.  The values for \fItest_type\fR are as follows: \fB1\fR: Internal loopback test.  Port loopback is on.  Transmit and receive clock sources are internal (baud rate generator). \fB2\fR: External loopback test.  Port loopback is off.  Transmit and receive clock sources are internal.  Requires a loopback plug suitable to the port under test. \fB3\fR: External loopback test.  Port loopback is off.  Transmit and receive clock sources are external (modem).  Requires that one of the local modem, the remote modem, or the remote system be set in a loopback configuration. \fB4\fR: Test using predefined parameters.  User defines hardware configuration and may select port parameters using the \fBsyncinit\fR(1M) command.
+A number, from 1 to 4, that specifies which test to perform.  The values for \fItest_type\fR are as follows: \fB1\fR: Internal loopback test.  Port loopback is on.  Transmit and receive clock sources are internal (baud rate generator). \fB2\fR: External loopback test.  Port loopback is off.  Transmit and receive clock sources are internal.  Requires a loopback plug suitable to the port under test. \fB3\fR: External loopback test.  Port loopback is off.  Transmit and receive clock sources are external (modem).  Requires that one of the local modem, the remote modem, or the remote system be set in a loopback configuration. \fB4\fR: Test using predefined parameters.  User defines hardware configuration and may select port parameters using the \fBsyncinit\fR(8) command.
 T}
 .TE
 
@@ -143,7 +143,7 @@ using 5000 packets and a bit rate of 56Kbps:
 .SH SEE ALSO
 .sp
 .LP
-\fBsyncinit\fR(1M), \fBsyncstat\fR(1M), \fBattributes\fR(5), \fBzsh\fR(7D)
+\fBsyncinit\fR(8), \fBsyncstat\fR(8), \fBattributes\fR(7), \fBzsh\fR(4D)
 .SH DIAGNOSTICS
 .sp
 .ne 2
diff --git a/usr/src/man/man8/syncstat.8 b/usr/src/man/man8/syncstat.8
index 3562bdbddf..68407e57b6 100644
--- a/usr/src/man/man8/syncstat.8
+++ b/usr/src/man/man8/syncstat.8
@@ -134,7 +134,7 @@ ipkts opkts undrun ovrrun abort crc iutil outil
 .SH SEE ALSO
 .sp
 .LP
-\fBsyncinit\fR(1M), \fBsyncloop\fR(1M), \fBattributes\fR(5), \fBzsh\fR(7D)
+\fBsyncinit\fR(8), \fBsyncloop\fR(8), \fBattributes\fR(7), \fBzsh\fR(4D)
 .SH DIAGNOSTICS
 .sp
 .ne 2
diff --git a/usr/src/man/man8/sysdef.8 b/usr/src/man/man8/sysdef.8
index 47d79e29ff..4c45f01371 100644
--- a/usr/src/man/man8/sysdef.8
+++ b/usr/src/man/man8/sysdef.8
@@ -156,5 +156,5 @@ default operating system image
 .SH SEE ALSO
 .sp
 .LP
-\fBhostid\fR(1), \fBprtconf\fR(1M), \fBnlist\fR(3ELF), \fBattributes\fR(5),
-\fBzones\fR(5)
+\fBhostid\fR(1), \fBprtconf\fR(8), \fBnlist\fR(3ELF), \fBattributes\fR(7),
+\fBzones\fR(7)
diff --git a/usr/src/man/man8/syseventadm.8 b/usr/src/man/man8/syseventadm.8
index 90ad9f6f9a..7d69759f16 100644
--- a/usr/src/man/man8/syseventadm.8
+++ b/usr/src/man/man8/syseventadm.8
@@ -214,7 +214,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-R\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -456,7 +456,7 @@ Out of memory.
 .SH SEE ALSO
 
 .LP
-\fBsyseventd\fR(1M), \fBsysevent_post_event\fR(3SYSEVENT), \fBattributes\fR(5),
+\fBsyseventd\fR(8), \fBsysevent_post_event\fR(3SYSEVENT), \fBattributes\fR(7),
 \fBddi_log_sysevent\fR(9F)
 .SH NOTES
 
diff --git a/usr/src/man/man8/syseventconfd.8 b/usr/src/man/man8/syseventconfd.8
index 2df8cac97a..409d533201 100644
--- a/usr/src/man/man8/syseventconfd.8
+++ b/usr/src/man/man8/syseventconfd.8
@@ -17,7 +17,7 @@ syseventconfd \- kernel system event command invocation daemon
 .sp
 .LP
 \fBsyseventconfd\fR is the user-level daemon that invokes user-level commands
-in response to kernel system events received from \fBsyseventd\fR(1M).
+in response to kernel system events received from \fBsyseventd\fR(8).
 .SH OPTIONS
 .sp
 .LP
@@ -56,13 +56,13 @@ The root path must match the root path used to invoke \fBsyseventd\fR.
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBsyseventd\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBsyseventd\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBsyseventconfd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -74,5 +74,5 @@ svc:/system/sysevent:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/syseventd.8 b/usr/src/man/man8/syseventd.8
index a689c4f795..4631d615db 100644
--- a/usr/src/man/man8/syseventd.8
+++ b/usr/src/man/man8/syseventd.8
@@ -132,13 +132,13 @@ kernel to \fBsyseventd\fR door file
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBsyseventconfd\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBsyseventconfd\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBsyseventd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -150,5 +150,5 @@ svc:/system/sysevent:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/syslogd.8 b/usr/src/man/man8/syslogd.8
index dd268220f9..58f9afbbee 100644
--- a/usr/src/man/man8/syslogd.8
+++ b/usr/src/man/man8/syslogd.8
@@ -17,7 +17,7 @@ syslogd \- log system messages
 \fBsyslogd\fR reads and forwards system messages to the appropriate log files
 or users, depending upon the priority of a message and the system facility from
 which it originates. The configuration file \fB/etc/syslog.conf\fR (see
-\fBsyslog.conf\fR(4)) controls where messages are forwarded. \fBsyslogd\fR logs
+\fBsyslog.conf\fR(5)) controls where messages are forwarded. \fBsyslogd\fR logs
 a mark (timestamp) message every \fImarkinterval\fR minutes (default \fB20\fR)
 at priority \fBLOG_INFO\fR to the facility whose name is given as \fBmark\fR in
 the \fBsyslog.conf\fR file.
@@ -44,11 +44,11 @@ As it starts up, \fBsyslogd\fR creates the file \fB/var/run/syslog.pid\fR, if
 possible, containing its process identifier (\fBPID\fR).
 .sp
 .LP
-If message \fBID\fR generation is enabled (see \fBlog\fR(7D)), each message
+If message \fBID\fR generation is enabled (see \fBlog\fR(4D)), each message
 will be preceded by an identifier in the following format: \fB[ID\fR \fImsgid
 facility\fR\fB\&.\fR\fIpriority\fR\fB]\fR. \fImsgid\fR is the message's numeric
-identifier described in \fBmsgid\fR(1M). \fIfacility\fR and \fIpriority\fR are
-described in \fBsyslog.conf\fR(4). \fB[ID 123456 kern.notice]\fR is an example
+identifier described in \fBmsgid\fR(8). \fIfacility\fR and \fIpriority\fR are
+described in \fBsyslog.conf\fR(5). \fB[ID 123456 kern.notice]\fR is an example
 of an identifier when message \fBID\fR generation is enabled.
 .sp
 .LP
@@ -69,7 +69,7 @@ selected. See \fBFILES\fR.
 .sp
 .LP
 The recommended way to allow or disallow message logging is through the use of
-the service management facility (\fBsmf\fR(5)) property:
+the service management facility (\fBsmf\fR(7)) property:
 .sp
 .in +2
 .nf
@@ -298,9 +298,9 @@ Network services for each transport
 .RE
 
 .SH SEE ALSO
-\fBlogger\fR(1), \fBsvcs\fR(1), \fBmsgid\fR(1M), \fBsvcadm\fR(1M),
-\fBsvccfg\fR(1M), \fBsyslog\fR(3C), \fBsyslog.conf\fR(4), \fBattributes\fR(5),
-\fBsignal.h\fR(3HEAD), \fBsmf\fR(5), \fBlog\fR(7D)
+\fBlogger\fR(1), \fBsvcs\fR(1), \fBmsgid\fR(8), \fBsvcadm\fR(8),
+\fBsvccfg\fR(8), \fBsyslog\fR(3C), \fBsyslog.conf\fR(5), \fBattributes\fR(7),
+\fBsignal.h\fR(3HEAD), \fBsmf\fR(7), \fBlog\fR(4D)
 .SH NOTES
 The \fBmark\fR message is a system time stamp, and so it is only defined for
 the system on which \fBsyslogd\fR is running. It can not be forwarded to other
@@ -326,7 +326,7 @@ window.
 .sp
 .LP
 The \fBsyslogd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -338,11 +338,11 @@ The \fBsyslogd\fR service is managed by the service management facility,
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
-When \fBsyslogd\fR is started by means of \fBsvcadm\fR(1M), if a value is
+When \fBsyslogd\fR is started by means of \fBsvcadm\fR(8), if a value is
 specified for \fBLOG_FROM_REMOTE\fR in the \fB/etc/defaults/syslogd\fR file,
 the SMF property \fBsvc:/system/system-log/config/log_from_remote\fR is set to
 correspond to the \fBLOG_FROM_REMOTE\fR value and the
@@ -351,7 +351,7 @@ correspond to the \fBLOG_FROM_REMOTE\fR value and the
 .sp
 .in +2
 .nf
-# LOG_FROM_REMOTE is now set using svccfg(1m), see syslogd(1m).
+# LOG_FROM_REMOTE is now set using svccfg(8), see syslogd(8).
 .fi
 .in -2
 
diff --git a/usr/src/man/man8/tapes.8 b/usr/src/man/man8/tapes.8
index 706d6ef5ad..bff6a1bb2c 100644
--- a/usr/src/man/man8/tapes.8
+++ b/usr/src/man/man8/tapes.8
@@ -15,7 +15,7 @@ tapes \- creates /dev entries for tape drives attached to the system
 .SH DESCRIPTION
 .sp
 .LP
-\fBdevfsadm\fR(1M) is now the preferred command for \fB/dev\fR and
+\fBdevfsadm\fR(8) is now the preferred command for \fB/dev\fR and
 \fB/devices\fR and should be used instead of \fBtapes\fR.
 .sp
 .LP
@@ -52,11 +52,11 @@ removed by hand.
 .sp
 .LP
 \fBtapes\fR is run each time a reconfiguration-boot is performed, or when
-\fBadd_drv\fR(1M) is executed.
+\fBadd_drv\fR(8) is executed.
 .SS "Notice to Driver Writers"
 .sp
 .LP
-\fBtapes\fR(1M) considers all devices with the node type \fBDDI_NT_TAPE\fR to
+\fBtapes\fR(8) considers all devices with the node type \fBDDI_NT_TAPE\fR to
 be tape devices; these devices must have their minor name created with a
 specific format. The minor name encodes operational modes for the tape device
 and consists of an \fBASCII\fR string of the form [
@@ -84,13 +84,13 @@ over the \fBEOF\fR mark and begin reading from the next file.
 .LP
 \fBn\fR or no-rewind-on-close instructs the driver to not rewind to the
 beginning of tape when the device is closed. Normal behavior for tape devices
-is to reposition to BOT when closing. See \fBmtio\fR(7I).
+is to reposition to BOT when closing. See \fBmtio\fR(4I).
 .sp
 .LP
 The minor number for tape devices should be created by encoding the device's
 instance number using the tape macro \fBMTMINOR\fR and ORing in the proper
 combination of density, \fBBSD\fR behavior, and no-rewind flags. See
-\fBmtio\fR(7I).
+\fBmtio\fR(4I).
 .sp
 .LP
 To prevent \fBtapes\fR from attempting to automatically generate links for a
@@ -175,7 +175,7 @@ xktapeattach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 .sp
 .LP
 Installing the \fBxktape\fR driver on a Sun Fire 4800, with the driver
-controlling a \fBSCSI\fR tape (target 4 attached to an \fBisp\fR(7D) \fBSCSI
+controlling a \fBSCSI\fR tape (target 4 attached to an \fBisp\fR(4D) \fBSCSI
 HBA)\fR and performing a reconfiguration-boot creates the following special
 files in \fB/devices\fR.
 
@@ -260,8 +260,8 @@ tape device nodes
 .SH SEE ALSO
 .sp
 .LP
-\fBadd_drv\fR(1M), \fBdevfsadm\fR(1M), \fBattributes\fR(5), \fBisp\fR(7D),
-\fBdevfs\fR(7FS), \fBmtio\fR(7I), \fBattach\fR(9E),
+\fBadd_drv\fR(8), \fBdevfsadm\fR(8), \fBattributes\fR(7), \fBisp\fR(4D),
+\fBdevfs\fR(4FS), \fBmtio\fR(4I), \fBattach\fR(9E),
 \fBddi_create_minor_node\fR(9F)
 .sp
 .LP
diff --git a/usr/src/man/man8/tcpd.8 b/usr/src/man/man8/tcpd.8
index 6a3f59d456..7d8571fbec 100644
--- a/usr/src/man/man8/tcpd.8
+++ b/usr/src/man/man8/tcpd.8
@@ -53,7 +53,7 @@ Optionally,
 supports a simple form of access control that is based on pattern
 matching.  The access-control software provides hooks for the execution
 of shell commands when a pattern fires.  For details, see the
-\fIhosts_access\fR(4) manual page.
+\fIhosts_access\fR(5) manual page.
 .SH HOST NAME VERIFICATION
 The authentication scheme of some protocols (\fIrlogin, rsh\fR) relies
 on host names. Some implementations believe the host name that they get
diff --git a/usr/src/man/man8/tcpdchk.8 b/usr/src/man/man8/tcpdchk.8
index 46611bc14f..29d94914e2 100644
--- a/usr/src/man/man8/tcpdchk.8
+++ b/usr/src/man/man8/tcpdchk.8
@@ -55,12 +55,12 @@ The default locations of the \fItcpd\fR access control tables are:
 .SH SEE ALSO
 .na
 .nf
-tcpdmatch(1M), explain what tcpd would do in specific cases.
-hosts_access(4), format of the tcpd access control tables.
-hosts_options(4), format of the language extensions.
-inetd.conf(4), format of the inetd control file.
-inetd(1M), how to invoke tcpd from inetd using the libwrap library.
-inetadm(1M), managing inetd services in the Service Management Framework.
+tcpdmatch(8), explain what tcpd would do in specific cases.
+hosts_access(5), format of the tcpd access control tables.
+hosts_options(5), format of the language extensions.
+inetd.conf(5), format of the inetd control file.
+inetd(8), how to invoke tcpd from inetd using the libwrap library.
+inetadm(8), managing inetd services in the Service Management Framework.
 
 .SH AUTHORS
 .nf
diff --git a/usr/src/man/man8/tcpdmatch.8 b/usr/src/man/man8/tcpdmatch.8
index d83bad73b3..b046398287 100644
--- a/usr/src/man/man8/tcpdmatch.8
+++ b/usr/src/man/man8/tcpdmatch.8
@@ -83,12 +83,12 @@ The default locations of the \fItcpd\fR access control tables are:
 /etc/hosts.deny
 .SH SEE ALSO
 .nf
-tcpdchk(1M), tcpd configuration checker
-hosts_access(4), format of the tcpd access control tables.
-hosts_options(4), format of the language extensions.
-inetd.conf(4), format of the inetd control file.
-inetd(1M), how to invoke tcpd from inetd using the libwrap library.
-inetadm(1M), managing inetd services in the Service Management Framework.
+tcpdchk(8), tcpd configuration checker
+hosts_access(5), format of the tcpd access control tables.
+hosts_options(5), format of the language extensions.
+inetd.conf(5), format of the inetd control file.
+inetd(8), how to invoke tcpd from inetd using the libwrap library.
+inetadm(8), managing inetd services in the Service Management Framework.
 
 .SH AUTHORS
 .nf
diff --git a/usr/src/man/man8/th_define.8 b/usr/src/man/man8/th_define.8
index ecffe0b2f2..114c9ebbad 100644
--- a/usr/src/man/man8/th_define.8
+++ b/usr/src/man/man8/th_define.8
@@ -52,7 +52,7 @@ given by the errdef become satisfied (in practice, this will occur when the
 access counts go to zero).
 .sp
 .LP
-You use the \fBth_manage\fR(1M) command with the \fBstart\fR option to activate
+You use the \fBth_manage\fR(8) command with the \fBstart\fR option to activate
 the resulting errdef. The effect of \fBth_manage\fR with the \fBstart\fR option
 is that the \fBbofi\fR driver acts upon the errdef by matching the number of
 hardware accesses\(emspecified in \fIcount\fR, that are of the type specified
@@ -440,9 +440,9 @@ log until the log becomes full). Note that, if the errdef specification matches
 multiple driver handles, multiple logging errdefs are registered with the
 \fBbofi\fR driver and logging terminates when all logs become full or when
 \fIcollect_time\fR expires or when the associated errdefs are cleared. The
-current state of the log can be checked with the \fBth_manage\fR(1M) command,
+current state of the log can be checked with the \fBth_manage\fR(8) command,
 using the \fBbroadcast\fR parameter. A log can be terminated by running
-\fBth_manage\fR(1M) with the \fBclear_errdefs\fR option or by sending a
+\fBth_manage\fR(8) with the \fBclear_errdefs\fR option or by sending a
 \fBSIGALRM\fR signal to the \fBth_define\fR process. See \fBalarm\fR(2) for the
 semantics of \fBSIGALRM\fR.
 .RE
@@ -946,5 +946,5 @@ operators.
 
 .SH SEE ALSO
 .LP
-\fBkill\fR(1), \fBth_manage\fR(1M), \fBalarm\fR(2),
+\fBkill\fR(1), \fBth_manage\fR(8), \fBalarm\fR(2),
 \fBddi_check_acc_handle\fR(9F), \fBddi_check_dma_handle\fR(9F)
diff --git a/usr/src/man/man8/th_manage.8 b/usr/src/man/man8/th_manage.8
index 16be88782a..62cb3dea5c 100644
--- a/usr/src/man/man8/th_manage.8
+++ b/usr/src/man/man8/th_manage.8
@@ -23,7 +23,7 @@ th_manage \- manage the fault injection test harness
 \fBth_manage\fR applies the action specified by \fIcommand\fR to the instance
 specified by \fIinstance\fR of the driver specified by \fIname\fR (or the
 driver instance specified by \fIpath\fR). The driver instance must be running
-fault injection specifications (errdefs) defined by \fBth_define\fR(1M).
+fault injection specifications (errdefs) defined by \fBth_define\fR(8).
 .sp
 .LP
 \fBth_manage\fR supports several commands that operate on the driver instance
@@ -154,4 +154,4 @@ To terminate testing, enter:
 .SH SEE ALSO
 .sp
 .LP
-\fBth_define\fR(1M)
+\fBth_define\fR(8)
diff --git a/usr/src/man/man8/tic.8 b/usr/src/man/man8/tic.8
index 82dbb5f803..5301b9b2d6 100644
--- a/usr/src/man/man8/tic.8
+++ b/usr/src/man/man8/tic.8
@@ -64,7 +64,7 @@ the level of detail is increased.
 .ad
 .RS 8n
 Contains one or more \fBterminfo\fR terminal descriptions in source format [see
-\fBterminfo\fR(4)]. Each description in the file describes the capabilities of
+\fBterminfo\fR(5)]. Each description in the file describes the capabilities of
 a particular terminal. When a \fBuse\fR\fI=entry-name\fR field is discovered in
 a terminal entry currently being compiled, \fBtic\fR reads in the binary from
 \fB/usr/share/lib/terminfo\fR to complete the entry. (Entries created from
@@ -89,7 +89,7 @@ Compiled terminal description database
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -103,8 +103,8 @@ ATTRIBUTE TYPE	ATTRIBUTE VALUE
 .SH SEE ALSO
 .sp
 .LP
-\fBcaptoinfo\fR(1M), \fBinfocmp\fR(1M), \fBcurses\fR(3CURSES),
-\fBterminfo\fR(4), \fBattributes\fR(5)
+\fBcaptoinfo\fR(8), \fBinfocmp\fR(8), \fBcurses\fR(3CURSES),
+\fBterminfo\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/tnchkdb.8 b/usr/src/man/man8/tnchkdb.8
index 77869a288d..faa4fb3e28 100644
--- a/usr/src/man/man8/tnchkdb.8
+++ b/usr/src/man/man8/tnchkdb.8
@@ -147,7 +147,7 @@ Trusted zone configuration database
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -166,7 +166,7 @@ The command line is Committed. The output is Uncommitted.
 .SH SEE ALSO
 .sp
 .LP
-\fBtnd\fR(1M), \fBtnctl\fR(1M), \fBattributes\fR(5)
+\fBtnd\fR(8), \fBtnctl\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 \fIHow to Check the Syntax of Trusted Network Databases\fR in \fISolaris
diff --git a/usr/src/man/man8/tnctl.8 b/usr/src/man/man8/tnctl.8
index aa36398647..c0e9940b28 100644
--- a/usr/src/man/man8/tnctl.8
+++ b/usr/src/man/man8/tnctl.8
@@ -21,11 +21,11 @@ the Solaris kernel.
 .sp
 .LP
 As part of Solaris Trusted Extensions initialization, \fBtnctl\fR is run in the
-global zone by an \fBsmf\fR(5) script during system boot. The \fBtnctl\fR
+global zone by an \fBsmf\fR(7) script during system boot. The \fBtnctl\fR
 command is not intended to be used during normal system administration.
 Instead, if a local trusted networking database file is modified,
 the administrator first issues
-\fBtnchkdb\fR(1M) to check the syntax, and then refreshes the kernel copy with
+\fBtnchkdb\fR(8) to check the syntax, and then refreshes the kernel copy with
 this command:
 .sp
 .in +2
@@ -59,8 +59,8 @@ form:
 .sp
 
 Where \fIport\fR can be a number in the range 1 to 65535. or any known service
-(see \fBservices\fR(4)), and protocol can be a number in the range 1 to 255, or
-any known protocol (see \fBprotocols\fR(4)).
+(see \fBservices\fR(5)), and protocol can be a number in the range 1 to 255, or
+any known protocol (see \fBprotocols\fR(5)).
 .RE
 
 .sp
@@ -166,7 +166,7 @@ reload MLPs for a non-global zone, reboot the zone:
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -221,9 +221,9 @@ Configuration file for the name service switch
 
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBtninfo\fR(1M), \fBtnd\fR(1M),
-\fBtnchkdb\fR(1M), \fBzoneadm\fR(1M), \fBnsswitch.conf\fR(4),
-\fBprotocols\fR(4), \fBservices\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBtninfo\fR(8), \fBtnd\fR(8),
+\fBtnchkdb\fR(8), \fBzoneadm\fR(8), \fBnsswitch.conf\fR(5),
+\fBprotocols\fR(5), \fBservices\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fIHow to Synchronize Kernel Cache With Network Databases\fR in \fISolaris
@@ -239,7 +239,7 @@ is configured with Trusted Extensions.
 .sp
 .LP
 The \fBtnctl\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -252,7 +252,7 @@ svc:/network/tnctl
 .LP
 The service's status can be queried by using \fBsvcs\fR(1). Administrative
 actions on this service, such as refreshing the kernel cache, can be performed
-using \fBsvcadm\fR(1M), as in:
+using \fBsvcadm\fR(8), as in:
 .sp
 .in +2
 .nf
diff --git a/usr/src/man/man8/tnd.8 b/usr/src/man/man8/tnd.8
index 6bbd05cfef..e77077165e 100644
--- a/usr/src/man/man8/tnd.8
+++ b/usr/src/man/man8/tnd.8
@@ -31,12 +31,12 @@ predetermined interval.
 .sp
 .LP
 If a local trusted networking database file is modified, the administrator
-should run \fBtnchkdb\fR(1M) to check the syntax, and should also run \fBsvcadm
+should run \fBtnchkdb\fR(8) to check the syntax, and should also run \fBsvcadm
 refresh svc:/network/tnd\fR to initiate an immediate database scan by
 \fBtnd\fR.
 .sp
 .LP
-\fBtnd\fR is intended to be started from an \fBsmf\fR(5) script and to run in
+\fBtnd\fR is intended to be started from an \fBsmf\fR(7) script and to run in
 the global zone. The following signals cause specific \fBsvcadm\fR actions:
 .sp
 .ne 2
@@ -163,7 +163,7 @@ Configuration file for the name service switch
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -182,8 +182,8 @@ The command invocation is Committed. The service is Private.
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBtninfo\fR(1M), \fBtnctl\fR(1M),
-\fBtnchkdb\fR(1M), \fBnsswitch.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBsvcadm\fR(8), \fBtninfo\fR(8), \fBtnctl\fR(8),
+\fBtnchkdb\fR(8), \fBnsswitch.conf\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fIHow to Synchronize Kernel Cache With Network Databases\fR in \fISolaris
@@ -196,7 +196,7 @@ is configured with Trusted Extensions.
 .sp
 .LP
 The \fBtnd\fR service is managed by the service  management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -209,7 +209,7 @@ svc:/network/tnd
 .LP
 The  service's status can be queried by using \fBsvcs\fR(1). Administrative
 actions on this service,  such as requests to restart the daemon, can be
-performed using \fBsvcadm\fR(1M), as in:
+performed using \fBsvcadm\fR(8), as in:
 .sp
 .in +2
 .nf
diff --git a/usr/src/man/man8/tninfo.8 b/usr/src/man/man8/tninfo.8
index f82fc89fe3..d3694f0e86 100644
--- a/usr/src/man/man8/tninfo.8
+++ b/usr/src/man/man8/tninfo.8
@@ -144,7 +144,7 @@ Trusted zone configuration database
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -163,7 +163,7 @@ The command line is Committed. The output is Uncommitted.
 .SH SEE ALSO
 .sp
 .LP
-\fBtnd\fR(1M), \fBtnctl\fR(1M), \fBattributes\fR(5)
+\fBtnd\fR(8), \fBtnctl\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 \fIHow to Synchronize Kernel Cache With Network Databases\fR in \fISolaris
diff --git a/usr/src/man/man8/tpmadm.8 b/usr/src/man/man8/tpmadm.8
index 74e77cc283..6b67326b06 100644
--- a/usr/src/man/man8/tpmadm.8
+++ b/usr/src/man/man8/tpmadm.8
@@ -203,7 +203,7 @@ Usage error. The \fBtpmadm\fR command was invoked with invalid arguments.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -218,7 +218,7 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBattributes\fR(5)
+\fBattributes\fR(7)
 .sp
 .LP
 TCG Software Stack (TSS) Specifications:
diff --git a/usr/src/man/man8/traceroute.8 b/usr/src/man/man8/traceroute.8
index dabc669310..d868c13f46 100644
--- a/usr/src/man/man8/traceroute.8
+++ b/usr/src/man/man8/traceroute.8
@@ -451,7 +451,7 @@ Set the desired number of probe queries. The default is 3.
 Bypass the normal routing tables and send directly to a host on an attached
 network. If the host is not on a directly-attached network, an error is
 returned. This option can be used to send probes to a local host through an
-interface that has been dropped by the router daemon. See \fBin.routed\fR(1M).
+interface that has been dropped by the router daemon. See \fBin.routed\fR(8).
 You cannot use this option if the \fB-g\fR option is used.
 .RE
 
@@ -660,10 +660,10 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-\fBnetstat\fR(1M), \fBsignal\fR(3C), \fBping\fR(1M), \fBattributes\fR(5),
-\fBprivileges\fR(5), \fBzones\fR(5)
+\fBnetstat\fR(8), \fBsignal\fR(3C), \fBping\fR(8), \fBattributes\fR(7),
+\fBprivileges\fR(7), \fBzones\fR(7)
 .SH WARNINGS
 This utility is intended for use in network testing, measurement and
 management. It should be used primarily for manual fault isolation. Because of
 the load it could impose on the network, it is unwise to use
-\fBtraceroute\fR(1M) during normal operations or from automated scripts.
+\fBtraceroute\fR(8) during normal operations or from automated scripts.
diff --git a/usr/src/man/man8/trapstat.8 b/usr/src/man/man8/trapstat.8
index 4f6e57dd4e..8c7ddc589b 100644
--- a/usr/src/man/man8/trapstat.8
+++ b/usr/src/man/man8/trapstat.8
@@ -575,7 +575,7 @@ example# \fBtrapstat -e level-10 -P -r 1000\fR
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -591,8 +591,8 @@ Interface Stability
 
 .SH SEE ALSO
 .LP
-\fBlockstat\fR(1M), \fBpmap\fR(1), \fBpsrset\fR(1M), \fBpsrinfo\fR(1M),
-\fBpbind\fR(1M), \fBppgsz\fR(1), \fBgetpagesizes\fR(3C)
+\fBlockstat\fR(8), \fBpmap\fR(1), \fBpsrset\fR(8), \fBpsrinfo\fR(8),
+\fBpbind\fR(8), \fBppgsz\fR(1), \fBgetpagesizes\fR(3C)
 .sp
 .LP
 \fISun Microelectronics UltraSPARC II User's Manual,\fR January 1997, STP1031,
diff --git a/usr/src/man/man8/ttyadm.8 b/usr/src/man/man8/ttyadm.8
index fa0c09c8ac..87f61fb701 100644
--- a/usr/src/man/man8/ttyadm.8
+++ b/usr/src/man/man8/ttyadm.8
@@ -24,11 +24,11 @@ ttyadm \- format and output port monitor-specific information
 .sp
 .LP
 The \fBttyadm\fR command is an administrative command that formats
-\fBttymon\fR(1M)-specific information and writes it to standard output. The
+\fBttymon\fR(8)-specific information and writes it to standard output. The
 Service Access Facility (SAF) requires each port monitor to provide such a
 command. Note that the port monitor administrative file is updated by the
-Service Access Controller's administrative commands, \fBsacadm\fR(1M) and
-\fBpmadm\fR(1M). \fBttyadm\fR provides a means of presenting formatted port
+Service Access Controller's administrative commands, \fBsacadm\fR(8) and
+\fBpmadm\fR(8). \fBttyadm\fR provides a means of presenting formatted port
 monitor-specific (\fBttymon\fR-specific) data to these commands.
 .SH OPTIONS
 .sp
@@ -42,7 +42,7 @@ The following options are supported:
 .RS 15n
 Set the ``bi-directional port'' flag. When this flag is set, the line can be
 used in both directions. \fBttymon\fR will allow users to connect to the
-service associated with the port, but if the port is free, \fBuucico\fR(1M),
+service associated with the port, but if the port is free, \fBuucico\fR(8),
 \fBcu\fR(1C), or \fBct\fR(1C) can use it for dialing out.
 .RE
 
@@ -216,8 +216,8 @@ error and \fBttymon\fR will exit with a non-zero status.
 .SH SEE ALSO
 .sp
 .LP
-\fBct\fR(1C), \fBcu\fR(1C), \fBpmadm\fR(1M), \fBsacadm\fR(1M),
-\fBttymon\fR(1M), \fBuucico\fR(1M), \fBattributes\fR(5)
+\fBct\fR(1C), \fBcu\fR(1C), \fBpmadm\fR(8), \fBsacadm\fR(8),
+\fBttymon\fR(8), \fBuucico\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/ttymon.8 b/usr/src/man/man8/ttymon.8
index 740fb38ceb..813284772c 100644
--- a/usr/src/man/man8/ttymon.8
+++ b/usr/src/man/man8/ttymon.8
@@ -27,19 +27,19 @@ ttymon \- port monitor for terminal ports
 ports, to set terminal modes, baud rates, and line disciplines for the ports,
 and to connect users or applications to services associated with the ports.
 Normally, \fBttymon\fR is configured to run under the Service Access
-Controller, \fBsac\fR(1M), as part of the Service Access Facility (SAF). It is
-configured using the \fBsacadm\fR(1M) command. Each instance of \fBttymon\fR
+Controller, \fBsac\fR(8), as part of the Service Access Facility (SAF). It is
+configured using the \fBsacadm\fR(8) command. Each instance of \fBttymon\fR
 can monitor multiple ports. The ports monitored by an instance of \fBttymon\fR
 are specified in the port monitor's administrative file. The administrative
-file is configured using the \fBpmadm\fR(1M) and \fBttyadm\fR(1M) commands.
+file is configured using the \fBpmadm\fR(8) and \fBttyadm\fR(8) commands.
 When an instance of \fBttymon\fR is invoked by the \fBsac\fR command, it starts
 to monitor its ports. For each port, \fBttymon\fR first initializes the line
 disciplines, if they are specified, and the speed and terminal settings. For
 ports with entries in \fB/etc/logindevperm\fR, device owner, group and
-permissions are set. (See \fBlogindevperm\fR(4).) The values used for
+permissions are set. (See \fBlogindevperm\fR(5).) The values used for
 initialization are taken from the appropriate entry in the TTY settings file.
-This file is maintained by the \fBsttydefs\fR(1M) command. Default line
-disciplines on ports are usually set up by the \fBautopush\fR(1M) command of
+This file is maintained by the \fBsttydefs\fR(8) command. Default line
+disciplines on ports are usually set up by the \fBautopush\fR(8) command of
 the Autopush Facility.
 .sp
 .LP
@@ -48,7 +48,7 @@ indicates that the speed is inappropriate by pressing the BREAK key,
 \fBttymon\fR tries the next speed and writes the prompt again. When valid input
 is received, \fBttymon\fR interprets the per-service configuration file for the
 port, if one exists, creates a \fButmpx\fR entry if required (see
-\fButmpx\fR(4)), establishes the service environment, and then invokes the
+\fButmpx\fR(5)), establishes the service environment, and then invokes the
 service associated with the port. Valid input consists of a string of at least
 one non-newline character, terminated by a carriage return. After the service
 terminates, \fBttymon\fR cleans up the \fButmpx\fR entry, if one exists, and
@@ -63,7 +63,7 @@ baud rates that can be determined by \fIautobaud\fR are \fB110\fR, \fB1200\fR,
 .sp
 .LP
 If a port is configured as a bidirectional port, \fBttymon\fR will allow users
-to connect to a service, and, if the port is free, will allow \fBuucico\fR(1M),
+to connect to a service, and, if the port is free, will allow \fBuucico\fR(8),
 \fBcu\fR(1C), or \fBct\fR(1C) to use it for dialing out. If a port is
 bidirectional, \fBttymon\fR will wait to read a character before it prints a
 prompt.
@@ -100,12 +100,12 @@ determining if a prompt was actually issued by \fBttymon\fR and, if so, what
 that prompt actually was.
 .sp
 .LP
-See \fBttyadm\fR(1M) for options that can be set for ports monitored by
+See \fBttyadm\fR(8) for options that can be set for ports monitored by
 \fBttymon\fR under the Service Access Controller.
 .SS "System Console Invocation"
 .sp
 .LP
-The invocation of ttymon on the system console is managed under \fBsmf\fR(5) by
+The invocation of ttymon on the system console is managed under \fBsmf\fR(7) by
 the service \fBsvc:/system/console-login\fR. It provides a number of properties
 within the property group \fBttymon\fR to control the invocation, as follows:
 .sp
@@ -266,7 +266,7 @@ the system console \fBttymon\fR invocation:
 .LP
 If any of the \fBLC_*\fR variables ( \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR,
 \fBLC_TIME\fR, \fBLC_COLLATE\fR, \fBLC_NUMERIC\fR, and \fBLC_MONETARY\fR ) (see
-\fBenviron\fR(5)) are not set in the environment, the operational behavior of
+\fBenviron\fR(7)) are not set in the environment, the operational behavior of
 \fBttymon\fR for each corresponding locale category is determined by the value
 of the \fBLANG\fR environment variable. If \fBLC_ALL\fR is set, its contents
 are used to override both the \fBLANG\fR and the other \fBLC_*\fR variables. If
@@ -302,13 +302,13 @@ The command-line syntax is Stable. The SMF properties are Evolving.
 .SH SEE ALSO
 .sp
 .LP
-\fBct\fR(1C), \fBcu\fR(1C), \fBautopush\fR(1M), \fBpmadm\fR(1M), \fBsac\fR(1M),
-\fBsacadm\fR(1M), \fBsttydefs\fR(1M), \fBttyadm\fR(1M), \fBuucico\fR(1M),
-\fBpam\fR(3PAM), \fBlogindevperm\fR(4), \fBpam.conf\fR(4), \fButmpx\fR(4),
-\fBattributes\fR(5), \fBenviron\fR(5), \fBpam_authtok_check\fR(5),
-\fBpam_authtok_get\fR(5), \fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5),
-\fBpam_passwd_auth\fR(5), \fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5),
-\fBpam_unix_session\fR(5), \fBsmf\fR(5)
+\fBct\fR(1C), \fBcu\fR(1C), \fBautopush\fR(8), \fBpmadm\fR(8), \fBsac\fR(8),
+\fBsacadm\fR(8), \fBsttydefs\fR(8), \fBttyadm\fR(8), \fBuucico\fR(8),
+\fBpam\fR(3PAM), \fBlogindevperm\fR(5), \fBpam.conf\fR(5), \fButmpx\fR(5),
+\fBattributes\fR(7), \fBenviron\fR(7), \fBpam_authtok_check\fR(7),
+\fBpam_authtok_get\fR(7), \fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7),
+\fBpam_passwd_auth\fR(7), \fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7),
+\fBpam_unix_session\fR(7), \fBsmf\fR(7)
 .sp
 .LP
 \fI\fR
@@ -320,8 +320,8 @@ If a port is monitored by more than one \fBttymon\fR, it is possible for the
 input.
 .sp
 .LP
-The \fBpam_unix\fR(5) module is no longer supported. Similar functionality is
-provided by \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
-\fBpam_authtok_store\fR(5), \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5),
-\fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5), and
-\fBpam_unix_session\fR(5).
+The \fBpam_unix\fR(7) module is no longer supported. Similar functionality is
+provided by \fBpam_authtok_check\fR(7), \fBpam_authtok_get\fR(7),
+\fBpam_authtok_store\fR(7), \fBpam_dhkeys\fR(7), \fBpam_passwd_auth\fR(7),
+\fBpam_unix_account\fR(7), \fBpam_unix_auth\fR(7), and
+\fBpam_unix_session\fR(7).
diff --git a/usr/src/man/man8/tunefs.8 b/usr/src/man/man8/tunefs.8
index b796444ee0..56a0d0cee4 100644
--- a/usr/src/man/man8/tunefs.8
+++ b/usr/src/man/man8/tunefs.8
@@ -114,9 +114,9 @@ full.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBtunefs\fR when
+See \fBlargefile\fR(7) for the description of the behavior of \fBtunefs\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH SEE ALSO
 .sp
 .LP
-\fBmkfs_ufs\fR(1M), \fBnewfs\fR(1M), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBmkfs_ufs\fR(8), \fBnewfs\fR(8), \fBattributes\fR(7), \fBlargefile\fR(7)
diff --git a/usr/src/man/man8/txzonemgr.8 b/usr/src/man/man8/txzonemgr.8
index 92be65d413..36042bb1a0 100644
--- a/usr/src/man/man8/txzonemgr.8
+++ b/usr/src/man/man8/txzonemgr.8
@@ -28,7 +28,7 @@ or by root in the global zone. It takes no options and returns no values.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -46,8 +46,8 @@ Interactive Dialogue	Not an Interface
 .SH SEE ALSO
 .sp
 .LP
-\fBzenity\fR(1), \fBifconfig\fR(1M), \fBzoneadm\fR(1M), \fBzonecfg\fR(1M),
-\fBattributes\fR(5), \fBrbac\fR(5), \fBzones\fR(5)
+\fBzenity\fR(1), \fBifconfig\fR(8), \fBzoneadm\fR(8), \fBzonecfg\fR(8),
+\fBattributes\fR(7), \fBrbac\fR(7), \fBzones\fR(7)
 .sp
 .LP
 \fISolaris Trusted Extensions Administrator's Procedures\fR
diff --git a/usr/src/man/man8/tzselect.8 b/usr/src/man/man8/tzselect.8
index f7447385ca..90036278b3 100644
--- a/usr/src/man/man8/tzselect.8
+++ b/usr/src/man/man8/tzselect.8
@@ -60,7 +60,7 @@ directory containing timezone data files
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -76,4 +76,4 @@ Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBzdump\fR(1M), \fBzic\fR(1M), \fBctime\fR(3C), \fBattributes\fR(5)
+\fBzdump\fR(8), \fBzic\fR(8), \fBctime\fR(3C), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/uadmin.8 b/usr/src/man/man8/uadmin.8
index 03bfc711bd..f93e1dac04 100644
--- a/usr/src/man/man8/uadmin.8
+++ b/usr/src/man/man8/uadmin.8
@@ -46,7 +46,7 @@ uadmin 1 1 "\fB-s\fR kernel/unix"
 .SH SEE ALSO
 .sp
 .LP
-\fBhalt\fR(1M), \fBreboot\fR(1M), \fBuadmin\fR(2), \fBattributes\fR(5)
+\fBhalt\fR(8), \fBreboot\fR(8), \fBuadmin\fR(2), \fBattributes\fR(7)
 .SH WARNINGS
 .sp
 .LP
@@ -72,4 +72,4 @@ updating existing driver binaries or kernel binaries.
 .RE
 .sp
 .LP
-Use \fBreboot\fR(1M) or \fBhalt\fR(1M) instead.
+Use \fBreboot\fR(8) or \fBhalt\fR(8) instead.
diff --git a/usr/src/man/man8/ucodeadm.8 b/usr/src/man/man8/ucodeadm.8
index a8a73a1393..901fccab44 100644
--- a/usr/src/man/man8/ucodeadm.8
+++ b/usr/src/man/man8/ucodeadm.8
@@ -156,7 +156,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -172,4 +172,4 @@ Interface Stability	Stable
 .SH SEE ALSO
 .sp
 .LP
-\fBpsradm\fR(1M), \fBpsrinfo\fR(1M), \fBattributes\fR(5)
+\fBpsradm\fR(8), \fBpsrinfo\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/ufsdump.8 b/usr/src/man/man8/ufsdump.8
index fc7c56e40c..7dd86d893f 100644
--- a/usr/src/man/man8/ufsdump.8
+++ b/usr/src/man/man8/ufsdump.8
@@ -23,7 +23,7 @@ date) to magnetic tape, diskette, or disk file.
 The \fBufsdump\fR command can only be used on unmounted file systems, or those
 mounted read-only. Attempting to dump a mounted, read-write file system might
 result in a system disruption or the inability to restore files from the dump.
-Consider using the \fBfssnap\fR(1M) command to create a file system snapshot if
+Consider using the \fBfssnap\fR(8) command to create a file system snapshot if
 you need a point-in-time image of a file system that is mounted.
 .sp
 .LP
@@ -77,7 +77,7 @@ files modified or added since the "level \fB2\fR" (Monday) backup. A "level
 .sp .6
 .RS 4n
 Archive file. Archive a dump table-of-contents in the specified
-\fIarchive_file\fR to be used by \fBufsrestore\fR(1M) to determine whether a
+\fIarchive_file\fR to be used by \fBufsrestore\fR(8) to determine whether a
 file is in the dump file that is being restored.
 .RE
 
@@ -143,7 +143,7 @@ values for tape devices are:
 .sp .6
 .RS 4n
 1000 BPI The tape densities and other options are documented in the
-\fBst\fR(7D) man page.
+\fBst\fR(4D) man page.
 .RE
 
 .RE
@@ -170,7 +170,7 @@ Dump file. Use \fIdump_file\fR as the file to dump to, instead of
 standard output.
 .sp
 If the name of the file is of the form \fImachine\fR\fB:\fR\fIdevice,\fR the
-dump is done from the specified machine over the network using \fBrmt\fR(1M).
+dump is done from the specified machine over the network using \fBrmt\fR(8).
 Since \fBufsdump\fR is normally run by root, the name of the local machine must
 appear in the \fB/.rhosts\fR file of the remote machine. If the file is
 specified as \fIuser\fR\fB@\fR\fImachine\fR\fB:\fR\fIdevice,\fR \fBufsdump\fR
@@ -217,7 +217,7 @@ is specific to the \fBufsdump\fR tape format, and bears no resemblance to
 .RS 4n
 Notify all operators in the \fBsys\fR group that \fBufsdump\fR requires
 attention by sending messages to their terminals, in a manner similar to that
-used by the \fBwall\fR(1M) command. Otherwise, such messages are sent only to
+used by the \fBwall\fR(8) command. Otherwise, such messages are sent only to
 the terminals (such as the console) on which the user running \fBufsdump\fR is
 logged in.
 .RE
@@ -451,7 +451,7 @@ If no \fIoptions\fR are given, the default is \fB9uf\fR \fB/dev/rmt/0\fR
 \fIfiles_to_dump\fR.
 .SH USAGE
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBufsdump\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBufsdump\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXAMPLES
 .LP
@@ -569,10 +569,10 @@ list of file systems
 
 .SH SEE ALSO
 .LP
-\fBcpio\fR(1), \fBtar\fR(1), \fBdd\fR(1M), \fBdevnm\fR(1M), \fBfssnap\fR(1M),
-\fBprtvtoc\fR(1M), \fBrmt\fR(1M), \fBshutdown\fR(1M), \fBufsrestore\fR(1M),
-\fBvolcopy\fR(1M), \fBwall\fR(1M), \fBscanf\fR(3C), \fBufsdump\fR(4),
-\fBattributes\fR(5), \fBlargefile\fR(5), \fBst\fR(7D)
+\fBcpio\fR(1), \fBtar\fR(1), \fBdd\fR(8), \fBdevnm\fR(8), \fBfssnap\fR(8),
+\fBprtvtoc\fR(8), \fBrmt\fR(8), \fBshutdown\fR(8), \fBufsrestore\fR(8),
+\fBvolcopy\fR(8), \fBwall\fR(8), \fBscanf\fR(3C), \fBufsdump\fR(5),
+\fBattributes\fR(7), \fBlargefile\fR(7), \fBst\fR(4D)
 .SH NOTES
 .SS "Read Errors"
 .LP
@@ -600,7 +600,7 @@ checkpoint after a defective volume has been replaced.
 .LP
 It is vital to perform full, "level \fB0\fR", dumps at regular intervals. When
 performing a full dump, bring the machine down to single-user mode using
-\fBshutdown\fR(1M). While preparing for a full dump, it is a good idea to clean
+\fBshutdown\fR(8). While preparing for a full dump, it is a good idea to clean
 the tape drive and heads. Incremental dumps should be performed with the system
 running in single-user mode.
 .sp
diff --git a/usr/src/man/man8/ufsrestore.8 b/usr/src/man/man8/ufsrestore.8
index 681089e1a2..9a95882221 100644
--- a/usr/src/man/man8/ufsrestore.8
+++ b/usr/src/man/man8/ufsrestore.8
@@ -76,7 +76,7 @@ higher level of dump (0, 1, ..., 9).  Files that were deleted between the level
 completely restore a file system, use the \fBr\fR function restore the level 0
 dump, and again for each incremental dump. Although  this function letter is
 intended for a complete restore onto a new file system (one just created with
-\fBnewfs\fR(1M)), if the file  system contains files not on the backup media,
+\fBnewfs\fR(8)), if the file  system contains files not on the backup media,
 they are preserved.
 .RE
 
@@ -188,7 +188,7 @@ Debug. Turn on debugging output.
 Use \fIdump_file\fR instead of \fB/dev/rmt/0\fR as the file to restore from.
 Typically \fIdump_file\fR specifies a tape or diskette drive. If
 \fIdump_file\fR is specified as `\fB\(mi\fR\&', \fBufsrestore\fR reads from the
-standard input. This allows \fBufsdump\fR(1M) and \fBufsrestore\fR to be used
+standard input. This allows \fBufsdump\fR(8) and \fBufsrestore\fR to be used
 in a pipeline to copy a file system:
 .sp
 .in +2
@@ -201,7 +201,7 @@ example# ufsdump 0f \(mi /dev/rdsk/c0t0d0s7 \e
 
 If the name of the file is of the form \fImachine\fR\fB:\fR\fIdevice\fR, the
 restore is done from the specified machine over the network using
-\fBrmt\fR(1M). Since \fBufsrestore\fR is normally run by root, the name of the
+\fBrmt\fR(8). Since \fBufsrestore\fR is normally run by root, the name of the
 local machine must appear in the \fB/.rhosts\fR file of the remote machine. If
 the file is specified as \fIuser\fR\fB@\fR\fImachine\fR\fB:\fR\fIdevice\fR,
 \fBufsrestore\fR will attempt to execute as the specified user on the remote
@@ -513,7 +513,7 @@ function letters, and must come last.
 .SH USAGE
 .sp
 .LP
-See \fBlargefile\fR(5) for the description of the behavior of \fBufsrestore\fR
+See \fBlargefile\fR(7) for the description of the behavior of \fBufsrestore\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXIT STATUS
 .sp
@@ -598,8 +598,8 @@ information passed between incremental restores
 .SH SEE ALSO
 .sp
 .LP
-\fBmore\fR(1), \fBmkfs\fR(1M), \fBmount\fR(1M), \fBrmt\fR(1M),
-\fBufsdump\fR(1M), \fBufsdump\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5)
+\fBmore\fR(1), \fBmkfs\fR(8), \fBmount\fR(8), \fBrmt\fR(8),
+\fBufsdump\fR(8), \fBufsdump\fR(5), \fBattributes\fR(7), \fBlargefile\fR(7)
 .SH DIAGNOSTICS
 .sp
 .LP
diff --git a/usr/src/man/man8/unshare.8 b/usr/src/man/man8/unshare.8
index d97fd4a73e..98cdd0a780 100644
--- a/usr/src/man/man8/unshare.8
+++ b/usr/src/man/man8/unshare.8
@@ -77,7 +77,7 @@ Contains a table of local resources shared by the \fBshare\fR command.
 .SH SEE ALSO
 .sp
 .LP
-\fBshare\fR(1M), \fBshareall\fR(1M), \fBattributes\fR(5)
+\fBshare\fR(8), \fBshareall\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/unshare_nfs.8 b/usr/src/man/man8/unshare_nfs.8
index 020a073203..ecdd82d588 100644
--- a/usr/src/man/man8/unshare_nfs.8
+++ b/usr/src/man/man8/unshare_nfs.8
@@ -56,7 +56,7 @@ file \fB/etc/dfs/fstypes\fR.
 .SH SEE ALSO
 .sp
 .LP
-\fBnfsd\fR(1M), \fBshare\fR(1M), \fBattributes\fR(5)
+\fBnfsd\fR(8), \fBshare\fR(8), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -84,4 +84,4 @@ and unrecoverable by the clients. If the intent is to share the file system
 after some administrative action, the NFS daemon (\fBnfsd\fR) should first be
 stopped and then the file system unshared. After the administrative action is
 complete, the file system would then be shared and the NFS daemon restarted.
-See \fBnfsd\fR(1M)
+See \fBnfsd\fR(8)
diff --git a/usr/src/man/man8/update_drv.8 b/usr/src/man/man8/update_drv.8
index d19a299840..9de8577a1f 100644
--- a/usr/src/man/man8/update_drv.8
+++ b/usr/src/man/man8/update_drv.8
@@ -25,7 +25,7 @@ update_drv \- modify device driver attributes
 
 .SH DESCRIPTION
 The \fBupdate_drv\fR command informs the system about attribute changes to an
-installed device driver. It can be used to re-read the \fBdriver.conf\fR(4)
+installed device driver. It can be used to re-read the \fBdriver.conf\fR(5)
 file, or to add, modify, or delete a driver's minor node permissions or
 aliases.
 .sp
@@ -78,7 +78,7 @@ Note -
 The root file system of any non-global zones must not be referenced with the
 \fB-b\fR option. Doing so might damage the global zone's file system, might
 compromise the security of the global zone, and might damage the non-global
-zone's file system. See \fBzones\fR(5).
+zone's file system. See \fBzones\fR(7).
 .RE
 .RE
 
@@ -127,7 +127,7 @@ such devices remain.
 .RS 4n
 A white-space separated list of aliases for the driver. If \fB-a\fR or \fB-d\fR
 option is not specified then this option is ignored. The \fIidentify-name\fR
-string is mandatory. If all aliases need to be removed, \fBrem_drv\fR(1M) is
+string is mandatory. If all aliases need to be removed, \fBrem_drv\fR(8) is
 recommended.
 .RE
 
@@ -240,7 +240,7 @@ example# update_drv -a -i '"usb459,20"' ugen
 \fBExample 4 \fRRe-reading the \fBdriver.conf\fR File For the \fBohci\fR Driver
 .sp
 .LP
-The following command re-reads the \fBdriver.conf\fR(4) file.
+The following command re-reads the \fBdriver.conf\fR(5) file.
 
 .sp
 .in +2
@@ -303,8 +303,8 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-\fBadd_drv\fR(1M), \fBmodunload\fR(1M), \fBrem_drv\fR(1M),
-\fBdriver.conf\fR(4), \fBattributes\fR(5), \fBprivileges\fR(5)
+\fBadd_drv\fR(8), \fBmodunload\fR(8), \fBrem_drv\fR(8),
+\fBdriver.conf\fR(5), \fBattributes\fR(7), \fBprivileges\fR(7)
 .SH NOTES
 If \fB-a\fR or \fB-d\fR options are specified, \fBupdate_drv\fR does not reread
 the \fBdriver.conf\fR file.
diff --git a/usr/src/man/man8/updatehome.8 b/usr/src/man/man8/updatehome.8
index a16a9edb40..0e3a4a92d2 100644
--- a/usr/src/man/man8/updatehome.8
+++ b/usr/src/man/man8/updatehome.8
@@ -151,7 +151,7 @@ List of files to be symbolically linked
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -167,7 +167,7 @@ Interface Stability	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5)
+\fBattributes\fR(7)
 .sp
 .LP
 \fI\&.copy_files and .link_files Files\fR in \fISolaris Trusted Extensions
diff --git a/usr/src/man/man8/useradd.8 b/usr/src/man/man8/useradd.8
index 8188a1e3f3..f127fc958a 100644
--- a/usr/src/man/man8/useradd.8
+++ b/usr/src/man/man8/useradd.8
@@ -59,8 +59,8 @@ this limit.
 .sp
 .LP
 \fBuseradd\fR requires that usernames be in the format described in
-\fBpasswd\fR(4). A warning message is displayed if these restrictions are not
-met. See \fBpasswd\fR(4) for the requirements for usernames.
+\fBpasswd\fR(5). A warning message is displayed if these restrictions are not
+met. See \fBpasswd\fR(5) for the requirements for usernames.
 .LP
 To change the action of \fBuseradd\fR when the traditional login name
 length limit of eight characters is exceeded, edit the file
@@ -76,7 +76,7 @@ The following options are supported:
 .ad
 .sp .6
 .RS 4n
-One or more comma separated authorizations defined in \fBauth_attr\fR(4). Only
+One or more comma separated authorizations defined in \fBauth_attr\fR(5). Only
 a user or role who has \fBgrant\fR rights to the authorization can assign it to
 an account.
 .RE
@@ -233,7 +233,7 @@ null
 .sp
 .ne 2
 .na
-\fBkey=value\fR (pairs defined in \fBuser_attr\fR(4))
+\fBkey=value\fR (pairs defined in \fBuser_attr\fR(5))
 .ad
 .sp .6
 .RS 4n
@@ -333,7 +333,7 @@ this purpose.
 A \fIkey=value\fR pair to add to the user's attributes. Multiple \fB-K\fR
 options may be used to add multiple \fIkey=value\fR pairs. The generic \fB-K\fR
 option with the appropriate key may be used instead of the specific implied key
-options (\fB-A\fR, \fB-p\fR, \fB-P\fR, \fB-R\fR). See \fBuser_attr\fR(4) for a
+options (\fB-A\fR, \fB-p\fR, \fB-P\fR, \fB-R\fR). See \fBuser_attr\fR(5) for a
 list of valid \fIkey=value\fR pairs. The "type" key is not a valid key for this
 option. Keys cannot be repeated.
 .RE
@@ -378,7 +378,7 @@ This option allows a \fBUID\fR to be duplicated (non-unique).
 .sp .6
 .RS 4n
 Name of the project with which the added user is associated. See the
-\fIprojname\fR field as defined in \fBproject\fR(4).
+\fIprojname\fR field as defined in \fBproject\fR(5).
 .RE
 
 .sp
@@ -388,7 +388,7 @@ Name of the project with which the added user is associated. See the
 .ad
 .sp .6
 .RS 4n
-One or more comma-separated execution profiles defined in \fBprof_attr\fR(4).
+One or more comma-separated execution profiles defined in \fBprof_attr\fR(5).
 .RE
 
 .sp
@@ -398,7 +398,7 @@ One or more comma-separated execution profiles defined in \fBprof_attr\fR(4).
 .ad
 .sp .6
 .RS 4n
-One or more comma-separated roles defined in \fBuser_attr\fR(4).
+One or more comma-separated roles defined in \fBuser_attr\fR(5).
 Roles cannot be assigned to other roles.
 .RE
 
@@ -455,7 +455,7 @@ reserved for allocation by the Operating System.
 \fB/etc/user_attr\fR
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -471,10 +471,10 @@ Interface Stability	Committed
 .SH SEE ALSO
 .LP
 \fBpasswd\fR(1), \fBprofiles\fR(1), \fBroles\fR(1),
-\fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBgroupmod\fR(1M), \fBgrpck\fR(1M),
-\fBlogins\fR(1M), \fBpwck\fR(1M), \fBuserdel\fR(1M), \fBusermod\fR(1M),
-\fBzfs\fR(1M), \fBgetdate\fR(3C), \fBauth_attr\fR(4), \fBpasswd\fR(4),
-\fBprof_attr\fR(4), \fBproject\fR(4), \fBuser_attr\fR(4), \fBattributes\fR(5)
+\fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBgrpck\fR(8),
+\fBlogins\fR(8), \fBpwck\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8),
+\fBzfs\fR(8), \fBgetdate\fR(3C), \fBauth_attr\fR(5), \fBpasswd\fR(5),
+\fBprof_attr\fR(5), \fBproject\fR(5), \fBuser_attr\fR(5), \fBattributes\fR(7)
 .SH DIAGNOSTICS
 .LP
 In case of an error, \fBuseradd\fR prints an error message and exits with a
diff --git a/usr/src/man/man8/userdel.8 b/usr/src/man/man8/userdel.8
index d7022b466d..386f2a2516 100644
--- a/usr/src/man/man8/userdel.8
+++ b/usr/src/man/man8/userdel.8
@@ -154,10 +154,10 @@ system file containing additional user attributes
 .SH SEE ALSO
 .LP
 \fBauths\fR(1), \fBpasswd\fR(1), \fBprofiles\fR(1), \fBroles\fR(1),
-\fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBgroupmod\fR(1M),
-\fBlogins\fR(1M), \fBroleadd\fR(1M), \fBroledel\fR(1M), \fBrolemod\fR(1M),
-\fBuseradd\fR(1M), \fBusermod\fR(1M), \fBzfs\fR(1M), \fBpasswd\fR(4),
-\fBprof_attr\fR(4), \fBuser_attr\fR(4), \fBattributes\fR(5)
+\fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8),
+\fBlogins\fR(8), \fBroleadd\fR(8), \fBroledel\fR(8), \fBrolemod\fR(8),
+\fBuseradd\fR(8), \fBusermod\fR(8), \fBzfs\fR(8), \fBpasswd\fR(5),
+\fBprof_attr\fR(5), \fBuser_attr\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .LP
 The \fBuserdel\fR utility only deletes an account definition that is in the
diff --git a/usr/src/man/man8/usermod.8 b/usr/src/man/man8/usermod.8
index d1b5c52a69..33baa0851f 100644
--- a/usr/src/man/man8/usermod.8
+++ b/usr/src/man/man8/usermod.8
@@ -38,7 +38,7 @@ The following options are supported:
 .ad
 .sp .6
 .RS 4n
-One or more comma separated authorizations as defined in \fBauth_attr\fR(4).
+One or more comma separated authorizations as defined in \fBauth_attr\fR(5).
 Only a user or role who has \fBgrant\fR rights to the \fBauthorization\fR can
 assign it to an account. This replaces any existing authorization setting. If
 an empty authorization list is specified, the existing setting is removed.
@@ -133,9 +133,9 @@ Replace existing or add to a user's \fIkey=value\fR pair attributes. Multiple
 \fB-K\fR options can be used to replace or add multiple \fIkey=value\fR pairs.
 However, keys must not be repeated. The generic \fB-K\fR option with the
 appropriate key can be used instead of the specific implied key options
-(\fB-A\fR, \fB-P\fR, \fB-R\fR, \fB-p\fR). See \fBuser_attr\fR(4) for a list of
+(\fB-A\fR, \fB-P\fR, \fB-R\fR, \fB-p\fR). See \fBuser_attr\fR(5) for a list of
 valid \fIkey\fRs. Values for these keys are usually found in man pages or other
-sources related to those keys. For example, see \fBproject\fR(4) for guidance
+sources related to those keys. For example, see \fBproject\fR(5) for guidance
 on values for the \fBproject\fR key. Use the command \fBppriv\fR(1) with the
 \fB-v\fR and \fB-l\fR options for a list of values for the keys
 \fBdefaultpriv\fR and \fBlimitpriv\fR.
@@ -156,7 +156,7 @@ present.
 .ad
 .sp .6
 .RS 4n
-Specify the new login name for the user. See \fBpasswd\fR(4) for the
+Specify the new login name for the user. See \fBpasswd\fR(5) for the
 requirements for usernames.
 .RE
 
@@ -204,8 +204,8 @@ This option allows the specified \fBUID\fR to be duplicated (non-unique).
 .ad
 .sp .6
 .RS 4n
-One or more comma-separated execution profiles defined in \fBprof_attr\fR(4).
-This replaces any existing profile setting in \fBuser_attr\fR(4). If an empty
+One or more comma-separated execution profiles defined in \fBprof_attr\fR(5).
+This replaces any existing profile setting in \fBuser_attr\fR(5). If an empty
 profile list is specified, the existing setting is removed.
 .RE
 
@@ -216,7 +216,7 @@ profile list is specified, the existing setting is removed.
 .ad
 .sp .6
 .RS 4n
-One or more comma-separated roles (see \fBroleadd\fR(1M)). This replaces any
+One or more comma-separated roles (see \fBroleadd\fR(8)). This replaces any
 existing role setting. If an empty role list is specified, the existing setting
 is removed.
 .RE
@@ -343,7 +343,7 @@ jdoe::::type=normal;defaultpriv=basic,!proc_session;limitpriv=all
 .sp
 .LP
 The following command assigns a role to a user. The role must have been created
-prior to this command, see \fBroleadd\fR(1M).
+prior to this command, see \fBroleadd\fR(8).
 
 .sp
 .in +2
@@ -370,7 +370,7 @@ jdoe::::type=normal;roles=mailadm;defaultpriv=basic;limitpriv=all
 .LP
 The following command removes all profiles that were granted to a user
 directly. The user will still have any execution profiles that are granted by
-means of the \fBPROFS_GRANTED\fR key in \fBpolicy.conf\fR(4).
+means of the \fBPROFS_GRANTED\fR key in \fBpolicy.conf\fR(5).
 
 .sp
 .in +2
@@ -422,8 +422,8 @@ The \fIuid\fR given with the \fB-u\fR option is already in use.
 .ad
 .sp .6
 .RS 4n
-The password files contain an error. \fBpwconv\fR(1M) can be used to correct
-possible errors. See \fBpasswd\fR(4).
+The password files contain an error. \fBpwconv\fR(8) can be used to correct
+possible errors. See \fBpasswd\fR(5).
 .RE
 
 .sp
@@ -552,7 +552,7 @@ system file containing additional user and role attributes
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -567,12 +567,12 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBchown\fR(1), \fBpasswd\fR(1), \fBgroupadd\fR(1M), \fBgroupdel\fR(1M),
-\fBgroupmod\fR(1M), \fBlogins\fR(1M), \fBpwconv\fR(1M), \fBroleadd\fR(1M),
-\fBroledel\fR(1M), \fBrolemod\fR(1M), \fBuseradd\fR(1M), \fBuserdel\fR(1M),
-\fBzfs\fR(1M), \fBgetdate\fR(3C), \fBauth_attr\fR(4), \fBpasswd\fR(4),
-\fBpolicy.conf\fR(4), \fBprof_attr\fR(4), \fBuser_attr\fR(4),
-\fBattributes\fR(5)
+\fBchown\fR(1), \fBpasswd\fR(1), \fBgroupadd\fR(8), \fBgroupdel\fR(8),
+\fBgroupmod\fR(8), \fBlogins\fR(8), \fBpwconv\fR(8), \fBroleadd\fR(8),
+\fBroledel\fR(8), \fBrolemod\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8),
+\fBzfs\fR(8), \fBgetdate\fR(3C), \fBauth_attr\fR(5), \fBpasswd\fR(5),
+\fBpolicy.conf\fR(5), \fBprof_attr\fR(5), \fBuser_attr\fR(5),
+\fBattributes\fR(7)
 .SH NOTES
 .LP
 The \fBusermod\fR utility modifies \fBpasswd\fR definitions only in the local
diff --git a/usr/src/man/man8/utmpd.8 b/usr/src/man/man8/utmpd.8
index 763fda7750..f8f8de8e09 100644
--- a/usr/src/man/man8/utmpd.8
+++ b/usr/src/man/man8/utmpd.8
@@ -17,7 +17,7 @@ utmpd \- utmpx monitoring daemon
 .SH DESCRIPTION
 .LP
 The \fButmpd\fR daemon monitors the \fB/var/adm/utmpx\fR file. See
-\fButmpx\fR(4) (and \fButmp\fR(4) for historical information).
+\fButmpx\fR(5) (and \fButmp\fR(5) for historical information).
 .sp
 .LP
 \fButmpd\fR receives requests from \fBpututxline\fR(3C) by way of a named pipe.
@@ -106,7 +106,7 @@ default value is 4096.
 .RS 4n
 The number of seconds that \fButmpd\fR sleeps between read accesses of the
 \fBwtmpx\fR file. The \fBwtmpx\fR file's last access time is used by
-\fBinit\fR(1M) on reboot to determine when the operating system became
+\fBinit\fR(8) on reboot to determine when the operating system became
 unavailable. The default is 60.
 .RE
 
@@ -136,9 +136,9 @@ monitored.
 
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBinit\fR(1M), \fBsvcadm\fR(1M), \fBpoll\fR(2),
-\fBpututxline\fR(3C), \fBproc\fR(4), \fButmp\fR(4), \fButmpx\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBinit\fR(8), \fBsvcadm\fR(8), \fBpoll\fR(2),
+\fBpututxline\fR(3C), \fBproc\fR(5), \fButmp\fR(5), \fButmpx\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .LP
 If the filesystem holding \fB/var/adm/wtmpx\fR is mounted with options which
@@ -151,7 +151,7 @@ regardless of access time deferral or inhibition.
 .sp
 .LP
 The \fButmpd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -163,5 +163,5 @@ svc:/system/utmp:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/uucheck.8 b/usr/src/man/man8/uucheck.8
index 22f1e6bfc6..e66637fda1 100644
--- a/usr/src/man/man8/uucheck.8
+++ b/usr/src/man/man8/uucheck.8
@@ -114,8 +114,8 @@ information.
 .SH SEE ALSO
 .sp
 .LP
-\fBuucp\fR(1C), \fBuustat\fR(1C), \fBuux\fR(1C), \fBuucico\fR(1M),
-\fBuusched\fR(1M), \fBattributes\fR(5)
+\fBuucp\fR(1C), \fBuustat\fR(1C), \fBuux\fR(1C), \fBuucico\fR(8),
+\fBuusched\fR(8), \fBattributes\fR(7)
 .SH BUGS
 .sp
 .LP
diff --git a/usr/src/man/man8/uucico.8 b/usr/src/man/man8/uucico.8
index 78e9b4c738..c35975d308 100644
--- a/usr/src/man/man8/uucico.8
+++ b/usr/src/man/man8/uucico.8
@@ -189,5 +189,5 @@ debugging information.
 .SH SEE ALSO
 .sp
 .LP
-\fBuucp\fR(1C), \fBuustat\fR(1C), \fBuux\fR(1C), \fBUutry\fR(1M),
-\fBcron\fR(1M), \fBuusched\fR(1M), \fBattributes\fR(5)
+\fBuucp\fR(1C), \fBuustat\fR(1C), \fBuux\fR(1C), \fBUutry\fR(8),
+\fBcron\fR(8), \fBuusched\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/uucleanup.8 b/usr/src/man/man8/uucleanup.8
index e8bf6be0cc..7c0be6cd98 100644
--- a/usr/src/man/man8/uucleanup.8
+++ b/usr/src/man/man8/uucleanup.8
@@ -52,7 +52,7 @@ unless \fBtime\fR is specifically set.
 .sp
 .LP
 This program is typically started by the shell \fBuudemon.cleanup\fR, which
-should be started by \fBcron\fR(1M).
+should be started by \fBcron\fR(8).
 .SH OPTIONS
 .ne 2
 .na
@@ -158,4 +158,4 @@ spool directory
 
 .SH SEE ALSO
 .LP
-\fBuucp\fR(1C), \fBuux\fR(1C), \fBcron\fR(1M), \fBattributes\fR(5)
+\fBuucp\fR(1C), \fBuux\fR(1C), \fBcron\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/uusched.8 b/usr/src/man/man8/uusched.8
index 31e556940e..19a1c41907 100644
--- a/usr/src/man/man8/uusched.8
+++ b/usr/src/man/man8/uusched.8
@@ -16,7 +16,7 @@ uusched \- uucp file transport program scheduler
 .sp
 .LP
 \fBuusched\fR is the  \fBuucp\fR(1C) file transport scheduler. It is usually
-started by the daemon \fIuudemon.hour\fR that is started by  \fBcron\fR(1M)
+started by the daemon \fIuudemon.hour\fR that is started by  \fBcron\fR(8)
 from an entry in user \fBuucp\fR's crontab file:
 .sp
 .LP
@@ -36,7 +36,7 @@ The following options are supported:
 \fB\fB-u\fR\fI debug-level\fR\fR
 .ad
 .RS 18n
-Passes the \fB-u\fR\fI debug-level\fR option  \fBuucico\fR(1M) as \fB-x\fR\fI
+Passes the \fB-u\fR\fI debug-level\fR option  \fBuucico\fR(8) as \fB-x\fR\fI
 debug-level.\fR
 .RE
 
@@ -107,5 +107,5 @@ Outputs debugging messages from  \fBuusched\fR.
 .SH SEE ALSO
 .sp
 .LP
-\fBuucp\fR(1C), \fBuustat\fR(1C), \fBuux\fR(1C), \fBcron\fR(1M),
-\fBuucico\fR(1M), \fBattributes\fR(5)
+\fBuucp\fR(1C), \fBuustat\fR(1C), \fBuux\fR(1C), \fBcron\fR(8),
+\fBuucico\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/uuxqt.8 b/usr/src/man/man8/uuxqt.8
index 5e0a04eded..77baf6a45d 100644
--- a/usr/src/man/man8/uuxqt.8
+++ b/usr/src/man/man8/uuxqt.8
@@ -106,4 +106,4 @@ detailed debugging information.
 .sp
 .LP
 \fBmail\fR(1), \fBuucp\fR(1C), \fBuustat\fR(1C), \fBuux\fR(1C),
-\fBuucico\fR(1M), \fBattributes\fR(5)
+\fBuucico\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/vmstat.8 b/usr/src/man/man8/vmstat.8
index 61026c543d..ee71b74157 100644
--- a/usr/src/man/man8/vmstat.8
+++ b/usr/src/man/man8/vmstat.8
@@ -17,11 +17,11 @@ memory, disk, trap, and \fBCPU\fR activity.
 .sp
 .LP
 On \fBMP\fR (multi-processor) systems, \fBvmstat\fR averages the number of
-\fBCPUs\fR into the output. For per-processor statistics, see \fBmpstat\fR(1M).
+\fBCPUs\fR into the output. For per-processor statistics, see \fBmpstat\fR(8).
 .sp
 .LP
 \fBvmstat\fR only supports statistics for certain devices. For more general
-system statistics, use \fBsar\fR(1), \fBiostat\fR(1M), or \fBsar\fR(1M).
+system statistics, use \fBsar\fR(1), \fBiostat\fR(8), or \fBsar\fR(8).
 .sp
 .LP
 Without options, \fBvmstat\fR displays a one-line summary of the virtual memory
@@ -44,7 +44,7 @@ output, in one of the following forms:
 
 .sp
 .LP
-See \fBdisks\fR(1M) for device naming conventions for disks.
+See \fBdisks\fR(8) for device naming conventions for disks.
 .SH OPTIONS
 The following options are supported:
 .sp
@@ -494,7 +494,7 @@ above only report activity on the processors in the processor set of the
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -511,8 +511,8 @@ Interface Stability	See below.
 .LP
 Invocation is evolving. Human readable output is unstable.
 .SH SEE ALSO
-\fBdate\fR(1), \fBsar\fR(1), \fBdisks\fR(1M), \fBiostat\fR(1M), \fBmpstat\fR(1M), \fBsar\fR(1M),
-\fBtime\fR(2), \fBattributes\fR(5)
+\fBdate\fR(1), \fBsar\fR(1), \fBdisks\fR(8), \fBiostat\fR(8), \fBmpstat\fR(8), \fBsar\fR(8),
+\fBtime\fR(2), \fBattributes\fR(7)
 .SH NOTES
 The sum of CPU utilization might vary slightly from 100 because of rounding
 errors in the production of a percentage figure.
diff --git a/usr/src/man/man8/vntsd.8 b/usr/src/man/man8/vntsd.8
index c09dd1142c..dc8a9803aa 100644
--- a/usr/src/man/man8/vntsd.8
+++ b/usr/src/man/man8/vntsd.8
@@ -296,13 +296,13 @@ Binary executable \fBvntsd\fR file.
 .ad
 .sp .6
 .RS 4n
-Service management facility (\fBsmf\fR(5)) manifest file for \fBvntsd\fR.
+Service management facility (\fBsmf\fR(7)) manifest file for \fBvntsd\fR.
 .RE
 
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -318,12 +318,12 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBtelnet\fR(1), \fBsvccfg\fR(1M), \fBusermod\fR(1M), \fBauth_attr\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBtelnet\fR(1), \fBsvccfg\fR(8), \fBusermod\fR(8), \fBauth_attr\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
-The \fBvntsd\fR is managed by the service management facility, \fBsmf\fR(5),
+The \fBvntsd\fR is managed by the service management facility, \fBsmf\fR(7),
 under the service identifier:
 .sp
 .in +2
@@ -334,7 +334,7 @@ svc:/ldoms/vntsd
 
 .sp
 .LP
-You can change the following properties using the \fBsvccfg\fR(1M) command:
+You can change the following properties using the \fBsvccfg\fR(8) command:
 .sp
 .ne 2
 .na
@@ -396,7 +396,7 @@ default value is 0, which disables timeout.
 Enable the authorization checking of users and roles for the domain console or
 consoles that are being accessed. The default value of this property is
 \fBfalse\fR to maintain backward compatibility. To enable authorization
-checking, use the \fBsvccfg\fR(1M) command to set the property value to
+checking, use the \fBsvccfg\fR(8) command to set the property value to
 \fBtrue\fR. While this option is enabled, \fBvntsd\fR listens and accepts
 connections on \fBlocalhost\fR. If the \fBlisten_addr\fR property specifies an
 alternate IP address when this option is enabled, \fBvntsd\fR ignores the
@@ -405,7 +405,7 @@ that are initiated from other hosts will also fail. Authorizations are
 available to access all consoles or console groups, or to access specific
 consoles or console groups. When the \fBvntsd\fR service is enabled, the
 following authorization is added to the authorization description database,
-\fBauth_attr\fR(4):
+\fBauth_attr\fR(5):
 .sp
 .in +2
 .nf
@@ -416,7 +416,7 @@ solaris.vntsd.consoles:::Access All LDoms Guest Consoles::
 
 Add any fine-grained authorizations based on the name of the console group. For
 example, if the name of the console group to be authorized is \fBldg1\fR, add
-the following entry to the \fBauth_attr\fR(4) file:
+the following entry to the \fBauth_attr\fR(5) file:
 .sp
 .in +2
 .nf
@@ -427,7 +427,7 @@ solaris.vntsd.console-ldg1:::Access Specific LDoms Guest Console::
 
 By default, the authorization to access all consoles is assigned to the root
 user or role. The Primary Administrator (superuser) can use the
-\fBusermod\fR(1M) command to assign the required authorization or
+\fBusermod\fR(8) command to assign the required authorization or
 authorizations to other users or roles.
 .sp
 The following example gives user \fBuser1\fR the authorization to access all
diff --git a/usr/src/man/man8/volcopy.8 b/usr/src/man/man8/volcopy.8
index 04052acc32..746b84f7f2 100644
--- a/usr/src/man/man8/volcopy.8
+++ b/usr/src/man/man8/volcopy.8
@@ -155,5 +155,5 @@ The default partition for a command if no \fIFSType\fR is specified.
 .SH SEE ALSO
 .sp
 .LP
-\fBlabelit\fR(1M), \fBvfstab\fR(4), \fBattributes\fR(5) Manual pages for the
+\fBlabelit\fR(8), \fBvfstab\fR(5), \fBattributes\fR(7) Manual pages for the
 \fIFSType\fR-specific modules of \fBvolcopy\fR.
diff --git a/usr/src/man/man8/volcopy_ufs.8 b/usr/src/man/man8/volcopy_ufs.8
index 2d48598ce7..ebc6626e9e 100644
--- a/usr/src/man/man8/volcopy_ufs.8
+++ b/usr/src/man/man8/volcopy_ufs.8
@@ -28,7 +28,7 @@ The following option is supported:
 .ad
 .RS 19n
 options supported by the generic  \fBvolcopy\fR command. See
-\fBvolcopy\fR(1M).
+\fBvolcopy\fR(8).
 .RE
 
 .SH OPERANDS
@@ -114,10 +114,10 @@ a record of file systems/volumes copied
 .SH SEE ALSO
 .sp
 .LP
-\fBcpio\fR(1), \fBdd\fR(1M), \fBlabelit\fR(1M), \fBvolcopy\fR(1M),
-\fBattributes\fR(5), \fBufs\fR(7FS)
+\fBcpio\fR(1), \fBdd\fR(8), \fBlabelit\fR(8), \fBvolcopy\fR(8),
+\fBattributes\fR(7), \fBufs\fR(4FS)
 .SH NOTES
 .sp
 .LP
-\fBvolcopy\fR does not support copying to tape devices. Use \fBdd\fR(1M) for
+\fBvolcopy\fR does not support copying to tape devices. Use \fBdd\fR(8) for
 copying to and from tape devices.
diff --git a/usr/src/man/man8/vscanadm.8 b/usr/src/man/man8/vscanadm.8
index 7c5f2f2e6d..d336fd4faf 100644
--- a/usr/src/man/man8/vscanadm.8
+++ b/usr/src/man/man8/vscanadm.8
@@ -66,12 +66,12 @@ vscanadm \- vscan service configuration utility
 .sp
 .LP
 The \fBvscanadm\fR command sets and displays properties of the \fBvscan\fR
-service, \fBvscand\fR(1M), and provides scan statistics.
+service, \fBvscand\fR(8), and provides scan statistics.
 .sp
 .LP
 File system exemption from virus scanning may be configured per file system
 using the appropriate file system administrative command, for example
-\fBzfs\fR(1M).
+\fBzfs\fR(8).
 .sp
 .LP
 Scan engines are third-party applications on external hosts that perform the
@@ -605,7 +605,7 @@ An error occurred.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -623,7 +623,7 @@ Utility output format	Not-An-Interface
 .SH SEE ALSO
 .sp
 .LP
-\fBvscand\fR(1M), \fBzfs\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBvscand\fR(8), \fBzfs\fR(8), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/vscand.8 b/usr/src/man/man8/vscand.8
index 44b2c89827..f7d3bce8d7 100644
--- a/usr/src/man/man8/vscand.8
+++ b/usr/src/man/man8/vscand.8
@@ -18,10 +18,10 @@ vscand \- vscan service daemon
 \fBvscand\fR is the daemon that handles virus scan requests from file systems
 on file open and close operations. A file system may support enabling and
 disabling of virus scanning on a per dataset basis, using that file system's
-administrative command, for example \fBzfs\fR(1M).
+administrative command, for example \fBzfs\fR(8).
 .sp
 .LP
-If the file state or scan policy (see \fBvscanadm\fR(1M) requires that a file
+If the file state or scan policy (see \fBvscanadm\fR(8) requires that a file
 be scanned, \fBvscand\fR communicates with external third-party virus scanners
 (scan engines) using the Internet Content Adaptation Protocol (\fBICAP\fR,
 \fBRFC\fR 3507) to have the file scanned.
@@ -36,10 +36,10 @@ updated.
 .sp
 .LP
 If the file is found to contain a virus, the virus is logged in
-\fBsyslogd\fR(1M), an audit record is written, and the file is quarantined (by
+\fBsyslogd\fR(8), an audit record is written, and the file is quarantined (by
 setting its quarantine attribute). Once a file is quarantined, attempts to
 read, execute or rename the file will be denied by the file system. The
-\fBsyslogd\fR(1M) entry and the audit record specify the name of the infected
+\fBsyslogd\fR(8) entry and the audit record specify the name of the infected
 file and the violations detected in the file. Each violation is specified as
 "ID - threat description", where \fBID\fR and threat description are defined in
 the X-Infection-Found-Header in \fBICAP\fR \fBRFC\fR 3507; Extensions.
@@ -47,11 +47,11 @@ the X-Infection-Found-Header in \fBICAP\fR \fBRFC\fR 3507; Extensions.
 .LP
 By default, \fBvscand\fR connects to scan engines on port 1344. The port and
 other service configuration parameters can be configured using
-\fBvscanadm\fR(1M).
+\fBvscanadm\fR(8).
 .sp
 .LP
 The \fBvscan\fR service is disabled by default, and can be enabled using
-\fBsvcadm\fR(1M).
+\fBsvcadm\fR(8).
 .SH EXIT STATUS
 .sp
 .LP
@@ -77,7 +77,7 @@ Daemon failed to start.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -93,9 +93,9 @@ Interface Stability	Uncommitted
 .SH SEE ALSO
 .sp
 .LP
-\fBps\fR(1), \fBsvcs\fR(1), \fBlogadm\fR(1M), \fBsvcadm\fR(1M),
-\fBsyslogd\fR(1M), \fBvscanadm\fR(1M), \fBzfs\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBps\fR(1), \fBsvcs\fR(1), \fBlogadm\fR(8), \fBsvcadm\fR(8),
+\fBsyslogd\fR(8), \fBvscanadm\fR(8), \fBzfs\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -108,12 +108,12 @@ File content is transferred to the scan engines as \fBcleartext\fR data.
 .sp
 .LP
 Administrative actions for the \fBvscan\fR service, such as enabling,
-disabling, or requesting a restart, can be performed using \fBsvcadm\fR(1M).
+disabling, or requesting a restart, can be performed using \fBsvcadm\fR(8).
 The \fBvscan\fR service status can be queried using the \fBsvcs\fR(1) command.
 .sp
 .LP
 The \fBvscan\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
diff --git a/usr/src/man/man8/wall.8 b/usr/src/man/man8/wall.8
index de86e85290..a56e41e9d3 100644
--- a/usr/src/man/man8/wall.8
+++ b/usr/src/man/man8/wall.8
@@ -73,7 +73,7 @@ Broadcast message to the console and pseudo-terminals.
 .ad
 .RS 14n
 Broadcast to the users in a specified group only, per the group database (see
-\fBgroup\fR(4)).
+\fBgroup\fR(5)).
 .RE
 
 .sp
@@ -102,7 +102,7 @@ If the  \fBLC_*\fR variables (\fBLC_CTYPE\fR, \fBLC_TIME\fR, \fBLC_COLLATE\fR,
 \fBLC_NUMERIC\fR, and \fBLC_MONETARY\fR) are not set in the environment, the
 operational behavior of \fBwall\fR for each corresponding locale category is
 determined by  the value of the \fBLANG\fR environment variable. See
-\fBenviron\fR(5). If \fBLC_ALL\fR is set, its contents are used to override
+\fBenviron\fR(7). If \fBLC_ALL\fR is set, its contents are used to override
 both the  \fBLANG\fR and the other \fBLC_*\fR variables. If none of the above
 variables are set in the environment, the "C" (U.S. style) locale determines
 how \fBwall\fR behaves.
@@ -113,8 +113,8 @@ how \fBwall\fR behaves.
 .SH SEE ALSO
 .sp
 .LP
-\fBmesg\fR(1), \fBwrite\fR(1), \fBsetuid\fR(2), \fBattributes\fR(5),
-\fBenviron\fR(5)
+\fBmesg\fR(1), \fBwrite\fR(1), \fBsetuid\fR(2), \fBattributes\fR(7),
+\fBenviron\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/whodo.8 b/usr/src/man/man8/whodo.8
index e826c3835b..ee867e3b76 100644
--- a/usr/src/man/man8/whodo.8
+++ b/usr/src/man/man8/whodo.8
@@ -108,7 +108,7 @@ xt162    lee      10:20
 .LP
 If any of the \fBLC_*\fR variables ( \fB\fR\fBLC_CTYPE\fR\fB,\fR
 \fBLC_MESSAGES\fR\fB,\fR \fBLC_TIME\fR\fB,\fR \fBLC_COLLATE\fR\fB,\fR
-\fBLC_NUMERIC\fR\fB,\fR and \fBLC_MONETARY\fR ) (see \fBenviron\fR(5)) are not
+\fBLC_NUMERIC\fR\fB,\fR and \fBLC_MONETARY\fR ) (see \fBenviron\fR(7)) are not
 set in the environment, the operational behavior of \fBtar\fR(1) for each
 corresponding locale category is determined by the value of the \fBLANG\fR
 environment variable. If \fBLC_ALL\fR is set, its contents are used to override
@@ -205,4 +205,4 @@ Contains PID
 .SH SEE ALSO
 .sp
 .LP
-\fBps\fR(1), \fBwho\fR(1), \fBattributes\fR(5), \fBenviron\fR(5)
+\fBps\fR(1), \fBwho\fR(1), \fBattributes\fR(7), \fBenviron\fR(7)
diff --git a/usr/src/man/man8/wificonfig.8 b/usr/src/man/man8/wificonfig.8
index a70cdd5686..b362c58e7a 100644
--- a/usr/src/man/man8/wificonfig.8
+++ b/usr/src/man/man8/wificonfig.8
@@ -121,7 +121,7 @@ wificonfig \- WLAN configuration
 subset of these parameters.
 .sp
 .LP
-\fBwificonfig\fR uses \fBrbac\fR(5) to control user access to the interface.
+\fBwificonfig\fR uses \fBrbac\fR(7) to control user access to the interface.
 Only users with the "solaris.network.wifi.config" authorization can manage a
 \fBWiFi\fR interface, while only users with
 "solaris.network.wifi.wep"authorizations can configure the \fBWEP\fR (Wired
@@ -230,7 +230,7 @@ subcommand.
 .sp
 The \fBWiFi\fR device driver can not guarantee to retain the state for the
 connection when it is not held open. For this reason, it is strongly
-recommended that the \fBplumb\fR subcommand for \fBifconfig\fR(1M) is done
+recommended that the \fBplumb\fR subcommand for \fBifconfig\fR(8) is done
 before the \fBwificonfig autoconf\fR subcommand is given.
 .RE
 
@@ -277,7 +277,7 @@ subcommand.
 .sp
 The \fBWiFi\fR device driver can not guarantee to retain the state for the
 connection when it is not held open. For this reason, it is strongly
-recommended that the \fBplumb\fR subcommand for \fBifconfig\fR(1M) is done
+recommended that the \fBplumb\fR subcommand for \fBifconfig\fR(8) is done
 before the \fBwificonfig autoconf\fR subcommand is given.
 .RE
 
@@ -1038,7 +1038,7 @@ Minor error
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1052,4 +1052,4 @@ Interface Stability	Unstable
 .TE
 
 .SH SEE ALSO
-\fBps\fR(1), \fBifconfig\fR(1M), \fBattributes\fR(5), \fBath\fR(7D)
+\fBps\fR(1), \fBifconfig\fR(8), \fBattributes\fR(7), \fBath\fR(4D)
diff --git a/usr/src/man/man8/wpad.8 b/usr/src/man/man8/wpad.8
index 1e79cca5d3..34e68d2638 100644
--- a/usr/src/man/man8/wpad.8
+++ b/usr/src/man/man8/wpad.8
@@ -38,7 +38,7 @@ Key management for CCMP, TKIP, WEP104, WEP40
 .RE
 .sp
 .LP
-Stop and start the \fBwpad\fR daemon using \fBdladm\fR(1M). Use:
+Stop and start the \fBwpad\fR daemon using \fBdladm\fR(8). Use:
 .sp
 .in +2
 .nf
@@ -130,7 +130,7 @@ To stop the daemon on the link \fBath0\fR, enter:
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -146,13 +146,13 @@ Interface Stability	Uncommitted
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBdladm\fR(1M), \fBsvcadm\fR(1M), \fBattributes\fR(5),
-\fBsmf\fR(5)
+\fBsvcs\fR(1), \fBdladm\fR(8), \fBsvcadm\fR(8), \fBattributes\fR(7),
+\fBsmf\fR(7)
 .SH NOTES
 .sp
 .LP
 The \fBwpad\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -164,5 +164,5 @@ svc:/network/wpa:\fI<link>\fR
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/wracct.8 b/usr/src/man/man8/wracct.8
index 1c5c863f51..4b8e68bf0d 100644
--- a/usr/src/man/man8/wracct.8
+++ b/usr/src/man/man8/wracct.8
@@ -175,4 +175,4 @@ Extended accounting data files.
 .SH SEE ALSO
 .sp
 .LP
-\fBacctadm\fR(1M), \fBattributes\fR(5)
+\fBacctadm\fR(8), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/ypbind.8 b/usr/src/man/man8/ypbind.8
index df287b591f..75cb2321e9 100644
--- a/usr/src/man/man8/ypbind.8
+++ b/usr/src/man/man8/ypbind.8
@@ -18,8 +18,8 @@ ypbind \- NIS binder process
 NIS provides a simple network lookup service consisting of databases and
 processes. The databases are stored at the machine that runs an NIS server
 process. The programmatic interface to NIS is described in \fBypclnt\fR(3NSL).
-Administrative tools are described in \fBypinit\fR(1M), \fBypwhich\fR(1), and
-\fBypset\fR(1M). Tools to see the contents of NIS maps are described in
+Administrative tools are described in \fBypinit\fR(8), \fBypwhich\fR(1), and
+\fBypset\fR(8). Tools to see the contents of NIS maps are described in
 \fBypcat\fR(1), and \fBypmatch\fR(1).
 .sp
 .LP
@@ -65,7 +65,7 @@ bound domain is marked as unbound when the node running the \fBNIS\fR server
 crashes or gets overloaded. In such a case, \fBypbind\fR will try to bind to
 another \fBNIS\fR server using the process described above.\fBypbind\fR also
 accepts requests to set its binding for a particular domain.  The request is
-usually generated by the \fBypset\fR(1M) command. In order for \fBypset\fR to
+usually generated by the \fBypset\fR(8) command. In order for \fBypset\fR to
 work, \fBypbind\fR must have been invoked with flags \fB-ypset\fR or
 \fB-ypsetme\fR.
 .SH OPTIONS
@@ -129,14 +129,14 @@ File in which it is recommended that NIS servers be listed.
 .SH SEE ALSO
 .LP
 \fBsvcs\fR(1), \fBypcat\fR(1), \fBypmatch\fR(1), \fBypwhich\fR(1),
-\fBifconfig\fR(1M), \fBsvcadm\fR(1M), \fBypinit\fR(1M),
-\fBypset\fR(1M), \fBypclnt\fR(3NSL), \fBhosts\fR(4), \fBypfiles\fR(4),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBifconfig\fR(8), \fBsvcadm\fR(8), \fBypinit\fR(8),
+\fBypset\fR(8), \fBypclnt\fR(3NSL), \fBhosts\fR(5), \fBypfiles\fR(5),
+\fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .LP
 \fBypbind\fR supports multiple domains. The \fBypbind\fR process can maintain
 bindings to several domains and their servers, the default domain is the one
-specified by the \fBdomainname\fR(1M) command at startup time.
+specified by the \fBdomainname\fR(8) command at startup time.
 .sp
 .LP
 The \fB-broadcast\fR option works only on the \fBUDP\fR transport. It is
@@ -145,7 +145,7 @@ broadcast request and poses itself as an \fBNIS\fR server.
 .sp
 .LP
 The \fBypbind\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -157,5 +157,5 @@ svc:/network/nis/client:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/ypinit.8 b/usr/src/man/man8/ypinit.8
index aed9970046..4d4873c082 100644
--- a/usr/src/man/man8/ypinit.8
+++ b/usr/src/man/man8/ypinit.8
@@ -20,7 +20,7 @@ ypinit \- set up NIS client
 .LP
 \fBypinit\fR can be used to set up an \fBNIS\fR client system. You must be the
 superuser to run this command. This script need not be used at all if
-\fBypbind\fR(1M) is started with the \fB-broadcast\fR option (it is invoked
+\fBypbind\fR(8) is started with the \fB-broadcast\fR option (it is invoked
 with this option from the \fBsvc:/network/nis/client:default service\fR).
 .sp
 .LP
@@ -96,12 +96,12 @@ Lists the servers to which the NIS client is allowed to bind.
 
 .SH SEE ALSO
 .LP
-\fBsvcs\fR(1), \fBypwhich\fR(1), \fBsvcadm\fR(1M), \fBypbind\fR(1M),
-\fBsysinfo\fR(2), \fBhosts\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBsvcs\fR(1), \fBypwhich\fR(1), \fBsvcadm\fR(8), \fBypbind\fR(8),
+\fBsysinfo\fR(2), \fBhosts\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 .SH NOTES
 .LP
 The \fBNIS client\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -113,7 +113,7 @@ svc:/network/nis/client:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .SH BUGS
 .LP
diff --git a/usr/src/man/man8/ypmake.8 b/usr/src/man/man8/ypmake.8
index 4db197a663..9a0de6e83a 100644
--- a/usr/src/man/man8/ypmake.8
+++ b/usr/src/man/man8/ypmake.8
@@ -18,7 +18,7 @@ ypmake \- rebuild NIS database
 The file called \fBMakefile\fR in \fB/var/yp\fR is used by \fBmake\fR(1S) to
 build the  Network Information Service (\fBNIS\fR) database. With no arguments,
 \fBmake\fR creates \fBdbm\fR databases for any \fBNIS\fR maps that are
-out-of-date, and then executes \fByppush\fR(1M) to notify slave databases that
+out-of-date, and then executes \fByppush\fR(8) to notify slave databases that
 there has been a change.
 .sp
 .LP
@@ -38,7 +38,7 @@ construct a domain other than the master's default domain. The default for
 The default for \fBNOPUSH\fR is the null string.
 .sp
 .LP
-Refer to \fBypfiles\fR(4) and \fBypserv\fR(1M) for an overview of the
+Refer to \fBypfiles\fR(5) and \fBypserv\fR(8) for an overview of the
 \fBNIS\fR service.
 .sp
 .LP
@@ -49,7 +49,7 @@ LDAP DIT. In N2L mode, authoritative NIS information is obtained from the DIT.
 The NIS source files and \fBypmake\fR have no role, and they should not be
 used. If \fBypmake\fR is accidentally run, then the server components will
 detect this, and will log a warning message. For additional information, see
-\fBypfiles\fR(4).
+\fBypfiles\fR(5).
 .SH FILES
 .ne 2
 .na
@@ -79,7 +79,7 @@ Default directory for source files.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5)  for descriptions of the following attributes:
+See \fBattributes\fR(7)  for descriptions of the following attributes:
 .sp
 
 .sp
@@ -94,9 +94,9 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBmake\fR(1S), \fBmakedbm\fR(1M),
-\fBypbind\fR(1M), \fByppush\fR(1M), \fBypserv\fR(1M), \fBypclnt\fR(3NSL),
-\fBNISLDAPmapping\fR(4), \fBypfiles\fR(4), \fBypserv\fR(4)
+\fBmake\fR(1S), \fBmakedbm\fR(8),
+\fBypbind\fR(8), \fByppush\fR(8), \fBypserv\fR(8), \fBypclnt\fR(3NSL),
+\fBNISLDAPmapping\fR(5), \fBypfiles\fR(5), \fBypserv\fR(5)
 .SH NOTES
 .LP
 The Network Information Service (\fBNIS\fR) was formerly known as Sun Yellow
diff --git a/usr/src/man/man8/ypmap2src.8 b/usr/src/man/man8/ypmap2src.8
index 009536c7dd..436b38e8a7 100644
--- a/usr/src/man/man8/ypmap2src.8
+++ b/usr/src/man/man8/ypmap2src.8
@@ -18,7 +18,7 @@ ypmap2src \- convert NIS maps to NIS source files
 .LP
 Use the \fBypmap2src\fR utility to convert standard NIS maps to approximations
 of the equivalent NIS source files. This utility functions like the reverse of
-\fBypmake\fR(1M).
+\fBypmake\fR(8).
 .sp
 .LP
 The primary use for \fBypmap2src\fR is to convert from a NIS server that uses
@@ -124,7 +124,7 @@ option, are converted.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -139,8 +139,8 @@ Interface Stability	Obsolete
 
 .SH SEE ALSO
 .LP
-\fBypmake\fR(1M), \fBypserv\fR(1M), \fBNISLDAPmapping\fR(4),
-\fBattributes\fR(5)
+\fBypmake\fR(8), \fBypserv\fR(8), \fBNISLDAPmapping\fR(5),
+\fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/yppoll.8 b/usr/src/man/man8/yppoll.8
index bc6b0edd59..cdb755b0b2 100644
--- a/usr/src/man/man8/yppoll.8
+++ b/usr/src/man/man8/yppoll.8
@@ -41,4 +41,4 @@ is, the default host is the one returned by \fBypwhich\fR(1).
 .SH SEE ALSO
 .sp
 .LP
-\fBypwhich\fR(1), \fBypfiles\fR(4), \fBattributes\fR(5)
+\fBypwhich\fR(1), \fBypfiles\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/yppush.8 b/usr/src/man/man8/yppush.8
index 10bc24f6bc..991b6129ea 100644
--- a/usr/src/man/man8/yppush.8
+++ b/usr/src/man/man8/yppush.8
@@ -34,7 +34,7 @@ when a transfer is not possible, for instance, when the request message is
 undeliverable, or when the timeout period on responses has expired.
 .sp
 .LP
-Refer to \fBypfiles\fR(4) and \fBypserv\fR(1M) for an overview of the \fBNIS\fR
+Refer to \fBypfiles\fR(5) and \fBypserv\fR(8) for an overview of the \fBNIS\fR
 service.
 .SH OPTIONS
 .sp
@@ -102,7 +102,7 @@ mode.
 .SH SEE ALSO
 .sp
 .LP
-\fBypserv\fR(1M), \fBypxfr\fR(1M), \fBypfiles\fR(4), \fBattributes\fR(5)
+\fBypserv\fR(8), \fBypxfr\fR(8), \fBypfiles\fR(5), \fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
@@ -115,7 +115,7 @@ permission.
 .sp
 .LP
 In the current implementation (version 2 \fBNIS\fR protocol), the transfer
-agent is \fBypxfr\fR(1M), which is started by the \fBypserv\fR program. If
+agent is \fBypxfr\fR(8), which is started by the \fBypserv\fR program. If
 \fByppush\fR detects that it is speaking to a version 1 \fBNIS\fR protocol
 server, it uses the older protocol, sending a version 1 \fBYPPROC_GET\fR
 request and issues a message to that effect. Unfortunately, there is no way of
diff --git a/usr/src/man/man8/ypserv.8 b/usr/src/man/man8/ypserv.8
index 4dd91c3630..ff26894850 100644
--- a/usr/src/man/man8/ypserv.8
+++ b/usr/src/man/man8/ypserv.8
@@ -20,23 +20,23 @@ ypserv, ypxfrd \- NIS server and binder processes
 The Network Information Service (\fBNIS\fR) provides a simple network lookup
 service consisting of databases and processes. The databases are \fBndbm\fR
 files in a directory tree rooted at \fB/var/yp\fR. See \fBndbm\fR(3C). These
-files are described in \fBypfiles\fR(4). The processes are
+files are described in \fBypfiles\fR(5). The processes are
 \fB/usr/lib/netsvc/yp/ypserv\fR, the \fBNIS\fR database lookup server, and
 \fB/usr/lib/netsvc/yp/ypbind\fR, the \fBNIS\fR binder. The programmatic
 interface to the \fBNIS\fR service is described in \fBypclnt\fR(3NSL).
-Administrative tools are described in \fByppoll\fR(1M), \fByppush\fR(1M),
-\fBypset\fR(1M), \fBypxfr\fR(1M), and \fBypwhich\fR(1). Tools to see the
+Administrative tools are described in \fByppoll\fR(8), \fByppush\fR(8),
+\fBypset\fR(8), \fBypxfr\fR(8), and \fBypwhich\fR(1). Tools to see the
 contents of \fBNIS\fR maps are described in \fBypcat\fR(1), and
 \fBypmatch\fR(1). Database generation and maintenance tools are described in
-\fBypinit\fR(1M), \fBypmake\fR(1M), and \fBmakedbm\fR(1M).
+\fBypinit\fR(8), \fBypmake\fR(8), and \fBmakedbm\fR(8).
 .sp
 .LP
 The \fBypserv\fR utility is a daemon process typically activated at system
 startup from \fBsvc:/network/nis/server:default\fR. Alternatively, you can, as
-the root user, start \fBNIS\fR services using \fBypstart\fR(1M) from the
+the root user, start \fBNIS\fR services using \fBypstart\fR(8) from the
 command-line. \fBypserv\fR runs only on \fBNIS\fR server machines with a
 complete \fBNIS\fR database. You can halt all \fBNIS\fR services using the
-\fBypstop\fR(1M) command.
+\fBypstop\fR(8) command.
 .sp
 .LP
 The \fBypxfrd\fR utility transfers entire \fBNIS\fR maps in an efficient
@@ -107,7 +107,7 @@ Two other functions supply information about the map, rather than map entries:
 \fByp_order\fR(3NSL), and \fByp_master\fR(3NSL). In fact, both order number and
 master name exist in the map as key-value pairs, but the server will not return
 either through the normal lookup functions. If you examine the map with
-\fBmakedbm\fR(1M), however, they are visible. Other functions are used within
+\fBmakedbm\fR(8), however, they are visible. Other functions are used within
 the \fBNIS\fR service subsystem itself, and are not of general interest to
 \fBNIS\fR clients. These functions include \fBdo_you_serve_this_domain?\fR,
 \fBtransfer_map\fR, and \fBreinitialize_internal_state\fR.
@@ -121,12 +121,12 @@ server starts in N2L mode. If the file is not present it starts in
 .LP
 In N2L mode, a new set of map files, with an \fBLDAP_\fR prefix, are generated,
 based on the contents of the LDAP DIT. The old map files, NIS source files and
-\fBypmake\fR(1M) are not used.
+\fBypmake\fR(8) are not used.
 .sp
 .LP
-It is possible that \fBypmake\fR(1M) can be accidentally run in N2L mode. If
+It is possible that \fBypmake\fR(8) can be accidentally run in N2L mode. If
 the occurs, the old style map files are overwritten. That the map files are
-overwritten is harmless. However, any resulting \fByppush\fR(1M) operation will
+overwritten is harmless. However, any resulting \fByppush\fR(8) operation will
 push information based on the DIT rather than the source files. The user may
 not expect information based on the DIT. \fBypserv\fR keeps track of the last
 modification date of the old style map files. If the map files have been
@@ -173,7 +173,7 @@ The \fBNIS\fR service should go to the \fBDNS\fR for more host information.
 This requires the existence of a correct \fB/etc/resolv.conf\fR file pointing
 to a \fBDNS\fR server. This option turns on \fBDNS\fR forwarding regardless of
 whether or not the \fBYP_INTERDOMAIN\fR flag is set in the \fBhosts\fR maps.
-See \fBmakedbm\fR(1M). In the absence of an \fB/etc/resolv.conf\fR file,
+See \fBmakedbm\fR(8). In the absence of an \fB/etc/resolv.conf\fR file,
 \fBypserv\fR complains, but ignores the \fB-d\fR option.
 .RE
 
@@ -251,7 +251,7 @@ When run with the \fB-i\fR, \fB-r\fR, \fB-I\fR, \fB-ir\fR or \fB-Ir\fR options,
 the \fBypserv\fR command runs in the foreground and exits once map
 initialization has been completed. Once the \fBypserv\fR command exits, the
 user knows the maps are ready and can restart \fBypserv\fR and the other
-\fByp\fR daemons by running \fBypstart\fR(1M).
+\fByp\fR daemons by running \fBypstart\fR(8).
 .sp
 .LP
 If there is a requirement to initialize the \fBDIT\fR from the NIS source
@@ -297,12 +297,12 @@ Lists the \fBNIS\fR server hosts that \fBypbind\fR can bind to.
 
 .SH SEE ALSO
 \fBsvcs\fR(1), \fBypcat\fR(1), \fBypmatch\fR(1), \fBypwhich\fR(1),
-\fBdomainname\fR(1M), \fBmakedbm\fR(1M), \fBsvcadm\fR(1M), \fBypbind\fR(1M),
-\fBypinit\fR(1M), \fBypmake\fR(1M), \fByppoll\fR(1M), \fByppush\fR(1M),
-\fBypset\fR(1M), \fBypstart\fR(1M), \fBypstop\fR(1M), \fBypxfr\fR(1M),
+\fBdomainname\fR(8), \fBmakedbm\fR(8), \fBsvcadm\fR(8), \fBypbind\fR(8),
+\fBypinit\fR(8), \fBypmake\fR(8), \fByppoll\fR(8), \fByppush\fR(8),
+\fBypset\fR(8), \fBypstart\fR(8), \fBypstop\fR(8), \fBypxfr\fR(8),
 \fBndbm\fR(3C), \fBypclnt\fR(3NSL), \fBlibnsl\fR(3LIB),
-\fBNISLDAPmapping\fR(4), \fBsecurenets\fR(4), \fBypfiles\fR(4),
-\fBypserv\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
+\fBNISLDAPmapping\fR(5), \fBsecurenets\fR(5), \fBypfiles\fR(5),
+\fBypserv\fR(5), \fBattributes\fR(7), \fBsmf\fR(7)
 
 .SH NOTES
 \fBypserv\fR supports multiple domains. The \fBypserv\fR process determines the
@@ -324,7 +324,7 @@ the 1024 byte limitations described in the USAGE and NOTES sections of the
 .sp
 .LP
 The NIS server service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -336,5 +336,5 @@ svc:/network/nis/server:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/ypset.8 b/usr/src/man/man8/ypset.8
index cb32f576e6..9e42d73ea0 100644
--- a/usr/src/man/man8/ypset.8
+++ b/usr/src/man/man8/ypset.8
@@ -17,7 +17,7 @@ ypset \- point ypbind at a particular server
 .sp
 .LP
 In order to run \fBypset\fR, \fBypbind\fR must be initiated with the
-\fB\(miypset\fR or \fB\(miypsetme\fR options. See \fBypbind\fR(1M). \fBypset\fR
+\fB\(miypset\fR or \fB\(miypsetme\fR options. See \fBypbind\fR(8). \fBypset\fR
 tells \fBypbind\fR to get NIS services for the specified \fIypdomain\fR from
 the \fBypserv\fR process running on \fIserver\fR. If \fIserver\fR is down, or
 is not running \fBypserv\fR, this might not be discovered until an NIS client
@@ -65,7 +65,7 @@ call, \fByp_all()\fR, uses connection-oriented transport and derives the NIS
 server's address  based on the connectionless address supplied by \fBypset\fR.
 .sp
 .LP
-Refer to \fBypfiles\fR(4) for an overview of the NIS name service.
+Refer to \fBypfiles\fR(5) for an overview of the NIS name service.
 .SH OPTIONS
 .sp
 .ne 2
@@ -89,4 +89,4 @@ Set \fBypbind\fR's binding on \fIhost\fR, instead of locally. Specify
 .SH SEE ALSO
 .sp
 .LP
-\fBypwhich\fR(1), \fBypfiles\fR(4), \fBattributes\fR(5)
+\fBypwhich\fR(1), \fBypfiles\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/ypstart.8 b/usr/src/man/man8/ypstart.8
index 47fcd63863..231dcec930 100644
--- a/usr/src/man/man8/ypstart.8
+++ b/usr/src/man/man8/ypstart.8
@@ -22,7 +22,7 @@ ypstart, ypstop \- Start and stop NIS services
 .sp
 .LP
 The  \fBypstart\fR command is used to start the Network Information Service
-(NIS). After the host has been configured using the \fBypinit\fR(1M) command,
+(NIS). After the host has been configured using the \fBypinit\fR(8) command,
 \fBypstart\fR automatically determines the \fBNIS\fR status of the machine and
 starts the appropriate daemons.
 .sp
@@ -32,7 +32,7 @@ The \fBypstop\fR command is used to stop the  Network Information Service
 .SH SEE ALSO
 .sp
 .LP
-\fBypinit\fR(1M), \fBattributes\fR(5)
+\fBypinit\fR(8), \fBattributes\fR(7)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man8/ypxfr.8 b/usr/src/man/man8/ypxfr.8
index 1209e204c4..754d1cf684 100644
--- a/usr/src/man/man8/ypxfr.8
+++ b/usr/src/man/man8/ypxfr.8
@@ -47,7 +47,7 @@ several maps in a shell script. Examples (mnemonically named) are in
 \fBypxfr_1perhour\fR.
 .sp
 .LP
-Refer to \fBypfiles\fR(4) for an overview of the NIS name service.
+Refer to \fBypfiles\fR(5) for an overview of the NIS name service.
 .SH OPTIONS
 .sp
 .ne 2
@@ -131,7 +131,7 @@ Log file
 .ad
 .sp .6
 .RS 4n
-Script to run one transfer per day, for use with \fBcron\fR(1M)
+Script to run one transfer per day, for use with \fBcron\fR(8)
 .RE
 
 .sp
@@ -141,7 +141,7 @@ Script to run one transfer per day, for use with \fBcron\fR(1M)
 .ad
 .sp .6
 .RS 4n
-Script to run two transfer per day, for use with \fBcron\fR(1M)
+Script to run two transfer per day, for use with \fBcron\fR(8)
 .RE
 
 .sp
@@ -180,5 +180,5 @@ Privileged user's \fBcrontab\fR file
 .SH SEE ALSO
 .sp
 .LP
-\fBcrontab\fR(1), \fBcron\fR(1M), \fBypinit\fR(1M), \fByppush\fR(1M),
-\fBypserv\fR(1M), \fBypfiles\fR(4), \fBattributes\fR(5)
+\fBcrontab\fR(1), \fBcron\fR(8), \fBypinit\fR(8), \fByppush\fR(8),
+\fBypserv\fR(8), \fBypfiles\fR(5), \fBattributes\fR(7)
diff --git a/usr/src/man/man8/zdump.8 b/usr/src/man/man8/zdump.8
index b23014240f..dc811ecdd1 100644
--- a/usr/src/man/man8/zdump.8
+++ b/usr/src/man/man8/zdump.8
@@ -100,7 +100,7 @@ Standard zone information directory
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -116,5 +116,5 @@ Interface Stability	Stable
 .SH SEE ALSO
 .sp
 .LP
-\fBzic\fR(1M), \fBctime\fR(3C), \fBmktime\fR(3C), \fBattributes\fR(5),
-\fBenviron\fR(5)
+\fBzic\fR(8), \fBctime\fR(3C), \fBmktime\fR(3C), \fBattributes\fR(7),
+\fBenviron\fR(7)
diff --git a/usr/src/man/man8/zic.8 b/usr/src/man/man8/zic.8
index d13b6120dc..427a557aaa 100644
--- a/usr/src/man/man8/zic.8
+++ b/usr/src/man/man8/zic.8
@@ -548,7 +548,7 @@ Directory containing source files
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -567,8 +567,8 @@ Interface Stability	Committed*
 .SH SEE ALSO
 .sp
 .LP
-\fBtime\fR(1), \fBzdump\fR(1M), \fBctime\fR(3C), \fBmktime\fR(3C),
-\fBattributes\fR(5)
+\fBtime\fR(1), \fBzdump\fR(8), \fBctime\fR(3C), \fBmktime\fR(3C),
+\fBattributes\fR(7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man8/zoneadm.8 b/usr/src/man/man8/zoneadm.8
index cd11e97090..14f2745db2 100644
--- a/usr/src/man/man8/zoneadm.8
+++ b/usr/src/man/man8/zoneadm.8
@@ -108,10 +108,10 @@ and can also determine whether the host is capable of supporting the zone. The
 path can be "\fB-\fR", to read the input from standard input.
 .sp
 The zone's brand may include additional options that govern how the zone will
-be attached. See \fBbrands\fR(5) for specific brand information.
+be attached. See \fBbrands\fR(7) for specific brand information.
 .sp
 The zone being attached must first be configured using the \fBzonecfg\fR (see
-\fBzonecfg\fR(1M)) command. This does not apply when running "\fBattach\fR
+\fBzonecfg\fR(8)) command. This does not apply when running "\fBattach\fR
 \fB-n\fR".
 .sp
 Use the following command to attach a zone:
@@ -144,7 +144,7 @@ The following \fIboot_options\fR are supported:
 .RS 4n
 Select an alternative executable to be the primordial Process. \fIaltinit\fR is
 a valid path to an executable. The default primordial process is
-\fBinit\fR(1M).
+\fBinit\fR(8).
 .RE
 
 .sp
@@ -158,9 +158,9 @@ The \fIsmf_options\fR include two categories of options to control booting
 behavior of the service management facility: recovery options and messages
 options.
 .sp
-Message options determine the type and amount of messages that \fBsmf\fR(5)
+Message options determine the type and amount of messages that \fBsmf\fR(7)
 displays during boot. Service options determine the services which are used to
-boot the system. See \fBkernel\fR(1M) for a listing of the \fB-m\fR suboptions.
+boot the system. See \fBkernel\fR(8) for a listing of the \fB-m\fR suboptions.
 .RE
 
 .sp
@@ -171,8 +171,8 @@ boot the system. See \fBkernel\fR(1M) for a listing of the \fB-m\fR suboptions.
 .sp .6
 .RS 4n
 Boots only to milestone \fBsvc:/milestone/single-user:default\fR. This
-milestone is equivalent to init level \fBs\fR. See \fBsvc.startd\fR(1M) and
-\fBinit\fR(1M).
+milestone is equivalent to init level \fBs\fR. See \fBsvc.startd\fR(8) and
+\fBinit\fR(8).
 .RE
 
 .RE
@@ -288,7 +288,7 @@ Do not create a \fBZFS\fR file system.
 .RE
 
 The zone's brand may include additional options that govern how the software
-will be installed in the zone. See \fBbrands\fR(5) for specific brand
+will be installed in the zone. See \fBbrands\fR(7) for specific brand
 information.
 .RE
 
@@ -639,7 +639,7 @@ Invalid usage.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -655,14 +655,14 @@ Interface Stability	Committed
 .SH SEE ALSO
 .LP
 \fBread\fR(1), \fBsvcs\fR(1), \fBzlogin\fR(1), \fBzonename\fR(1),
-\fBinit\fR(1M), \fBkernel\fR(1M), \fBsvcadm\fR(1M), \fBsvc.startd\fR(1M),
-\fBsvc.startd\fR(1M), \fBzonecfg\fR(1M), \fBlibuuid\fR(3LIB),
-\fBattributes\fR(5), \fBbrands\fR(5), \fBnative\fR(5), \fBsmf\fR(5),
-\fBzones\fR(5)
+\fBinit\fR(8), \fBkernel\fR(8), \fBsvcadm\fR(8), \fBsvc.startd\fR(8),
+\fBsvc.startd\fR(8), \fBzonecfg\fR(8), \fBlibuuid\fR(3LIB),
+\fBattributes\fR(7), \fBbrands\fR(7), \fBnative\fR(7), \fBsmf\fR(7),
+\fBzones\fR(7)
 .SH NOTES
 .LP
-The \fBzones\fR(5) service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+The \fBzones\fR(7) service is managed by the service management facility,
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -674,5 +674,5 @@ svc:/system/zones:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/zoneadmd.8 b/usr/src/man/man8/zoneadmd.8
index a589febd1a..c4d9fd8720 100644
--- a/usr/src/man/man8/zoneadmd.8
+++ b/usr/src/man/man8/zoneadmd.8
@@ -29,7 +29,7 @@ private interface.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -45,13 +45,13 @@ Interface Stability	Private
 .SH SEE ALSO
 .sp
 .LP
-\fBsvcs\fR(1), \fBzlogin\fR(1), \fBsvcadm\fR(1M), \fBzoneadm\fR(1M),
-\fBattributes\fR(5), \fBsmf\fR(5), \fBzones\fR(5)
+\fBsvcs\fR(1), \fBzlogin\fR(1), \fBsvcadm\fR(8), \fBzoneadm\fR(8),
+\fBattributes\fR(7), \fBsmf\fR(7), \fBzones\fR(7)
 .SH NOTES
 .sp
 .LP
-The \fBzones\fR(5) service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
+The \fBzones\fR(7) service is managed by the service management facility,
+\fBsmf\fR(7), under the service identifier:
 .sp
 .in +2
 .nf
@@ -63,5 +63,5 @@ svc:/system/zones:default
 .sp
 .LP
 Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
+requesting restart, can be performed using \fBsvcadm\fR(8). The service's
 status can be queried using the \fBsvcs\fR(1) command.
diff --git a/usr/src/man/man8/zonecfg.8 b/usr/src/man/man8/zonecfg.8
index b0d4fa989d..9ad64b65a0 100644
--- a/usr/src/man/man8/zonecfg.8
+++ b/usr/src/man/man8/zonecfg.8
@@ -59,7 +59,7 @@ global zone.
 .sp
 .LP
 In the following text, "rctl" is used as an abbreviation for "resource
-control". See \fBresource_controls\fR(5).
+control". See \fBresource_controls\fR(7).
 .sp
 .LP
 Every zone is configured with an associated brand. The brand determines the
@@ -68,7 +68,7 @@ the zone when it is installed, boots, or is shutdown. Once a zone has been
 installed the brand cannot be changed. The default brand is determined by the
 installed distribution in the global zone. Some brands do not support all of
 the \fBzonecfg\fR properties and resources. See the brand-specific man page for
-more details on each brand. For an overview of brands, see the \fBbrands\fR(5)
+more details on each brand. For an overview of brands, see the \fBbrands\fR(7)
 man page.
 .SS "Resources"
 The following resource types are supported:
@@ -504,7 +504,7 @@ list syntax. That is, "foo" is equivalent to "[foo]". A list can be empty
 .sp
 .LP
 In interpreting property values, \fBzonecfg\fR accepts regular expressions as
-specified in \fBfnmatch\fR(5). See \fBEXAMPLES\fR.
+specified in \fBfnmatch\fR(7). See \fBEXAMPLES\fR.
 .sp
 .LP
 The property types are described as follows:
@@ -548,7 +548,7 @@ regardless of the setting of this property. You enable the zones service with a
 .sp
 
 Replace \fBenable\fR with \fBdisable\fR to disable the zones service. See
-\fBsvcadm\fR(1M).
+\fBsvcadm\fR(8).
 .RE
 
 .sp
@@ -560,7 +560,7 @@ Replace \fBenable\fR with \fBdisable\fR to disable the zones service. See
 .RS 4n
 Arguments (options) to be passed to the zone bootup, unless options are
 supplied to the "\fBzoneadm boot\fR" command, in which case those take
-precedence. The valid arguments are described in \fBzoneadm\fR(1M).
+precedence. The valid arguments are described in \fBzoneadm\fR(8).
 .RE
 
 .sp
@@ -588,23 +588,23 @@ preceding their names with a dash (-) or an exclamation point (!). The special
 privilege string "zone" is not supported in this context. If the special string
 "default" occurs as the first token in the property, it expands into a safe set
 of privileges that preserve the resource and security isolation described in
-\fBzones\fR(5). A missing or empty property is equivalent to this same set of
+\fBzones\fR(7). A missing or empty property is equivalent to this same set of
 safe privileges.
 .sp
 The system administrator must take extreme care when configuring privileges for
 a zone. Some privileges cannot be excluded through this mechanism as they are
 required in order to boot a zone. In addition, there are certain privileges
 which cannot be given to a zone as doing so would allow processes inside a zone
-to unduly affect processes in other zones. \fBzoneadm\fR(1M) indicates when an
+to unduly affect processes in other zones. \fBzoneadm\fR(8) indicates when an
 invalid privilege has been added or removed from a zone's privilege set when an
 attempt is made to either "boot" or "ready" the zone.
 .sp
-See \fBprivileges\fR(5) for a description of privileges. The command "\fBppriv
+See \fBprivileges\fR(7) for a description of privileges. The command "\fBppriv
 -l\fR" (see \fBppriv\fR(1)) produces a list of all Solaris privileges. You can
 specify privileges as they are displayed by \fBppriv\fR. In
-\fBprivileges\fR(5), privileges are listed in the form
+\fBprivileges\fR(7), privileges are listed in the form
 PRIV_\fIprivilege_name\fR. For example, the privilege \fIsys_time\fR, as you
-would specify it in this property, is listed in \fBprivileges\fR(5) as
+would specify it in this property, is listed in \fBprivileges\fR(7) as
 \fBPRIV_SYS_TIME\fR.
 .RE
 
@@ -653,7 +653,7 @@ uppercase and lowercase hexadecimal digits are acceptable.
 .sp .6
 .RS 4n
 Values needed to determine how, where, and so forth to mount file systems. See
-\fBmount\fR(1M), \fBmount\fR(2), \fBfsck\fR(1M), and \fBvfstab\fR(4).
+\fBmount\fR(8), \fBmount\fR(2), \fBfsck\fR(8), and \fBvfstab\fR(5).
 .RE
 
 .sp
@@ -726,7 +726,7 @@ Device name to match.
 .sp .6
 .RS 4n
 The name and \fIpriv\fR/\fIlimit\fR/\fIaction\fR triple of a resource control.
-See \fBprctl\fR(1) and \fBrctladm\fR(1M). The preferred way to set rctl values
+See \fBprctl\fR(1) and \fBrctladm\fR(8). The preferred way to set rctl values
 is to use the global property name associated with a specific rctl.
 .RE
 
@@ -750,7 +750,7 @@ that type. \fBuint\fR means unsigned, that is, a non-negative integer.
 .sp .6
 .RS 4n
 The name of a \fBZFS\fR dataset to be accessed from within the zone. See
-\fBzfs\fR(1M).
+\fBzfs\fR(8).
 .RE
 
 .sp
@@ -879,11 +879,11 @@ Under any other conditions, the system default scheduling class is used.
 .sp .6
 .RS 4n
 The number of CPUs that should be assigned for this zone's exclusive use. The
-zone will create a pool and processor set when it boots. See \fBpooladm\fR(1M)
-and \fBpoolcfg\fR(1M) for more information on resource pools. The \fBncpu\fR
+zone will create a pool and processor set when it boots. See \fBpooladm\fR(8)
+and \fBpoolcfg\fR(8) for more information on resource pools. The \fBncpu\fR
 property can specify a single value or a range (for example, 1-4) of
 processors. The \fBimportance\fR property is optional; if set, it will specify
-the \fBpset.importance\fR value for use by \fBpoold\fR(1M). If this resource is
+the \fBpset.importance\fR value for use by \fBpoold\fR(8). If this resource is
 used, there must be enough free processors to allocate to this zone when it
 boots or the zone will not boot. The processors assigned to this zone will not
 be available for the use of the global zone or other zones. This resource is
@@ -903,7 +903,7 @@ be applied to the value for each of these numbers (for example, 1M is one
 megabyte). Each of these properties is optional but at least one property must
 be set when adding this resource. Only a single instance of this resource can
 be added to the zone. The \fBphysical\fR property sets the \fBmax-rss\fR for
-this zone. This will be enforced by \fBrcapd\fR(1M) running in the global zone.
+this zone. This will be enforced by \fBrcapd\fR(8) running in the global zone.
 The \fBswap\fR property is the preferred way to set the \fBzone.max-swap\fR
 rctl. The \fBlocked\fR property is the preferred way to set the
 \fBzone.max-locked-memory\fR rctl.
@@ -926,7 +926,7 @@ have their own caps, the minimum value takes precedence.
 .sp
 The \fBcapped-cpu\fR property is an alias for \fBzone.cpu-cap\fR resource
 control and is related to the \fBzone.cpu-cap\fR resource control. See
-\fBresource_controls\fR(5).
+\fBresource_controls\fR(7).
 .RE
 
 .sp
@@ -966,7 +966,7 @@ a new zone using this zone as a clone source.
 .sp .6
 .RS 4n
 A comma-separated list of additional filesystems that may be mounted within
-the zone; for example "ufs,pcfs". By default, only hsfs(7fs) and network
+the zone; for example "ufs,pcfs". By default, only hsfs(4FS) and network
 filesystems can be mounted. If the first entry in the list is "-" then
 that disables all of the default filesystems. If any filesystems are listed
 after "-" then only those filesystems can be mounted.
@@ -1061,11 +1061,11 @@ kernel statistics for all active CPU caps:
 
 .sp
 .LP
-A \fBkstat\fR(1M) command running in a zone displays only CPU caps relevant for
+A \fBkstat\fR(8) command running in a zone displays only CPU caps relevant for
 that zone and for projects in that zone. See \fBEXAMPLES\fR.
 .sp
 .LP
-The following are cap-related arguments for use with \fBkstat\fR(1M):
+The following are cap-related arguments for use with \fBkstat\fR(8):
 .sp
 .ne 2
 .na
@@ -1099,7 +1099,7 @@ project or zone identifier.
 
 .sp
 .LP
-The following fields are displayed in response to a \fBkstat\fR(1M) command
+The following fields are displayed in response to a \fBkstat\fR(8) command
 requesting statistics for all CPU caps.
 .sp
 .ne 2
@@ -1329,7 +1329,7 @@ Use the \fB-a\fR \fIpath\fR option to facilitate configuring a detached zone on
 a new host. The \fIpath\fR parameter is the zonepath location of a detached
 zone that has been moved on to this new host. Once the detached zone is
 configured, it should be installed using the "\fBzoneadm attach\fR" command
-(see \fBzoneadm\fR(1M)). All validation of the new zone happens during the
+(see \fBzoneadm\fR(8)). All validation of the new zone happens during the
 \fBattach\fR process, not during zone configuration.
 .sp
 Use the \fB-b\fR option to create a blank configuration. Without arguments,
@@ -1587,7 +1587,7 @@ other zones configured on the system.
 .sp
 .LP
 The IP addresses and routing should be configured inside the new zone using
-the normal networking administration tools such as \fBipadm\fR(1M).
+the normal networking administration tools such as \fBipadm\fR(8).
 
 .sp
 .in +2
@@ -1628,8 +1628,8 @@ zonecfg:myzone> \fBexit\fR
 
 .sp
 .LP
-For more information about resource pools, see \fBpooladm\fR(1M) and
-\fBpoolcfg\fR(1M).
+For more information about resource pools, see \fBpooladm\fR(8) and
+\fBpoolcfg\fR(8).
 
 .LP
 \fBExample 5 \fRChanging the Name of a Zone
@@ -1933,7 +1933,7 @@ Invalid usage.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -1947,13 +1947,13 @@ Interface Stability	Volatile
 .TE
 
 .SH SEE ALSO
-\fBppriv\fR(1), \fBprctl\fR(1), \fBzlogin\fR(1), \fBkstat\fR(1M),
-\fBmount\fR(1M), \fBpooladm\fR(1M), \fBpoolcfg\fR(1M), \fBpoold\fR(1M),
-\fBrcapd\fR(1M), \fBrctladm\fR(1M), \fBsvcadm\fR(1M), \fBipadm\fR(1M),
-\fBzfs\fR(1M), \fBzoneadm\fR(1M), \fBpriv_str_to_set\fR(3C),
-\fBkstat\fR(3KSTAT), \fBvfstab\fR(4), \fBattributes\fR(5), \fBbrands\fR(5),
-\fBfnmatch\fR(5), \fBlx\fR(5), \fBprivileges\fR(5), \fBresource_controls\fR(5),
-\fBsecurity-flags\fR(5), \fBzones\fR(5)
+\fBppriv\fR(1), \fBprctl\fR(1), \fBzlogin\fR(1), \fBkstat\fR(8),
+\fBmount\fR(8), \fBpooladm\fR(8), \fBpoolcfg\fR(8), \fBpoold\fR(8),
+\fBrcapd\fR(8), \fBrctladm\fR(8), \fBsvcadm\fR(8), \fBipadm\fR(8),
+\fBzfs\fR(8), \fBzoneadm\fR(8), \fBpriv_str_to_set\fR(3C),
+\fBkstat\fR(3KSTAT), \fBvfstab\fR(5), \fBattributes\fR(7), \fBbrands\fR(7),
+\fBfnmatch\fR(7), \fBlx\fR(7), \fBprivileges\fR(7), \fBresource_controls\fR(7),
+\fBsecurity-flags\fR(7), \fBzones\fR(7)
 .sp
 .LP
 \fISystem Administration Guide: Solaris Containers-Resource Management, and
diff --git a/usr/src/man/man8/zstreamdump.8 b/usr/src/man/man8/zstreamdump.8
index cc1e7a67ea..90dcc3c820 100644
--- a/usr/src/man/man8/zstreamdump.8
+++ b/usr/src/man/man8/zstreamdump.8
@@ -17,7 +17,7 @@ zstreamdump \- filter data in zfs send stream
 .LP
 The \fBzstreamdump\fR utility reads from the output of the \fBzfs send\fR
 command, then displays headers and some statistics from that output.  See
-\fBzfs\fR(1M).
+\fBzfs\fR(8).
 .SH OPTIONS
 .sp
 .LP
@@ -45,7 +45,7 @@ Verbose. Dump all headers, not only begin and end headers.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -61,4 +61,4 @@ Interface Stability	Uncommitted
 .SH SEE ALSO
 .sp
 .LP
-\fBzfs\fR(1M), \fBattributes\fR(5)
+\fBzfs\fR(8), \fBattributes\fR(7)