OS-8361 IPD 4 (man page renumbering) tracking issue

Reviewed by: Brian Bennett <brian.bennett@joyent.com>
Approved by: Brian Bennett <brian.bennett@joyent.com>

183 files changed, 332 insertions, 350 deletions

diff --git a/usr/src/uts/common/Makefile.files b/usr/src/uts/common/Makefile.files
index 9fd7078394..3aacd2dde2 100644
--- a/usr/src/uts/common/Makefile.files
+++ b/usr/src/uts/common/Makefile.files
@@ -2335,13 +2335,13 @@ BNX_OBJS += \
 	bnx_lm_send.o
 
 #
-# mlxcx(7D)
+# mlxcx(4D)
 #
 MLXCX_OBJS +=	mlxcx.o mlxcx_dma.o mlxcx_cmd.o mlxcx_intr.o mlxcx_gld.o \
 		mlxcx_ring.o mlxcx_sensor.o
 
 #
-# ena(7D)
+# ena(4D)
 #
 ENA_OBJS +=	ena.o ena_admin.o ena_dma.o ena_gld.o ena_hw.o ena_intr.o \
 		ena_stats.o ena_tx.o ena_rx.o
diff --git a/usr/src/uts/common/c2/audit_start.c b/usr/src/uts/common/c2/audit_start.c
index 49713c6f77..ef0c74a049 100644
--- a/usr/src/uts/common/c2/audit_start.c
+++ b/usr/src/uts/common/c2/audit_start.c
@@ -90,7 +90,7 @@ audit_init_module()
 	/*
 	 * setup environment for asynchronous auditing. We can't use
 	 * audit_async_start() here since it assumes the audit system
-	 * has been started via auditd(1m). auditd sets the variable,
+	 * has been started via auditd(8). auditd sets the variable,
 	 * auk_auditstate, to indicate audit record generation should
 	 * commence. Here we want to always generate an audit record.
 	 */
diff --git a/usr/src/uts/common/conf/param.c b/usr/src/uts/common/conf/param.c
index 4660a280e8..942a1fe619 100644
--- a/usr/src/uts/common/conf/param.c
+++ b/usr/src/uts/common/conf/param.c
@@ -716,7 +716,7 @@ param_check(void)
 #if defined(__x86)
 	if (physmem != original_physmem) {
 		cmn_err(CE_NOTE, "physmem cannot be modified to 0x%lx"
-		    " via /etc/system. Please use eeprom(1M) instead.",
+		    " via /etc/system. Please use eeprom(8) instead.",
 		    physmem);
 		physmem = original_physmem;
 	}
diff --git a/usr/src/uts/common/contract/process.c b/usr/src/uts/common/contract/process.c
index d5cf629276..32e5707cb2 100644
--- a/usr/src/uts/common/contract/process.c
+++ b/usr/src/uts/common/contract/process.c
@@ -68,7 +68,7 @@
  * special casing itself.
  *
  * A composite outcome of these two concepts is that we can now create
- * a tree of process contracts, rooted at init(1M), which represent
+ * a tree of process contracts, rooted at init(8), which represent
  * services and subservices that are reliably observed and can be
  * restarted when fatal errors occur.  The service management framework
  * (SMF) realizes this structure.
@@ -787,7 +787,7 @@ contract_process_init(void)
 	    &contract_process_ops, contract_process_default);
 
 	/*
-	 * Create a template for use with init(1M) and other
+	 * Create a template for use with init(8) and other
 	 * kernel-started processes.
 	 */
 	sys_process_tmpl = kmem_alloc(sizeof (ctmpl_process_t), KM_SLEEP);
diff --git a/usr/src/uts/common/cpr/cpr_misc.c b/usr/src/uts/common/cpr/cpr_misc.c
index ee7cd5ddf4..0510c15e81 100644
--- a/usr/src/uts/common/cpr/cpr_misc.c
+++ b/usr/src/uts/common/cpr/cpr_misc.c
@@ -201,7 +201,7 @@ cpr_get_config(void)
 		cprconfig_loaded = 1;
 	else {
 		cpr_err(CE_CONT, "invalid config file \"%s\", "
-		    "rerun pmconfig(1M)\n", config_path);
+		    "rerun pmconfig(8)\n", config_path);
 		err = EINVAL;
 	}
 
@@ -255,7 +255,7 @@ cpr_verify_statefile_path(void)
 	    "cpr statefile device %s.\n";
 	static const char path_chg_fmt[] = "Device path for statefile "
 	    "has changed from %s to %s.\t%s\n";
-	static const char rerun[] = "Please rerun pmconfig(1m).";
+	static const char rerun[] = "Please rerun pmconfig(8).";
 	struct vfs *vfsp = NULL, *vfsp_save = rootvfs;
 	ufsvfs_t *ufsvfsp = (ufsvfs_t *)rootvfs->vfs_data;
 	ufsvfs_t *ufsvfsp_save = ufsvfsp;
@@ -406,7 +406,7 @@ cpr_verify_statefile_path(void)
 	if (ufsvfsp_save->vfs_devvp->v_rdev != vp->v_rdev) {
 		cpr_err(CE_CONT, "Filesystem containing "
 		    "statefile no longer mounted on device %s. "
-		    "See power.conf(4).", cf->cf_devfs);
+		    "See power.conf(5).", cf->cf_devfs);
 		VN_RELE(vp);
 		return (ENXIO);
 	}
diff --git a/usr/src/uts/common/cpr/cpr_mod.c b/usr/src/uts/common/cpr/cpr_mod.c
index 623ed0dba0..9bf72dcbcf 100644
--- a/usr/src/uts/common/cpr/cpr_mod.c
+++ b/usr/src/uts/common/cpr/cpr_mod.c
@@ -131,7 +131,7 @@ cpr(int fcn, void *mdep)
 	static const char noswapstr[] = "reusable statefile requires "
 	    "that no swap area be configured.\n";
 	static const char blockstr[] = "reusable statefile must be "
-	    "a block device.  See power.conf(4) and pmconfig(1M).\n";
+	    "a block device.  See power.conf(5) and pmconfig(8).\n";
 	static const char normalfmt[] = "cannot run normal "
 	    "checkpoint/resume when in reusable statefile mode. "
 	    "use uadmin A_FREEZE AD_REUSEFINI (uadmin %d %d) "
diff --git a/usr/src/uts/common/crypto/api/kcf_random.c b/usr/src/uts/common/crypto/api/kcf_random.c
index 2a51830e6e..80bbb64505 100644
--- a/usr/src/uts/common/crypto/api/kcf_random.c
+++ b/usr/src/uts/common/crypto/api/kcf_random.c
@@ -934,9 +934,8 @@ rnd_handler(void *arg)
 	int len = 0;
 
 	if (!rng_prov_found && rng_ok_to_log) {
-		(void) strlog(0, 0, 0, SL_NOTE,
-		    "No randomness provider enabled for "
-		    "/dev/random. Use cryptoadm(1M) to enable a provider.");
+		cmn_err(CE_WARN, "No randomness provider enabled for "
+		    "/dev/random. Use cryptoadm(8) to enable a provider.");
 		rng_ok_to_log = B_FALSE;
 	}
 
diff --git a/usr/src/uts/common/crypto/core/kcf_cryptoadm.c b/usr/src/uts/common/crypto/core/kcf_cryptoadm.c
index 19fc558088..b7da72060b 100644
--- a/usr/src/uts/common/crypto/core/kcf_cryptoadm.c
+++ b/usr/src/uts/common/crypto/core/kcf_cryptoadm.c
@@ -1122,7 +1122,7 @@ add_soft_config(char *name, uint_t count, crypto_mech_name_t *array)
 		 * This is because the default entries for Software providers
 		 * are more up-to-date than possibly stale entries in kcf.conf.
 		 * If an entry is to be deleted, the proper way to do it is
-		 * to add it to the disablelist (with cryptoadm(1M)),
+		 * to add it to the disablelist (with cryptoadm(8)),
 		 * instead of removing it from the supportedlist.
 		 */
 		if (entry->ce_mechs == NULL) { /* add new mechanisms */
diff --git a/usr/src/uts/common/crypto/core/kcf_prov_tabs.c b/usr/src/uts/common/crypto/core/kcf_prov_tabs.c
index 1f69e2dd18..6c5a1ca4bf 100644
--- a/usr/src/uts/common/crypto/core/kcf_prov_tabs.c
+++ b/usr/src/uts/common/crypto/core/kcf_prov_tabs.c
@@ -62,7 +62,7 @@
  * which triggers the removal of the prov_tab entry.
  * It also calls kcf_remove_mech_provider().
  *
- * prov_tab entries are not updated from kcf.conf or by cryptoadm(1M).
+ * prov_tab entries are not updated from kcf.conf or by cryptoadm(8).
  */
 static kcf_provider_desc_t **prov_tab = NULL;
 kmutex_t prov_tab_mutex; /* ensure exclusive access to the table */
@@ -662,7 +662,7 @@ out:
 
 /*
  * Returns an array of hardware provider descriptors. This routine
- * used by cryptoadm(1M). A REFHOLD is done on each descriptor before
+ * used by cryptoadm(8). A REFHOLD is done on each descriptor before
  * the array is returned. The entire table can be freed by calling
  * kcf_free_provider_tab().
  *
diff --git a/usr/src/uts/common/disp/disp.c b/usr/src/uts/common/disp/disp.c
index 7e933bccc4..33921eecb0 100644
--- a/usr/src/uts/common/disp/disp.c
+++ b/usr/src/uts/common/disp/disp.c
@@ -142,7 +142,7 @@ int	rechoose_interval = RECHOOSE_INTERVAL;
 hrtime_t nosteal_nsec = NOSTEAL_UNINITIALIZED;
 extern void cmp_set_nosteal_interval(void);
 
-id_t	defaultcid;	/* system "default" class; see dispadmin(1M) */
+id_t	defaultcid;	/* system "default" class; see dispadmin(8) */
 
 disp_lock_t	transition_lock;	/* lock on transitioning threads */
 disp_lock_t	stop_lock;		/* lock on stopped threads */
@@ -290,7 +290,7 @@ dispinit(void)
 
 	/*
 	 * Get the default class ID; this may be later modified via
-	 * dispadmin(1M).  This will load the class (normally TS) and that will
+	 * dispadmin(8).  This will load the class (normally TS) and that will
 	 * call disp_add(), which is why we had to drop cpu_lock first.
 	 */
 	if (getcid(defaultclass, &defaultcid) != 0) {
diff --git a/usr/src/uts/common/disp/fx_dptbl.c b/usr/src/uts/common/disp/fx_dptbl.c
index d0d5ad8096..cf7c3f5561 100644
--- a/usr/src/uts/common/disp/fx_dptbl.c
+++ b/usr/src/uts/common/disp/fx_dptbl.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/proc.h>
 #include <sys/priocntl.h>
 #include <sys/class.h>
@@ -37,7 +35,7 @@
 /*
  * The purpose of this file is to allow a user to make their own
  * fx_dptbl. The contents of this file should be included in the
- * fx_dptbl(4) man page with proper instructions for making
+ * fx_dptbl(5) man page with proper instructions for making
  * and replacing the FX_DPTBL in usr/kernel/sched.
  * It is recommended that the system calls be used to change the time
  * quantums instead of re-building the module.
diff --git a/usr/src/uts/common/disp/rt_dptbl.c b/usr/src/uts/common/disp/rt_dptbl.c
index cc88ed72fc..a5c8836518 100644
--- a/usr/src/uts/common/disp/rt_dptbl.c
+++ b/usr/src/uts/common/disp/rt_dptbl.c
@@ -39,7 +39,7 @@
 /*
  * The purpose of this file is to allow a user to make their own
  * rt_dptbl. The contents of this file should be included in the
- * rt_dptbl(4) man page with proper instructions for making
+ * rt_dptbl(5) man page with proper instructions for making
  * and replacing the RT_DPTBL.kmod in modules/sched. This was the
  * only way to provide functionality equivalent to the mkboot/cunix
  * method in SVr4 without having the utilities mkboot/cunix in
diff --git a/usr/src/uts/common/disp/ts_dptbl.c b/usr/src/uts/common/disp/ts_dptbl.c
index 4399a9bad1..09c7b7615d 100644
--- a/usr/src/uts/common/disp/ts_dptbl.c
+++ b/usr/src/uts/common/disp/ts_dptbl.c
@@ -28,8 +28,6 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989, 1990 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/proc.h>
 #include <sys/priocntl.h>
 #include <sys/class.h>
@@ -41,7 +39,7 @@
 /*
  * The purpose of this file is to allow a user to make their own
  * ts_dptbl. The contents of this file should be included in the
- * ts_dptbl(4) man page with proper instructions for making
+ * ts_dptbl(5) man page with proper instructions for making
  * and replacing the TS_DPTBL.kmod in modules/sched. This was the
  * only way to provide functionality equivalent to the mkboot/cunix
  * method in SVr4 without having the utilities mkboot/cunix in
diff --git a/usr/src/uts/common/dtrace/dcpc.c b/usr/src/uts/common/dtrace/dcpc.c
index 9da817537c..9e2b42e457 100644
--- a/usr/src/uts/common/dtrace/dcpc.c
+++ b/usr/src/uts/common/dtrace/dcpc.c
@@ -75,7 +75,7 @@
  * A consumer will fail to enable probes when resources are currently in use.
  *
  * The cpc provider contends for shared hardware resources along with other
- * consumers of the kernel CPU performance counter subsystem (e.g. cpustat(1M)).
+ * consumers of the kernel CPU performance counter subsystem (e.g. cpustat(8)).
  * Only one such consumer can use the performance counters at any one time and
  * counters are made available on a first-come, first-served basis. As with
  * cpustat, the cpc provider has priority over per-LWP libcpc usage (e.g.
diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c
index 67ce0c24fe..5ecd546d01 100644
--- a/usr/src/uts/common/dtrace/dtrace.c
+++ b/usr/src/uts/common/dtrace/dtrace.c
@@ -151,7 +151,7 @@ hrtime_t	dtrace_unregister_defunct_reap = (hrtime_t)60 * NANOSEC;
 /*
  * DTrace External Variables
  *
- * As dtrace(7D) is a kernel module, any DTrace variables are obviously
+ * As dtrace(4D) is a kernel module, any DTrace variables are obviously
  * available to DTrace consumers via the backtick (`) syntax.  One of these,
  * dtrace_zero, is made deliberately so:  it is provided as a source of
  * well-known, zero-filled memory.  While this variable is not documented,
diff --git a/usr/src/uts/common/fs/mntfs/mntvnops.c b/usr/src/uts/common/fs/mntfs/mntvnops.c
index 7374820f95..6bb3b514fb 100644
--- a/usr/src/uts/common/fs/mntfs/mntvnops.c
+++ b/usr/src/uts/common/fs/mntfs/mntvnops.c
@@ -54,7 +54,7 @@ extern void vfs_mnttab_readop(void);
  * mntfs provides two methods of reading the in-kernel mnttab, i.e. the state of
  * the mounted resources: the read-only file /etc/mnttab, and a collection of
  * ioctl() commands. Most of these interfaces are public and are described in
- * mnttab(4). Three private ioctl() commands, MNTIOC_GETMNTENT,
+ * mnttab(5). Three private ioctl() commands, MNTIOC_GETMNTENT,
  * MNTIOC_GETEXTMNTENT and MNTIOC_GETMNTANY, provide for the getmntent(3C)
  * family of functions, allowing them to support white space in mount names.
  *
@@ -1039,7 +1039,7 @@ mntgetattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr,
 			/*
 			 * The mntnode already has at least one snapshot from
 			 * which to take the size; the user will understand from
-			 * mnttab(4) that the current size of the in-kernel
+			 * mnttab(5) that the current size of the in-kernel
 			 * mnttab is irrelevant.
 			 */
 			size = rsnapp->mnts_nmnts ? rsnapp->mnts_text_size :
@@ -1186,7 +1186,7 @@ mntinactive(vnode_t *vp, cred_t *cr, caller_context_t *ct)
  * has a special meaning for /etc/mnttab: it forces mntfs to refresh the
  * snapshot at the next ioctl().
  *
- * mnttab(4) explains that "the snapshot...is taken any time a read(2) is
+ * mnttab(5) explains that "the snapshot...is taken any time a read(2) is
  * performed at offset 0". We therefore ignore the read snapshot here.
  */
 /* ARGSUSED */
diff --git a/usr/src/uts/common/fs/nfs/nfs4_idmap.c b/usr/src/uts/common/fs/nfs/nfs4_idmap.c
index c0e2492d56..0eb449b5ef 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_idmap.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_idmap.c
@@ -31,11 +31,11 @@
  * mapping code is executing on the client or server. Thus, the following
  * rules represents the latest incantation of the id mapping policies.
  *
- * 1) For the case in which the nfsmapid(1m) daemon has _never_ been
+ * 1) For the case in which the nfsmapid(8) daemon has _never_ been
  *    started, the policy is to _always_ work with stringified uid's
  *    and gid's
  *
- * 2) For the case in which the nfsmapid(1m) daemon _was_ started but
+ * 2) For the case in which the nfsmapid(8) daemon _was_ started but
  *    has either died or become unresponsive, the mapping policies are
  *    as follows:
  *
@@ -72,7 +72,7 @@
  *         `-------------------------------'---------------------------------'
  *
  * 3) Lastly, in order to leverage better cache utilization whenever
- *    communication with nfsmapid(1m) is currently hindered, cache
+ *    communication with nfsmapid(8) is currently hindered, cache
  *    entry eviction is throttled whenever nfsidmap_daemon_dh == NULL.
  *
  *
@@ -80,28 +80,28 @@
  *  ====================================================
  *
  *   GETATTR - Server-side GETATTR *id to attr string conversion policies
- *             for unresponsive/dead nfsmapid(1m) daemon
+ *             for unresponsive/dead nfsmapid(8) daemon
  *
  *	a) If the *id is *ID_NOBODY, the string "nobody" is returned
  *
- *	b) If the *id is not *ID_NOBODY _and_ the nfsmapid(1m) daemon
+ *	b) If the *id is not *ID_NOBODY _and_ the nfsmapid(8) daemon
  *	   _is_ operational, the daemon is contacted to convert the
  *	   [u/g]id into a string of type "[user/group]@domain"
  *
- *	c) If the nfsmapid(1m) daemon has died or has become unresponsive,
+ *	c) If the nfsmapid(8) daemon has died or has become unresponsive,
  *	   the server returns status == NFS4_OK for the GETATTR operation,
  *	   and returns a strigified [u/g]id to let the client map it into
  *	   the appropriate value.
  *
  *   SETATTR - Server-side SETATTR attr string to *id conversion policies
- *             for unresponsive/dead nfsmapid(1m) daemon
+ *             for unresponsive/dead nfsmapid(8) daemon
  *
  *	a) If the otw string is a stringified uid (ie. does _not_ contain
  *	   an '@' sign and is of the form "12345") then the literal uid is
  *	   decoded and it is used to perform the mapping.
  *
  *	b) If, on the other hand, the otw string _is_ of the form
- *	   "[user/group]@domain" and problems arise contacting nfsmapid(1m),
+ *	   "[user/group]@domain" and problems arise contacting nfsmapid(8),
  *	   the SETATTR operation _must_ fail w/NFS4ERR_DELAY, as the server
  *	   cannot default to *ID_NOBODY, which would allow a file to be
  *	   given away by setting it's owner or owner_group to "nobody".
@@ -329,7 +329,7 @@ nfs_idmap_str_uid(utf8string *u8s, uid_t *uid, bool_t isserver)
 	}
 
 	/*
-	 * Start-off with upcalls disabled, and once nfsmapid(1m) is up and
+	 * Start-off with upcalls disabled, and once nfsmapid(8) is up and
 	 * running, we'll leverage it's first flush to let the kernel know
 	 * when it's up and available to perform mappings. Also, on client
 	 * only, be smarter about when to issue upcalls by checking the
@@ -399,7 +399,7 @@ retry:
 			/*
 			 * string came in as stringified id. Don't cache !
 			 *
-			 * nfsmapid(1m) semantics have changed in order to
+			 * nfsmapid(8) semantics have changed in order to
 			 * support diskless clients. Thus, for stringified
 			 * id's that have passwd/group entries, we'll go
 			 * ahead and map them, returning no error.
@@ -538,7 +538,7 @@ nfs_idmap_uid_str(uid_t uid, utf8string *u8s, bool_t isserver)
 	}
 
 	/*
-	 * Start-off with upcalls disabled, and once nfsmapid(1m) is
+	 * Start-off with upcalls disabled, and once nfsmapid(8) is
 	 * up and running, we'll leverage it's first flush to let the
 	 * kernel know when it's up and available to perform mappings.
 	 * We fall back to answering with stringified uid's.
@@ -708,7 +708,7 @@ nfs_idmap_str_gid(utf8string *u8s, gid_t *gid, bool_t isserver)
 	}
 
 	/*
-	 * Start-off with upcalls disabled, and once nfsmapid(1m) is up and
+	 * Start-off with upcalls disabled, and once nfsmapid(8) is up and
 	 * running, we'll leverage it's first flush to let the kernel know
 	 * when it's up and available to perform mappings. Also, on client
 	 * only, be smarter about when to issue upcalls by checking the
@@ -779,7 +779,7 @@ retry:
 			/*
 			 * string came in as stringified id. Don't cache !
 			 *
-			 * nfsmapid(1m) semantics have changed in order to
+			 * nfsmapid(8) semantics have changed in order to
 			 * support diskless clients. Thus, for stringified
 			 * id's that have passwd/group entries, we'll go
 			 * ahead and map them, returning no error.
@@ -918,7 +918,7 @@ nfs_idmap_gid_str(gid_t gid, utf8string *u8s, bool_t isserver)
 	}
 
 	/*
-	 * Start-off with upcalls disabled, and once nfsmapid(1m) is
+	 * Start-off with upcalls disabled, and once nfsmapid(8) is
 	 * up and running, we'll leverage it's first flush to let the
 	 * kernel know when it's up and available to perform mappings.
 	 * We fall back to answering with stringified gid's.
@@ -1119,7 +1119,7 @@ nfs_idmap_args(struct nfsidmap_args *idmp)
 	nfs_idmap_cache_flush(&nig->s2g_ci);
 
 	/*
-	 * nfsmapid(1m) up and running; enable upcalls
+	 * nfsmapid(8) up and running; enable upcalls
 	 * State:
 	 *	0	Just flush caches
 	 *	1	Re-establish door knob
@@ -1309,7 +1309,7 @@ nfs_idmap_cache_s2i_lkup(idmap_cache_info_t *cip, utf8string *u8s,
 		 * Check entry for staleness first, as user's id
 		 * may have changed and may need to be remapped.
 		 * Note that we don't evict entries from the cache
-		 * if we're having trouble contacting nfsmapid(1m)
+		 * if we're having trouble contacting nfsmapid(8)
 		 */
 		if (TIMEOUT(p->id_time) && (*cip->nfsidmap_daemon_dh) != NULL) {
 			nfs_idmap_cache_rment(p);
@@ -1405,7 +1405,7 @@ nfs_idmap_cache_s2i_insert(idmap_cache_info_t *cip, uid_t id, utf8string *u8s,
 		 * Check entry for staleness first, as user's id
 		 * may have changed and may need to be remapped.
 		 * Note that we don't evict entries from the cache
-		 * if we're having trouble contacting nfsmapid(1m)
+		 * if we're having trouble contacting nfsmapid(8)
 		 */
 		if (TIMEOUT(p->id_time) && (*cip->nfsidmap_daemon_dh) != NULL) {
 			nfs_idmap_cache_rment(p);
@@ -1486,7 +1486,7 @@ nfs_idmap_cache_i2s_lkup(idmap_cache_info_t *cip, uid_t id, uint_t *hashno,
 		 * Check entry for staleness first, as user's id
 		 * may have changed and may need to be remapped.
 		 * Note that we don't evict entries from the cache
-		 * if we're having trouble contacting nfsmapid(1m)
+		 * if we're having trouble contacting nfsmapid(8)
 		 */
 		if (TIMEOUT(p->id_time) && (*cip->nfsidmap_daemon_dh) != NULL) {
 			nfs_idmap_cache_rment(p);
@@ -1570,7 +1570,7 @@ nfs_idmap_cache_i2s_insert(idmap_cache_info_t *cip, uid_t id, utf8string *u8s,
 		 * Check entry for staleness first, as user's id
 		 * may have changed and may need to be remapped.
 		 * Note that we don't evict entries from the cache
-		 * if we're having trouble contacting nfsmapid(1m)
+		 * if we're having trouble contacting nfsmapid(8)
 		 */
 		if (TIMEOUT(p->id_time) && (*cip->nfsidmap_daemon_dh) != NULL) {
 			nfs_idmap_cache_rment(p);
diff --git a/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c b/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c
index a9ee217a8b..13e5320752 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c
@@ -2093,7 +2093,7 @@ rfs4_fattr4_owner(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg,
 		 * occur. Please refer to nfs4_idmap.c for details.
 		 *
 		 * Any other errors, such as the mapping not being found by
-		 * nfsmapid(1m), and interrupted clnt_call, etc, will result
+		 * nfsmapid(8), and interrupted clnt_call, etc, will result
 		 * in NFS4ERR_BADOWNER.
 		 *
 		 * XXX need to return consistent errors, perhaps all
@@ -2206,7 +2206,7 @@ rfs4_fattr4_owner_group(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg,
 		 * cannot occur. Please refer to nfs4_idmap.c for details.
 		 *
 		 * Any other errors, such as the mapping not being found by
-		 * nfsmapid(1m), and interrupted clnt_call, etc, will result
+		 * nfsmapid(8), and interrupted clnt_call, etc, will result
 		 * in NFS4ERR_BADOWNER.
 		 *
 		 * XXX need to return consistent errors, perhaps all
diff --git a/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c b/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c
index 83c84b7892..d0950dd6f0 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c
@@ -1906,7 +1906,7 @@ nfs4_trigger_domount(vnode_t *stubvp, domount_args_t *dma, vfs_t **vfsp,
 
 	uap->flags = MS_SYSSPACE | MS_DATA;
 	/* fstype-independent mount options not covered elsewhere */
-	/* copy parent's mount(1M) "-m" flag */
+	/* copy parent's mount(8) "-m" flag */
 	if (stubvfsp->vfs_flag & VFS_NOMNTTAB)
 		uap->flags |= MS_NOMNTTAB;
 
diff --git a/usr/src/uts/common/fs/nfs/nfs_auth.c b/usr/src/uts/common/fs/nfs/nfs_auth.c
index c20a18f433..16979e1422 100644
--- a/usr/src/uts/common/fs/nfs/nfs_auth.c
+++ b/usr/src/uts/common/fs/nfs/nfs_auth.c
@@ -219,7 +219,7 @@ nfsauth_zone_init(nfs_globals_t *ng)
 	nag = kmem_zalloc(sizeof (*nag), KM_SLEEP);
 
 	/*
-	 * mountd can be restarted by smf(5).  We need to make sure
+	 * mountd can be restarted by smf(7).  We need to make sure
 	 * the updated door handle will safely make it to mountd_dh.
 	 */
 	mutex_init(&nag->mountd_lock, NULL, MUTEX_DEFAULT, NULL);
@@ -462,7 +462,7 @@ retry:
 	if (dh == NULL) {
 		/*
 		 * The rendezvous point has not been established yet!
-		 * This could mean that either mountd(1m) has not yet
+		 * This could mean that either mountd(8) has not yet
 		 * been started or that _this_ routine nuked the door
 		 * handle after receiving an EINTR for a REVOKED door.
 		 *
@@ -523,8 +523,8 @@ retry:
 				/*
 				 * The server barfed and revoked
 				 * the (existing) door on us; we
-				 * want to wait to give smf(5) a
-				 * chance to restart mountd(1m)
+				 * want to wait to give smf(7) a
+				 * chance to restart mountd(8)
 				 * and establish a new door handle.
 				 */
 				mutex_enter(&nag->mountd_lock);
diff --git a/usr/src/uts/common/fs/nfs/nfs_cmd.c b/usr/src/uts/common/fs/nfs/nfs_cmd.c
index 40775bb231..b9d23ba0d6 100644
--- a/usr/src/uts/common/fs/nfs/nfs_cmd.c
+++ b/usr/src/uts/common/fs/nfs/nfs_cmd.c
@@ -138,7 +138,7 @@ retry:
 	if (dh == NULL) {
 		/*
 		 * The rendezvous point has not been established yet !
-		 * This could mean that either mountd(1m) has not yet
+		 * This could mean that either mountd(8) has not yet
 		 * been started or that _this_ routine nuked the door
 		 * handle after receiving an EINTR for a REVOKED door.
 		 *
@@ -176,8 +176,8 @@ retry:
 				/*
 				 * The server barfed and revoked
 				 * the (existing) door on us; we
-				 * want to wait to give smf(5) a
-				 * chance to restart mountd(1m)
+				 * want to wait to give smf(7) a
+				 * chance to restart mountd(8)
 				 * and establish a new door handle.
 				 */
 				mutex_enter(&ncg->nfscmd_lock);
diff --git a/usr/src/uts/common/fs/nfs/nfs_stats.c b/usr/src/uts/common/fs/nfs/nfs_stats.c
index 97f820d756..13466a4f33 100644
--- a/usr/src/uts/common/fs/nfs/nfs_stats.c
+++ b/usr/src/uts/common/fs/nfs/nfs_stats.c
@@ -34,7 +34,7 @@
 
 /*
  * Key to retrieve per-zone data corresponding to NFS kstats consumed by
- * nfsstat(1m).
+ * nfsstat(8).
  */
 zone_key_t nfsstat_zone_key;
 
diff --git a/usr/src/uts/common/fs/pcfs/pc_node.c b/usr/src/uts/common/fs/pcfs/pc_node.c
index 84a29f4430..bf01336c6f 100644
--- a/usr/src/uts/common/fs/pcfs/pc_node.c
+++ b/usr/src/uts/common/fs/pcfs/pc_node.c
@@ -667,7 +667,7 @@ pc_mark_irrecov(struct pcfs *fsp)
 		    "an irrecoverable error was encountered.\n"
 		    "File damage is possible.  To prevent further\n"
 		    "damage, this pcfs instance will now be frozen.\n"
-		    "Use umount(1M) to release the instance.\n");
+		    "Use umount(8) to release the instance.\n");
 		(void) pc_unlockfs(fsp);
 	}
 }
diff --git a/usr/src/uts/common/fs/pcfs/pc_vfsops.c b/usr/src/uts/common/fs/pcfs/pc_vfsops.c
index 7b2205e1d7..60041a3d71 100644
--- a/usr/src/uts/common/fs/pcfs/pc_vfsops.c
+++ b/usr/src/uts/common/fs/pcfs/pc_vfsops.c
@@ -589,7 +589,7 @@ pcfs_parse_mntopts(struct pcfs *fsp)
 
 	/*
 	 * The "secsize=..." mount option is a workaround for the lack of
-	 * lofi(7d) support for DKIOCGMEDIAINFO. If PCFS wants to parse the
+	 * lofi(4D) support for DKIOCGMEDIAINFO. If PCFS wants to parse the
 	 * partition table of a disk image and it has been partitioned with
 	 * sector sizes other than 512 bytes, we'd fail on loopback'ed disk
 	 * images.
@@ -1988,7 +1988,7 @@ parseBPB(struct pcfs *fsp, uchar_t *bpb, int *valid)
 		mediasize = (len_t)totsec * (len_t)secsize;
 		/*
 		 * This is not an error because not all devices support the
-		 * dkio(7i) mediasize queries, and/or not all devices are
+		 * dkio(4I) mediasize queries, and/or not all devices are
 		 * partitioned. If we have not been able to figure out the
 		 * size of the underlaying medium, we have to trust the BPB.
 		 */
@@ -2286,7 +2286,7 @@ recheck:
  *
  * Test whether the device is:
  *	- a floppy device from a known controller type via DKIOCINFO
- *	- a real floppy using the fd(7d) driver and capable of fdio(7I) ioctls
+ *	- a real floppy using the fd(4D) driver and capable of fdio(4I) ioctls
  *	- a USB floppy drive (identified by drive geometry)
  *
  * Detecting a floppy will make PCFS metadata updates on such media synchronous,
@@ -2381,7 +2381,7 @@ pcfs_device_getinfo(struct pcfs *fsp)
 	    arg.mi.dki_media_type == DK_JAZ);
 
 	/*
-	 * if this device understands fdio(7I) requests it's
+	 * if this device understands fdio(4I) requests it's
 	 * obviously a floppy drive.
 	 */
 	if (!isfloppy &&
@@ -2390,7 +2390,7 @@ pcfs_device_getinfo(struct pcfs *fsp)
 
 	/*
 	 * some devices we like to treat as floppies, but they don't
-	 * understand fdio(7I) requests.
+	 * understand fdio(4I) requests.
 	 */
 	if (!isfloppy &&
 	    !ldi_ioctl(lh, DKIOCINFO, argp, FKIOCTL, cr, NULL) &&
diff --git a/usr/src/uts/common/fs/portfs/port.c b/usr/src/uts/common/fs/portfs/port.c
index 91d998b4b5..dd32c82434 100644
--- a/usr/src/uts/common/fs/portfs/port.c
+++ b/usr/src/uts/common/fs/portfs/port.c
@@ -156,7 +156,7 @@
  *	interested on.
  *	The internal pollwakeup() function is used by all the file
  *	systems --which are supporting the VOP_POLL() interface- to notify
- *	the upper layer (poll(2), devpoll(7d) and now event ports) about
+ *	the upper layer (poll(2), devpoll(4D) and now event ports) about
  *	the event triggered (see valid events in poll(2)).
  *	The pollwakeup() function forwards the event to the layer registered
  *	to receive the current event.
diff --git a/usr/src/uts/common/fs/portfs/port_fd.c b/usr/src/uts/common/fs/portfs/port_fd.c
index a1a1d6fb68..511c15e979 100644
--- a/usr/src/uts/common/fs/portfs/port_fd.c
+++ b/usr/src/uts/common/fs/portfs/port_fd.c
@@ -230,7 +230,7 @@ port_associate_fd(port_t *pp, int source, uintptr_t object, int events,
 		 * Allocate a polldat_t structure per fd
 		 * The use of the polldat_t structure to cache file descriptors
 		 * is required to be able to share the pollwakeup() function
-		 * with poll(2) and devpoll(7d).
+		 * with poll(2) and devpoll(4D).
 		 */
 		pfd = kmem_zalloc(sizeof (portfd_t), KM_SLEEP);
 		pdp = PFTOD(pfd);
diff --git a/usr/src/uts/common/fs/proc/prvnops.c b/usr/src/uts/common/fs/proc/prvnops.c
index 993b42530a..2dccbb2f63 100644
--- a/usr/src/uts/common/fs/proc/prvnops.c
+++ b/usr/src/uts/common/fs/proc/prvnops.c
@@ -6235,7 +6235,7 @@ prseek(vnode_t *vp, offset_t ooff, offset_t *noffp, caller_context_t *ct)
 /*
  * We use the p_execdir member of proc_t to expand the %d token in core file
  * paths (the directory path for the executable that dumped core; see
- * coreadm(1M) for details). We'd like gcore(1) to be able to expand %d in
+ * coreadm(8) for details). We'd like gcore(1) to be able to expand %d in
  * the same way as core dumping from the kernel, but there's no convenient
  * and comprehensible way to export the path name for p_execdir. To solve
  * this, we try to find the actual path to the executable that was used. In
diff --git a/usr/src/uts/common/fs/sockfs/nl7c.c b/usr/src/uts/common/fs/sockfs/nl7c.c
index c76dada8d7..a71572cbd4 100644
--- a/usr/src/uts/common/fs/sockfs/nl7c.c
+++ b/usr/src/uts/common/fs/sockfs/nl7c.c
@@ -598,7 +598,7 @@ done:
 
 /*
  * Open and read each line from "/etc/nca/ncalogd.conf" and parse for
- * the tokens and token text (i.e. key and value ncalogd.conf(4)):
+ * the tokens and token text (i.e. key and value ncalogd.conf(5)):
  *
  *	status=enabled
  *
diff --git a/usr/src/uts/common/fs/sockfs/nl7clogd.c b/usr/src/uts/common/fs/sockfs/nl7clogd.c
index 1580a08c6c..4dd40abf2d 100644
--- a/usr/src/uts/common/fs/sockfs/nl7clogd.c
+++ b/usr/src/uts/common/fs/sockfs/nl7clogd.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/sysmacros.h>
 #include <sys/callb.h>
 #include <sys/fcntl.h>
@@ -53,7 +51,7 @@ static void		logit_flush(void *);
  * NL7C reuses the NCA logging scheme, the directory "/var/nca" contains
  * the symlink "current" to 1 of up to 16 NCA BLF logging files, by default
  * a single logging file "log", optionally paths of up to 16 log files can
- * be specified via ncalogd.conf(4), note that these log files need not be
+ * be specified via ncalogd.conf(5), note that these log files need not be
  * in the "/var/nca" directory.
  *
  * NL7C reuses the NCA logging APIs defined in <inet/nca/ncalogd.h>, at
diff --git a/usr/src/uts/common/fs/sockfs/sockcommon_sops.c b/usr/src/uts/common/fs/sockfs/sockcommon_sops.c
index bc2878ccc8..59d052084f 100644
--- a/usr/src/uts/common/fs/sockfs/sockcommon_sops.c
+++ b/usr/src/uts/common/fs/sockfs/sockcommon_sops.c
@@ -174,7 +174,7 @@ so_bind(struct sonode *so, struct sockaddr *name, socklen_t namelen,
 		/*
 		 * Force a zero sa_family to match so_family.
 		 *
-		 * Some programs like inetd(1M) don't set the
+		 * Some programs like inetd(8) don't set the
 		 * family field. Other programs leave
 		 * sin_family set to garbage - SunOS 4.X does
 		 * not check the family field on a bind.
diff --git a/usr/src/uts/common/fs/sockfs/sockfilter.c b/usr/src/uts/common/fs/sockfs/sockfilter.c
index ea161e30ae..62a079f419 100644
--- a/usr/src/uts/common/fs/sockfs/sockfilter.c
+++ b/usr/src/uts/common/fs/sockfs/sockfilter.c
@@ -42,7 +42,7 @@
  *
  * Socket filter entry (sof_entry_t):
  *
- *   There exists one entry for each configured filter (done via soconfig(1M)),
+ *   There exists one entry for each configured filter (done via soconfig(8)),
  *   and they are all in sof_entry_list. In addition to the global list, each
  *   sockparams entry maintains a list of filters that is interested in that
  *   particular socket type. So the filter entry may be referenced by multiple
diff --git a/usr/src/uts/common/fs/sockfs/sockfilter_impl.h b/usr/src/uts/common/fs/sockfs/sockfilter_impl.h
index cf2ad8b20d..e63831e172 100644
--- a/usr/src/uts/common/fs/sockfs/sockfilter_impl.h
+++ b/usr/src/uts/common/fs/sockfs/sockfilter_impl.h
@@ -80,7 +80,7 @@ struct sof_entry_kstat {
 
 /*
  * Socket filter entry - one for each configured filter (added and
- * removed by soconfig(1M)).
+ * removed by soconfig(8)).
  *
  * sofe_flags, sofe_refcnt and sofe_mod are protected by sofe_lock, and all
  * other fields are write once.
@@ -106,7 +106,7 @@ struct sof_entry {
 /* Filter entry flags */
 #define	SOFEF_AUTO	0x1	/* automatic filter */
 #define	SOFEF_PROG	0x2	/* programmatic filter */
-#define	SOFEF_CONDEMED	0x4	/* removed by soconfig(1M) */
+#define	SOFEF_CONDEMED	0x4	/* removed by soconfig(8) */
 
 /*
  * Socket filter instance - one for each socket using a sof_entry_t
diff --git a/usr/src/uts/common/fs/sockfs/sockparams.c b/usr/src/uts/common/fs/sockfs/sockparams.c
index 1015decaac..86cbced50c 100644
--- a/usr/src/uts/common/fs/sockfs/sockparams.c
+++ b/usr/src/uts/common/fs/sockfs/sockparams.c
@@ -64,7 +64,7 @@ static int 	sockparams_sdev_init(struct sockparams *, char *, int);
 static void 	sockparams_sdev_fini(struct sockparams *);
 
 /*
- * Global sockparams list (populated via soconfig(1M)).
+ * Global sockparams list (populated via soconfig(8)).
  */
 static list_t sphead;
 
diff --git a/usr/src/uts/common/fs/sockfs/socktpi.c b/usr/src/uts/common/fs/sockfs/socktpi.c
index b8d83105e8..0e9883498b 100644
--- a/usr/src/uts/common/fs/sockfs/socktpi.c
+++ b/usr/src/uts/common/fs/sockfs/socktpi.c
@@ -865,7 +865,7 @@ sotpi_bindlisten(struct sonode *so, struct sockaddr *name,
 			/*
 			 * Force a zero sa_family to match so_family.
 			 *
-			 * Some programs like inetd(1M) don't set the
+			 * Some programs like inetd(8) don't set the
 			 * family field. Other programs leave
 			 * sin_family set to garbage - SunOS 4.X does
 			 * not check the family field on a bind.
@@ -6518,7 +6518,7 @@ socktpi_init(void)
 {
 	/*
 	 * Create sonode caches.  We create a special one for AF_UNIX so
-	 * that we can track them for netstat(1m).
+	 * that we can track them for netstat(8).
 	 */
 	socktpi_cache = kmem_cache_create("socktpi_cache",
 	    sizeof (struct sotpi_sonode), 0, socktpi_constructor,
diff --git a/usr/src/uts/common/fs/ufs/lufs_log.c b/usr/src/uts/common/fs/ufs/lufs_log.c
index 2ec3f7907c..052c53d507 100644
--- a/usr/src/uts/common/fs/ufs/lufs_log.c
+++ b/usr/src/uts/common/fs/ufs/lufs_log.c
@@ -1591,7 +1591,7 @@ ldl_seterror(ml_unit_t *ul, char *why)
 	cmn_err(CE_WARN, "%s", why);
 	cmn_err(CE_WARN, "ufs log for %s changed state to Error",
 	    ul->un_ufsvfs->vfs_fs->fs_fsmnt);
-	cmn_err(CE_WARN, "Please umount(1M) %s and run fsck(1M)",
+	cmn_err(CE_WARN, "Please umount(8) %s and run fsck(8)",
 	    ul->un_ufsvfs->vfs_fs->fs_fsmnt);
 
 	/*
diff --git a/usr/src/uts/common/fs/ufs/ufs_alloc.c b/usr/src/uts/common/fs/ufs/ufs_alloc.c
index ee7d99143e..3b052f75c0 100644
--- a/usr/src/uts/common/fs/ufs/ufs_alloc.c
+++ b/usr/src/uts/common/fs/ufs/ufs_alloc.c
@@ -381,7 +381,7 @@ loop:
 		rw_exit(&ip->i_contents);
 		VN_RELE(ITOV(ip));
 		cmn_err(CE_WARN,
-		    "%s: unexpected allocated inode %d, run fsck(1M)%s",
+		    "%s: unexpected allocated inode %d, run fsck(8)%s",
 		    fs->fs_fsmnt, (int)ino,
 		    (TRANS_ISTRANS(ufsvfsp) ? " -o f" : ""));
 		goto loop;
@@ -406,7 +406,7 @@ loop:
 
 		if (ip->i_size) {
 			cmn_err(CE_WARN,
-			    "%s: free inode %d had size 0x%llx, run fsck(1M)%s",
+			    "%s: free inode %d had size 0x%llx, run fsck(8)%s",
 			    fs->fs_fsmnt, (int)ino, ip->i_size,
 			    (TRANS_ISTRANS(ufsvfsp) ? " -o f" : ""));
 		}
diff --git a/usr/src/uts/common/fs/ufs/ufs_inode.c b/usr/src/uts/common/fs/ufs/ufs_inode.c
index ea42eed6e4..35b66b203c 100644
--- a/usr/src/uts/common/fs/ufs/ufs_inode.c
+++ b/usr/src/uts/common/fs/ufs/ufs_inode.c
@@ -612,7 +612,7 @@ again:
 			vp->v_vfsp = &EIO_vfs;
 			VN_RELE(vp);
 			cmn_err(CE_NOTE,
-			    "%s: unexpected free inode %d, run fsck(1M)%s",
+			    "%s: unexpected free inode %d, run fsck(8)%s",
 			    fs->fs_fsmnt, (int)ino,
 			    (TRANS_ISTRANS(ufsvfsp) ? " -o f" : ""));
 			return (EIO);
diff --git a/usr/src/uts/common/fs/ufs/ufs_vfsops.c b/usr/src/uts/common/fs/ufs/ufs_vfsops.c
index afd43e7e63..390319bfef 100644
--- a/usr/src/uts/common/fs/ufs/ufs_vfsops.c
+++ b/usr/src/uts/common/fs/ufs/ufs_vfsops.c
@@ -983,7 +983,7 @@ mountfs(struct vfs *vfsp, enum whymountroot why, struct vnode *devvp,
 			 */
 			if (!(vfsp->vfs_flag & VFS_RDONLY)) {
 				cmn_err(CE_WARN, "Error accessing ufs "
-				    "log for %s; Please run fsck(1M)", path);
+				    "log for %s; Please run fsck(8)", path);
 				goto out;
 			}
 		}
diff --git a/usr/src/uts/common/fs/xattr.c b/usr/src/uts/common/fs/xattr.c
index 2326a42747..ffa68a362e 100644
--- a/usr/src/uts/common/fs/xattr.c
+++ b/usr/src/uts/common/fs/xattr.c
@@ -28,7 +28,7 @@
  *
  * The Solaris VFS layer presents extended file attributes using a special
  * "XATTR" directory under files or directories that have extended file
- * attributes.  See fsattr(5) for background.
+ * attributes.  See fsattr(7) for background.
  *
  * This design avoids the need for a separate set of VFS or vnode functions
  * for operating on XATTR objects.  File system implementations that support
diff --git a/usr/src/uts/common/fs/zfs/dsl_scan.c b/usr/src/uts/common/fs/zfs/dsl_scan.c
index fa7b9fb2fc..f6e8db4100 100644
--- a/usr/src/uts/common/fs/zfs/dsl_scan.c
+++ b/usr/src/uts/common/fs/zfs/dsl_scan.c
@@ -3856,7 +3856,7 @@ dsl_scan_scrub_cb(dsl_pool_t *dp,
 
 		/*
 		 * Keep track of how much data we've examined so that
-		 * zpool(1M) status can make useful progress reports.
+		 * zpool(8) status can make useful progress reports.
 		 */
 		scn->scn_phys.scn_examined += DVA_GET_ASIZE(dva);
 		spa->spa_scan_pass_exam += DVA_GET_ASIZE(dva);
diff --git a/usr/src/uts/common/fs/zfs/lua/README.zfs b/usr/src/uts/common/fs/zfs/lua/README.zfs
index 0e22de7a4a..bd0804f99e 100644
--- a/usr/src/uts/common/fs/zfs/lua/README.zfs
+++ b/usr/src/uts/common/fs/zfs/lua/README.zfs
@@ -26,7 +26,7 @@ maintenance policy, the modifications that have been made to it, and how it
 should (and should not) be used.
 
 For a description of the Lua language and features exposed by ZFS channel
-programs, please refer to the zfs-program(1m) man page instead.
+programs, please refer to the zfs-program(8) man page instead.
 
 
 Maintenance policy
diff --git a/usr/src/uts/common/fs/zfs/metaslab.c b/usr/src/uts/common/fs/zfs/metaslab.c
index fe53d142c2..4828824b10 100644
--- a/usr/src/uts/common/fs/zfs/metaslab.c
+++ b/usr/src/uts/common/fs/zfs/metaslab.c
@@ -5639,7 +5639,7 @@ metaslab_claim_concrete(vdev_t *vd, uint64_t offset, uint64_t size,
 	range_tree_remove(msp->ms_allocatable, offset, size);
 	range_tree_clear(msp->ms_trim, offset, size);
 
-	if (spa_writeable(spa)) {	/* don't dirty if we're zdb(1M) */
+	if (spa_writeable(spa)) {	/* don't dirty if we're zdb(8) */
 		metaslab_class_t *mc = msp->ms_group->mg_class;
 		multilist_sublist_t *mls =
 		    multilist_sublist_lock_obj(mc->mc_metaslab_txg_list, msp);
@@ -5686,7 +5686,7 @@ metaslab_claim_impl(vdev_t *vd, uint64_t offset, uint64_t size, uint64_t txg)
 		metaslab_claim_cb_arg_t arg;
 
 		/*
-		 * Only zdb(1M) can claim on indirect vdevs.  This is used
+		 * Only zdb(8) can claim on indirect vdevs.  This is used
 		 * to detect leaks of mapped space (that are not accounted
 		 * for in the obsolete counts, spacemap, or bpobj).
 		 */
diff --git a/usr/src/uts/common/fs/zfs/spa_history.c b/usr/src/uts/common/fs/zfs/spa_history.c
index 897d3c6e9a..44a4ec7ddc 100644
--- a/usr/src/uts/common/fs/zfs/spa_history.c
+++ b/usr/src/uts/common/fs/zfs/spa_history.c
@@ -334,7 +334,7 @@ spa_history_log_sync(void *arg, dmu_tx_t *tx)
 		 * posted as a result of the ZPOOL_HIST_CMD key being present
 		 * it would result in only one sysevent being posted with the
 		 * full command line arguments, requiring the consumer to know
-		 * how to parse and understand zfs(1M) command invocations.
+		 * how to parse and understand zfs(8) command invocations.
 		 */
 		spa_history_log_notify(spa, nvl);
 	} else if (nvlist_exists(nvl, ZPOOL_HIST_IOCTL)) {
diff --git a/usr/src/uts/common/fs/zfs/spa_misc.c b/usr/src/uts/common/fs/zfs/spa_misc.c
index 27697d5267..cb59eef824 100644
--- a/usr/src/uts/common/fs/zfs/spa_misc.c
+++ b/usr/src/uts/common/fs/zfs/spa_misc.c
@@ -1384,7 +1384,7 @@ spa_vdev_state_exit(spa_t *spa, vdev_t *vd, int error)
 
 	/*
 	 * If anything changed, wait for it to sync.  This ensures that,
-	 * from the system administrator's perspective, zpool(1M) commands
+	 * from the system administrator's perspective, zpool(8) commands
 	 * are synchronous.  This is important for things like zpool offline:
 	 * when the command completes, you expect no further I/O from ZFS.
 	 */
diff --git a/usr/src/uts/common/fs/zfs/sys/dmu.h b/usr/src/uts/common/fs/zfs/sys/dmu.h
index d38914dd1d..be834895c8 100644
--- a/usr/src/uts/common/fs/zfs/sys/dmu.h
+++ b/usr/src/uts/common/fs/zfs/sys/dmu.h
@@ -963,7 +963,7 @@ void dmu_objset_fast_stat(objset_t *os, dmu_objset_stats_t *stat);
 
 /*
  * Add entries to the nvlist for all the objset's properties.  See
- * zfs_prop_table[] and zfs(1m) for details on the properties.
+ * zfs_prop_table[] and zfs(8) for details on the properties.
  */
 void dmu_objset_stats(objset_t *os, struct nvlist *nv);
 
@@ -974,7 +974,7 @@ void dmu_objset_stats(objset_t *os, struct nvlist *nv);
  * availbytes is the amount of space available to this objset, taking
  * into account quotas & reservations, assuming that no other objsets
  * use the space first.  These values correspond to the 'referenced' and
- * 'available' properties, described in the zfs(1m) manpage.
+ * 'available' properties, described in the zfs(8) manpage.
  *
  * usedobjs and availobjs are the number of objects currently allocated,
  * and available.
diff --git a/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h b/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h
index 60d4d6805f..5058d48e74 100644
--- a/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h
+++ b/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h
@@ -455,7 +455,7 @@ typedef struct zfs_cmd {
 	uint64_t	zc_history_len;
 	uint64_t	zc_history_offset;
 	uint64_t	zc_obj;
-	uint64_t	zc_iflags;		/* internal to zfs(7fs) */
+	uint64_t	zc_iflags;		/* internal to zfs(4FS) */
 	zfs_share_t	zc_share;
 	dmu_objset_stats_t zc_objset_stats;
 	dmu_replay_record_t zc_begin_record;
diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c
index 99ad0cd27d..8e155979e6 100644
--- a/usr/src/uts/common/fs/zfs/vdev.c
+++ b/usr/src/uts/common/fs/zfs/vdev.c
@@ -203,7 +203,7 @@ vdev_getops(const char *type)
 
 /*
  * Derive the enumerated alloction bias from string input.
- * String origin is either the per-vdev zap or zpool(1M).
+ * String origin is either the per-vdev zap or zpool(8).
  */
 static vdev_alloc_bias_t
 vdev_derive_alloc_bias(const char *bias)
diff --git a/usr/src/uts/common/fs/zfs/zcp.c b/usr/src/uts/common/fs/zfs/zcp.c
index 45ffa37e2a..e2db01c5b6 100644
--- a/usr/src/uts/common/fs/zfs/zcp.c
+++ b/usr/src/uts/common/fs/zfs/zcp.c
@@ -22,7 +22,7 @@
  *
  * The ZCP interface allows various ZFS commands and operations ZFS
  * administrative operations (e.g. creating and destroying snapshots, typically
- * performed via an ioctl to /dev/zfs by the zfs(1M) command and
+ * performed via an ioctl to /dev/zfs by the zfs(8) command and
  * libzfs/libzfs_core) to be run * programmatically as a Lua script.  A ZCP
  * script is run as a dsl_sync_task and fully executed during one transaction
  * group sync.  This ensures that no other changes can be written concurrently
@@ -86,7 +86,7 @@
  * longjumps out of the script execution with luaL_error() and returns with the
  * error.
  *
- * See zfs-program(1M) for more information on high level usage.
+ * See zfs-program(8) for more information on high level usage.
  */
 
 #include "lua.h"
diff --git a/usr/src/uts/common/fs/zfs/zfs_vfsops.c b/usr/src/uts/common/fs/zfs/zfs_vfsops.c
index 26805d4806..86d83e7ace 100644
--- a/usr/src/uts/common/fs/zfs/zfs_vfsops.c
+++ b/usr/src/uts/common/fs/zfs/zfs_vfsops.c
@@ -175,7 +175,7 @@ zfs_sync(vfs_t *vfsp, short flag, cred_t *cr)
 	} else {
 		/*
 		 * Sync all ZFS filesystems.  This is what happens when you
-		 * run sync(1M).  Unlike other filesystems, ZFS honors the
+		 * run sync(8).  Unlike other filesystems, ZFS honors the
 		 * request by waiting for all pools to commit all dirty data.
 		 */
 		spa_sync_allpools();
diff --git a/usr/src/uts/common/fs/zfs/zio.c b/usr/src/uts/common/fs/zfs/zio.c
index 014f2518ab..b32dffd79c 100644
--- a/usr/src/uts/common/fs/zfs/zio.c
+++ b/usr/src/uts/common/fs/zfs/zio.c
@@ -1121,7 +1121,7 @@ zio_claim(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
 	ASSERT3U(spa->spa_uberblock.ub_rootbp.blk_birth, <,
 	    spa_min_claim_txg(spa));
 	ASSERT(txg == spa_min_claim_txg(spa) || txg == 0);
-	ASSERT(!BP_GET_DEDUP(bp) || !spa_writeable(spa));	/* zdb(1M) */
+	ASSERT(!BP_GET_DEDUP(bp) || !spa_writeable(spa));	/* zdb(8) */
 
 	zio = zio_create(pio, spa, txg, bp, NULL, BP_GET_PSIZE(bp),
 	    BP_GET_PSIZE(bp), done, private, ZIO_TYPE_CLAIM, ZIO_PRIORITY_NOW,
diff --git a/usr/src/uts/common/fs/zfs/zvol.c b/usr/src/uts/common/fs/zfs/zvol.c
index 3bb8b8964c..1b3bc07600 100644
--- a/usr/src/uts/common/fs/zfs/zvol.c
+++ b/usr/src/uts/common/fs/zfs/zvol.c
@@ -1709,7 +1709,7 @@ zvol_log_truncate(zvol_state_t *zv, dmu_tx_t *tx, uint64_t off, uint64_t len,
 }
 
 /*
- * Dirtbag ioctls to support mkfs(1M) for UFS filesystems.  See dkio(7I).
+ * Dirtbag ioctls to support mkfs(8) for UFS filesystems.  See dkio(4I).
  * Also a dirtbag dkio ioctl for unmap/free-block functionality.
  */
 /*ARGSUSED*/
diff --git a/usr/src/uts/common/inet/ip.h b/usr/src/uts/common/inet/ip.h
index 81801b3dad..7687fdd29e 100644
--- a/usr/src/uts/common/inet/ip.h
+++ b/usr/src/uts/common/inet/ip.h
@@ -177,7 +177,7 @@ typedef struct ipoptp_s
 #define	IPOPTP_ERROR	0x00000001
 #endif	/* _KERNEL */
 
-/* Controls forwarding of IP packets, set via ipadm(1M)/ndd(1M) */
+/* Controls forwarding of IP packets, set via ipadm(8)/ndd(8) */
 #define	IP_FORWARD_NEVER	0
 #define	IP_FORWARD_ALWAYS	1
 
diff --git a/usr/src/uts/common/inet/ip/ip_if.c b/usr/src/uts/common/inet/ip/ip_if.c
index 638a5e4b21..2307837eb8 100644
--- a/usr/src/uts/common/inet/ip/ip_if.c
+++ b/usr/src/uts/common/inet/ip/ip_if.c
@@ -8656,8 +8656,8 @@ ip_sioctl_plink_ipmp(ill_t *ill, int ioccmd)
  * Do I_PLINK/I_LINK or I_PUNLINK/I_UNLINK with consistency checks and also
  * atomically set/clear the muxids. Also complete the ioctl by acking or
  * naking it.  Note that the code is structured such that the link type,
- * whether it's persistent or not, is treated equally.  ifconfig(1M) and
- * its clones use the persistent link, while pppd(1M) and perhaps many
+ * whether it's persistent or not, is treated equally.  ifconfig(8) and
+ * its clones use the persistent link, while pppd(8) and perhaps many
  * other daemons may use non-persistent link.  When combined with some
  * ill_t states, linking and unlinking lower streams may be used as
  * indicators of dynamic re-plumbing events [see PSARC/1999/348].
diff --git a/usr/src/uts/common/inet/ip/sadb.c b/usr/src/uts/common/inet/ip/sadb.c
index 5f1d1c96ee..14848656ed 100644
--- a/usr/src/uts/common/inet/ip/sadb.c
+++ b/usr/src/uts/common/inet/ip/sadb.c
@@ -3239,7 +3239,7 @@ sadb_common_add(queue_t *pfkey_q, mblk_t *mp, sadb_msg_t *samsg,
 			/*
 			 * An error here indicates that alg is the wrong type
 			 * (IE: not authentication) or its not in the alg tables
-			 * created by ipsecalgs(1m), or Kcf does not like the
+			 * created by ipsecalgs(8), or Kcf does not like the
 			 * parameters passed in with this algorithm, which is
 			 * probably a coding error!
 			 */
@@ -6867,8 +6867,8 @@ ipsec_tun_pol(ipsec_selector_t *sel, ipsec_policy_t **ppp,
 			return (ENOENT);
 		}
 		/*
-		 * Else, this is a tunnel policy configured with ifconfig(1m)
-		 * or "negotiate transport" with ipsecconf(1m).  We have an
+		 * Else, this is a tunnel policy configured with ifconfig(8)
+		 * or "negotiate transport" with ipsecconf(8).  We have an
 		 * itp with policy set based on any match, so don't bother
 		 * changing fields in "sel".
 		 */
diff --git a/usr/src/uts/common/inet/ip/spd.c b/usr/src/uts/common/inet/ip/spd.c
index 85f06f3d02..0bcecd8a3a 100644
--- a/usr/src/uts/common/inet/ip/spd.c
+++ b/usr/src/uts/common/inet/ip/spd.c
@@ -4913,7 +4913,7 @@ ipsec_alg_fix_min_max(ipsec_alginfo_t *alg, ipsec_algtype_t alg_type,
 }
 
 /*
- * Sanity check parameters provided by ipsecalgs(1m). Assume that
+ * Sanity check parameters provided by ipsecalgs(8). Assume that
  * the algoritm is marked as valid, there is a check at the top
  * of this function. If any of the checks below fail, the algorithm
  * entry is invalid.
diff --git a/usr/src/uts/common/inet/ip_ndp.h b/usr/src/uts/common/inet/ip_ndp.h
index 38ab51e2ff..c1a156067e 100644
--- a/usr/src/uts/common/inet/ip_ndp.h
+++ b/usr/src/uts/common/inet/ip_ndp.h
@@ -161,7 +161,7 @@ typedef	struct ndp_g_s {
 
 /*
  * NCE_F_NONUD is used to disable IPv6 Neighbor Unreachability Detection or
- * IPv4 aging and maps to the ATF_PERM flag for arp(1m)
+ * IPv4 aging and maps to the ATF_PERM flag for arp(8)
  */
 #define	NCE_F_NONUD		0x10
 
@@ -181,7 +181,7 @@ typedef	struct ndp_g_s {
  * NCE_F_AUTHORITY is set for any address that we have authoritatitve
  * information for. This includes locally configured addresses as well
  * as statically configured arp entries that are set up using the "permanent"
- * option described in arp(1m). The NCE_F_AUTHORITY asserts that we would
+ * option described in arp(8). The NCE_F_AUTHORITY asserts that we would
  * reject any updates for that nce's (host, link-layer-address) information
  */
 #define	NCE_F_AUTHORITY		0x800
diff --git a/usr/src/uts/common/inet/ipd/ipd.c b/usr/src/uts/common/inet/ipd/ipd.c
index 25e0b699c5..22f2d79d24 100644
--- a/usr/src/uts/common/inet/ipd/ipd.c
+++ b/usr/src/uts/common/inet/ipd/ipd.c
@@ -71,7 +71,7 @@
  *
  * ipd has two different entry points, one is administrative, the other is the
  * data path. The administrative path is accessed by a userland component called
- * ipdadm(1M). It communicates to the kernel component via ioctls to /dev/ipd.
+ * ipdadm(8). It communicates to the kernel component via ioctls to /dev/ipd.
  * If the administrative path enables a specific zone, then the data path will
  * become active for that zone. Any packet that leaves that zone's IP stack or
  * is going to enter it, comes through the callback specified in the hook_t(9S)
diff --git a/usr/src/uts/common/inet/iptun.h b/usr/src/uts/common/inet/iptun.h
index 1cd74d87cc..7745c8b3d7 100644
--- a/usr/src/uts/common/inet/iptun.h
+++ b/usr/src/uts/common/inet/iptun.h
@@ -82,7 +82,7 @@ typedef struct iptun_kparams {
 #define	IPTUN_KPARAM_RADDR	0x00000004 /* itk_raddr is set */
 #define	IPTUN_KPARAM_SECINFO	0x00000008 /* itk_secinfo is set */
 #define	IPTUN_KPARAM_IMPLICIT	0x00000010 /* implicitly created IP tunnel */
-#define	IPTUN_KPARAM_IPSECPOL	0x00000020 /* ipsecconf(1M) policy present */
+#define	IPTUN_KPARAM_IPSECPOL	0x00000020 /* ipsecconf(8) policy present */
 
 #ifdef	__cplusplus
 }
diff --git a/usr/src/uts/common/inet/iptun/iptun.c b/usr/src/uts/common/inet/iptun/iptun.c
index ca46539f89..e67e6bd26e 100644
--- a/usr/src/uts/common/inet/iptun/iptun.c
+++ b/usr/src/uts/common/inet/iptun/iptun.c
@@ -1115,12 +1115,12 @@ iptun_setparams(iptun_t *iptun, const iptun_kparams_t *ik)
 
 	if (ik->iptun_kparam_flags & IPTUN_KPARAM_SECINFO) {
 		/*
-		 * Set IPsec policy originating from the ifconfig(1M) command
+		 * Set IPsec policy originating from the ifconfig(8) command
 		 * line.  This is traditionally called "simple" policy because
 		 * the ipsec_req_t (iptun_kparam_secinfo) can only describe a
 		 * simple policy of "do ESP on everything" and/or "do AH on
 		 * everything" (as opposed to the rich policy that can be
-		 * defined with ipsecconf(1M)).
+		 * defined with ipsecconf(8)).
 		 */
 		if (iptun->iptun_typeinfo->iti_type == IPTUN_TYPE_6TO4) {
 			/*
diff --git a/usr/src/uts/common/inet/sadb.h b/usr/src/uts/common/inet/sadb.h
index 30b935495f..ddb3b3902f 100644
--- a/usr/src/uts/common/inet/sadb.h
+++ b/usr/src/uts/common/inet/sadb.h
@@ -73,12 +73,12 @@ typedef struct ipsa_cm_mech_s {
  * initialize the Block Cipher, is made up of a Counter and a Salt.
  * The Counter is fixed at 64 bits and is incremented for each packet.
  * The Salt value can be any whole byte value upto 64 bits. This is
- * algorithm mode specific and can be configured with ipsecalgs(1m).
+ * algorithm mode specific and can be configured with ipsecalgs(8).
  *
  * We only support whole byte salt lengths, this is because the salt is
- * stored in an array of uint8_t's. This is enforced by ipsecalgs(1m)
+ * stored in an array of uint8_t's. This is enforced by ipsecalgs(8)
  * which configures the salt length as a number of bytes. Checks are
- * made to ensure the salt length defined in ipsecalgs(1m) fits in
+ * made to ensure the salt length defined in ipsecalgs(8) fits in
  * the ipsec_nonce_t.
  *
  * The Salt value remains constant for the life of the SA, the Salt is
diff --git a/usr/src/uts/common/inet/tcp/tcp_bind.c b/usr/src/uts/common/inet/tcp/tcp_bind.c
index 18efac7b74..5c2e1e1932 100644
--- a/usr/src/uts/common/inet/tcp/tcp_bind.c
+++ b/usr/src/uts/common/inet/tcp/tcp_bind.c
@@ -291,7 +291,7 @@ retry:
  * Return the next anonymous port in the privileged port range for
  * bind checking.  It starts at IPPORT_RESERVED - 1 and goes
  * downwards.  This is the same behavior as documented in the userland
- * library call rresvport(3N).
+ * library call rresvport(3SOCKET).
  *
  * TS note: skip multilevel ports.
  */
diff --git a/usr/src/uts/common/inet/tcp/tcp_misc.c b/usr/src/uts/common/inet/tcp/tcp_misc.c
index 0896dd7611..423d3003cf 100644
--- a/usr/src/uts/common/inet/tcp/tcp_misc.c
+++ b/usr/src/uts/common/inet/tcp/tcp_misc.c
@@ -44,7 +44,7 @@ static boolean_t tcp_do_reclaim = B_TRUE;
  * TCP_IOC_ABORT_CONN is a non-transparent ioctl command used for aborting
  * TCP connections. To invoke this ioctl, a tcp_ioc_abort_conn_t structure
  * (defined in tcp.h) needs to be filled in and passed into the kernel
- * via an I_STR ioctl command (see streamio(7I)). The tcp_ioc_abort_conn_t
+ * via an I_STR ioctl command (see streamio(4I)). The tcp_ioc_abort_conn_t
  * structure contains the four-tuple of a TCP connection and a range of TCP
  * states (specified by ac_start and ac_end). The use of wildcard addresses
  * and ports is allowed. Connections with a matching four tuple and a state
diff --git a/usr/src/uts/common/io/audio/impl/audio_ddi.c b/usr/src/uts/common/io/audio/impl/audio_ddi.c
index 7acf57da82..41ac11d528 100644
--- a/usr/src/uts/common/io/audio/impl/audio_ddi.c
+++ b/usr/src/uts/common/io/audio/impl/audio_ddi.c
@@ -507,7 +507,7 @@ audio_init_ops(struct dev_ops *devops, const char *name)
 
 	(void) strlcpy(helper->name, name, sizeof (helper->name));
 
-	helper->minfo.mi_idnum = 0;	/* only for strlog(1M) */
+	helper->minfo.mi_idnum = 0;	/* only for strlog(8) */
 	helper->minfo.mi_idname = helper->name;
 	helper->minfo.mi_minpsz = 0;
 	helper->minfo.mi_maxpsz = 8192;
diff --git a/usr/src/uts/common/io/audio/impl/audio_sun.c b/usr/src/uts/common/io/audio/impl/audio_sun.c
index cee3f6ace4..698eae3801 100644
--- a/usr/src/uts/common/io/audio/impl/audio_sun.c
+++ b/usr/src/uts/common/io/audio/impl/audio_sun.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * Sun audio(7I) and mixer(7I) personality.
+ * Sun audio(4I) and mixer(4I) personality.
  *
  * There are some "undocumented" details of how legacy Sun audio
  * interfaces work.  The following "rules" were derived from reading the
@@ -251,7 +251,7 @@ devaudio_proc_alloc(audio_client_t *c)
 	info = &proc->p_info;
 
 	/*
-	 * audio(7I) says: Upon the initial open() of the audio
+	 * audio(4I) says: Upon the initial open() of the audio
 	 * device, the driver resets the data format of the device to
 	 * the default state of 8-bit, 8Khz, mono u-Law data.
 	 */
diff --git a/usr/src/uts/common/io/bge/bge.conf b/usr/src/uts/common/io/bge/bge.conf
index edabf29ab1..8387dcbeb8 100644
--- a/usr/src/uts/common/io/bge/bge.conf
+++ b/usr/src/uts/common/io/bge/bge.conf
@@ -27,7 +27,7 @@
 # Broadcom 579x Gigabit Ethernet devices
 # 
 # All the properties below can be set globally (i.e. for all instances
-# of BGE), or on a per-instance basis.  See driver.conf(4) for details
+# of BGE), or on a per-instance basis.  See driver.conf(5) for details
 # of the syntax of global and per-instance properties.
 #
 # Properties specified in this file take effect when the driver is first
@@ -35,7 +35,7 @@
 # therefore not take effect until the next reboot, but will be permanent
 # thereafter.
 #
-# Some of the driver's parameters can also be changed using ndd(1m).
+# Some of the driver's parameters can also be changed using ndd(8).
 # Changes made with ndd apply only to a specific instance (e.g. bge1).
 # They take effect immediately, but are lost if the driver is unloaded.
 #
@@ -106,7 +106,7 @@
 # adv_pause_cap		= 0;
 #
 # All of these parameters can can also be queried and modified at run-time
-# by use of the ndd(1m) command.
+# by use of the ndd(8) command.
 #
 #########################################################################
 #
diff --git a/usr/src/uts/common/io/bnx/bnx.conf b/usr/src/uts/common/io/bnx/bnx.conf
index cb19ea560a..9c960cbcf6 100644
--- a/usr/src/uts/common/io/bnx/bnx.conf
+++ b/usr/src/uts/common/io/bnx/bnx.conf
@@ -14,6 +14,6 @@
 #
 
 #
-# Driver.conf file for NetExtreme II 1 GbE parts. See bnx(7D) for valid
+# Driver.conf file for NetExtreme II 1 GbE parts. See bnx(4D) for valid
 # options.
 #
diff --git a/usr/src/uts/common/io/cmlb.c b/usr/src/uts/common/io/cmlb.c
index 7d88643ada..dce6c74a43 100644
--- a/usr/src/uts/common/io/cmlb.c
+++ b/usr/src/uts/common/io/cmlb.c
@@ -1689,7 +1689,7 @@ cmlb_validate_geometry(struct cmlb_lun *cl, boolean_t forcerevalid, int flags,
 				cmlb_log(CMLB_DEVINFO(cl), CMLB_LABEL(cl),
 				    CE_NOTE, "!Disk (%s%d) is limited to 2 TB "
 				    "due to VTOC label. To use the full "
-				    "capacity of the disk, use format(1M) to "
+				    "capacity of the disk, use format(8) to "
 				    "relabel the disk with EFI/GPT label.\n",
 				    CMLB_LABEL(cl),
 				    ddi_get_instance(CMLB_DEVINFO(cl)));
diff --git a/usr/src/uts/common/io/devinfo.c b/usr/src/uts/common/io/devinfo.c
index 68ccd8eea4..d9e1e81a2d 100644
--- a/usr/src/uts/common/io/devinfo.c
+++ b/usr/src/uts/common/io/devinfo.c
@@ -1987,7 +1987,7 @@ property:
 		 * Make copy of global property list if this devinfo refers
 		 * global properties different from what's on the devnames
 		 * array. It can happen if there has been a forced
-		 * driver.conf update. See mod_drv(1M).
+		 * driver.conf update. See update_drv(8).
 		 */
 		ASSERT(me->drv_major != -1);
 		if (node->devi_global_prop_list !=
diff --git a/usr/src/uts/common/io/e1000api/e1000_hw.h b/usr/src/uts/common/io/e1000api/e1000_hw.h
index 9d440c3e71..644cc1ef17 100644
--- a/usr/src/uts/common/io/e1000api/e1000_hw.h
+++ b/usr/src/uts/common/io/e1000api/e1000_hw.h
@@ -290,8 +290,8 @@ enum e1000_mac_type {
 	e1000_pch_lnp,
 	e1000_pch_rpl,
 	/*
-	 * After this point all MACs are used by the igb(7D) driver as opposed
-	 * to e1000g(7D). If a new MAC is specific to e1000g series of devices,
+	 * After this point all MACs are used by the igb(4D) driver as opposed
+	 * to e1000g(4D). If a new MAC is specific to e1000g series of devices,
 	 * then it should be added above this.
 	 */
 	e1000_82575,
diff --git a/usr/src/uts/common/io/ecpp.conf b/usr/src/uts/common/io/ecpp.conf
index 910929263b..527dd186ad 100644
--- a/usr/src/uts/common/io/ecpp.conf
+++ b/usr/src/uts/common/io/ecpp.conf
@@ -23,7 +23,6 @@
 # Use is subject to license terms.
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 # When fast-centronics is set to "true", handshaking between the 
 # driver and the peripheral is conducted by hardware. For some
@@ -45,7 +44,7 @@ fast-1284-compatible="true";
 
 # Some Centronics devices require the Init signal to be toggled upon 
 # power-up.  The application should do this directly with ioctl(2) interface
-# as specified in ecpp(7d). As an alternative to using the API, the driver
+# as specified in ecpp(4D). As an alternative to using the API, the driver
 # may be configured to toggle the nInit signal upon every time the device 
 # is opened. If centronics-init-seq is set to "true" the Init signal 
 # will be toggled when the device is opened.  The default is "false".
diff --git a/usr/src/uts/common/io/ena/ena.conf b/usr/src/uts/common/io/ena/ena.conf
index 64ee011d7c..5df2c7e805 100644
--- a/usr/src/uts/common/io/ena/ena.conf
+++ b/usr/src/uts/common/io/ena/ena.conf
@@ -15,7 +15,7 @@
 #
 
 #
-# Driver .conf file for AWS Elastic Network Adapter. See ena(7D) for
+# Driver .conf file for AWS Elastic Network Adapter. See ena(4D) for
 # valid options.
 #
 
diff --git a/usr/src/uts/common/io/i40e/i40e.conf b/usr/src/uts/common/io/i40e/i40e.conf
index b4c3459931..0f039f21f0 100644
--- a/usr/src/uts/common/io/i40e/i40e.conf
+++ b/usr/src/uts/common/io/i40e/i40e.conf
@@ -15,5 +15,5 @@
 
 #
 # Driver.conf file for Intel XL710 PCIe NIC Driver (i40e)
-# See i40e(7D) for valid options.
+# See i40e(4D) for valid options.
 #
diff --git a/usr/src/uts/common/io/ib/adapters/hermon/hermon_stats.c b/usr/src/uts/common/io/ib/adapters/hermon/hermon_stats.c
index b479f461e0..fde0ca6f2d 100644
--- a/usr/src/uts/common/io/ib/adapters/hermon/hermon_stats.c
+++ b/usr/src/uts/common/io/ib/adapters/hermon/hermon_stats.c
@@ -30,7 +30,7 @@
  *
  *    Implements all the routines necessary for setting up, querying, and
  *    (later) tearing down all the kstats necessary for implementing to
- *    the interfaces necessary to provide busstat(1M) access.
+ *    the interfaces necessary to provide busstat(8) access.
  */
 
 #include <sys/types.h>
diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c
index 244cf9b4fc..aa9e0889ae 100644
--- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c
+++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c
@@ -30,7 +30,7 @@
  *
  *    Implements all the routines necessary for setting up, querying, and
  *    (later) tearing down all the kstats necessary for implementing to
- *    the interfaces necessary to provide busstat(1M) access.
+ *    the interfaces necessary to provide busstat(8) access.
  */
 
 #include <sys/types.h>
diff --git a/usr/src/uts/common/io/ib/clients/ibd/ibd.c b/usr/src/uts/common/io/ib/clients/ibd/ibd.c
index 75e25457f2..8232642502 100644
--- a/usr/src/uts/common/io/ib/clients/ibd/ibd.c
+++ b/usr/src/uts/common/io/ib/clients/ibd/ibd.c
@@ -109,14 +109,14 @@
  * objects that can be plumbed and they alone participate in I/O and not the
  * port driver.
  *
- * There are some info ioctls supported in ibd which are used by dladm(1M) to
+ * There are some info ioctls supported in ibd which are used by dladm(8) to
  * display useful information. The info entry point for ibd is
  * ibd_get_partition_info().
  *
  * 2. Late HCA initialization feature.
  * ------------------------------------
  * As mentioned in section 1, the user creates the partition objects via
- * dladm(1M). It is possible that:
+ * dladm(8). It is possible that:
  * a) The physical port itself is down and the SM cannot be reached.
  * b) The PKEY specified by the used has not been created in the SM yet.
  * c) An IPoIB broadcast group for the specified PKEY is not present.
diff --git a/usr/src/uts/common/io/ib/ibtl/ibtl_ibnex.c b/usr/src/uts/common/io/ib/ibtl/ibtl_ibnex.c
index 6b14dc4e8b..3a7847fd99 100644
--- a/usr/src/uts/common/io/ib/ibtl/ibtl_ibnex.c
+++ b/usr/src/uts/common/io/ib/ibtl/ibtl_ibnex.c
@@ -56,7 +56,7 @@ ibtl_ibnex_callback_t	ibtl_ibnex_callback_routine = NULL;
  *			IBTL_IBNEX_UNCFG_CLNTS_FLAG - Build a NVLIST containing
  *						clients' devpaths and their
  *						AP_IDs. (-x unconfig_clients)
- *	callback	- Callback function to get ap_id from ib(7d)
+ *	callback	- Callback function to get ap_id from ib(4D)
  * Output:
  *	buffer		- The information is returned in this buffer
  *      bufsiz		- The size of the information buffer
@@ -519,7 +519,7 @@ ibt_reprobe_dev(dev_info_t *dip)
  *	else IBT_NO_HCAS_AVAILABLE.
  *
  *	For IOC/Pseudo devices check if the given pdip is that of
- *	the ib(7d) nexus or that of the eoib(7d) nexus. If yes
+ *	the ib(4D) nexus or that of the eoib(4D) nexus. If yes
  *	return IBT_SUCCESS, else IBT_NO_HCAS_AVAILABLE.
  */
 ibt_status_t
diff --git a/usr/src/uts/common/io/lofi.c b/usr/src/uts/common/io/lofi.c
index ed3ee88e53..e775ecce0d 100644
--- a/usr/src/uts/common/io/lofi.c
+++ b/usr/src/uts/common/io/lofi.c
@@ -126,7 +126,7 @@
  *
  * Encryption:
  *	Each lofi device can have its own symmetric key and cipher.
- *	They are passed to us by lofiadm(1m) in the correct format for use
+ *	They are passed to us by lofiadm(8) in the correct format for use
  *	with the misc/kcf crypto_* routines.
  *
  *	Each block has its own IV, that is calculated in lofi_blk_mech(), based
@@ -2275,7 +2275,7 @@ fake_disk_geometry(struct lofi_state *lsp)
 {
 	u_offset_t dsize = lsp->ls_vp_size - lsp->ls_crypto_offset;
 
-	/* dk_geom - see dkio(7I) */
+	/* dk_geom - see dkio(4I) */
 	/*
 	 * dkg_ncyl _could_ be set to one here (one big cylinder with gobs
 	 * of sectors), but that breaks programs like fdisk which want to
@@ -2305,7 +2305,7 @@ fake_disk_geometry(struct lofi_state *lsp)
 }
 
 /*
- * build vtoc - see dkio(7I)
+ * build vtoc - see dkio(4I)
  *
  * Fakes one big partition based on the size of the file. This is needed
  * because we allow newfs'ing the traditional lofi device and newfs will
@@ -2345,7 +2345,7 @@ fake_disk_vtoc(struct lofi_state *lsp, struct vtoc *vt)
 }
 
 /*
- * build dk_cinfo - see dkio(7I)
+ * build dk_cinfo - see dkio(4I)
  */
 static void
 fake_disk_info(dev_t dev, struct dk_cinfo *ci)
diff --git a/usr/src/uts/common/io/log.c b/usr/src/uts/common/io/log.c
index 91ee5b2879..87ae96806c 100644
--- a/usr/src/uts/common/io/log.c
+++ b/usr/src/uts/common/io/log.c
@@ -25,7 +25,7 @@
 
 
 /*
- * Streams log driver.  See log(7D).
+ * Streams log driver.  See log(4D).
  */
 
 #include <sys/types.h>
diff --git a/usr/src/uts/common/io/mac/mac_flow.c b/usr/src/uts/common/io/mac/mac_flow.c
index 62612122d6..d83de9503e 100644
--- a/usr/src/uts/common/io/mac/mac_flow.c
+++ b/usr/src/uts/common/io/mac/mac_flow.c
@@ -1204,7 +1204,7 @@ mac_link_flow_init(mac_client_handle_t mch, flow_entry_t *sub_flow)
 
 /*
  * mac_link_flow_add()
- * Used by flowadm(1m) or kernel mac clients for creating flows.
+ * Used by flowadm(8) or kernel mac clients for creating flows.
  */
 int
 mac_link_flow_add(datalink_id_t linkid, char *flow_name,
@@ -1344,7 +1344,7 @@ mac_link_flow_clean(mac_client_handle_t mch, flow_entry_t *sub_flow)
 
 	/*
 	 * Delete the SRSs associated with this subflow. If this is being
-	 * driven by flowadm(1M) then the subflow will be deleted by
+	 * driven by flowadm(8) then the subflow will be deleted by
 	 * dls_rem_flow. However if this is a result of the interface being
 	 * unplumbed then the subflow itself won't be deleted.
 	 */
@@ -1370,7 +1370,7 @@ mac_link_flow_clean(mac_client_handle_t mch, flow_entry_t *sub_flow)
 
 /*
  * mac_link_flow_remove()
- * Used by flowadm(1m) or kernel mac clients for removing flows.
+ * Used by flowadm(8) or kernel mac clients for removing flows.
  */
 int
 mac_link_flow_remove(char *flow_name)
diff --git a/usr/src/uts/common/io/mac/mac_sched.c b/usr/src/uts/common/io/mac/mac_sched.c
index 9290530810..fe00be8b14 100644
--- a/usr/src/uts/common/io/mac/mac_sched.c
+++ b/usr/src/uts/common/io/mac/mac_sched.c
@@ -44,7 +44,7 @@
  *
  *	This driver. It interfaces with device drivers and provides abstractions
  *	that the rest of the system consumes. All data links -- things managed
- *	with dladm(1M), are accessed through MAC.
+ *	with dladm(8), are accessed through MAC.
  *
  * GLDv3 DEVICE DRIVER
  *
@@ -65,7 +65,7 @@
  *	which is used for all unicast traffic addressed to the address of a MAC
  *	device. For example, when a VNIC is created, a default flow is created
  *	for the VNIC's MAC address. In addition, flows are created for broadcast
- *	groups and a user may create a flow with flowadm(1M).
+ *	groups and a user may create a flow with flowadm(8).
  *
  * CLASSIFICATION
  *
@@ -77,7 +77,7 @@
  *	destination MAC address.
  *
  *	The system also will do classification based on layer three and layer
- *	four properties. This is used to support things like flowadm(1M), which
+ *	four properties. This is used to support things like flowadm(8), which
  *	allows setting QoS and other properties on a per-flow basis.
  *
  * RING
@@ -230,8 +230,8 @@
  * capabilities and rules in place and then to supplement that with hardware
  * resources when available. In general, simple layer two classification is
  * sufficient and nothing else is used, unless a specific flow is created with
- * tools such as flowadm(1M) or bandwidth limits are set on a device with
- * dladm(1M).
+ * tools such as flowadm(8) or bandwidth limits are set on a device with
+ * dladm(8).
  *
  * RINGS AND GROUPS
  *
@@ -292,7 +292,7 @@
  *
  * MAC makes the determination as to which of these modes a given soft ring set
  * obtains based on parameters such as whether or not it's the primary mac
- * client, whether it's on a 10 GbE or faster device, user controlled dladm(1M)
+ * client, whether it's on a 10 GbE or faster device, user controlled dladm(8)
  * properties, and the nature of the hardware and the resources that it has.
  *
  * When there is no fanout, MAC does not create any soft rings for a device and
diff --git a/usr/src/uts/common/io/mac/plugins/mac_ether.c b/usr/src/uts/common/io/mac/plugins/mac_ether.c
index 9b230b36cd..6e1ec4953a 100644
--- a/usr/src/uts/common/io/mac/plugins/mac_ether.c
+++ b/usr/src/uts/common/io/mac/plugins/mac_ether.c
@@ -62,7 +62,7 @@ static mac_stat_info_t ether_stats[] = {
 	{ ETHER_STAT_TOOSHORT_ERRORS, "runt_errors", KSTAT_DATA_UINT32,	0 },
 	{ ETHER_STAT_JABBER_ERRORS, "jabber_errors", KSTAT_DATA_UINT32,	0 },
 
-	/* Statistics described in the ieee802.3(5) man page */
+	/* Statistics described in the ieee802.3(7) man page */
 	{ ETHER_STAT_XCVR_ADDR, "xcvr_addr", KSTAT_DATA_UINT32,		0 },
 	{ ETHER_STAT_XCVR_ID, "xcvr_id", KSTAT_DATA_UINT32, 		0 },
 	{ ETHER_STAT_XCVR_INUSE, "xcvr_inuse", KSTAT_DATA_UINT32,	0 },
diff --git a/usr/src/uts/common/io/mac/plugins/mac_wifi.c b/usr/src/uts/common/io/mac/plugins/mac_wifi.c
index 1bd338c8b9..d8087cab91 100644
--- a/usr/src/uts/common/io/mac/plugins/mac_wifi.c
+++ b/usr/src/uts/common/io/mac/plugins/mac_wifi.c
@@ -44,7 +44,7 @@ static uint8_t wifi_ietfmagic[]	= { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
 static uint8_t wifi_ieeemagic[]	= { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
 
 static mac_stat_info_t wifi_stats[] = {
-	/* statistics described in ieee802.11(5) */
+	/* statistics described in ieee802.11(7) */
 { WIFI_STAT_TX_FRAGS, 		"tx_frags",		KSTAT_DATA_UINT32, 0 },
 { WIFI_STAT_MCAST_TX,		"mcast_tx",		KSTAT_DATA_UINT32, 0 },
 { WIFI_STAT_TX_FAILED,		"tx_failed",		KSTAT_DATA_UINT32, 0 },
diff --git a/usr/src/uts/common/io/mlxcx/mlxcx.conf b/usr/src/uts/common/io/mlxcx/mlxcx.conf
index 321820a47b..3c3d1bcb87 100644
--- a/usr/src/uts/common/io/mlxcx/mlxcx.conf
+++ b/usr/src/uts/common/io/mlxcx/mlxcx.conf
@@ -17,7 +17,7 @@
 
 #
 # Driver.conf file for Mellanox Connect-X 4/5/6.
-# See mlxcx(7D) for valid options.
+# See mlxcx(4D) for valid options.
 #
 
 #
diff --git a/usr/src/uts/common/io/mlxcx/mlxcx.h b/usr/src/uts/common/io/mlxcx/mlxcx.h
index 68da65765f..a85a432bbe 100644
--- a/usr/src/uts/common/io/mlxcx/mlxcx.h
+++ b/usr/src/uts/common/io/mlxcx/mlxcx.h
@@ -25,7 +25,7 @@
 #define	_MLXCX_H
 
 /*
- * mlxcx(7D) defintions
+ * mlxcx(4D) defintions
  */
 
 #include <sys/ddi.h>
diff --git a/usr/src/uts/common/io/net80211/net80211.c b/usr/src/uts/common/io/net80211/net80211.c
index 7b8d614190..74b1b7ada8 100644
--- a/usr/src/uts/common/io/net80211/net80211.c
+++ b/usr/src/uts/common/io/net80211/net80211.c
@@ -670,7 +670,7 @@ ieee80211_notify_node_leave(ieee80211com_t *ic, ieee80211_node_t *in)
 
 
 /*
- * Get 802.11 kstats defined in ieee802.11(5)
+ * Get 802.11 kstats defined in ieee802.11(7)
  *
  * Return 0 on success
  */
diff --git a/usr/src/uts/common/io/ntxn/ntxn.conf b/usr/src/uts/common/io/ntxn/ntxn.conf
index a0f152297c..6adb37666d 100644
--- a/usr/src/uts/common/io/ntxn/ntxn.conf
+++ b/usr/src/uts/common/io/ntxn/ntxn.conf
@@ -28,7 +28,7 @@
 # Driver.conf file for Netxen 10-Gigabit Ethernet devices
 # 
 # All the properties below can be set globally (i.e. for all instances
-# of ntxn), or on a per-instance basis.  See driver.conf(4) for details
+# of ntxn), or on a per-instance basis.  See driver.conf(5) for details
 # of the syntax of global and per-instance properties.
 #
 # Properties specified in this file take effect when the driver is first
@@ -36,7 +36,7 @@
 # therefore not take effect until the next reboot, but will be permanent
 # thereafter.
 #
-# Some of the driver's parameters can also be changed using ndd(1m).
+# Some of the driver's parameters can also be changed using ndd(8).
 # Changes made with ndd apply only to a specific instance (e.g. ntxn0).
 # They take effect immediately, but are lost if the driver is unloaded.
 #
diff --git a/usr/src/uts/common/io/nulldriver.c b/usr/src/uts/common/io/nulldriver.c
index 04e8d86b22..d5050cf51a 100644
--- a/usr/src/uts/common/io/nulldriver.c
+++ b/usr/src/uts/common/io/nulldriver.c
@@ -45,7 +45,7 @@
  *   device access, a nexus driver can still internally use the transport
  *   services.
  *
- *   A scsi(4) example of this type of use is SCSA enumeration services
+ *   A scsi(5) example of this type of use is SCSA enumeration services
  *   issuing a scsi REPORT_LUN command to a lun-0 'probe' node bound to
  *   nulldriver in order to discover all luns supported by a target.
  */
diff --git a/usr/src/uts/common/io/nvme/nvme.c b/usr/src/uts/common/io/nvme/nvme.c
index a8a9d0b843..c1c808ed34 100644
--- a/usr/src/uts/common/io/nvme/nvme.c
+++ b/usr/src/uts/common/io/nvme/nvme.c
@@ -107,7 +107,7 @@
  * For each NVMe device the driver exposes one minor node for the controller and
  * one minor node for each namespace. The only operations supported by those
  * minor nodes are open(9E), close(9E), and ioctl(9E). This serves as the
- * interface for the nvmeadm(1M) utility.
+ * interface for the nvmeadm(8) utility.
  *
  *
  * Blkdev Interface:
diff --git a/usr/src/uts/common/io/overlay/overlay.c b/usr/src/uts/common/io/overlay/overlay.c
index 3016d88b13..47a1833731 100644
--- a/usr/src/uts/common/io/overlay/overlay.c
+++ b/usr/src/uts/common/io/overlay/overlay.c
@@ -36,7 +36,7 @@
  * General Architecture
  * --------------------
  *
- * The logical overlay device that a user sees in dladm(1M) is a combination of
+ * The logical overlay device that a user sees in dladm(8) is a combination of
  * two different components that work together. The first component is this
  * kernel module, which is responsible for answering question one -- how should
  * I transform a packet to put it on the wire.
@@ -56,7 +56,7 @@
  * general, the path isn't very common.
  *
  * The following is what makes up the logical overlay device that a user would
- * create with dladm(1M).
+ * create with dladm(8).
  *
  *       Kernel                                     Userland
  *   . . . . . . . . . . . . . . . . . . . . .   . . . . . . . . . . . . .
@@ -244,7 +244,7 @@
  * Finally, a property may declare a list of valid values. These valid values
  * are used for display purposes, they are not enforced by the broader system,
  * but merely allow a means for the information to be communicated to the user
- * through dladm(1M). Like a default value, this is optional.
+ * through dladm(8). Like a default value, this is optional.
  *
  * The general scaffolding does not do very much with respect to the getting and
  * setting of properties. That is really owned by the individual plugins
@@ -401,7 +401,7 @@
  *   +-------------------------------+
  *
  * The primary entries that we care about are the overlay_dev_t, which
- * correspond to each overlay device that is created with dladm(1M). Globally,
+ * correspond to each overlay device that is created with dladm(8). Globally,
  * these devices are maintained in a simple list_t which is protected with a
  * lock.  Hence, these include important information such as the mac_handle_t
  * and a datalink_id_t which is used to interact with the broader MAC and DLS
diff --git a/usr/src/uts/common/io/power.c b/usr/src/uts/common/io/power.c
index aed53f5334..2e29f55416 100644
--- a/usr/src/uts/common/io/power.c
+++ b/usr/src/uts/common/io/power.c
@@ -41,7 +41,7 @@
  *	an application that has opened the device is going away, a new
  *	minor clone is created for each open(9E) request.  There are
  *	allocations for creating minor clones between 1 and 255.  The ioctl
- *	interface is defined by pbio(7I) and approved as part of
+ *	interface is defined by pbio(4I) and approved as part of
  *	PSARC/1999/393 case.
  */
 
diff --git a/usr/src/uts/common/io/ptem.c b/usr/src/uts/common/io/ptem.c
index 3be1f9d777..137f2916b5 100644
--- a/usr/src/uts/common/io/ptem.c
+++ b/usr/src/uts/common/io/ptem.c
@@ -756,7 +756,7 @@ out:
 
 			/*
 			 * TCSBRK meaningful if data part of message is 0
-			 * cf. termio(7).
+			 * cf. termio(4I).
 			 */
 			if (!(*(int *)mp->b_cont->b_rptr))
 				(void) putnextctl(q, M_BREAK);
diff --git a/usr/src/uts/common/io/ramdisk.c b/usr/src/uts/common/io/ramdisk.c
index a7a568b77c..5fbd5e62b2 100644
--- a/usr/src/uts/common/io/ramdisk.c
+++ b/usr/src/uts/common/io/ramdisk.c
@@ -29,7 +29,7 @@
  *
  * There are two types of ramdisk: 'real' OBP-created ramdisks, and 'pseudo'
  * ramdisks created at runtime with no corresponding OBP device node.  The
- * ramdisk(7D) driver is capable of dealing with both, and with the creation
+ * ramdisk(4D) driver is capable of dealing with both, and with the creation
  * and deletion of 'pseudo' ramdisks.
  *
  * Every ramdisk has a single 'state' structure which maintains data for
@@ -44,7 +44,7 @@
  * assigned to the ramdisk.  All 'pseudo' ramdisks share a common devinfo
  * structure.
  *
- * A single character device node is used by ramdiskadm(1M) to communicate
+ * A single character device node is used by ramdiskadm(8) to communicate
  * with the ramdisk driver, with minor number 0:
  *
  *	/dev/ramdiskctl -> /devices/pseudo/ramdisk@0:ctl
@@ -495,7 +495,7 @@ rd_map_window(rd_devstate_t *rsp, off_t offset)
 static void
 rd_fake_disk_geometry(rd_devstate_t *rsp)
 {
-	/* dk_geom - see dkio(7I) */
+	/* dk_geom - see dkio(4I) */
 	/*
 	 * dkg_ncyl _could_ be set to one here (one big cylinder with gobs
 	 * of sectors), but that breaks programs like fdisk which want to
@@ -529,7 +529,7 @@ rd_fake_disk_geometry(rd_devstate_t *rsp)
 	rsp->rd_dkg.dkg_write_reinstruct = 0;
 	rsp->rd_dkg.dkg_read_reinstruct = 0;
 
-	/* vtoc - see dkio(7I) */
+	/* vtoc - see dkio(4I) */
 	bzero(&rsp->rd_vtoc, sizeof (struct vtoc));
 	rsp->rd_vtoc.v_sanity = VTOC_SANE;
 	rsp->rd_vtoc.v_version = V_VERSION;
@@ -548,7 +548,7 @@ rd_fake_disk_geometry(rd_devstate_t *rsp)
 	rsp->rd_vtoc.v_part[0].p_size = rsp->rd_dkg.dkg_pcyl *
 	    rsp->rd_dkg.dkg_nsect * rsp->rd_dkg.dkg_nhead;
 
-	/* dk_cinfo - see dkio(7I) */
+	/* dk_cinfo - see dkio(4I) */
 	bzero(&rsp->rd_ci, sizeof (struct dk_cinfo));
 	(void) strcpy(rsp->rd_ci.dki_cname, RD_DRIVER_NAME);
 	rsp->rd_ci.dki_ctype = DKC_MD;
diff --git a/usr/src/uts/common/io/sata/impl/sata.c b/usr/src/uts/common/io/sata/impl/sata.c
index 8ee71ce192..9228b470ec 100644
--- a/usr/src/uts/common/io/sata/impl/sata.c
+++ b/usr/src/uts/common/io/sata/impl/sata.c
@@ -2221,7 +2221,7 @@ sata_scsi_tgt_free(dev_info_t *hba_dip, dev_info_t *tgt_dip,
 
 	/*
 	 * If devid was previously created but not freed up from
-	 * sd(7D) driver (i.e during detach(9F)) then do it here.
+	 * sd(4D) driver (i.e during detach(9F)) then do it here.
 	 */
 	if ((sdinfo->satadrv_type == SATA_DTYPE_ATADISK) &&
 	    (ddi_getprop(DDI_DEV_T_ANY, hba_dip, DDI_PROP_DONTPASS,
@@ -11588,7 +11588,7 @@ sata_reprobe_pmult(sata_hba_inst_t *sata_hba_inst, sata_device_t *sata_device,
 	 * after which the port multiplier is not correct initialized and
 	 * recognized. In that case the new device will be marked as unknown
 	 * and will not be automatically probed in this routine. Instead
-	 * system administrator could manually restart it via cfgadm(1M).
+	 * system administrator could manually restart it via cfgadm(8).
 	 */
 	if (sata_device->satadev_type != SATA_DTYPE_PMULT) {
 		cportinfo->cport_dev_type = SATA_DTYPE_UNKNOWN;
diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
index cf1fa01c68..d62e3b2924 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
@@ -97,7 +97,7 @@ static int	vhci_bus_config_debug = 0;
 
 /*
  * Bidirectional map of 'target-port' to port id <pid> for support of
- * iostat(1M) '-Xx' and '-Yx' output.
+ * iostat(8) '-Xx' and '-Yx' output.
  */
 static kmutex_t		vhci_targetmap_mutex;
 static uint_t		vhci_targetmap_pid = 1;
@@ -4966,14 +4966,14 @@ vhci_kstat_create_pathinfo(mdi_pathinfo_t *pip)
 	 *
 	 * We maintain a bidirectional 'target-port' to <pid> map,
 	 * called targetmap. All pathinfo nodes with the same
-	 * 'target-port' map to the same <pid>. The iostat(1M) code,
+	 * 'target-port' map to the same <pid>. The iostat(8) code,
 	 * when parsing a path oriented kstat name, uses the <pid> as
 	 * a SCSI_VHCI_GET_TARGET_LONGNAME ioctl argument in order
 	 * to get the 'target-port'. For KSTAT_FLAG_PERSISTENT kstats,
 	 * this ioctl needs to translate a <pid> to a 'target-port'
 	 * even after all pathinfo nodes associated with the
 	 * 'target-port' have been destroyed. This is needed to support
-	 * consistent first-iteration activity-since-boot iostat(1M)
+	 * consistent first-iteration activity-since-boot iostat(8)
 	 * output. Because of this requirement, the mapping can't be
 	 * based on pathinfo information in a devinfo snapshot.
 	 */
@@ -5003,7 +5003,7 @@ vhci_kstat_create_pathinfo(mdi_pathinfo_t *pip)
 		 * For this type of mapping we don't want the
 		 * <id> -> 'target-port' mapping to be made.  This
 		 * will cause the SCSI_VHCI_GET_TARGET_LONGNAME ioctl
-		 * to fail, and the iostat(1M) long '-n' output will
+		 * to fail, and the iostat(8) long '-n' output will
 		 * still use the <pid>.  We do this because we just
 		 * made up the 'target-port' using the guid, and we
 		 * don't want to expose that fact in iostat output.
@@ -8346,7 +8346,7 @@ vhci_uscsi_send_sense(struct scsi_pkt *pkt, mp_uscsi_cmd_t *mp_uscmdp)
 	rqpkt->pkt_private = mp_uscmdp;
 
 	/*
-	 * NOTE: This code path is related to MPAPI uscsi(7I), so path
+	 * NOTE: This code path is related to MPAPI uscsi(4I), so path
 	 * selection is not based on path_instance.
 	 */
 	if (scsi_pkt_allocated_correctly(rqpkt))
@@ -8577,7 +8577,7 @@ vhci_uscsi_iostart(struct buf *bp)
 	    (void *)bp, bp->b_bcount, (void *)mp_uscmdp->pip, stat_size));
 
 	/*
-	 * NOTE: This code path is related to MPAPI uscsi(7I), so path
+	 * NOTE: This code path is related to MPAPI uscsi(4I), so path
 	 * selection is not based on path_instance.
 	 */
 	if (scsi_pkt_allocated_correctly(pkt))
diff --git a/usr/src/uts/common/io/scsi/impl/scsi_hba.c b/usr/src/uts/common/io/scsi/impl/scsi_hba.c
index 50bf21b2f3..0ae0978796 100644
--- a/usr/src/uts/common/io/scsi/impl/scsi_hba.c
+++ b/usr/src/uts/common/io/scsi/impl/scsi_hba.c
@@ -3229,7 +3229,7 @@ scsi_hba_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
 		    (bus_state == BUS_QUIESCED))
 			rv = EALREADY;
 		else if (tran->tran_quiesce == NULL)
-			rv = ENOTSUP; /* man ioctl(7I) says ENOTTY */
+			rv = ENOTSUP; /* man ioctl(2) says ENOTTY */
 		else if (tran->tran_quiesce(self) != 0)
 			rv = EIO;
 		else if (ndi_set_bus_state(self, BUS_QUIESCED) != NDI_SUCCESS)
@@ -3241,7 +3241,7 @@ scsi_hba_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
 		    (bus_state == BUS_ACTIVE))
 			rv = EALREADY;
 		else if (tran->tran_unquiesce == NULL)
-			rv = ENOTSUP; /* man ioctl(7I) says ENOTTY */
+			rv = ENOTSUP; /* man ioctl(2) says ENOTTY */
 		else if (tran->tran_unquiesce(self) != 0)
 			rv = EIO;
 		else if (ndi_set_bus_state(self, BUS_ACTIVE) != NDI_SUCCESS)
@@ -3250,7 +3250,7 @@ scsi_hba_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
 
 	case DEVCTL_BUS_RESET:
 		if (tran->tran_bus_reset == NULL)
-			rv = ENOTSUP; /* man ioctl(7I) says ENOTTY */
+			rv = ENOTSUP; /* man ioctl(2) says ENOTTY */
 		else if (tran->tran_bus_reset(self, RESET_BUS) != 1)
 			rv = EIO;
 		break;
@@ -3261,7 +3261,7 @@ scsi_hba_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
 			break;		/* reset all worked */
 		}
 		if (tran->tran_bus_reset == NULL) {
-			rv = ENOTSUP; /* man ioctl(7I) says ENOTTY */
+			rv = ENOTSUP; /* man ioctl(2) says ENOTTY */
 			break;
 		}
 		if (tran->tran_bus_reset(self, RESET_BUS) != 1)
@@ -3917,7 +3917,7 @@ scsi_hba_ident_nodename_compatible_get(struct scsi_inquiry *inq,
 	csp = compatp;
 	p = (char *)(compatp + NCOMPAT);
 
-	/* ( 0) driver (optional, not documented in scsi(4)) */
+	/* ( 0) driver (optional, not documented in scsi(5)) */
 	if (compat0) {
 		*csp++ = p;
 		(void) snprintf(p, tlen, "%s", compat0);
@@ -4006,7 +4006,7 @@ scsi_hba_ident_nodename_compatible_get(struct scsi_inquiry *inq,
 		tlen -= len;
 	}
 
-	/* (8.5) scsa,DD.bB (not documented in scsi(4)) */
+	/* (8.5) scsa,DD.bB (not documented in scsi(5)) */
 	if (binding_set) {
 		*csp++ = p;
 		(void) snprintf(p, tlen, "scsa,%02x.b%s",
@@ -7819,7 +7819,7 @@ scsi_hba_bus_config_spi(dev_info_t *self, uint_t flags,
 		 * Static driver.conf file enumeration:
 		 *
 		 * Force reprobe for BUS_CONFIG_ONE or when manually
-		 * reconfiguring via devfsadm(1m) to emulate deferred attach.
+		 * reconfiguring via devfsadm(8) to emulate deferred attach.
 		 * Reprobe only discovers driver.conf enumerated nodes, more
 		 * dynamic implementations probably require their own
 		 * bus_config.
diff --git a/usr/src/uts/common/io/scsi/impl/scsi_subr.c b/usr/src/uts/common/io/scsi/impl/scsi_subr.c
index 4b08bed848..1fd97aeeb3 100644
--- a/usr/src/uts/common/io/scsi/impl/scsi_subr.c
+++ b/usr/src/uts/common/io/scsi/impl/scsi_subr.c
@@ -2502,7 +2502,7 @@ scsi_uscsi_pktinit(struct uscsi_cmd *uscmd, struct scsi_pkt *pkt)
 	    (uscmd->uscsi_path_instance != 0)) {
 		/*
 		 * Check to make sure the scsi_pkt was allocated correctly
-		 * before transferring uscsi(7i) path_instance to scsi_pkt(9S).
+		 * before transferring uscsi(4I) path_instance to scsi_pkt(9S).
 		 */
 		if (scsi_pkt_allocated_correctly(pkt)) {
 			/* set pkt_path_instance and flag. */
@@ -2547,7 +2547,7 @@ scsi_uscsi_pktfini(struct scsi_pkt *pkt, struct uscsi_cmd *uscmd)
 {
 	/*
 	 * Check to make sure the scsi_pkt was allocated correctly before
-	 * transferring scsi_pkt(9S) path_instance to uscsi(7i).
+	 * transferring scsi_pkt(9S) path_instance to uscsi(4I).
 	 */
 	if (!scsi_pkt_allocated_correctly(pkt)) {
 		uscmd->uscsi_path_instance = 0;
diff --git a/usr/src/uts/common/io/scsi/targets/sd.c b/usr/src/uts/common/io/scsi/targets/sd.c
index 3478aa0325..aa88a9c42f 100644
--- a/usr/src/uts/common/io/scsi/targets/sd.c
+++ b/usr/src/uts/common/io/scsi/targets/sd.c
@@ -14337,7 +14337,7 @@ sd_initpkt_for_uscsi(struct buf *bp, struct scsi_pkt **pktpp)
 	SD_FILL_SCSI1_LUN(un, pktp);
 
 	/*
-	 * Set up the optional USCSI flags. See the uscsi (7I) man page
+	 * Set up the optional USCSI flags. See the uscsi(4I) man page
 	 * for listing of the supported flags.
 	 */
 
@@ -31044,7 +31044,7 @@ sd_faultinjection(struct scsi_pkt *pktp)
  * 4. Building default VTOC label
  *
  *     As section 3 says, sd checks if some kinds of devices have VTOC label.
- *     If those devices have no valid VTOC label, sd(7d) will attempt to
+ *     If those devices have no valid VTOC label, sd(4D) will attempt to
  *     create default VTOC for them. Currently sd creates default VTOC label
  *     for all devices on x86 platform (VTOC_16), but only for removable
  *     media devices on SPARC (VTOC_8).
@@ -31077,7 +31077,7 @@ sd_faultinjection(struct scsi_pkt *pktp)
  *
  * 6. Automatic mount & unmount
  *
- *     Sd(7d) driver provides DKIOCREMOVABLE ioctl. This ioctl is used to query
+ *     sd(4D) driver provides DKIOCREMOVABLE ioctl. This ioctl is used to query
  *     if a device is removable media device. It return 1 for removable media
  *     devices, and 0 for others.
  *
@@ -31087,9 +31087,9 @@ sd_faultinjection(struct scsi_pkt *pktp)
  *
  * 7. fdisk partition management
  *
- *     Fdisk is traditional partition method on x86 platform. Sd(7d) driver
+ *     Fdisk is traditional partition method on x86 platform. sd(4D) driver
  *     just supports fdisk partitions on x86 platform. On sparc platform, sd
- *     doesn't support fdisk partitions at all. Note: pcfs(7fs) can recognize
+ *     doesn't support fdisk partitions at all. Note: pcfs(4FS) can recognize
  *     fdisk partitions on both x86 and SPARC platform.
  *
  *     -----------------------------------------------------------
@@ -31103,7 +31103,7 @@ sd_faultinjection(struct scsi_pkt *pktp)
  *
  * 8. MBOOT/MBR
  *
- *     Although sd(7d) doesn't support fdisk on SPARC platform, it does support
+ *     Although sd(4D) doesn't support fdisk on SPARC platform, it does support
  *     read/write mboot for removable media devices on sparc platform.
  *
  *     -----------------------------------------------------------
diff --git a/usr/src/uts/common/io/scsi/targets/sgen.c b/usr/src/uts/common/io/scsi/targets/sgen.c
index 1d6316caf3..2a954f116d 100644
--- a/usr/src/uts/common/io/scsi/targets/sgen.c
+++ b/usr/src/uts/common/io/scsi/targets/sgen.c
@@ -34,7 +34,7 @@
  * sgen - SCSI generic device driver
  *
  * The sgen driver provides user programs access to SCSI devices that
- * are not supported by other drivers by providing the USCSI(7I) interface.
+ * are not supported by other drivers by providing the uscsi(4I) interface.
  */
 
 #include <sys/modctl.h>
@@ -1128,7 +1128,7 @@ sgen_close(dev_t dev, int flag, int otyp, cred_t *cred_p)
 
 /*
  * sgen_ioctl()
- *	sgen supports the USCSI(7I) ioctl interface.
+ *	sgen supports the uscsi(4I) ioctl interface.
  */
 /*ARGSUSED4*/
 static int
@@ -1195,7 +1195,7 @@ sgen_ioctl(dev_t dev,
 
 /*
  * sgen_uscsi_cmd()
- *	Setup, configuration and teardown for a uscsi(7I) command
+ *	Setup, configuration and teardown for a uscsi(4I) command
  */
 /*ARGSUSED*/
 static int
diff --git a/usr/src/uts/common/io/scsi/targets/sgen.conf b/usr/src/uts/common/io/scsi/targets/sgen.conf
index e18c06928c..38b0161862 100644
--- a/usr/src/uts/common/io/scsi/targets/sgen.conf
+++ b/usr/src/uts/common/io/scsi/targets/sgen.conf
@@ -28,7 +28,7 @@
 #
 
 # WARNING: enabling this driver may impact the security and data integrity of
-# devices on your system.  Please refer to sgen(7d) for details.
+# devices on your system.  Please refer to sgen(4D) for details.
 #
 # There are two ways of configuring sgen: by establishing an association
 # between a compatible alias for a device and the sgen driver via
@@ -39,7 +39,7 @@
 # preferred method to control driver binding, it avoids issues associated
 # with multiple driver.conf files associating more than one driver with a
 # device. The compatible property forms for SCSI target devices used in the
-# add_drv command are described in scsi(4).
+# add_drv command are described in scsi(5).
 #
 # USAGE EXAMPLE (add_drv)
 #
@@ -85,7 +85,7 @@
 # Vendor and Product IDs returned by the device in response to the SCSI INQUIRY
 # command.  This is accomplished by specifying pairs of Vendor ID and Product ID
 # strings in the inquiry-config-list property, below.  "*" may be substituted
-# for the vendor ID as a wildcard.  See sgen(7D) for details and extended usage
+# for the vendor ID as a wildcard.  See sgen(4D) for details and extended usage
 # examples.
 #
 # USAGE EXAMPLE (sgen.conf)
diff --git a/usr/src/uts/common/io/scsi/targets/st.c b/usr/src/uts/common/io/scsi/targets/st.c
index 3fef558d3a..cdba7764cc 100644
--- a/usr/src/uts/common/io/scsi/targets/st.c
+++ b/usr/src/uts/common/io/scsi/targets/st.c
@@ -1031,7 +1031,7 @@ st_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 			    " I/O\n"
 			    " For more information, read about "
 			    " tape-driver-buffering "
-			    "property in the st(7d) man page\n");
+			    "property in the st(4D) man page\n");
 		}
 	}
 
diff --git a/usr/src/uts/common/io/sfxge/sfxge_ioc.h b/usr/src/uts/common/io/sfxge/sfxge_ioc.h
index 0ad86a160b..64e9e37b7f 100644
--- a/usr/src/uts/common/io/sfxge/sfxge_ioc.h
+++ b/usr/src/uts/common/io/sfxge/sfxge_ioc.h
@@ -78,7 +78,7 @@ typedef	struct sfxge_nvram_ioc_s {
 	uint16_t	sni_version[4];		/* get/set_ver */
 	/*
 	 * Streams STRMSGSZ limit (default 64kb)
-	 * See write(2) and I_STR in streamio(7i)
+	 * See write(2) and I_STR in streamio(4I)
 	 */
 	uint8_t		sni_data[32*1024];	/* read/write */
 } sfxge_nvram_ioc_t;
diff --git a/usr/src/uts/common/io/sfxge/sfxge_pci.c b/usr/src/uts/common/io/sfxge/sfxge_pci.c
index 720b47f7aa..e88f68c370 100644
--- a/usr/src/uts/common/io/sfxge/sfxge_pci.c
+++ b/usr/src/uts/common/io/sfxge/sfxge_pci.c
@@ -111,7 +111,7 @@ sfxge_pci_init(sfxge_t *sp)
 	 * resources. Each element contains a 5-tuple of 32bit values,
 	 * where the first 32bit value contains the bus/dev/fn slot
 	 * information.
-	 * See pci(4) and the definition of "struct pci_phys_spec" in sys/pci.h
+	 * See pci(5) and the definition of "struct pci_phys_spec" in sys/pci.h
 	 */
 	if (ddi_prop_lookup_int_array(DDI_DEV_T_ANY, sp->s_dip,
 	    DDI_PROP_DONTPASS, "reg", (int **)&pci_regs, &pci_nregs) !=
diff --git a/usr/src/uts/common/io/smbios.c b/usr/src/uts/common/io/smbios.c
index 92d28cc4fa..8a4bfd12fe 100644
--- a/usr/src/uts/common/io/smbios.c
+++ b/usr/src/uts/common/io/smbios.c
@@ -26,7 +26,7 @@
 
 
 /*
- * smbios(7D) driver
+ * smbios(4D) driver
  *
  * This pseudo-driver makes available a snapshot of the system's SMBIOS image
  * that can be accessed using libsmbios.  Clients may access a snapshot using
diff --git a/usr/src/uts/common/io/softmac/softmac_main.c b/usr/src/uts/common/io/softmac/softmac_main.c
index e19df40e0c..294afecb58 100644
--- a/usr/src/uts/common/io/softmac/softmac_main.c
+++ b/usr/src/uts/common/io/softmac/softmac_main.c
@@ -563,7 +563,7 @@ softmac_update_info(softmac_t *softmac, datalink_id_t *linkidp)
 
 		cmn_err(CE_WARN, "%s device might not be available "
 		    "for use.", softmac->smac_devname);
-		cmn_err(CE_WARN, "See dladm(1M) for more information.");
+		cmn_err(CE_WARN, "See dladm(8) for more information.");
 	}
 
 	return (err);
diff --git a/usr/src/uts/common/io/strplumb.c b/usr/src/uts/common/io/strplumb.c
index d57bc150f5..5ecd2cdc39 100644
--- a/usr/src/uts/common/io/strplumb.c
+++ b/usr/src/uts/common/io/strplumb.c
@@ -348,12 +348,12 @@ strplumb_dev(ldi_ident_t li)
 	 * permanently linked under UDP.  One stream consists of the
 	 * ARP-[ifname] combination, while the other consists of IP-[ifname].
 	 *
-	 * We pin underneath UDP here to match what is done in ifconfig(1m);
+	 * We pin underneath UDP here to match what is done in ifconfig(8);
 	 * otherwise, ifconfig will be unable to unplumb the stream (the major
 	 * number and mux id must both match for a successful I_PUNLINK).
 	 *
 	 * There are subtleties in the plumbing which make it essential to
-	 * follow the logic used in ifconfig(1m) very closely.
+	 * follow the logic used in ifconfig(8) very closely.
 	 */
 
 	/*
diff --git a/usr/src/uts/common/io/tem_safe.c b/usr/src/uts/common/io/tem_safe.c
index 7b8730aa08..41f93c42be 100644
--- a/usr/src/uts/common/io/tem_safe.c
+++ b/usr/src/uts/common/io/tem_safe.c
@@ -32,7 +32,7 @@
 /*
  * Polled I/O safe ANSI terminal emulator module;
  * Supporting TERM types 'sun' and 'sun-color, parsing
- * ANSI x3.64 escape sequences, and the like.  (See wscons(7d)
+ * ANSI x3.64 escape sequences, and the like.  (See wscons(4D)
  * for more information).
  *
  * IMPORTANT:
diff --git a/usr/src/uts/common/io/ufm.c b/usr/src/uts/common/io/ufm.c
index d124485e65..2fe7cdd793 100644
--- a/usr/src/uts/common/io/ufm.c
+++ b/usr/src/uts/common/io/ufm.c
@@ -15,7 +15,7 @@
  */
 
 /*
- * The ufm(7D) pseudo driver provides an ioctl interface for DDI UFM
+ * The ufm(4D) pseudo driver provides an ioctl interface for DDI UFM
  * information.  See ddi_ufm.h.
  */
 #include <sys/ddi.h>
diff --git a/usr/src/uts/common/io/usb/clients/usbecm/usbecm.c b/usr/src/uts/common/io/usb/clients/usbecm/usbecm.c
index 8cb9218912..cdaf1f04ce 100644
--- a/usr/src/uts/common/io/usb/clients/usbecm/usbecm.c
+++ b/usr/src/uts/common/io/usb/clients/usbecm/usbecm.c
@@ -2828,7 +2828,7 @@ usbecm_usb_init(usbecm_state_t *ecmp)
 	} else {
 		USB_DPRINTF_L2(PRINT_MASK_ATTA, ecmp->ecm_lh,
 		    "usbecm_usb_init: A nonstandard device is attached to "
-		    "usbecm(7D) driver. This device doesn't conform to "
+		    "usbecm(4D) driver. This device doesn't conform to "
 		    "usb cdc spec.");
 		ecmp->ecm_compatibility = B_FALSE;
 
diff --git a/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/usbser_keyspan.c b/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/usbser_keyspan.c
index b6143e4a6b..7a9d491638 100644
--- a/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/usbser_keyspan.c
+++ b/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/usbser_keyspan.c
@@ -595,7 +595,7 @@ keyspan_download_firmware(keyspan_pre_state_t *kbp)
 	if (!record) {
 		USB_DPRINTF_L1(DPRINT_ATTACH, kbp->kb_lh,
 		    "No firmware available for Keyspan usa49wlc"
-		    " usb-to-serial adapter. Refer to usbsksp(7D)"
+		    " usb-to-serial adapter. Refer to usbsksp(4D)"
 		    " for details.");
 
 		return (USB_FAILURE);
diff --git a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
index 1ce34ed9a4..9a3eea35ee 100644
--- a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
+++ b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * USB video class driver (usbvc(7D))
+ * USB video class driver (usbvc(4D))
  *
  * 1. Overview
  * ------------
diff --git a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c
index 74c76afc8c..04269888f8 100644
--- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c
+++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c
@@ -1153,7 +1153,7 @@ ehci_init_workaround(ehci_state_t	*ehcip)
 			USB_DPRINTF_L1(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
 			    "If you are interested in enabling USB2.x");
 			USB_DPRINTF_L1(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
-			    "support please, refer to the ehci(7D) man page.");
+			    "support please, refer to the ehci(4D) man page.");
 			USB_DPRINTF_L1(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
 			    "Please also refer to www.sun.com/io for");
 			USB_DPRINTF_L1(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
diff --git a/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.conf b/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.conf
index af772d8a9f..7bc92a9b91 100644
--- a/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.conf
+++ b/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.conf
@@ -111,7 +111,7 @@
 #		By setting "remvalue" to "true", the information provided
 #		by the device is ignored. Consequently a USB hard disk
 #		is treated as a removable media disk and will not show in
-#		format(1M) disk list.
+#		format(8) disk list.
 #
 #	modesensevalue - "false" if the device cannot handle mode sense
 #		requests. This is the only legal value for this
diff --git a/usr/src/uts/common/io/zcons.c b/usr/src/uts/common/io/zcons.c
index eb74c3a039..ad64099f2d 100644
--- a/usr/src/uts/common/io/zcons.c
+++ b/usr/src/uts/common/io/zcons.c
@@ -71,7 +71,7 @@
  * ensuring that the subsidiary's STREAMS anchor would never be popped from
  * within the non-global zone (because zoneadmd runs in the global zone).
  * However, this file descriptor was removed to make zone console management
- * more robust.  sad(7D) is now used to automatically set up the subsidiary's
+ * more robust.  sad(4D) is now used to automatically set up the subsidiary's
  * STREAMS modules when the zone console is freshly opened within the
  * associated non-global zone.  However, when a process within the non-global
  * zone freshly opens the zone console, the anchor is pushed from within the
@@ -538,9 +538,9 @@ zc_subsidiary_open(zc_state_t *zcs,
 	}
 
 	/*
-	 * Set up sad(7D) so that the necessary STREAMS modules will be in
+	 * Set up sad(4D) so that the necessary STREAMS modules will be in
 	 * place.  A wrinkle is that 'ptem' must be anchored
-	 * in place (see streamio(7i)) because we always want the console to
+	 * in place (see streamio(4I)) because we always want the console to
 	 * have terminal semantics.
 	 */
 	minor = ddi_get_instance(zcs->zc_devinfo) << 1 | ZC_SUBSID_MINOR;
diff --git a/usr/src/uts/common/net/if.h b/usr/src/uts/common/net/if.h
index b184fcdda9..924fd390c7 100644
--- a/usr/src/uts/common/net/if.h
+++ b/usr/src/uts/common/net/if.h
@@ -147,7 +147,7 @@ struct ifnet {
 #define	IFF_IPV4	0x0001000000	/* IPv4 interface */
 #define	IFF_IPV6	0x0002000000	/* IPv6 interface */
 #define	IFF_NOACCEPT	0x0004000000	/* no-accept mode VRRP ill */
-#define	IFF_NOFAILOVER	0x0008000000	/* in.mpathd(1M) test address */
+#define	IFF_NOFAILOVER	0x0008000000	/* in.mpathd(8) test address */
 
 #define	IFF_FAILED	0x0010000000	/* Interface has failed */
 #define	IFF_STANDBY	0x0020000000	/* Interface is a hot-spare */
diff --git a/usr/src/uts/common/net/pfpolicy.h b/usr/src/uts/common/net/pfpolicy.h
index 0e456cf8f3..7da8256aed 100644
--- a/usr/src/uts/common/net/pfpolicy.h
+++ b/usr/src/uts/common/net/pfpolicy.h
@@ -326,8 +326,8 @@ struct spd_attribute
 };
 
 /*
- * These flags are used by the kernel algorithm structures and by ipsecalgs(1m).
- * ALG_FLAG_KERNELCHECKED is used by ipsecalgs(1m) to tag ipsecalgent_t as
+ * These flags are used by the kernel algorithm structures and by ipsecalgs(8).
+ * ALG_FLAG_KERNELCHECKED is used by ipsecalgs(8) to tag ipsecalgent_t as
  * kernel verified. ALG_FLAG_VALID is only meaningful if set by the kernel.
  */
 #define	ALG_FLAG_VALID		0x01
diff --git a/usr/src/uts/common/nfs/auth.h b/usr/src/uts/common/nfs/auth.h
index 5293e3fdd1..c33ac714d3 100644
--- a/usr/src/uts/common/nfs/auth.h
+++ b/usr/src/uts/common/nfs/auth.h
@@ -177,7 +177,7 @@ typedef struct nfsauth_res nfsauth_res_t;
 
 /*
  * For future extensibility, we version the data structures so
- * future incantations of mountd(1m) will know how to XDR decode
+ * future incantations of mountd(8) will know how to XDR decode
  * the arguments.
  */
 enum vtypes {
diff --git a/usr/src/uts/common/nfs/nfs.h b/usr/src/uts/common/nfs/nfs.h
index 6f76fc93ea..2bb312e661 100644
--- a/usr/src/uts/common/nfs/nfs.h
+++ b/usr/src/uts/common/nfs/nfs.h
@@ -1031,7 +1031,7 @@ extern void		(*nfs_srv_quiesce_func)(void);
 extern int		(*nfs_srv_dss_func)(char *, size_t);
 
 /*
- * Per-zone stats as consumed by nfsstat(1m)
+ * Per-zone stats as consumed by nfsstat(8)
  */
 struct nfs_version_stats {
 	kstat_named_t	*aclreqcnt_ptr;		/* nfs_acl:0:aclreqcnt_v? */
diff --git a/usr/src/uts/common/os/cap_util.c b/usr/src/uts/common/os/cap_util.c
index 86475315e1..7647302cfe 100644
--- a/usr/src/uts/common/os/cap_util.c
+++ b/usr/src/uts/common/os/cap_util.c
@@ -693,7 +693,7 @@ cu_cpc_program(cpu_t *cp, int *err)
 	 *
 	 * Context is marked with KCPC_CTX_INVALID_STOPPED when context is
 	 * unprogrammed and may be marked with KCPC_CTX_INVALID when
-	 * kcpc_invalidate_all() is called by cpustat(1M) and dtrace CPC to
+	 * kcpc_invalidate_all() is called by cpustat(8) and dtrace CPC to
 	 * invalidate all CPC contexts before they take over all the counters.
 	 *
 	 * This isn't necessary since these flags are only used for thread bound
diff --git a/usr/src/uts/common/os/clock_process.c b/usr/src/uts/common/os/clock_process.c
index 555cfd01d9..a3c1641c9c 100644
--- a/usr/src/uts/common/os/clock_process.c
+++ b/usr/src/uts/common/os/clock_process.c
@@ -18,7 +18,7 @@
  * clock. This clock is weakly defined by POSIX as "The identifier of the
  * CPU-time clock associated with the process making a clock() or timer*()
  * function call". We interpret that as including LMS_USER, LMS_SYSTEM, and
- * LMS_TRAP microstates. This is similar to what we do in proc(4) for the
+ * LMS_TRAP microstates. This is similar to what we do in proc(5) for the
  * lwpstatus_t and the prstatus_t.
  *
  * At this time, we only provide the ability to read the current time (e.g.
diff --git a/usr/src/uts/common/os/ddi.c b/usr/src/uts/common/os/ddi.c
index a37d91e92a..c348ee474c 100644
--- a/usr/src/uts/common/os/ddi.c
+++ b/usr/src/uts/common/os/ddi.c
@@ -1136,8 +1136,8 @@ qunbufcall(queue_t *q, bufcall_id_t id)
  * Associate the stream with an instance of the bottom driver.  This
  * function is called by APIs that establish or modify the hardware
  * association (ppa) of an open stream.  Two examples of such
- * post-open(9E) APIs are the dlpi(7p) DL_ATTACH_REQ message, and the
- * ndd(1M) "instance=" ioctl(2).  This interface may be called from a
+ * post-open(9E) APIs are the dlpi(4P) DL_ATTACH_REQ message, and the
+ * ndd(8) "instance=" ioctl(2).  This interface may be called from a
  * stream driver's wput procedure and from within syncq perimeters,
  * so it can't block.
  *
diff --git a/usr/src/uts/common/os/ddi_hp_impl.c b/usr/src/uts/common/os/ddi_hp_impl.c
index 38e575dbfd..8f0890fc2b 100644
--- a/usr/src/uts/common/os/ddi_hp_impl.c
+++ b/usr/src/uts/common/os/ddi_hp_impl.c
@@ -92,8 +92,8 @@
  *	- Through the nexus driver interface, ndi_hp_state_change_req. PCIe
  *	nexus drivers that pass a hotplug interrupt through to pciehpc will kick
  *	off state changes in this way.
- *	- Through coordinated removal, ddihp_modctl. Both cfgadm(1M) and
- *	hotplug(1M) pass state change requests through hotplugd, which uses
+ *	- Through coordinated removal, ddihp_modctl. Both cfgadm(8) and
+ *	hotplug(8) pass state change requests through hotplugd, which uses
  *	modctl to request state changes to the DDI hotplug framework. That
  *	interface is ultimately implemented by ddihp_modctl.
  *
@@ -131,7 +131,7 @@
  * of some key components are below.
  *
  *				+------------+
- *				| cfgadm(1M) |
+ *				| cfgadm(8)  |
  *				+------------+
  *				      |
  *			    +-------------------+
@@ -139,7 +139,7 @@
  *			    +-------------------+
  *				      |
  *	+-------------+		 +------------+
- *	| hotplug(1M) |----------| libhotplug |
+ *	| hotplug(8)  |----------| libhotplug |
  *	+-------------+		 +------------+
  *				      |
  *				 +----------+
@@ -193,14 +193,14 @@
  *
  * KEY HOTPLUG SOFTWARE COMPONENTS
  *
- *	CFGADM(1M)
+ *	cfgadm(8)
  *
  *	cfgadm is the canonical tool for hotplug operations. It can be used to
  *	list connections on the system and change their state in a coordinated
  *	fashion. For more information, see its manual page.
  *
  *
- *	HOTPLUG(1M)
+ *	hotplug(8)
  *
  *	hotplug is a command line tool for managing hotplug connections for
  *	connectors. For more information, see its manual page.
diff --git a/usr/src/uts/common/os/ddi_ufm.c b/usr/src/uts/common/os/ddi_ufm.c
index 3610df8bac..940ebf82bf 100644
--- a/usr/src/uts/common/os/ddi_ufm.c
+++ b/usr/src/uts/common/os/ddi_ufm.c
@@ -30,7 +30,7 @@
  * drivers that participate in the DDI UFM subsystem on a per-instance basis
  * via ddi_ufm_handle_t structures (see ddi_ufm_impl.h).  This is known as the
  * UFM handle.  The UFM handle contains a pointer to the driver's UFM ops,
- * which the ufm(7D) pseudo driver uses to invoke the UFM entry points in
+ * which the ufm(4D) pseudo driver uses to invoke the UFM entry points in
  * response to DDI UFM ioctls.  Additionally, the DDI UFM subsystem uses the
  * handle to maintain cached UFM image and slot data.
  *
diff --git a/usr/src/uts/common/os/ddifm.c b/usr/src/uts/common/os/ddifm.c
index 533fa15aed..dc39ba49ab 100644
--- a/usr/src/uts/common/os/ddifm.c
+++ b/usr/src/uts/common/os/ddifm.c
@@ -56,7 +56,7 @@
  *
  *	Error reports resulting from hardware component specific and common IO
  *	fault and driver defects must be accompanied by an Eversholt fault
- *	tree (.eft) by the Solaris fault manager (fmd(1M)) for
+ *	tree (.eft) by the Solaris fault manager (fmd(8)) for
  *	diagnosis.
  *
  * DDI_FM_ERRCB_CAPABLE
@@ -466,7 +466,7 @@ out:	if (ereport && (nva == NULL))
 
 /*
  * Generate an error report for consumption by the Solaris Fault Manager,
- * fmd(1M).  Valid ereport classes are defined in /usr/include/sys/fm/io.
+ * fmd(8).  Valid ereport classes are defined in /usr/include/sys/fm/io.
  *
  * The ENA should be set if this error is a result of an error status
  * returned from ddi_dma_err_check() or ddi_acc_err_check().  Otherwise,
diff --git a/usr/src/uts/common/os/devid_cache.c b/usr/src/uts/common/os/devid_cache.c
index 3e1a06a844..2a780eebe2 100644
--- a/usr/src/uts/common/os/devid_cache.c
+++ b/usr/src/uts/common/os/devid_cache.c
@@ -47,7 +47,7 @@
  * involves walking the entire device tree attaching all possible disk
  * instances, to search for the device referenced by a devid.  Obviously,
  * full device discovery is something to be avoided where possible.
- * Note that simply invoking devfsadm(1M) is equivalent to running full
+ * Note that simply invoking devfsadm(8) is equivalent to running full
  * discovery at the devid cache level.
  *
  * Reasons why a disk may not be accessible:
@@ -61,7 +61,7 @@
  * When discovery may succeed:
  *	Discovery will result in success when a device has been moved
  *	to a different address.  Note that it's recommended that
- *	devfsadm(1M) be invoked (no arguments required) whenever a system's
+ *	devfsadm(8) be invoked (no arguments required) whenever a system's
  *	h/w configuration has been updated.  Alternatively, a
  *	reconfiguration boot can be used to accomplish the same result.
  *
@@ -69,7 +69,7 @@
  * failure for a device which was powered off.  Assuming the cache has an
  * entry for such a device, simply powering it on should permit the system
  * to access it.  If problems persist after powering it on, invoke
- * devfsadm(1M).
+ * devfsadm(8).
  *
  * Discovery prior to mounting root is only of interest when booting
  * from a filesystem which accesses devices by device id, which of
diff --git a/usr/src/uts/common/os/errorq.c b/usr/src/uts/common/os/errorq.c
index 8b41e7e8c1..cd71b9be08 100644
--- a/usr/src/uts/common/os/errorq.c
+++ b/usr/src/uts/common/os/errorq.c
@@ -946,7 +946,7 @@ errorq_cancel(errorq_t *eqp, errorq_elem_t *eqep)
 
 /*
  * Write elements on the dump list of each nvlist errorq to the dump device.
- * Upon reboot, fmd(1M) will extract and replay them for diagnosis.
+ * Upon reboot, fmd(8) will extract and replay them for diagnosis.
  */
 void
 errorq_dump(void)
diff --git a/usr/src/uts/common/os/exit.c b/usr/src/uts/common/os/exit.c
index c400c774d8..7ccf9b3221 100644
--- a/usr/src/uts/common/os/exit.c
+++ b/usr/src/uts/common/os/exit.c
@@ -191,11 +191,11 @@ restart_init(int what, int why)
 	 * zone) know that init has failed and will be restarted.
 	 */
 	zcmn_err(p->p_zone->zone_id, CE_WARN,
-	    "init(1M) %s: restarting automatically",
+	    "init(8) %s: restarting automatically",
 	    exit_reason(reason_buf, sizeof (reason_buf), what, why));
 
 	if (!INGLOBALZONE(p)) {
-		cmn_err(CE_WARN, "init(1M) for zone %s (pid %d) %s: "
+		cmn_err(CE_WARN, "init(8) for zone %s (pid %d) %s: "
 		    "restarting automatically",
 		    p->p_zone->zone_name, p->p_pid, reason_buf);
 	}
@@ -210,7 +210,7 @@ restart_init(int what, int why)
 
 	/*
 	 * Grab p_lock and begin clearing miscellaneous global process
-	 * state that needs to be reset before we exec the new init(1M).
+	 * state that needs to be reset before we exec the new init(8).
 	 */
 
 	mutex_enter(&p->p_lock);
@@ -310,7 +310,7 @@ restart_init(int what, int why)
 	restart_init_notify(p->p_zone);
 
 	/*
-	 * Now exec() the new init(1M) on top of the current process.  If we
+	 * Now exec() the new init(8) on top of the current process.  If we
 	 * succeed, the caller will treat this like a successful system call.
 	 * If we fail, we issue messages and the caller will proceed with exit.
 	 */
@@ -320,11 +320,11 @@ restart_init(int what, int why)
 		return (0);
 
 	zcmn_err(p->p_zone->zone_id, CE_WARN,
-	    "failed to restart init(1M) (err=%d): system reboot required", err);
+	    "failed to restart init(8) (err=%d): system reboot required", err);
 
 	if (!INGLOBALZONE(p)) {
-		cmn_err(CE_WARN, "failed to restart init(1M) for zone %s "
-		    "(pid %d, err=%d): zoneadm(1M) boot required",
+		cmn_err(CE_WARN, "failed to restart init(8) for zone %s "
+		    "(pid %d, err=%d): zoneadm(8) boot required",
 		    p->p_zone->zone_name, p->p_pid, err);
 	}
 
diff --git a/usr/src/uts/common/os/fm.c b/usr/src/uts/common/os/fm.c
index 15215b58c3..bd3e5dceac 100644
--- a/usr/src/uts/common/os/fm.c
+++ b/usr/src/uts/common/os/fm.c
@@ -364,7 +364,7 @@ fm_nvprint(nvlist_t *nvl)
 
 /*
  * Wrapper for panic() that first produces an FMA-style message for admins.
- * Normally such messages are generated by fmd(1M)'s syslog-msgs agent: this
+ * Normally such messages are generated by fmd(8)'s syslog-msgs agent: this
  * is the one exception to that rule and the only error that gets messaged.
  * This function is intended for use by subsystems that have detected a fatal
  * error and enqueued appropriate ereports and wish to then force a panic.
diff --git a/usr/src/uts/common/os/kmem.c b/usr/src/uts/common/os/kmem.c
index 4edb136b96..4d2c1e6c10 100644
--- a/usr/src/uts/common/os/kmem.c
+++ b/usr/src/uts/common/os/kmem.c
@@ -2251,7 +2251,7 @@ kmem_dumppr(char **pp, char *e, const char *format, ...)
 }
 
 /*
- * Called when dumpadm(1M) configures dump parameters.
+ * Called when dumpadm(8) configures dump parameters.
  */
 void
 kmem_dump_init(size_t size)
diff --git a/usr/src/uts/common/os/ksensor.c b/usr/src/uts/common/os/ksensor.c
index 491fbcc7cd..7dd4a22c8a 100644
--- a/usr/src/uts/common/os/ksensor.c
+++ b/usr/src/uts/common/os/ksensor.c
@@ -67,8 +67,8 @@
  *
  * The implementation of (1) is all in this file. The implementation of (2) is
  * in uts/common/io/ksensor/ksensor_drv.c. The implementation of (3) is found in
- * all of the different leaf devices. Examples of (3) include pchtemp(7D) and
- * igb(7D).
+ * all of the different leaf devices. Examples of (3) include pchtemp(4D) and
+ * igb(4D).
  *
  * We separate numbers one and two into two different components for a few
  * reasons. The most important thing is that drivers that provide sensors should
diff --git a/usr/src/uts/common/os/logsubr.c b/usr/src/uts/common/os/logsubr.c
index a506f5a3b8..e365ad26b6 100644
--- a/usr/src/uts/common/os/logsubr.c
+++ b/usr/src/uts/common/os/logsubr.c
@@ -199,7 +199,7 @@ log_init(void)
 
 	/*
 	 * Create a backlog queue to consume console messages during periods
-	 * when there is no console reader (e.g. before syslogd(1M) starts).
+	 * when there is no console reader (e.g. before syslogd(8) starts).
 	 */
 	log_backlogq = log_consq = log_makeq(0, LOG_HIWAT, NULL);
 
@@ -681,7 +681,7 @@ log_sendmsg(mblk_t *mp, zoneid_t zoneid)
 				if (lp->log_q == log_consq) {
 					console_printf(log_overflow_msg,
 					    lp->log_minor,
-					    " -- is syslogd(1M) running?");
+					    " -- is syslogd(8) running?");
 				} else {
 					printf(log_overflow_msg,
 					    lp->log_minor, "");
diff --git a/usr/src/uts/common/os/ndifm.c b/usr/src/uts/common/os/ndifm.c
index 16613a9203..54640971fd 100644
--- a/usr/src/uts/common/os/ndifm.c
+++ b/usr/src/uts/common/os/ndifm.c
@@ -669,7 +669,7 @@ ndi_fm_dma_err_set(ddi_dma_handle_t handle, ddi_fm_error_t *dfe)
 /*
  * Call parent busop fm initialization routine.
  *
- * Called during driver attach(1M)
+ * Called during driver attach(9E)
  */
 int
 i_ndi_busop_fm_init(dev_info_t *dip, int tcap, ddi_iblock_cookie_t *ibc)
@@ -696,7 +696,7 @@ i_ndi_busop_fm_init(dev_info_t *dip, int tcap, ddi_iblock_cookie_t *ibc)
 /*
  * Call parent busop fm clean-up routine.
  *
- * Called during driver detach(1M)
+ * Called during driver detach(9E)
  */
 void
 i_ndi_busop_fm_fini(dev_info_t *dip)
diff --git a/usr/src/uts/common/os/priv_defs b/usr/src/uts/common/os/priv_defs
index 854fb602da..05979dd236 100644
--- a/usr/src/uts/common/os/priv_defs
+++ b/usr/src/uts/common/os/priv_defs
@@ -217,7 +217,7 @@ privilege PRIV_NET_BINDMLP
 	Allow a process to bind to a port that is configured as a
 	multi-level port(MLP) for the process's zone. This privilege
 	applies to both shared address and zone-specific address MLPs.
-	See tnzonecfg(4) from the Trusted Extensions manual pages for
+	See tnzonecfg(5) from the Trusted Extensions manual pages for
 	information on configuring MLP ports.
 	This privilege is interpreted only if the system is configured
 	with Trusted Extensions.
@@ -507,7 +507,7 @@ privilege PRIV_SYS_TRANS_LABEL
 privilege PRIV_VIRT_MANAGE
 
 	Allows a process to manage virtualized environments such as
-	xVM(5).
+	xVM(7).
 
 privilege PRIV_WIN_COLORMAP
 
@@ -613,7 +613,7 @@ privilege PRIV_WIN_UPGRADE_SL
 
 privilege PRIV_XVM_CONTROL
 
-	Allows a process access to the xVM(5) control devices for
+	Allows a process access to the xVM(7) control devices for
 	managing guest domains and the hypervisor. This privilege is
 	used only if booted into xVM on x86 platforms.
 
diff --git a/usr/src/uts/common/os/rctl.c b/usr/src/uts/common/os/rctl.c
index 4ddef1c00f..8f52f4ef3a 100644
--- a/usr/src/uts/common/os/rctl.c
+++ b/usr/src/uts/common/os/rctl.c
@@ -149,7 +149,7 @@
  *   The locking subsequence of interest is: p_lock, rctl_dict_lock,
  *   rctl_lists_lock, entity->rcs_lock.
  *
- * The projects(4) database and project entity resource controls
+ * The project(5) database and project entity resource controls
  *   A special case is made for RCENTITY_PROJECT values set through the
  *   setproject(3PROJECT) interface.  setproject() makes use of a private
  *   interface, setprojrctl(), which passes through an array of resource control
@@ -170,7 +170,7 @@
  *
  *      rctl->rc_values - a linked list of rctl_val_t.  These are the active
  *      resource values associated with this rctl, and may have been set by
- *      setrctl() - via prctl(1M), or by setprojrctl() - via
+ *      setrctl() - via prctl(1), or by setprojrctl() - via
  *      setproject(3PROJECT).
  *
  *      rctl->rc_projdb - a linked list of rctl_val_t.  These reflect the
diff --git a/usr/src/uts/common/os/streamio.c b/usr/src/uts/common/os/streamio.c
index 975b2f3d2e..90a9ea6f0f 100644
--- a/usr/src/uts/common/os/streamio.c
+++ b/usr/src/uts/common/os/streamio.c
@@ -3629,7 +3629,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag,
 
 		/*
 		 * The I_STR facility provides a trap door for malicious
-		 * code to send down bogus streamio(7I) ioctl commands to
+		 * code to send down bogus streamio(4I) ioctl commands to
 		 * unsuspecting STREAMS modules and drivers which expect to
 		 * only get these messages from the stream head.
 		 * Explicitly prohibit any streamio ioctls which can be
diff --git a/usr/src/uts/common/os/sunpm.c b/usr/src/uts/common/os/sunpm.c
index 0d40abbbcf..7518c45cea 100644
--- a/usr/src/uts/common/os/sunpm.c
+++ b/usr/src/uts/common/os/sunpm.c
@@ -61,8 +61,8 @@
  * tells what each component's power state values are, and provides human
  * readable strings (currently unused) for each component name and power state.
  * Devices which export pm-components(9P) are automatically power managed
- * whenever autopm is enabled (via PM_START_PM ioctl issued by pmconfig(1M)
- * after parsing power.conf(4)). The exception to this rule is that power
+ * whenever autopm is enabled (via PM_START_PM ioctl issued by pmconfig(8)
+ * after parsing power.conf(5)). The exception to this rule is that power
  * manageable CPU devices may be automatically managed independently of autopm
  * by either enabling or disabling (via PM_START_CPUPM and PM_STOP_CPUPM
  * ioctls) cpupm. If the CPU devices are not managed independently, then they
@@ -72,13 +72,13 @@
  * hardware state.
  *
  * Each device component also has a threshold time associated with each power
- * transition (see power.conf(4)), and a busy/idle state maintained by the
+ * transition (see power.conf(5)), and a busy/idle state maintained by the
  * driver calling pm_idle_component(9F) and pm_busy_component(9F).
  * Components are created idle.
  *
  * The PM framework provides several functions:
- * -implement PM policy as described in power.conf(4)
- *  Policy is set by pmconfig(1M) issuing pm ioctls based on power.conf(4).
+ * -implement PM policy as described in power.conf(5)
+ *  Policy is set by pmconfig(8) issuing pm ioctls based on power.conf(5).
  *  Policies consist of:
  *    -set threshold values (defaults if none provided by pmconfig)
  *    -set dependencies among devices
@@ -122,7 +122,7 @@
  * cdrom is always up whenever the console framebuffer is up, so that the user
  * can insert a cdrom and see a popup as a result.
  *
- * The dependency terminology used in power.conf(4) is not easy to understand,
+ * The dependency terminology used in power.conf(5) is not easy to understand,
  * so we've adopted a different terminology in the implementation.  We write
  * of a "keeps up" and a "kept up" device.  A relationship can be established
  * where one device keeps up another.  That means that if the keepsup device
@@ -384,7 +384,7 @@ int cpr_platform_enable = 0;
 
 /*
  * pm_S3_enabled indicates that we believe the platform can support S3,
- * which we get from pmconfig(1M)
+ * which we get from pmconfig(8)
  */
 int		pm_S3_enabled;
 
@@ -7646,7 +7646,7 @@ pm_cfb_setup(const char *stdout_path)
 			 */
 		} else {
 			cmn_err(CE_WARN, "Kernel debugger present: see "
-			    "kmdb(1M) for interaction with power management.");
+			    "kmdb(1) for interaction with power management.");
 		}
 	}
 #ifdef DEBUG
diff --git a/usr/src/uts/common/os/timer.c b/usr/src/uts/common/os/timer.c
index ce678a3ccd..f587430625 100644
--- a/usr/src/uts/common/os/timer.c
+++ b/usr/src/uts/common/os/timer.c
@@ -179,7 +179,7 @@ timer_delete_locked(proc_t *p, timer_t tid, itimer_t *it)
 
 /*
  * timer_grab() and its companion routine, timer_release(), are wrappers
- * around timer_lock()/_unlock() which allow the timer_*(3R) routines to
+ * around timer_lock()/_unlock() which allow the timer_*(3C) routines to
  * (a) share error handling code and (b) not grab p_lock themselves.  Routines
  * which are called with p_lock held (e.g. timer_lwpbind(), timer_lwpexit())
  * must call timer_lock()/_unlock() explictly.
@@ -194,7 +194,7 @@ timer_delete_locked(proc_t *p, timer_t tid, itimer_t *it)
  *  (a)	The specified timer ID is out of range.
  *
  *  (b)	The specified timer ID does not correspond to a timer ID returned
- *	from timer_create(3R).
+ *	from timer_create(3C).
  *
  *  (c)	The specified timer ID is currently being removed.
  *
diff --git a/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c b/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c
index aa0eb2484e..bf8e6ed3a1 100644
--- a/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c
+++ b/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c
@@ -949,7 +949,7 @@ rpcsec_gss_init(
 	}
 
 	/*
-	 * kgss_accept_sec_context()/gssd(1M) can be overly time
+	 * kgss_accept_sec_context()/gssd(8) can be overly time
 	 * consuming so let's queue it and return asap.
 	 *
 	 * taskq func must free arg.
diff --git a/usr/src/uts/common/sys/class.h b/usr/src/uts/common/sys/class.h
index a132d38419..c795f85eca 100644
--- a/usr/src/uts/common/sys/class.h
+++ b/usr/src/uts/common/sys/class.h
@@ -130,7 +130,7 @@ extern int	loaded_classes;	/* number of classes loaded */
 extern pri_t	minclsyspri;
 extern id_t	syscid;		/* system scheduling class ID */
 extern id_t	sysdccid;	/* system duty-cycle scheduling class ID */
-extern id_t	defaultcid;	/* "default" class id; see dispadmin(1M) */
+extern id_t	defaultcid;	/* "default" class id; see dispadmin(8) */
 
 extern int	alloc_cid(char *, id_t *);
 extern int	scheduler_load(char *, sclass_t *);
diff --git a/usr/src/uts/common/sys/csiioctl.h b/usr/src/uts/common/sys/csiioctl.h
index 78a1303798..6a6debfadb 100644
--- a/usr/src/uts/common/sys/csiioctl.h
+++ b/usr/src/uts/common/sys/csiioctl.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_CSIIOCTL_H
 #define	_SYS_CSIIOCTL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -37,14 +35,14 @@ extern "C" {
  * csiioctl.h
  *
  * CodeSet Independent codeset width communication between stty(1) and
- * ldterm(7M).
+ * ldterm(4M).
  *
  * CSDATA_SET	This call takes a pointer to a ldterm_cs_data_t data
  *		structure, and uses it to set the line discipline definition
  *		and also for a possible switch of the internal methods and
  *		data for the current locale's codeset.
  *
- *		When this message is reached, the ldterm(7M) will check
+ *		When this message is reached, the ldterm(4M) will check
  *		the validity of the message and if the message contains
  *		a valid data, it will accumulate the data and switch
  *		the internal methods if necessary to support the requested
@@ -52,7 +50,7 @@ extern "C" {
  *
  * CSDATA_GET	This call takes a pointer to a ldterm_cs_data_t structure
  *		and returns in it the codeset data info currently in use by
- *		the ldterm(7M) module.
+ *		the ldterm(4M) module.
  */
 
 #define	CSI_IOC		(('C' | 128) << 8)
diff --git a/usr/src/uts/common/sys/dkio.h b/usr/src/uts/common/sys/dkio.h
index e66551fc6d..6996837b40 100644
--- a/usr/src/uts/common/sys/dkio.h
+++ b/usr/src/uts/common/sys/dkio.h
@@ -88,7 +88,7 @@ struct dk_cinfo {
 #define	DKC_PCMCIA_MEM	21	/* PCMCIA memory disk-like type (Obsolete) */
 #define	DKC_PCMCIA_ATA	22	/* PCMCIA AT Attached type */
 #define	DKC_VBD		23	/* virtual block device */
-#define	DKC_BLKDEV	24	/* generic block device (see blkdev(7d)) */
+#define	DKC_BLKDEV	24	/* generic block device (see blkdev(4D)) */
 
 /*
  * Sun reserves up through 1023
diff --git a/usr/src/uts/common/sys/dklabel.h b/usr/src/uts/common/sys/dklabel.h
index 457c1ecadc..25b52c014b 100644
--- a/usr/src/uts/common/sys/dklabel.h
+++ b/usr/src/uts/common/sys/dklabel.h
@@ -87,7 +87,7 @@ typedef	daddr32_t	blkaddr32_t;
 
 /*
  * partition headers:  section 1
- * Returned in struct dk_allmap by ioctl DKIOC[SG]APART (dkio(7I))
+ * Returned in struct dk_allmap by ioctl DKIOC[SG]APART (dkio(4I))
  */
 struct dk_map {
 	blkaddr_t	dkl_cylno;	/* starting cylinder */
diff --git a/usr/src/uts/common/sys/dld.h b/usr/src/uts/common/sys/dld.h
index 6921960160..b73d22249a 100644
--- a/usr/src/uts/common/sys/dld.h
+++ b/usr/src/uts/common/sys/dld.h
@@ -48,7 +48,7 @@ extern "C" {
 #endif
 
 /*
- * Data-Link Driver Information (text emitted by modinfo(1m))
+ * Data-Link Driver Information (text emitted by modinfo(8))
  */
 #define	DLD_INFO	"Data-Link Driver"
 
diff --git a/usr/src/uts/common/sys/dlpi.h b/usr/src/uts/common/sys/dlpi.h
index 72d9a9db15..f3a5fd6f70 100644
--- a/usr/src/uts/common/sys/dlpi.h
+++ b/usr/src/uts/common/sys/dlpi.h
@@ -278,7 +278,7 @@ typedef struct dl_ipnetinfo {
 #define	DL_IPV6		0x80000002ul	/* IPv6 Tunnel Link */
 #define	SUNW_DL_VNI	0x80000003ul	/* Virtual network interface */
 #define	DL_WIFI		0x80000004ul	/* IEEE 802.11 */
-#define	DL_IPNET	0x80000005ul	/* ipnet(7D) link */
+#define	DL_IPNET	0x80000005ul	/* ipnet(4D) link */
 #define	SUNW_DL_IPMP	0x80000006ul	/* IPMP stub interface */
 #define	DL_6TO4		0x80000007ul	/* 6to4 Tunnel Link */
 
diff --git a/usr/src/uts/common/sys/dls.h b/usr/src/uts/common/sys/dls.h
index 81f9e2abac..0c5ffb0dd7 100644
--- a/usr/src/uts/common/sys/dls.h
+++ b/usr/src/uts/common/sys/dls.h
@@ -46,7 +46,7 @@ extern "C" {
 #define	DLS_MODULE_NAME	"dls"
 
 /*
- * Data-Link Services Information (text emitted by modinfo(1m))
+ * Data-Link Services Information (text emitted by modinfo(8))
  */
 #define	DLS_INFO	"Data-Link Services"
 
diff --git a/usr/src/uts/common/sys/dtrace.h b/usr/src/uts/common/sys/dtrace.h
index ab6d4c4445..f554fb0e58 100644
--- a/usr/src/uts/common/sys/dtrace.h
+++ b/usr/src/uts/common/sys/dtrace.h
@@ -43,7 +43,7 @@ extern "C" {
  * Solaris system and DTrace subsystem and are subject to change at any time
  * without notice.  Applications and drivers using these interfaces will fail
  * to run on future releases.  These interfaces should not be used for any
- * purpose except those expressly outlined in dtrace(7D) and libdtrace(3LIB).
+ * purpose except those expressly outlined in dtrace(4D) and libdtrace(3LIB).
  * Please refer to the "Solaris Dynamic Tracing Guide" for more information.
  */
 
@@ -1188,7 +1188,7 @@ typedef struct dtrace_argdesc {
  * The D compiler can query the provider attributes (dtrace_pattr_t below) in
  * order to compute the properties of an input program and report them.
  */
-typedef uint8_t dtrace_stability_t;	/* stability code (see attributes(5)) */
+typedef uint8_t dtrace_stability_t;	/* stability code (see attributes(7)) */
 typedef uint8_t dtrace_class_t;		/* architectural dependency class */
 
 #define	DTRACE_STABILITY_INTERNAL	0	/* private to DTrace itself */
diff --git a/usr/src/uts/common/sys/dtrace_impl.h b/usr/src/uts/common/sys/dtrace_impl.h
index a55d0d7e1f..fe8666e1dd 100644
--- a/usr/src/uts/common/sys/dtrace_impl.h
+++ b/usr/src/uts/common/sys/dtrace_impl.h
@@ -43,7 +43,7 @@ extern "C" {
  * Solaris system and DTrace subsystem and are subject to change at any time
  * without notice.  Applications and drivers using these interfaces will fail
  * to run on future releases.  These interfaces should not be used for any
- * purpose except those expressly outlined in dtrace(7D) and libdtrace(3LIB).
+ * purpose except those expressly outlined in dtrace(4D) and libdtrace(3LIB).
  * Please refer to the "Solaris Dynamic Tracing Guide" for more information.
  */
 
@@ -1201,7 +1201,7 @@ typedef struct dtrace_enabling {
  * properties in the dtrace.conf file.  If there is an anonymous enabling, a
  * DTrace consumer state and enabling are created on attach.  The state may be
  * subsequently grabbed by the first consumer specifying the "grabanon"
- * option.  As long as an anonymous DTrace enabling exists, dtrace(7D) will
+ * option.  As long as an anonymous DTrace enabling exists, dtrace(4D) will
  * refuse to unload.
  */
 typedef struct dtrace_anon {
diff --git a/usr/src/uts/common/sys/dumphdr.h b/usr/src/uts/common/sys/dumphdr.h
index 57a9a9c2dc..aa2fbde7a5 100644
--- a/usr/src/uts/common/sys/dumphdr.h
+++ b/usr/src/uts/common/sys/dumphdr.h
@@ -41,8 +41,8 @@ extern "C" {
  * are written out: one at the beginning of the dump, and the other at
  * the very end of the dump device.  The terminal header is at a known
  * location (end of device) so we can always find it.  The initial header
- * is redundant, but helps savecore(1M) determine whether the dump has been
- * overwritten by swap activity.  See dumpadm(1M) for dump configuration.
+ * is redundant, but helps savecore(8) determine whether the dump has been
+ * overwritten by swap activity.  See dumpadm(8) for dump configuration.
  */
 #define	DUMP_MAGIC	0xdefec8edU		/* dump magic number */
 #define	DUMP_VERSION	10			/* version of this dumphdr */
diff --git a/usr/src/uts/common/sys/epoll.h b/usr/src/uts/common/sys/epoll.h
index 3b38d9f629..480bfdf9ff 100644
--- a/usr/src/uts/common/sys/epoll.h
+++ b/usr/src/uts/common/sys/epoll.h
@@ -45,7 +45,7 @@ typedef struct epoll_event {
 #endif
 
 /*
- * Define the EPOLL* constants in terms of their poll(2)/poll(7) equivalents.
+ * Define the EPOLL* constants in terms of their poll(2)/poll(4D) equivalents.
  * Note that the values match the equivalents in Linux to allow for any binary
  * compatibility layers to not need to translate them.
  */
diff --git a/usr/src/uts/common/sys/fault.h b/usr/src/uts/common/sys/fault.h
index d37e8a0f47..139216b5ff 100644
--- a/usr/src/uts/common/sys/fault.h
+++ b/usr/src/uts/common/sys/fault.h
@@ -40,7 +40,7 @@ extern "C" {
  * hardware faults.  Setting the appropriate flags in a process's
  * set of traced faults via /proc causes the process to stop each
  * time one of the designated faults occurs so that a debugger can
- * take action.  See proc(4) for details.
+ * take action.  See proc(5) for details.
  */
 
 	/* fault enumeration must begin with 1 */
diff --git a/usr/src/uts/common/sys/feature_tests.h b/usr/src/uts/common/sys/feature_tests.h
index 9236a398b8..728060e7ec 100644
--- a/usr/src/uts/common/sys/feature_tests.h
+++ b/usr/src/uts/common/sys/feature_tests.h
@@ -58,7 +58,7 @@ extern "C" {
  * compress common standards specified feature test macros for easier reading.
  * These macros should not be used by the application developer as
  * unexpected results may occur. Instead, the user should reference
- * standards(5) for correct usage of the standards feature test macros.
+ * standards(7) for correct usage of the standards feature test macros.
  *
  * __XOPEN_OR_POSIX     Used in cases where a symbol is defined by both
  *                      X/Open or POSIX or in the negative, when neither
@@ -259,7 +259,7 @@ extern "C" {
  *
  * When writing a conforming X/Open application, as per the specification
  * requirements, the appropriate feature test macros must be defined at
- * compile time. These are as follows. For more info, see standards(5).
+ * compile time. These are as follows. For more info, see standards(7).
  *
  * Feature Test Macro				     Specification
  * ------------------------------------------------  -------------
diff --git a/usr/src/uts/common/sys/fs/zfs.h b/usr/src/uts/common/sys/fs/zfs.h
index 73050319b9..0ed966d22f 100644
--- a/usr/src/uts/common/sys/fs/zfs.h
+++ b/usr/src/uts/common/sys/fs/zfs.h
@@ -247,7 +247,7 @@ typedef enum {
 	ZPOOL_NUM_PROPS
 } zpool_prop_t;
 
-/* Small enough to not hog a whole line of printout in zpool(1M). */
+/* Small enough to not hog a whole line of printout in zpool(8). */
 #define	ZPROP_MAX_COMMENT	32
 
 #define	ZPROP_VALUE		"value"
diff --git a/usr/src/uts/common/sys/fsspriocntl.h b/usr/src/uts/common/sys/fsspriocntl.h
index 66931e813b..4f61519a7c 100644
--- a/usr/src/uts/common/sys/fsspriocntl.h
+++ b/usr/src/uts/common/sys/fsspriocntl.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_FSSPRIOCNTL_H
 #define	_SYS_FSSPRIOCNTL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/fss.h>
 
@@ -58,7 +56,7 @@ typedef struct fssinfo {
 #define	FSS_KY_UPRI	2	/* user priority */
 
 /*
- * The following is used by the dispadmin(1M) command for scheduler
+ * The following is used by the dispadmin(8) command for scheduler
  * administration and is not for general use.
  */
 typedef struct fssadmin {
diff --git a/usr/src/uts/common/sys/fxpriocntl.h b/usr/src/uts/common/sys/fxpriocntl.h
index feff8a2ad4..8a1c680ee9 100644
--- a/usr/src/uts/common/sys/fxpriocntl.h
+++ b/usr/src/uts/common/sys/fxpriocntl.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_FXPRIOCNTL_H
 #define	_SYS_FXPRIOCNTL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/thread.h>
 
@@ -68,7 +66,7 @@ typedef struct fxinfo {
 
 
 /*
- * The following is used by the dispadmin(1M) command for
+ * The following is used by the dispadmin(8) command for
  * scheduler administration and is not for general use.
  */
 
diff --git a/usr/src/uts/common/sys/iapriocntl.h b/usr/src/uts/common/sys/iapriocntl.h
index b6dcd1162b..d35577f9e8 100644
--- a/usr/src/uts/common/sys/iapriocntl.h
+++ b/usr/src/uts/common/sys/iapriocntl.h
@@ -78,7 +78,7 @@ typedef struct iainfo {
 #define	IA_KY_MODE	3	/* interactive on/off */
 
 /*
- * The following is used by the dispadmin(1M) command for
+ * The following is used by the dispadmin(8) command for
  * scheduler administration and is not for general use.
  */
 
diff --git a/usr/src/uts/common/sys/ib/ibnex/ibnex.h b/usr/src/uts/common/sys/ib/ibnex/ibnex.h
index f2928d8f4b..3b12a499fc 100644
--- a/usr/src/uts/common/sys/ib/ibnex/ibnex.h
+++ b/usr/src/uts/common/sys/ib/ibnex/ibnex.h
@@ -263,7 +263,7 @@ typedef struct ibnex_s {
 	IBNEX_MAX_COMPAT_NAMES * IBNEX_MAX_COMPAT_LEN
 #define	IBNEX_MAX_IBPORT_COMPAT_PROP_SZ	\
 	IBNEX_MAX_IBPORT_COMPAT_NAMES * IBNEX_MAX_COMPAT_LEN
-#define	IBNEX_DEVFS_ENUMERATE		0x1	/* enumerate via devfs(7fs) */
+#define	IBNEX_DEVFS_ENUMERATE		0x1	/* enumerate via devfs(4FS) */
 #define	IBNEX_CFGADM_ENUMERATE		0x2	/* enumerate via cfgadm */
 
 #define	IBNEX_MAX_NODEADDR_SZ		35
diff --git a/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h b/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h
index c82b43b5a5..8d74d61c86 100644
--- a/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h
+++ b/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h
@@ -82,14 +82,14 @@ typedef enum ib_service_type_e {
 #define	IBNEX_NODE_COND_NVL		"node_condition"
 
 /*
- * This flag is passed from cfgadm to ib(7d) to convey that it
+ * This flag is passed from cfgadm to ib(4D) to convey that it
  * need not attempt to probe the fabric.
  *
  * The value of these flags should be same as flags in enum
  * ibdm_ibnex_get_ioclist_mtd_t.
  */
 #define	IBNEX_DONOT_PROBE_FLAG	1
-#define	IBNEX_NORMAL_PROBE	0	/* flag used by ib(7d) only */
+#define	IBNEX_NORMAL_PROBE	0	/* flag used by ib(4D) only */
 
 /*
  * The following are sub-commands to DEVCTL_AP_CONTROL.
diff --git a/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h b/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h
index 824d692306..4acabc9e86 100644
--- a/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h
+++ b/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h
@@ -118,7 +118,7 @@ void	ibtl_ibnex_unregister_callback();
  *			    alternate_HCA database
  *			IBTL_IBNEX_UNCFG_CLNTS_FLAG - Build client devpaths/
  *			    ap_id database
- *	callback	- Callback function to get ap_id from ib(7d)
+ *	callback	- Callback function to get ap_id from ib(4D)
  * Output:
  *	buffer		- The information is returned in this buffer
  *      bufsiz		- The size of the information buffer
@@ -192,7 +192,7 @@ ibt_status_t	ibtl_ibnex_get_hca_verbose_data(ib_guid_t, char **, size_t *);
  *	registered HCAs's dip.  If match found return IBT_SUCCESS,
  *	else IBT_NO_HCAS_AVAILABLE.
  *	For IOC/Pseudo devices check if the given pdip is that of
- *	the ib(7d) nexus. If yes return IBT_SUCCESS,
+ *	the ib(4D) nexus. If yes return IBT_SUCCESS,
  *	else IBT_NO_HCAS_AVAILABLE.
  */
 ibt_status_t	ibtl_ibnex_valid_hca_parent(dev_info_t *);
diff --git a/usr/src/uts/common/sys/lofi.h b/usr/src/uts/common/sys/lofi.h
index f57388a098..f5285149fa 100644
--- a/usr/src/uts/common/sys/lofi.h
+++ b/usr/src/uts/common/sys/lofi.h
@@ -137,7 +137,7 @@ extern "C" {
  * torn down.
  *
  * Oh, and last but not least: these ioctls are totally private and only
- * for use by lofiadm(1M).
+ * for use by lofiadm(8).
  *
  */
 
diff --git a/usr/src/uts/common/sys/mac.h b/usr/src/uts/common/sys/mac.h
index 723128cfc9..da2cff93a7 100644
--- a/usr/src/uts/common/sys/mac.h
+++ b/usr/src/uts/common/sys/mac.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 
 /*
- * MAC Information (text emitted by modinfo(1m))
+ * MAC Information (text emitted by modinfo(8))
  */
 #define	MAC_INFO	"MAC Services"
 
@@ -593,7 +593,7 @@ typedef struct mactype_ops_s {
  * Note that the ndd ioctls are obsolete, and may be removed in a future
  * release of Solaris. The ndd ioctls are not typically used in legacy
  * ethernet drivers. New datalink drivers of all link-types should use
- * dladm(1m) interfaces for administering tunables and not have to provide
+ * dladm(8) interfaces for administering tunables and not have to provide
  * a mapping.
  */
 typedef struct mac_ndd_mapping_s {
diff --git a/usr/src/uts/common/sys/mac_wifi.h b/usr/src/uts/common/sys/mac_wifi.h
index 2ff46dbc6c..425c1a6613 100644
--- a/usr/src/uts/common/sys/mac_wifi.h
+++ b/usr/src/uts/common/sys/mac_wifi.h
@@ -50,7 +50,7 @@ extern "C" {
     sizeof (struct ieee80211_llc))
 
 enum wifi_stat {
-	/* statistics described in ieee802.11(5) */
+	/* statistics described in ieee802.11(7) */
 	WIFI_STAT_TX_FRAGS = MACTYPE_STAT_MIN,
 	WIFI_STAT_MCAST_TX,
 	WIFI_STAT_TX_FAILED,
diff --git a/usr/src/uts/common/sys/mem.h b/usr/src/uts/common/sys/mem.h
index c73a1b6e95..ff265b185c 100644
--- a/usr/src/uts/common/sys/mem.h
+++ b/usr/src/uts/common/sys/mem.h
@@ -68,7 +68,7 @@ typedef struct mem_vtop32 {
 #endif
 
 /*
- * Private ioctls for fmd(1M).  These interfaces are Sun Private.  Applications
+ * Private ioctls for fmd(8).  These interfaces are Sun Private.  Applications
  * and drivers should not make use of these interfaces: they can change without
  * notice and programs that consume them will fail to run on future releases.
  */
@@ -86,7 +86,7 @@ typedef struct mem_vtop32 {
 #define	MEM_SID			(('M' << 8) | 0x0B)
 
 /*
- * Bits returned from MEM_PAGE_GETERRORS ioctl for use by fmd(1M).
+ * Bits returned from MEM_PAGE_GETERRORS ioctl for use by fmd(8).
  */
 #define	MEM_PAGE_ERR_NONE	0x0
 #define	MEM_PAGE_ERR_MULTI_CE	0x1
diff --git a/usr/src/uts/common/sys/mixer.h b/usr/src/uts/common/sys/mixer.h
index 9abcd6121d..e50ad9fc47 100644
--- a/usr/src/uts/common/sys/mixer.h
+++ b/usr/src/uts/common/sys/mixer.h
@@ -81,7 +81,7 @@ struct am_control {
 	audio_info_t	dev_info;
 
 	/*
-	 * The mixer(7I) manual page shows an example of using the ch_open[]
+	 * The mixer(4I) manual page shows an example of using the ch_open[]
 	 * array. Each element that is set to 0 represents a channel which
 	 * isn't allocated, and non-zero elements represent a channel that is
 	 * alloacted. This size of this array may change, depending on the
@@ -111,7 +111,7 @@ struct am_sample_rates {
 
 	/*
 	 * Set this number to the number of sample rates to request. The
-	 * mixer(7I) manual page shows an example of using this structure.
+	 * mixer(4I) manual page shows an example of using this structure.
 	 * When AUDIO_MIXER_GET_SAMPLE_RATES returns the number of samples
 	 * available is set. This may be more or less than the number requested.
 	 * If more that only the requested number of samples is arctually
@@ -121,7 +121,7 @@ struct am_sample_rates {
 
 	/*
 	 * Variable size array for the supported sample rates. See the example
-	 * in the mixer(7I) manual page for how to use this array.
+	 * in the mixer(4I) manual page for how to use this array.
 	 */
 	uint_t		samp_rates[1];
 };
diff --git a/usr/src/uts/common/sys/mutex.h b/usr/src/uts/common/sys/mutex.h
index db34243dcc..7f6dc8ae10 100644
--- a/usr/src/uts/common/sys/mutex.h
+++ b/usr/src/uts/common/sys/mutex.h
@@ -51,7 +51,7 @@ extern "C" {
  * either MUTEX_ADAPTIVE or MUTEX_SPIN depending on the iblock cookie.
  *
  * Mutex statistics can be gathered on the fly, without rebooting or
- * recompiling the kernel, via the lockstat driver (lockstat(7D)).
+ * recompiling the kernel, via the lockstat driver (lockstat(4D)).
  */
 typedef enum {
 	MUTEX_ADAPTIVE = 0,	/* spin if owner is running, otherwise block */
diff --git a/usr/src/uts/common/sys/nvme.h b/usr/src/uts/common/sys/nvme.h
index bca3102270..9e154131b1 100644
--- a/usr/src/uts/common/sys/nvme.h
+++ b/usr/src/uts/common/sys/nvme.h
@@ -29,7 +29,7 @@
 #endif
 
 /*
- * Declarations used for communication between nvmeadm(1M) and nvme(7D)
+ * Declarations used for communication between nvmeadm(8) and nvme(4D)
  */
 
 #ifdef __cplusplus
diff --git a/usr/src/uts/common/sys/priocntl.h b/usr/src/uts/common/sys/priocntl.h
index 682c79ed7c..396672a31f 100644
--- a/usr/src/uts/common/sys/priocntl.h
+++ b/usr/src/uts/common/sys/priocntl.h
@@ -54,7 +54,7 @@ extern long	priocntlset(procset_t *, int, ...);
 #define	PC_SETPARMS	2	/* Set scheduling parameters */
 #define	PC_GETPARMS	3	/* Get scheduling parameters */
 #define	PC_ADMIN	4	/* Scheduler administration (used by */
-				/* dispadmin(1M), not for general use) */
+				/* dispadmin(8), not for general use) */
 #define	PC_GETPRIRANGE	5	/* Get priority range for a class */
 				/* posix.4 scheduling, not for general use */
 #define	PC_DONICE	6	/* Set or get nice value */
@@ -152,7 +152,7 @@ typedef struct pcpri {
 } pcpri_t;
 
 /*
- * The following is used by the dispadmin(1M) command for
+ * The following is used by the dispadmin(8) command for
  * scheduler administration and is not for general use.
  */
 
diff --git a/usr/src/uts/common/sys/ramdisk.h b/usr/src/uts/common/sys/ramdisk.h
index a750336d37..202fff360f 100644
--- a/usr/src/uts/common/sys/ramdisk.h
+++ b/usr/src/uts/common/sys/ramdisk.h
@@ -26,8 +26,6 @@
 #ifndef	_SYS_RAMDISK_H
 #define	_SYS_RAMDISK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/vtoc.h>
@@ -93,7 +91,7 @@ extern "C" {
 	}
 
 /*
- * Interface between the ramdisk(7D) driver and ramdiskadm(1M).  Use is:
+ * Interface between the ramdisk(4D) driver and ramdiskadm(8).  Use is:
  *
  *	fd = open("/dev/ramdiskctl", O_RDWR | O_EXCL);
  *
@@ -117,7 +115,7 @@ extern "C" {
  *  by the RD_DELETE_DISK ioctl).
  *
  * Note that these ioctls are completely private, and only for the use of
- * ramdiskadm(1M).
+ * ramdiskadm(8).
  */
 #define	RD_IOC_BASE		(('R' << 16) | ('D' << 8))
 
diff --git a/usr/src/uts/common/sys/rtpriocntl.h b/usr/src/uts/common/sys/rtpriocntl.h
index 6c9d824944..3baa1b62d8 100644
--- a/usr/src/uts/common/sys/rtpriocntl.h
+++ b/usr/src/uts/common/sys/rtpriocntl.h
@@ -67,7 +67,7 @@ typedef struct rtinfo {
 #define	RT_KY_TQSIG	4	/* real-time time quantum signal */
 
 /*
- * The following is used by the dispadmin(1M) command for
+ * The following is used by the dispadmin(8) command for
  * scheduler administration and is not for general use.
  */
 
diff --git a/usr/src/uts/common/sys/smbios.h b/usr/src/uts/common/sys/smbios.h
index 3ce9e2c7a3..257956b047 100644
--- a/usr/src/uts/common/sys/smbios.h
+++ b/usr/src/uts/common/sys/smbios.h
@@ -2085,7 +2085,7 @@ extern const char *smbios_csn(smbios_hdl_t *);
 #ifndef _KERNEL
 /*
  * The smbios_*_desc() and smbios_*_name() interfaces can be used for utilities
- * such as smbios(1M) that wish to decode SMBIOS fields for humans.  The _desc
+ * such as smbios(8) that wish to decode SMBIOS fields for humans.  The _desc
  * functions return the comment string next to the #defines listed above, and
  * the _name functions return the appropriate #define identifier itself.
  */
diff --git a/usr/src/uts/common/sys/socketvar.h b/usr/src/uts/common/sys/socketvar.h
index 910f2a839a..1e48b00dd7 100644
--- a/usr/src/uts/common/sys/socketvar.h
+++ b/usr/src/uts/common/sys/socketvar.h
@@ -617,7 +617,7 @@ extern smod_info_t *smod_lookup_byname(const char *);
 
 /*
  * Used to traverse the list of AF_UNIX sockets to construct the kstat
- * for netstat(1m).
+ * for netstat(8).
  */
 struct socklist {
 	kmutex_t	sl_lock;
diff --git a/usr/src/uts/common/sys/sysmsg_impl.h b/usr/src/uts/common/sys/sysmsg_impl.h
index 9081277478..a573db1320 100644
--- a/usr/src/uts/common/sys/sysmsg_impl.h
+++ b/usr/src/uts/common/sys/sysmsg_impl.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_SYSMSG_IMPL_H
 #define	_SYS_SYSMSG_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -36,7 +34,7 @@ extern "C" {
 #define	SYSMSG		"/dev/sysmsg"
 
 /*
- * consadm(1M) uses these ioctls to interface with /dev/sysmsg.
+ * consadm(8) uses these ioctls to interface with /dev/sysmsg.
  */
 
 /*
diff --git a/usr/src/uts/common/sys/tspriocntl.h b/usr/src/uts/common/sys/tspriocntl.h
index 1c8c35a5d6..6d814631e0 100644
--- a/usr/src/uts/common/sys/tspriocntl.h
+++ b/usr/src/uts/common/sys/tspriocntl.h
@@ -62,7 +62,7 @@ typedef struct tsinfo {
 #define	TS_KY_UPRI	2	/* user priority */
 
 /*
- * The following is used by the dispadmin(1M) command for
+ * The following is used by the dispadmin(8) command for
  * scheduler administration and is not for general use.
  */
 
diff --git a/usr/src/uts/common/sys/usb/clients/ugen/usb_ugen.h b/usr/src/uts/common/sys/usb/clients/ugen/usb_ugen.h
index d1bcc096d1..a63fb02f1a 100644
--- a/usr/src/uts/common/sys/usb/clients/ugen/usb_ugen.h
+++ b/usr/src/uts/common/sys/usb/clients/ugen/usb_ugen.h
@@ -39,7 +39,7 @@ extern "C" {
 
 /*
  * UGEN  provides a mechanism  to  retrieve  USB bus  specific information
- * through endpoint status minor nodes (See ugen(7D) for more information).
+ * through endpoint status minor nodes (See ugen(4D) for more information).
  * Whenever an error occurs on any endpoint, the application can retrieve
  * the last command status (int). Possible values are give below
  */
@@ -81,7 +81,7 @@ extern "C" {
 /*
  * Possible Device status (int) values
  * Application can poll(2) and read(2) device status on device status minor
- * nodes (See ugen(7D) for more details).
+ * nodes (See ugen(4D) for more details).
  */
 #define	USB_DEV_STAT_ONLINE		0x1	/* Device is online	  */
 #define	USB_DEV_STAT_DISCONNECTED	0x2	/* Device is disconnected */
diff --git a/usr/src/uts/common/sys/usb/clients/usbser/usbser_keyspan/keyspan_49fw.h b/usr/src/uts/common/sys/usb/clients/usbser/usbser_keyspan/keyspan_49fw.h
index 3dc5dbfba4..9ff61ffb35 100644
--- a/usr/src/uts/common/sys/usb/clients/usbser/usbser_keyspan/keyspan_49fw.h
+++ b/usr/src/uts/common/sys/usb/clients/usbser/usbser_keyspan/keyspan_49fw.h
@@ -32,7 +32,7 @@
 
 /*
  * For the 4-port Keyspan usb-to-serial adapter (usa49wlc) support
- * in the usbsksp(7D) driver, users can download a firmware package
+ * in the usbsksp(4D) driver, users can download a firmware package
  * from the Keyspan website (http://www.keyspan.com).
  * Please contact Keyspan technical support for questions regarding
  * firmware source access.
@@ -45,7 +45,7 @@
  * $ cd usr/src/uts/intel/usbs49_fw
  * $ make install
  *
- * See usbsksp(7D) for details on using the Solaris USB keyspan
+ * See usbsksp(4D) for details on using the Solaris USB keyspan
  * driver.
  */
 
diff --git a/usr/src/uts/common/sys/usb/clients/usbser/usbser_var.h b/usr/src/uts/common/sys/usb/clients/usbser/usbser_var.h
index 4cf89fe648..ceba9a81c9 100644
--- a/usr/src/uts/common/sys/usb/clients/usbser/usbser_var.h
+++ b/usr/src/uts/common/sys/usb/clients/usbser/usbser_var.h
@@ -171,7 +171,7 @@ _NOTE(LOCK_ORDER(usbser_state::us_mutex usbser_port::port_mutex))
  *
  * [2] tty mode open may be blocked waiting for carrier.
  *     if dial-out mode open happens at this time, it is allowed
- *     for it to overtake the port; from zs(7D) man page:
+ *     for it to overtake the port; from zs(4D) man page:
  *
  *	 This allows a modem to be attached to  /dev/term/[n]
  *	 and used for dial-in (by enabling the line for login in /etc/inittab)
diff --git a/usr/src/uts/common/sys/user.h b/usr/src/uts/common/sys/user.h
index e9739cf0fc..0b17066632 100644
--- a/usr/src/uts/common/sys/user.h
+++ b/usr/src/uts/common/sys/user.h
@@ -197,7 +197,7 @@ typedef struct {		/* kernel syscall set type */
  * for the portions of the kernel that care about aux vectors.
  *
  * Applications that need to know how many aux vectors the kernel
- * supplies should use the proc(4) interface to read /proc/PID/auxv.
+ * supplies should use the proc(5) interface to read /proc/PID/auxv.
  *
  * This value should not be changed in a patch.
  */
diff --git a/usr/src/uts/common/sys/watchpoint.h b/usr/src/uts/common/sys/watchpoint.h
index 36eb3addc2..7483a1fc35 100644
--- a/usr/src/uts/common/sys/watchpoint.h
+++ b/usr/src/uts/common/sys/watchpoint.h
@@ -38,7 +38,7 @@ extern "C" {
 
 /*
  * Definitions for the VM implementation of watchpoints.
- * See proc(4) and <sys/procfs.h> for definitions of the user interface.
+ * See proc(5) and <sys/procfs.h> for definitions of the user interface.
  */
 
 /*
diff --git a/usr/src/uts/common/sys/zone.h b/usr/src/uts/common/sys/zone.h
index f6bfe6626d..3a0556a937 100644
--- a/usr/src/uts/common/sys/zone.h
+++ b/usr/src/uts/common/sys/zone.h
@@ -249,7 +249,7 @@ typedef struct {
 /*
  * zone_status values
  *
- * You must modify zone_status_names in mdb(1M)'s genunix module
+ * You must modify zone_status_names in mdb(1)'s genunix module
  * (genunix/zone.c) when you modify this enum.
  */
 typedef enum {
@@ -310,7 +310,7 @@ typedef struct zone_cmd_rval {
 #define	GLOBAL_ZONENAME		"global"
 
 /*
- * Extended Regular expression (see regex(5)) which matches all valid zone
+ * Extended Regular expression (see regex(7)) which matches all valid zone
  * names.
  */
 #define	ZONENAME_REGEXP		"[a-zA-Z0-9][-_.a-zA-Z0-9]{0,62}"
diff --git a/usr/src/uts/common/syscall/auditsys.c b/usr/src/uts/common/syscall/auditsys.c
index 8fa5428ea6..038b3e68bc 100644
--- a/usr/src/uts/common/syscall/auditsys.c
+++ b/usr/src/uts/common/syscall/auditsys.c
@@ -429,7 +429,7 @@ getpolicy(caddr_t data)
  * by the value of the global zone's flags at the time the
  * local zone is created.
  *
- * While auditconfig(1M) allows setting and unsetting policies one bit
+ * While auditconfig(8) allows setting and unsetting policies one bit
  * at a time, the mask passed in from auditconfig() is created by a
  * syscall to getpolicy and then modified based on the auditconfig()
  * cmd line, so the input policy value is used to replace the existing
diff --git a/usr/src/uts/common/syscall/corectl.c b/usr/src/uts/common/syscall/corectl.c
index dc99f92a6e..540bcb6db6 100644
--- a/usr/src/uts/common/syscall/corectl.c
+++ b/usr/src/uts/common/syscall/corectl.c
@@ -48,10 +48,10 @@
  * structure (the core dumping sub-system for example) to safely use the
  * string without holding any locks on it in light of updates.
  *
- * At system and zone boot, init_core() sets init(1M)'s core file path and
+ * At system and zone boot, init_core() sets init(8)'s core file path and
  * content to the same value as the fields core_default_path and
  * core_default_content respectively (for the global zone). All subsequent
- * children of init(1M) reference those same settings. During boot coreadm(1M)
+ * children of init(8) reference those same settings. During boot coreadm(8)
  * is invoked with the -u option to update the system settings from
  * /etc/coreadm.conf. This has the effect of also changing the values in
  * core_default_path and core_default_content which updates the core file
@@ -60,7 +60,7 @@
  * content are set to the zone's default path and content.
  *
  * Processes that have their core file settings explicitly overridden using
- * coreadm(1M) no longer reference core_default_path or core_default_content
+ * coreadm(8) no longer reference core_default_path or core_default_content
  * so subsequent changes to the default will not affect them.
  */
 
diff --git a/usr/src/uts/common/syscall/rctlsys.c b/usr/src/uts/common/syscall/rctlsys.c
index aa552bfe8e..c5758d86f0 100644
--- a/usr/src/uts/common/syscall/rctlsys.c
+++ b/usr/src/uts/common/syscall/rctlsys.c
@@ -1042,7 +1042,7 @@ rctlsys(int code, char *name, void *obuf, void *nbuf, size_t obufsz, int flags)
 
 	case 3:
 		/*
-		 * Private code for rctladm(1M):  "rctlctl".
+		 * Private code for rctladm(8):  "rctlctl".
 		 */
 		return (rctlsys_ctl(name, obuf, flags));
 	case 4:
diff --git a/usr/src/uts/common/syscall/stat.c b/usr/src/uts/common/syscall/stat.c
index 93f26121bc..54dc532cd4 100644
--- a/usr/src/uts/common/syscall/stat.c
+++ b/usr/src/uts/common/syscall/stat.c
@@ -216,7 +216,7 @@ cstat(vnode_t *vp, struct stat *ubp, int flag, cred_t *cr)
 	 * instead we return the value MAXOFF32_T (LONG_MAX).
 	 *
 	 * 32-bit applications that care about the size of devices should be
-	 * built 64-bit or use a large file interface (lfcompile(5) or lf64(5)).
+	 * built 64-bit or use a large file interface (lfcompile(7) or lf64(7)).
 	 */
 	if ((vattr.va_size > MAXOFF32_T) &&
 	    ((vp->v_type == VBLK) || (vp->v_type == VCHR))) {
diff --git a/usr/src/uts/common/vm/page_retire.c b/usr/src/uts/common/vm/page_retire.c
index c3d9014e47..26def2eb27 100644
--- a/usr/src/uts/common/vm/page_retire.c
+++ b/usr/src/uts/common/vm/page_retire.c
@@ -1211,7 +1211,7 @@ page_retire_check_pp(page_t *pp, uint64_t *errors)
 	}
 
 	/*
-	 * We have magically arranged the bit values returned to fmd(1M)
+	 * We have magically arranged the bit values returned to fmd(8)
 	 * to line up with the FMA, MCE, and UE bits of the page_t.
 	 */
 	if (errors) {
diff --git a/usr/src/uts/common/xen/io/xdf.c b/usr/src/uts/common/xen/io/xdf.c
index bd900f818c..10a48c1540 100644
--- a/usr/src/uts/common/xen/io/xdf.c
+++ b/usr/src/uts/common/xen/io/xdf.c
@@ -2532,7 +2532,7 @@ xdf_ioctl_eject(xdf_t *vdp)
  * Watch for media state changes.  This can be an insertion of a device
  * (triggered by a 'xm block-configure' request in another domain) or
  * the ejection of a device (triggered by a local "eject" operation).
- * For a full description of the DKIOCSTATE ioctl behavior see dkio(7I).
+ * For a full description of the DKIOCSTATE ioctl behavior see dkio(4I).
  */
 static int
 xdf_dkstate(xdf_t *vdp, enum dkio_state mstate)
@@ -3609,7 +3609,7 @@ done:
 	    HVMPV_XDF_VERS);
 #endif /* XPV_HVM_DRIVER */
 
-	/* Create kstat for iostat(1M) */
+	/* Create kstat for iostat(8) */
 	if (xdf_kstat_create(dip) != 0) {
 		cmn_err(CE_WARN, "xdf@%s: failed to create kstat",
 		    ddi_get_name_addr(dip));