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>

36 files changed, 72 insertions, 74 deletions

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*/