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>

8 files changed, 26 insertions, 28 deletions

diff --git a/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c b/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c
index 33c68f4a05..d102735eb7 100644
--- a/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c
+++ b/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c
@@ -117,9 +117,9 @@ fmd_adm_svc_errmsg(enum fmd_adm_error err)
 	case FMD_ADM_ERR_MODEXIST:
 		return ("module using same name is already loaded");
 	case FMD_ADM_ERR_MODINIT:
-		return ("module failed to initialize (consult fmd(1M) log)");
+		return ("module failed to initialize (consult fmd(8) log)");
 	case FMD_ADM_ERR_MODLOAD:
-		return ("module failed to load (consult fmd(1M) log)");
+		return ("module failed to load (consult fmd(8) log)");
 	case FMD_ADM_ERR_RSRCSRCH:
 		return ("specified resource is not cached by fault manager");
 	case FMD_ADM_ERR_RSRCNOTF:
@@ -131,7 +131,7 @@ fmd_adm_svc_errmsg(enum fmd_adm_error err)
 	case FMD_ADM_ERR_ROTSRCH:
 		return ("invalid log file name");
 	case FMD_ADM_ERR_ROTFAIL:
-		return ("failed to rotate log file (consult fmd(1M) log)");
+		return ("failed to rotate log file (consult fmd(8) log)");
 	case FMD_ADM_ERR_ROTBUSY:
 		return ("log file is too busy to rotate (try again later)");
 	case FMD_ADM_ERR_CASESRCH:
diff --git a/usr/src/lib/fm/libfmd_log/common/fmd_log.h b/usr/src/lib/fm/libfmd_log/common/fmd_log.h
index be705571b9..9e9c0c2eae 100644
--- a/usr/src/lib/fm/libfmd_log/common/fmd_log.h
+++ b/usr/src/lib/fm/libfmd_log/common/fmd_log.h
@@ -26,8 +26,6 @@
 #ifndef	_FMD_LOG_H
 #define	_FMD_LOG_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <libnvpair.h>
 #include <exacct.h>
 #include <regex.h>
@@ -60,12 +58,12 @@ extern int fmd_log_errno(fmd_log_t *);
 typedef struct fmd_log_header {
 	const char *log_creator;	/* ea_get_creator(3EXACCT) string */
 	const char *log_hostname;	/* ea_get_hostname(3EXACCT) string */
-	const char *log_label;		/* fmd(1M) log file label */
-	const char *log_version;	/* fmd(1M) log file version */
+	const char *log_label;		/* fmd(8) log file label */
+	const char *log_version;	/* fmd(8) log file version */
 	const char *log_osrelease;	/* uname(1) -r value at creation time */
 	const char *log_osversion;	/* uname(1) -v value at creation time */
 	const char *log_platform;	/* uname(1) -i value at creation time */
-	const char *log_uuid;		/* fmd(1M) log file uuid */
+	const char *log_uuid;		/* fmd(8) log file uuid */
 } fmd_log_header_t;
 
 extern void fmd_log_header(fmd_log_t *, fmd_log_header_t *);
@@ -114,7 +112,7 @@ typedef struct fmd_log_filter_nvarg {
 
 /*
  * fmd_log_xiter() can be used to perform sophisticated iteration over an fmd
- * log file such as that required by fmdump(1M).  The arguments are as follows:
+ * log file such as that required by fmdump(8).  The arguments are as follows:
  *
  * fmd_log_t *lp - log to use for iteration from fmd_log_open()
  * uint_t iflags - FMD_LOG_XITER_* flags (see above)
diff --git a/usr/src/lib/fm/libfmd_msg/common/fmd_msg.c b/usr/src/lib/fm/libfmd_msg/common/fmd_msg.c
index 6f7ae70ab9..a36e6bbcda 100644
--- a/usr/src/lib/fm/libfmd_msg/common/fmd_msg.c
+++ b/usr/src/lib/fm/libfmd_msg/common/fmd_msg.c
@@ -36,7 +36,7 @@
  * fmd_msg_init - set up the library and return a handle
  * fmd_msg_fini - destroy the handle from fmd_msg_init
  *
- * fmd_msg_locale_set - set the default locale (initially based on environ(5))
+ * fmd_msg_locale_set - set the default locale (initially based on environ(7))
  * fmd_msg_locale_get - get the default locale
  *
  * fmd_msg_url_set - set the default URL for knowledge articles
@@ -310,7 +310,7 @@ fmd_msg_init(const char *root, int version)
 	 * directory for our default catalog, and set fmh_binding as the same
 	 * directory prefixed with the new root directory.  This simply turns
 	 * usr/lib/locale into <rootdir>/usr/lib/locale, but handles all of the
-	 * environ(5) settings that can change the default messages binding.
+	 * environ(7) settings that can change the default messages binding.
 	 */
 	if (root != NULL && root[0] != '\0' && strcmp(root, "/") != 0) {
 		if (root[0] != '/')
diff --git a/usr/src/lib/fm/libfmd_snmp/mibs/SUN-FM-MIB.mib b/usr/src/lib/fm/libfmd_snmp/mibs/SUN-FM-MIB.mib
index 3d18fc9056..63a59f92b4 100644
--- a/usr/src/lib/fm/libfmd_snmp/mibs/SUN-FM-MIB.mib
+++ b/usr/src/lib/fm/libfmd_snmp/mibs/SUN-FM-MIB.mib
@@ -68,7 +68,7 @@ SunFmUuidString ::= TEXTUAL-CONVENTION
 SunFmModuleState ::= TEXTUAL-CONVENTION
 	STATUS	current
 	DESCRIPTION
-		"Represents the status of an fmd(1M) module."
+		"Represents the status of an fmd(8) module."
 	SYNTAX	INTEGER {
 		other(1),	-- Unknown or unsupported
 		active(2),
@@ -146,7 +146,7 @@ sunFmProblemUUIDIndex OBJECT-TYPE
 	STATUS		current
 	DESCRIPTION
 		"The Universal Unique Identifier (UUID) for this problem, as
-		recorded by fmd(1M) and shown by fmadm(1M) or fmdump(1M).
+		recorded by fmd(8) and shown by fmadm(8) or fmdump(8).
 		This is the index into sunFmProblemTable."
 	::= { sunFmProblemEntry 1 }
 
@@ -156,7 +156,7 @@ sunFmProblemUUID OBJECT-TYPE
 	STATUS		current
 	DESCRIPTION
 		"The Universal Unique Identifier (UUID) for this problem, as
-		recorded by fmd(1M) and shown by fmadm(1M) or fmdump(1M)."
+		recorded by fmd(8) and shown by fmadm(8) or fmdump(8)."
 	::= { sunFmProblemEntry 2 }
 
 sunFmProblemCode OBJECT-TYPE
@@ -165,7 +165,7 @@ sunFmProblemCode OBJECT-TYPE
 	STATUS		current
 	DESCRIPTION
 		"The SUNW-MSG-ID static message identifier for this class of
-		problem, as recorded by fmd(1M) and shown by fmdump(1M).  The
+		problem, as recorded by fmd(8) and shown by fmdump(8).  The
 		message identifier can be used as a key at http://illumos.org/msg/"
 	::= { sunFmProblemEntry 3 }
 
@@ -202,7 +202,7 @@ sunFmProblemSuspectCount OBJECT-TYPE
 	DESCRIPTION
 		"The number of individual suspect defects or faults
 		associated with this problem diagnosis, as shown by
-		fmdump(1M) -v -u <UUID>."
+		fmdump(8) -v -u <UUID>."
 	::= { sunFmProblemEntry 7 }
 
 --
@@ -218,7 +218,7 @@ sunFmFaultEventTable OBJECT-TYPE
 	STATUS		current
 	DESCRIPTION
 		"List of individual suspect defects or faults associated with
-		a problem diagnosis, as shown by fmdump(1M) -v -u <UUID>."
+		a problem diagnosis, as shown by fmdump(8) -v -u <UUID>."
 	::= { sunFmMIB 2 }
 
 sunFmFaultEventEntry OBJECT-TYPE
@@ -324,7 +324,7 @@ sunFmFaultEventStatus OBJECT-TYPE
 	STATUS		current
 	DESCRIPTION
 		"The current status of this suspect for this diagnosis. 
-		See fmadm(1M) faulty."
+		See fmadm(8) faulty."
 	::= { sunFmFaultEventEntry 9 }
 
 sunFmFaultEventLocation OBJECT-TYPE
@@ -346,7 +346,7 @@ sunFmModuleTable OBJECT-TYPE
 	MAX-ACCESS	not-accessible
 	STATUS		current
 	DESCRIPTION
-		"List of modules configured in fmd(1M)."
+		"List of modules configured in fmd(8)."
 	::= { sunFmMIB 3 }
 
 sunFmModuleEntry OBJECT-TYPE
@@ -354,7 +354,7 @@ sunFmModuleEntry OBJECT-TYPE
 	MAX-ACCESS	not-accessible
 	STATUS		current
 	DESCRIPTION
-		"A module which has been loaded into fmd(1M) to handle events.
+		"A module which has been loaded into fmd(8) to handle events.
 		The information provided is equivalent to the output of
 		fmadm(1) config'"
 	INDEX	{ sunFmModuleIndex }
@@ -425,7 +425,7 @@ sunFmResourceTable OBJECT-TYPE
 	DESCRIPTION
 		"A table containing information about all resources for which
 		the fault manager has received telemetry.  This is the same
-		information provided by the fmadm(1M) faulty command."
+		information provided by the fmadm(8) faulty command."
 	::= { sunFmMIB 5 }
 
 sunFmResourceEntry OBJECT-TYPE
@@ -467,7 +467,7 @@ sunFmResourceStatus OBJECT-TYPE
 	MAX-ACCESS	read-only
 	STATUS		current
 	DESCRIPTION
-		"The current status of the resource.  See fmadm(1M) faulty."
+		"The current status of the resource.  See fmadm(8) faulty."
 	::= { sunFmResourceEntry 3 }
 
 sunFmResourceDiagnosisUUID OBJECT-TYPE
@@ -477,7 +477,7 @@ sunFmResourceDiagnosisUUID OBJECT-TYPE
 	DESCRIPTION
 		"The Universal Unique Identifier (UUID) for the problem
 		associated with the fault in this resource, as recorded by
-		fmd(1M) and shown by fmadm(1M)."
+		fmd(8) and shown by fmadm(8)."
 	::= { sunFmResourceEntry 4 }
 
 sunFmObjectGroups OBJECT IDENTIFIER ::= { sunFmMIB 6 }
@@ -529,7 +529,7 @@ sunFmProblemTrap NOTIFICATION-TYPE
 	STATUS	current
 	DESCRIPTION
 		"Trap notification that a diagnosis has been made or the
-		fault manager fmd(1M) has restarted and the corresponding
+		fault manager fmd(8) has restarted and the corresponding
 		problem is still believed to be present in the managed entity."
 	::= { sunFmTraps 1 }
 
diff --git a/usr/src/lib/fm/libfmevent/common/libfmevent.h b/usr/src/lib/fm/libfmevent/common/libfmevent.h
index 8fad3511aa..a90343b34c 100644
--- a/usr/src/lib/fm/libfmevent/common/libfmevent.h
+++ b/usr/src/lib/fm/libfmevent/common/libfmevent.h
@@ -143,7 +143,7 @@ extern const char *fmev_strerror(fmev_err_t);
  * Subscribe to FMA protocol events published by the fault management
  * daemon, receiving a callback for each matching event.
  *
- * This is a Committed interface (see attributes(5) for a definition).
+ * This is a Committed interface (see attributes(7) for a definition).
  */
 
 /*
diff --git a/usr/src/lib/fm/topo/libtopo/common/libtopo.h b/usr/src/lib/fm/topo/libtopo/common/libtopo.h
index 02d7828a79..93884718c6 100644
--- a/usr/src/lib/fm/topo/libtopo/common/libtopo.h
+++ b/usr/src/lib/fm/topo/libtopo/common/libtopo.h
@@ -318,7 +318,7 @@ extern void topo_debug_set(topo_hdl_t *, const char *, const char *);
 
 /*
  * Each topology node advertises the name and data stability of each of its
- * modules and properties. (see attributes(5)).
+ * modules and properties. (see attributes(7)).
  */
 
 /*
diff --git a/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c b/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c
index 13dfe11031..b6f7426512 100644
--- a/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c
+++ b/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c
@@ -45,7 +45,7 @@
  * Topology node properties and method operations may be accessed by FMRI.
  * The FMRI used to perform property look-ups and method operations is
  * the FMRI contained in the matching topology node's protocol property
- * grouping for the resource property. The full range of fmd(1M)
+ * grouping for the resource property. The full range of fmd(8)
  * scheme plugin operations are supported as long as a backend method is
  * supplied by a scheme-specific enumerator or the enumerator module that
  * created the matching topology node.  Support for fmd scheme operations
diff --git a/usr/src/lib/fm/topo/modules/common/ses/ses.c b/usr/src/lib/fm/topo/modules/common/ses/ses.c
index 6b9be28bd5..0273009bbe 100644
--- a/usr/src/lib/fm/topo/modules/common/ses/ses.c
+++ b/usr/src/lib/fm/topo/modules/common/ses/ses.c
@@ -3849,7 +3849,7 @@ ses_enum(topo_mod_t *mod, tnode_t *rnode, const char *name,
 			goto error;
 
 		/*
-		 * We search both the ses(7D) and sgen(7D) locations, so we are
+		 * We search both the ses(4D) and sgen(4D) locations, so we are
 		 * independent of any particular driver class bindings.
 		 */
 		if (ses_process_dir("/dev/es", data) != 0 ||