5 files changed, 23 insertions, 26 deletions
diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/README b/usr/src/cmd/cmd-inet/sbin/dhcpagent/README
index 749ec9a665..58b996aab5 100644
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/README
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/README
@@ -22,7 +22,6 @@ Use is subject to license terms.
 
 Architectural Overview for the DHCP agent
 Peter Memishian
-ident	"%Z%%M%	%I%	%E% SMI"
 
 INTRODUCTION
 ============
@@ -393,7 +392,7 @@ time, using the system's current notion of time.
 
 One additional limitation of the `hrtime_t' and `monosec_t' types is
 that they are unaware of the passage of time across checkpoint/resume
-events (e.g., those generated by sys-suspend(1M)).  For example, if
+events (e.g., those generated by sys-suspend(8)).  For example, if
 gethrtime() returns time T, and then the machine is suspended for 2
 hours, and then gethrtime() is called again, the time returned is not
 T + (2 * 60 * 60 * NANOSEC), but rather approximately still T.
diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/README.v6 b/usr/src/cmd/cmd-inet/sbin/dhcpagent/README.v6
index 77adf3655b..33d5ea80da 100644
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/README.v6
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/README.v6
@@ -45,13 +45,13 @@ Introduction
   - RFCs 2131 and 2132: IPv4 DHCP
   - RFCs 2461 and 2462: IPv6 NDP and stateless autoconfiguration
   - RFC 3484: IPv6 default address selection
-  - ifconfig(1M): Solaris IP interface configuration
-  - in.ndpd(1M): Solaris IPv6 Neighbor and Router Discovery daemon
-  - dhcpagent(1M): Solaris DHCP client
+  - ifconfig(8): Solaris IP interface configuration
+  - in.ndpd(8): Solaris IPv6 Neighbor and Router Discovery daemon
+  - dhcpagent(8): Solaris DHCP client
   - dhcpinfo(1): Solaris DHCP parameter utility
-  - ndpd.conf(4): in.ndpd configuration file
-  - netstat(1M): Solaris network status utility
-  - snoop(1M): Solaris network packet capture and inspection
+  - ndpd.conf(5): in.ndpd configuration file
+  - netstat(8): Solaris network status utility
+  - snoop(8): Solaris network packet capture and inspection
   - "DHCPv6 Client High-Level Design"
 
   Several terms from those documents (such as the DHCPv6 IA_NA and
diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/class_id.c b/usr/src/cmd/cmd-inet/sbin/dhcpagent/class_id.c
index 3e5a533466..5e3945ec2f 100644
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/class_id.c
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/class_id.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -117,7 +115,7 @@ return_property(int prom_fd, const char *prop)
 
 /*
  * sanitize_class_id(): translates the class id into a canonical format,
- *			so that it can be used easily with dhcptab(4).
+ *			so that it can be used easily with dhcptab(5).
  *
  *   input: char *: the class id to canonicalize
  *  output: void
diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.dfl b/usr/src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.dfl
index 7f5ffd2559..933e94b0a3 100644
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.dfl
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.dfl
@@ -26,7 +26,7 @@
 #
 
 #
-# This file contains tunable parameters for dhcpagent(1M).
+# This file contains tunable parameters for dhcpagent(8).
 #
 
 # All parameters can be tuned for a specific interface by prepending
@@ -105,9 +105,9 @@
 
 # By default, the DHCP agent will try to request the Fully Qualified Domain
 # Name (FQDN) currently associated with the interface performing DHCP.  The
-# hostname is defined by using the -h,--reqhost option of ipadm(1M) or the
-# ncu ip-reqhost property of nwamcfg(1M) or by flagging the interface as
-# primary so that nodename(4) is used as the hostname.
+# hostname is defined by using the -h,--reqhost option of ipadm(8) or the
+# ncu ip-reqhost property of nwamcfg(8) or by flagging the interface as
+# primary so that nodename(5) is used as the hostname.
 #
 # A defined hostname will be used as the FQDN if it is "rooted" (i.e., if
 # it ends with a '.') or if it consists of at least three DNS labels (e.g.,
@@ -128,19 +128,19 @@
 # REQUEST_FQDN=no
 
 # By default, the DHCP agent will not attempt to construct an FQDN from a
-# PQDN specified by the -h,--reqhost option of ipadm(1M), by the ncu
-# ip-reqhost property of nwamcfg(1M), or by nodename(4).  Set and
+# PQDN specified by the -h,--reqhost option of ipadm(8), by the ncu
+# ip-reqhost property of nwamcfg(8), or by nodename(5).  Set and
 # uncomment the following parameter to indicate a domain name to be used by
 # the DHCP agent to construct if necessary an FQDN.
 #
 # DNS_DOMAINNAME=
 
 # By default, the DHCP agent will not attempt to use a domain name returned
-# by the DHCP server or the domain in resolv.conf(4) to construct an FQDN
-# from a PQDN specified by the -h,--reqhost option of ipadm(1M), by the ncu
-# ip-reqhost property of nwamcfg(1M), or by nodename(4).  Set and uncomment
+# by the DHCP server or the domain in resolv.conf(5) to construct an FQDN
+# from a PQDN specified by the -h,--reqhost option of ipadm(8), by the ncu
+# ip-reqhost property of nwamcfg(8), or by nodename(5).  Set and uncomment
 # the following parameter to indicate that a returned DHCPv4 DNSdmain or the
-# domain from resolv.conf(4) should be adopted by the DHCP agent to
+# domain from resolv.conf(5) should be adopted by the DHCP agent to
 # construct if necessary an FQDN.
 #
 # ADOPT_DOMAINNAME=yes
@@ -148,14 +148,14 @@
 # By default, the DHCP agent will try to request the hostname currently
 # associated with the interface performing DHCP.  If this option is
 # enabled, the agent will attempt to use an -h,--reqhost option saved with
-# ipadm(1M) or an ncu ip-reqhost property set with nwamcfg(1M); or else
+# ipadm(8) or an ncu ip-reqhost property set with nwamcfg(8); or else
 # attempt to find a host name in /etc/hostname.<if>, which must contain a
 # line of the form
 #
 #	inet name
 #
 # where "name" is a single RFC 1101-compliant token; or else use
-# nodename(4) for a DHCP interface flagged as primary.  If found in any of
+# nodename(5) for a DHCP interface flagged as primary.  If found in any of
 # these configurations, the token will be used to request that host name
 # from the DHCP server.  To prevent this, uncomment the following line.
 #
diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.c b/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.c
index 6b69dfffe7..4a1c58aa17 100644
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.c
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.c
@@ -763,7 +763,7 @@ dhcp_get_nodename(char *buf, size_t buflen)
  *			    affirmative and if 1) dsm_msg_reqhost is available;
  *			    or 2) hostname is read from an extant
  *			    /etc/hostname.<ifname> file; or 3) interface is
- *			    primary and nodename(4) is defined.
+ *			    primary and nodename(5) is defined.
  *
  *   input: dhcp_pkt_t *: pointer to DHCP message being constructed;
  *	    dhcp_smach_t *: pointer to interface DHCP state machine;
@@ -1000,8 +1000,8 @@ dhcp_pick_domainname(char *namebuf, size_t buflen, dhcp_smach_t *dsmp)
 /*
  * dhcp_assemble_fqdn(): Set fqdnbuf if REQUEST_FQDN is set and
  *			 either a host name was sent in the IPC message (e.g.,
- *			 from ipadm(1M) -h,--reqhost) or the interface is
- *			 primary and a nodename(4) is defined. If the host
+ *			 from ipadm(8) -h,--reqhost) or the interface is
+ *			 primary and a nodename(5) is defined. If the host
  *			 name is not already fully qualified per is_fqdn(),
  *			 then dhcp_pick_domainname() is tried to select a
  *			 domain to be used to construct an FQDN.