diff options
Diffstat (limited to 'usr/src/cmd/cmd-inet')
81 files changed, 218 insertions, 258 deletions
diff --git a/usr/src/cmd/cmd-inet/common/store_forw_creds.c b/usr/src/cmd/cmd-inet/common/store_forw_creds.c index 2b5d7988b3..a8c680ed78 100644 --- a/usr/src/cmd/cmd-inet/common/store_forw_creds.c +++ b/usr/src/cmd/cmd-inet/common/store_forw_creds.c @@ -23,9 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - - #include <pwd.h> #include <locale.h> #include <syslog.h> @@ -38,7 +35,7 @@ extern uint_t kwarn_del_warning(char *); /* * Store the forwarded creds in the user's local ccache and register - * w/ktkt_warnd(1M). + * w/ktkt_warnd(8). */ krb5_error_code store_forw_creds(krb5_context context, @@ -86,7 +83,7 @@ store_forw_creds(krb5_context context, if ((retval = krb5_cc_close(context, *ccache)) != 0) goto cleanup; - /* Register with ktkt_warnd(1M) */ + /* Register with ktkt_warnd(8) */ if ((retval = krb5_unparse_name(context, (*creds)->client, &client_name)) != 0) goto cleanup; @@ -94,7 +91,7 @@ store_forw_creds(krb5_context context, if (kwarn_add_warning(client_name, (*creds)->times.endtime) != 0) { syslog(LOG_AUTH|LOG_NOTICE, "store_forw_creds: kwarn_add_warning" - " failed: ktkt_warnd(1M) down? "); + " failed: ktkt_warnd(8) down? "); } free(client_name); client_name = NULL; diff --git a/usr/src/cmd/cmd-inet/etc/dhcp/inittab b/usr/src/cmd/cmd-inet/etc/dhcp/inittab index 162183939d..d26d74ad64 100644 --- a/usr/src/cmd/cmd-inet/etc/dhcp/inittab +++ b/usr/src/cmd/cmd-inet/etc/dhcp/inittab @@ -29,10 +29,10 @@ # add support for SITE options for clients; no existing options should # be modified. Only SITE options will be preserved during an upgrade. # If you need to configure the Solaris DHCP server to support the vendor -# options of a different client, see dhcptab(4) for details. +# options of a different client, see dhcptab(5) for details. # -# Please consult dhcp_inittab(4) for further information. Note that -# this interface is "Unstable" as defined by attributes(5). +# Please consult dhcp_inittab(5) for further information. Note that +# this interface is "Unstable" as defined by attributes(7). # Subnet STANDARD, 1, IP, 1, 1, sdmi @@ -179,7 +179,7 @@ SHTTPproxy VENDOR, 17, ASCII, 1, 0, smi # the SITE category, meaning it is defined by each individual site. # It is option code 132, which is of type IP Address, consisting of # a potentially infinite number of pairs of IP addresses. (See -# dhcp_inittab(4) for details) +# dhcp_inittab(5) for details) # # ipPairs SITE, 132, IP, 2, 0, sdmi # diff --git a/usr/src/cmd/cmd-inet/etc/dhcp/inittab6 b/usr/src/cmd/cmd-inet/etc/dhcp/inittab6 index 5e8e083a04..b21c4a7693 100644 --- a/usr/src/cmd/cmd-inet/etc/dhcp/inittab6 +++ b/usr/src/cmd/cmd-inet/etc/dhcp/inittab6 @@ -21,13 +21,12 @@ # # CDDL HEADER END # -# ident "%Z%%M% %I% %E% SMI" # # This file provides information about all supported DHCPv6 options, for # use by DHCPv6-related programs. # -# Please consult dhcp_inittab(4) for further information. Note that -# this interface is "Uncommitted" as defined by attributes(5). +# Please consult dhcp_inittab(5) for further information. Note that +# this interface is "Uncommitted" as defined by attributes(7). # # Note: options 10 and 35 are not assigned. # diff --git a/usr/src/cmd/cmd-inet/etc/ike/config.sample b/usr/src/cmd/cmd-inet/etc/ike/config.sample index a9851a8d8a..7355b0a511 100644 --- a/usr/src/cmd/cmd-inet/etc/ike/config.sample +++ b/usr/src/cmd/cmd-inet/etc/ike/config.sample @@ -1,6 +1,4 @@ # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -27,12 +25,12 @@ ## ## This file should be copied into /etc/inet/ike/config to enable the -## launch of the IKE daemon, in.iked(1m), at boot time. You can also +## launch of the IKE daemon, in.iked(8), at boot time. You can also ## launch the IKE daemon after creating this file without rebooting by ## invoking /usr/lib/inet/in.iked with a root shell. ## -# Consult the ike.config(4) man page for further details. Here is a small +# Consult the ike.config(5) man page for further details. Here is a small # example from the man page. ### BEGINNING OF FILE @@ -47,7 +45,7 @@ ## certificate parameters... # Root certificates. I SHOULD use a full Distinguished Name. -# I MUST have this certificate in my local filesystem, see ikecert(1m). +# I MUST have this certificate in my local filesystem, see ikecert(8). cert_root "C=US, O=Sun Microsystems\\, Inc., CN=Sun CA" # Explicitly trusted certs that need no signatures, or perhaps self-signed diff --git a/usr/src/cmd/cmd-inet/etc/inetd.conf b/usr/src/cmd/cmd-inet/etc/inetd.conf index 0965497d35..2a654b6638 100644 --- a/usr/src/cmd/cmd-inet/etc/inetd.conf +++ b/usr/src/cmd/cmd-inet/etc/inetd.conf @@ -23,19 +23,17 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# Legacy configuration file for inetd(1M). See inetd.conf(4). +# Legacy configuration file for inetd(8). See inetd.conf(5). # # This file is no longer directly used to configure inetd. # The Solaris services which were formerly configured using this file -# are now configured in the Service Management Facility (see smf(5)) -# using inetadm(1M). +# are now configured in the Service Management Facility (see smf(7)) +# using inetadm(8). # # Any records remaining in this file after installation or upgrade, # or later created by installing additional software, must be converted -# to smf(5) services and imported into the smf repository using -# inetconv(1M), otherwise the service will not be available. Once +# to smf(7) services and imported into the smf repository using +# inetconv(8), otherwise the service will not be available. Once # a service has been converted using inetconv, further changes made to # its entry here are not reflected in the service. # diff --git a/usr/src/cmd/cmd-inet/etc/ipaddrsel.conf b/usr/src/cmd/cmd-inet/etc/ipaddrsel.conf index 901bb9dad1..0de979d0c0 100644 --- a/usr/src/cmd/cmd-inet/etc/ipaddrsel.conf +++ b/usr/src/cmd/cmd-inet/etc/ipaddrsel.conf @@ -24,7 +24,7 @@ # Use is subject to license terms. # # This is the IPv6 default address selection policy table. See -# ipaddrsel(1M) for details and examples. +# ipaddrsel(8) for details and examples. # # Prefix Precedence Label ::1/128 50 Loopback diff --git a/usr/src/cmd/cmd-inet/etc/ipsecalgs b/usr/src/cmd/cmd-inet/etc/ipsecalgs index a734e5ff13..dda67d86ea 100644 --- a/usr/src/cmd/cmd-inet/etc/ipsecalgs +++ b/usr/src/cmd/cmd-inet/etc/ipsecalgs @@ -24,7 +24,7 @@ # # DO NOT EDIT OR PARSE THIS FILE! # -# Use the ipsecalgs(1m) command to change the contents of this file. +# Use the ipsecalgs(8) command to change the contents of this file. # The algorithm descriptions contained in this file are synchronised to the # kernel with ipsecalgs -s, the kernel validates the entries at this point. diff --git a/usr/src/cmd/cmd-inet/etc/ipsecinit.sample b/usr/src/cmd/cmd-inet/etc/ipsecinit.sample index 76642506f2..4e7d2a6a2a 100644 --- a/usr/src/cmd/cmd-inet/etc/ipsecinit.sample +++ b/usr/src/cmd/cmd-inet/etc/ipsecinit.sample @@ -1,6 +1,4 @@ # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -72,9 +70,9 @@ # # WARNING: This file is read before default routes are established, and # before any naming services have been started. The -# ipsecconf(1M) command attempts to resolve names, but it will +# ipsecconf(8) command attempts to resolve names, but it will # fail unless the machine uses files, or DNS and the DNS server -# is reachable via routing information before ipsecconf(1m) +# is reachable via routing information before ipsecconf(8) # invocation. (E.g. the DNS server is on-subnet, or DHCP # has loaded up the default router already.) # diff --git a/usr/src/cmd/cmd-inet/etc/nca/ncaport.conf b/usr/src/cmd/cmd-inet/etc/nca/ncaport.conf index f2c7fd229b..74b110dfa7 100644 --- a/usr/src/cmd/cmd-inet/etc/nca/ncaport.conf +++ b/usr/src/cmd/cmd-inet/etc/nca/ncaport.conf @@ -23,14 +23,14 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# # # NCA Kernel Module Port Configuration File # # Use this file to tell NCA socket utility library /usr/lib/ncad_addr.so to # convert an AF_INET socket to an AF_NCA socket. Each line consists of two # fields - a key and a value - in the format ncaport=ipaddress/port. See -# man page ncaport(4) for the format and contents of this file. +# man page ncaport(5) for the format and contents of this file. # # Example configuration file: # diff --git a/usr/src/cmd/cmd-inet/etc/secret/ike.preshared b/usr/src/cmd/cmd-inet/etc/secret/ike.preshared index 49160535c7..033d9ed173 100644 --- a/usr/src/cmd/cmd-inet/etc/secret/ike.preshared +++ b/usr/src/cmd/cmd-inet/etc/secret/ike.preshared @@ -1,6 +1,4 @@ # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -34,4 +32,4 @@ # ... # } # -# Consult the man page for ike.preshared(4) for details. +# Consult the man page for ike.preshared(5) for details. diff --git a/usr/src/cmd/cmd-inet/etc/secret/ipseckeys.sample b/usr/src/cmd/cmd-inet/etc/secret/ipseckeys.sample index 256328e7f6..356b765a26 100644 --- a/usr/src/cmd/cmd-inet/etc/secret/ipseckeys.sample +++ b/usr/src/cmd/cmd-inet/etc/secret/ipseckeys.sample @@ -1,6 +1,4 @@ # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -25,7 +23,7 @@ # CDDL HEADER END # -# ipseckeys - This file takes the file format documented in ipseckey(1m). +# ipseckeys - This file takes the file format documented in ipseckey(8). # Note that naming services might not be available when this file # loads, just like ipsecinit.conf. # diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipadm.conf b/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipadm.conf index eeaee090b6..59f632d0e0 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipadm.conf +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipadm.conf @@ -23,4 +23,4 @@ # # DO NOT EDIT OR PARSE THIS FILE! # -# Use the ipadm(1m) command to change the contents of this file. +# Use the ipadm(8) command to change the contents of this file. diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c b/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c index a77be20510..41aeb2d98c 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c @@ -529,7 +529,7 @@ main(int argc, char *argv[]) if (!fg && getenv("SMF_FMRI") == NULL) { (void) fprintf(stderr, - "ipmgmtd is a smf(5) managed service and cannot be run " + "ipmgmtd is a smf(7) managed service and cannot be run " "from the command line.\n"); return (EINVAL); } diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt b/usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt index 6b39cde11f..cad7adf8bb 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt @@ -30,7 +30,7 @@ . /lib/svc/share/smf_include.sh if [ -z "$SMF_FMRI" ]; then - echo "this script can only be invoked by smf(5)" + echo "this script can only be invoked by smf(7)" exit $SMF_EXIT_ERR_NOSMF fi diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml b/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml index 7f2c7f53be..43ae9697ae 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml @@ -86,7 +86,7 @@ </loctext> </description> <documentation> - <manpage title='ipadm' section='1M' + <manpage title='ipadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/main.c b/usr/src/cmd/cmd-inet/lib/nwamd/main.c index 84ff96875d..4d6cca3b4e 100644 --- a/usr/src/cmd/cmd-inet/lib/nwamd/main.c +++ b/usr/src/cmd/cmd-inet/lib/nwamd/main.c @@ -68,7 +68,7 @@ static void graceful_shutdown(void); * * This is the Network Auto-Magic daemon. For further high level information * see the Network Auto-Magic project and the Approachability communities - * on opensolaris.org, nwamd(1M), and the README in the source directory. + * on opensolaris.org, nwamd(8), and the README in the source directory. * * The general structure of the code is as a set of event source threads * which feed events into the event handling thread. Some of these events @@ -88,9 +88,9 @@ static void graceful_shutdown(void); * live here as static functions: * - nlog set-up * - daemonizing - * - looking up SMF(5) properties + * - looking up smf(7) properties * - signal handling - * - managing privileges(5) + * - managing privileges(7) */ static void diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/ncu_ip.c b/usr/src/cmd/cmd-inet/lib/nwamd/ncu_ip.c index e8df88cd77..655b428757 100644 --- a/usr/src/cmd/cmd-inet/lib/nwamd/ncu_ip.c +++ b/usr/src/cmd/cmd-inet/lib/nwamd/ncu_ip.c @@ -159,7 +159,7 @@ nwamd_get_dhcpinfo_data(const char *sym_name, char *ifname) if (ifname == NULL) ifname = ""; - /* find code and category in dhcp_inittab(4) */ + /* find code and category in dhcp_inittab(5) */ entry = inittab_getbyname(ITAB_CAT_SITE | ITAB_CAT_STANDARD | ITAB_CAT_VENDOR | ITAB_CAT_FIELD, ITAB_CONS_INFO, sym_name); diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/ncu_phys.c b/usr/src/cmd/cmd-inet/lib/nwamd/ncu_phys.c index ae1a6d979c..65f71acbdc 100644 --- a/usr/src/cmd/cmd-inet/lib/nwamd/ncu_phys.c +++ b/usr/src/cmd/cmd-inet/lib/nwamd/ncu_phys.c @@ -978,7 +978,7 @@ find_best_wlan_cb(nwam_known_wlan_handle_t kwh, void *data) * If we're >= scan level, don't pick another Known WLAN if still * connected (even if a Known WLAN with higher priority is available). * If the user wants to connect to a different Known WLAN, it can be - * done from the GUI or select-wifi subcommand of nwamadm(1M). + * done from the GUI or select-wifi subcommand of nwamadm(8). */ if (curr_strength >= wireless_scan_level && link->nwamd_link_wifi_connected) { 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. diff --git a/usr/src/cmd/cmd-inet/usr.bin/tftp/tftp-udp6.xml b/usr/src/cmd/cmd-inet/usr.bin/tftp/tftp-udp6.xml index d5368753d4..b8a5b4e87e 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/tftp/tftp-udp6.xml +++ b/usr/src/cmd/cmd-inet/usr.bin/tftp/tftp-udp6.xml @@ -73,7 +73,7 @@ operating system upgrade. </loctext> </common_name> <documentation> - <manpage title='in.tftpd' section='1M' + <manpage title='in.tftpd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/bridged/bridge.xml b/usr/src/cmd/cmd-inet/usr.lib/bridged/bridge.xml index 3c9d0b5695..f79a2f1820 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/bridged/bridge.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/bridged/bridge.xml @@ -100,7 +100,7 @@ The "bridge" service provides Ethernet bridging and related protocols. </loctext> </description> <documentation> - <manpage title='bridged' section='1M' + <manpage title='bridged' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd.xml b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd.xml index 567fb9439d..b6a009275e 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd.xml @@ -103,9 +103,9 @@ </loctext> </common_name> <documentation> - <manpage title='ilbd' section='1M' + <manpage title='ilbd' section='8' manpath='/usr/share/man' /> - <manpage title='ilbadm' section='1M' + <manpage title='ilbadm' section='8' manpath='/usr/share/man' /> </documentation> diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_main.c b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_main.c index 3064428a36..fa17a8f96b 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_main.c +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_main.c @@ -2120,7 +2120,7 @@ main(int argc, char *argv[]) /* * If we're operating in "adopt" mode and no interfaces need to be - * tracked, shut down (ifconfig(1M) will restart us on demand if + * tracked, shut down (ifconfig(8) will restart us on demand if * interfaces are subsequently put into multipathing groups). */ if (adopt && phyint_instances == NULL) diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_tables.c b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_tables.c index 71aecb6970..231a7f7c5d 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_tables.c +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_tables.c @@ -1444,7 +1444,7 @@ phyint_offline(struct phyint *pi, uint_t minred) /* * The interface is now offline, so stop probing it. Note that - * if_mpadm(1M) will down the test addresses, after receiving a + * if_mpadm(8) will down the test addresses, after receiving a * success reply from us. The routing socket message will then make us * close the socket used for sending probes. But it is more logical * that an offlined interface must not be probed, even if it has test diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/net-ipmp b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/net-ipmp index be4263a74b..565b80e374 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/net-ipmp +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/net-ipmp @@ -18,7 +18,7 @@ . /lib/svc/share/smf_include.sh if [ -z "$SMF_FMRI" ]; then - echo "this script can only be invoked by smf(5)" + echo "this script can only be invoked by smf(7)" exit $SMF_EXIT_ERR_NOSMF fi diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/network-ipmp.xml b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/network-ipmp.xml index 282bf5b4df..f3c8b1a7f0 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/network-ipmp.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/network-ipmp.xml @@ -71,7 +71,7 @@ </loctext> </common_name> <documentation> - <manpage title='in.mpathd' section='1M' /> + <manpage title='in.mpathd' section='8' /> </documentation> </template> </service> diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/ndp.xml b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/ndp.xml index 3c9afca895..4459def5c8 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/ndp.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/ndp.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -78,7 +76,7 @@ value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Unstable' /> <!-- @@ -96,7 +94,7 @@ </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routing' type='application'> <stability value='Evolving' /> @@ -121,7 +119,7 @@ </loctext> </common_name> <documentation> - <manpage title='in.ndpd' section='1M' + <manpage title='in.ndpd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/ripng.xml b/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/ripng.xml index 297baaddf5..fbfc77bee1 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/ripng.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/ripng.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -97,7 +95,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Unstable' /> <!-- Identifies service as a routing service --> @@ -107,8 +105,8 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho <propval name='value_authorization' type='astring' value='solaris.smf.value.routing' /> </property_group> - - <!-- Properties in this group are modifiable via routeadm (1M) --> + + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routing' type='application'> <stability value='Evolving' /> @@ -129,7 +127,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho <!-- Equivalent to optional logging file --> <propval name='log_file' type='astring' value='' /> - + <propval name='value_authorization' type='astring' value='solaris.smf.value.routing' /> </property_group> @@ -141,7 +139,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho </loctext> </common_name> <documentation> - <manpage title='in.ripngd' section='1M' + <manpage title='in.ripngd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.sh b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.sh index eb18c250aa..eaef116d36 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.sh +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.sh @@ -97,7 +97,7 @@ n s/'//g p } -/from the inetd.conf(4) format line/{ +/from the inetd.conf(5) format line/{ n p } diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.xml b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.xml index 1944cdf2d6..a5c1a32c37 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -101,7 +99,7 @@ inetd-upgrade handles the upgrade of old inetd.conf entries to SMF service insta </loctext> </description> <documentation> - <manpage title='inetd' section='1M' + <manpage title='inetd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c index f1f99ff74d..1ded291af9 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c @@ -3809,23 +3809,23 @@ static void legacy_usage(void) { (void) fprintf(stderr, - "inetd is now an smf(5) managed service and can no longer be run " + "inetd is now an smf(7) managed service and can no longer be run " "from the\n" - "command line. To enable or disable inetd refer to svcadm(1M) on\n" + "command line. To enable or disable inetd refer to svcadm(8) on\n" "how to enable \"%s\", the inetd instance.\n" "\n" "The traditional inetd command line option mappings are:\n" "\t-d : there is no supported debug output\n" "\t-s : inetd is only runnable from within the SMF\n" - "\t-t : See inetadm(1M) on how to enable TCP tracing\n" - "\t-r : See inetadm(1M) on how to set a failure rate\n" + "\t-t : See inetadm(8) on how to enable TCP tracing\n" + "\t-r : See inetadm(8) on how to set a failure rate\n" "\n" - "To specify an alternative configuration file see svccfg(1M)\n" + "To specify an alternative configuration file see svccfg(8)\n" "for how to modify the \"%s/%s\" string type property of\n" "the inetd instance, and modify it according to the syntax:\n" "\"%s [alt_config_file] %%m\".\n" "\n" - "For further information on inetd see inetd(1M).\n", + "For further information on inetd see inetd(8).\n", INETD_INSTANCE_FMRI, START_METHOD_ARG, SCF_PROPERTY_EXEC, INETD_PATH); } diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml index f7ff3c95bc..322cca73d6 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml @@ -134,7 +134,7 @@ <stability value='Evolving' /> <propval name='max_con_rate' type='integer' value='-1' /> <propval name='con_rate_offline' type='integer' value='-1' /> - <propval name='max_copies' type='integer' value='-1' /> + <propval name='max_copies' type='integer' value='-1' /> <propval name='failrate_cnt' type='integer' value='40' /> <propval name='failrate_interval' type='integer' value='60' /> <propval name='inherit_env' type='boolean' value='true' /> @@ -177,9 +177,9 @@ services. </loctext> </description> <documentation> - <manpage title='inetd' section='1M' + <manpage title='inetd' section='8' manpath='/usr/share/man' /> - <manpage title='inetadm' section='1M' + <manpage title='inetadm' section='8' manpath='/usr/share/man' /> </documentation> @@ -908,7 +908,7 @@ method context resource pool <description> <loctext xml:lang='C'> The resource pool name on which to launch the method. :default can be used -as a token to indicate the pool specified in the project(4) entry given in +as a token to indicate the pool specified in the project(5) entry given in the project attribute. </loctext> </description> @@ -969,7 +969,7 @@ method credential privileges </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the privilege set as defined in privileges(5). +An optional string specifying the privilege set as defined in privileges(7). </loctext> </description> <cardinality min='1' max='1' /> @@ -985,7 +985,7 @@ method credential limit privilege set <description> <loctext xml:lang='C'> An optional string specifying the limit privilege set as defined in -privileges(5). +privileges(7). </loctext> </description> <cardinality min='1' max='1' /> @@ -1007,13 +1007,13 @@ user, group, privileges, and limit_privileges properties. required='false'> <common_name> <loctext xml:lang='C'> -method profile RBAC profile specification +method profile RBAC profile specification </loctext> </common_name> <description> <loctext xml:lang='C'> The name of an RBAC (role-based access control) profile which, along with the -method executable, identifies an entry in exec_attr(4). +method executable, identifies an entry in exec_attr(5). </loctext> </description> <cardinality min='1' max='1' /> diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/multicast.xml b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/multicast.xml index a6c1901c97..e2f7e50875 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/multicast.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/multicast.xml @@ -90,9 +90,9 @@ <!-- to start stop mdns service --> <property_group name='general' type='framework'> - <propval name='action_authorization' type='astring' + <propval name='action_authorization' type='astring' value='solaris.smf.manage.mdns' /> - <propval name='value_authorization' type='astring' + <propval name='value_authorization' type='astring' value='solaris.smf.manage.mdns' /> </property_group> @@ -140,7 +140,7 @@ <propval name='value_authorization' type='astring' value='solaris.smf.value.firewall.config' /> </property_group> - + </instance> <stability value='Unstable' /> @@ -152,7 +152,7 @@ </loctext> </common_name> <documentation> - <manpage title='mdnsd' section='1M' /> + <manpage title='mdnsd' section='8' /> <doc_link name='Service Discovery OpenSolaris Project Page' uri="http://opensolaris.org/os/project/nwam/service-discovery/"/> </documentation> diff --git a/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/ncaconfd.c b/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/ncaconfd.c index 06972f53dc..8115784a3a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/ncaconfd.c +++ b/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/ncaconfd.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/stat.h> #include <sys/tihdr.h> @@ -155,7 +153,7 @@ logwarn(char *fmt, ...) } /* - * Print out debugging info. Note that syslogd(1M) should be configured to + * Print out debugging info. Note that syslogd(8) should be configured to * take ordinary debug info for it to get this kind of info. */ /*PRINTFLIKE1*/ @@ -996,7 +994,7 @@ get_router_ether_addr(mib_item_t *item, boolean_t *changed) /* * Ping all default routers. It just uses system(3F) to call - * ping(1M) to do the job... + * ping(8) to do the job... */ static void ping_them(void) diff --git a/usr/src/cmd/cmd-inet/usr.lib/slpd/slp.xml b/usr/src/cmd/cmd-inet/usr.lib/slpd/slp.xml index 37b6499da3..577fba071a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/slpd/slp.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/slpd/slp.xml @@ -28,8 +28,6 @@ be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different file. - - ident "%Z%%M% %I% %E% SMI" --> <service_bundle type='manifest' name='SUNWslpr:slpd'> @@ -96,9 +94,9 @@ </loctext> </common_name> <documentation> - <manpage title='slpd' section='1M' /> - <manpage title='slp' section='7P' /> - <manpage title='slp.conf' section='4' /> + <manpage title='slpd' section='8' /> + <manpage title='slp' section='4P' /> + <manpage title='slp.conf' section='5' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.conf b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.conf index cf8160d86f..b95bdf486a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.conf +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.conf @@ -24,4 +24,4 @@ # # DO NOT EDIT OR PARSE THIS FILE! # -# Use the vrrpadm(1m) command to change the contents of this file. +# Use the vrrpadm(8) command to change the contents of this file. diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.xml b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.xml index 5b95f40404..cc02197d12 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.xml @@ -2,7 +2,7 @@ <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- CDDL HEADER START - + The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. @@ -86,9 +86,9 @@ <!-- to start/stop the VRRP service --> <property_group name='general' type='framework'> - <propval name='action_authorization' type='astring' + <propval name='action_authorization' type='astring' value='solaris.smf.manage.vrrp' /> - <propval name='value_authorization' type='astring' + <propval name='value_authorization' type='astring' value='solaris.smf.manage.vrrp' /> </property_group> @@ -105,10 +105,10 @@ <loctext xml:lang='C'> VRRP service daemon </loctext> </common_name> - <documentation> - <manpage title='vrrpd' section='1M' - manpath='/usr/share/man' /> - </documentation> + <documentation> + <manpage title='vrrpd' section='8' + manpath='/usr/share/man' /> + </documentation> </template> </service> diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c index 9269e9b94f..6f542ece96 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c @@ -685,7 +685,7 @@ daemon_init() vrrp_log(VRRP_DBG0, "daemon_init()"); if (getenv("SMF_FMRI") == NULL) { - vrrp_log(VRRP_ERR, "daemon_init(): vrrpd is an smf(5) managed " + vrrp_log(VRRP_ERR, "daemon_init(): vrrpd is an smf(7) managed " "service and should not be run from the command line."); return (-1); } diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.xcl b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.xcl index f4e72616cc..7fb5116d4a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.xcl +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.xcl @@ -58,7 +58,7 @@ msgid "daemon_init" msgid "setrlimit" msgid "vrrpd_init" msgid "iu_handle_events" -msgid "smf(5)" +msgid "smf(7)" msgid "vrrpd_init" msgid "dladm_open" msgid "iu_tq_create" diff --git a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa.xml b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa.xml index 40ab72b46d..c096354b8c 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -86,7 +84,7 @@ </loctext> </common_name> <documentation> - <manpage title='wpad' section='1M' + <manpage title='wpad' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_supplicant.c b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_supplicant.c index 3fb8b133a7..8b243e705d 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_supplicant.c +++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_supplicant.c @@ -790,8 +790,8 @@ main(int argc, char *argv[]) if (!is_smf_context()) { (void) fprintf(stderr, - "wpad is an smf(5) managed service and cannot be run from " - "the command line; please use dladm(1M).\n"); + "wpad is an smf(7) managed service and cannot be run from " + "the command line; please use dladm(8).\n"); return (SMF_EXIT_ERR_NOSMF); } diff --git a/usr/src/cmd/cmd-inet/usr.sbin/comsat.xml b/usr/src/cmd/cmd-inet/usr.sbin/comsat.xml index a66e18a02e..922cd84933 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/comsat.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/comsat.xml @@ -103,9 +103,9 @@ requested to be told when mail arrives. </loctext> </description> <documentation> - <manpage title='in.comsat' section='1M' + <manpage title='in.comsat' section='8' manpath='/usr/share/man' /> - <manpage title='comsat' section='1M' + <manpage title='comsat' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/finger.xml b/usr/src/cmd/cmd-inet/usr.sbin/finger.xml index 2c4281d84a..565eef962c 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/finger.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/finger.xml @@ -101,9 +101,9 @@ status and individual users. </loctext> </description> <documentation> - <manpage title='in.fingerd' section='1M' + <manpage title='in.fingerd' section='8' manpath='/usr/share/man' /> - <manpage title='fingerd' section='1M' + <manpage title='fingerd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c index 9da0ed811f..0475fad29f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c @@ -86,8 +86,8 @@ typedef struct { } if_appflags_t; static const if_appflags_t if_appflags_tbl[] = { - { "dhcpagent(1M)", IFF_DHCPRUNNING, 1 }, - { "in.ndpd(1M)", IFF_ADDRCONF, 3 }, + { "dhcpagent(8)", IFF_DHCPRUNNING, 1 }, + { "in.ndpd(8)", IFF_ADDRCONF, 3 }, { NULL, 0, 0 } }; @@ -643,7 +643,7 @@ ifconfig(int argc, char *argv[], int af, struct ifaddrs *ifa) * sometimes two or more attributes must be set together. For * example, setting an address without a netmask does not make sense. * Yet they can be set separately for IPv4 address using the current - * ifconfig(1M) syntax. The kernel then "infers" the correct netmask + * ifconfig(8) syntax. The kernel then "infers" the correct netmask * using the deprecated "IP address classes." This is simply not * correct. * @@ -660,7 +660,7 @@ ifconfig(int argc, char *argv[], int af, struct ifaddrs *ifa) * it will use the working interface's address to do the query. * It will be wrong now as we don't know the logical interface's name. * - * ifconfig(1M) is too overloaded and the code is so convoluted + * ifconfig(8) is too overloaded and the code is so convoluted * that it is "safer" not to re-architect the code to fix the above * issue, hence this "hack." We may be better off to have a new * command with better syntax for configuring network interface @@ -1074,7 +1074,7 @@ setifaddr(char *addr, int64_t param) } /* - * The following functions are stolen from the ipseckey(1m) program. + * The following functions are stolen from the ipseckey(8) program. * Perhaps they should be somewhere common, but for now, we just maintain * two versions. We do this because of the different semantics for which * algorithms we select ("requested" for ifconfig vs. "actual" for key). @@ -2244,11 +2244,11 @@ again: } /* - * If the interface being moved is under the control of `ipmgmtd(1M)' + * If the interface being moved is under the control of `ipmgmtd(8)' * dameon then we should inform the daemon about this move, so that * the daemon can delete the state associated with this interface. * - * This workaround is needed until the IPMP support in ipadm(1M). + * This workaround is needed until the IPMP support in ipadm(8). */ ipadm_if_move(iph, name); diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm.c b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm.c index 949fcc064c..67de6e31ba 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm.c @@ -50,7 +50,7 @@ ilbadm_errstr(ilbadm_status_t rc) case ILBADM_ENOMEM: return (gettext("memory allocation failure")); case ILBADM_EINVAL: - return (gettext("invalid value - refer to ilbadm(1M)")); + return (gettext("invalid value - refer to ilbadm(8)")); case ILBADM_HCPRINT: return (gettext("failed to print healthcheck values")); case ILBADM_INVAL_AF: @@ -63,7 +63,7 @@ ilbadm_errstr(ilbadm_status_t rc) return (gettext("address is invalid")); case ILBADM_INVAL_ARGS: return (gettext("invalid/incompatible keywords - refer to" - " ilbadm(1M)")); + " ilbadm(8)")); case ILBADM_ENOSGNAME: return (gettext("servergroup name missing")); case ILBADM_ENORULE: @@ -83,21 +83,21 @@ ilbadm_errstr(ilbadm_status_t rc) return (gettext("operation type is invalid")); case ILBADM_INVAL_KEYWORD: return (gettext("keyword is invalid - please refer" - " to ilbadm(1M)")); + " to ilbadm(8)")); case ILBADM_ASSIGNREQ: return (gettext("assignment '=' missing")); case ILBADM_NORECURSIVE: return (gettext("recursive import not allowed")); case ILBADM_INVAL_COMMAND: return (gettext("subcommand is invalid - please refer" - " to ilbadm(1M)")); + " to ilbadm(8)")); case ILBADM_ENOPROXY: return (gettext("proxy-src is missing")); case ILBADM_INVAL_PROXY: return (gettext("proxy-src not allowed")); case ILBADM_ENOOPTION: return (gettext("mandatory argument(s) missing - refer" - " to ilbadm(1M)")); + " to ilbadm(8)")); case ILBADM_TOOMANYIPADDR: return (gettext("address range contains more than 255" " IP addresses")); @@ -105,7 +105,7 @@ ilbadm_errstr(ilbadm_status_t rc) return (gettext("could not export servergroup because" " of lack of space")); case ILBADM_INVAL_SYNTAX: - return (gettext("syntax failure - refer to ilbadm(1M)")); + return (gettext("syntax failure - refer to ilbadm(8)")); case ILBADM_NOKEYWORD_VAL: return (gettext("missing value")); case ILBADM_LIBERR: diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c index f159a3b6d6..dad110a62f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c @@ -1123,7 +1123,7 @@ ilbadm_create_rule(int argc, char *argv[]) if (optind >= argc) { ilbadm_err(gettext("missing mandatory arguments - please refer" " to 'ilbadm create-rule' subcommand description in" - " ilbadm(1M)")); + " ilbadm(8)")); rc = ILBADM_LIBERR; goto out; diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c index 8a0d92bbd7..a27ac5c95a 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c @@ -467,7 +467,7 @@ ilbadm_create_servergroup(int argc, char *argv[]) if (optind >= argc) { ilbadm_err(gettext("missing mandatory arguments - please refer" " to 'create-servergroup' subcommand" - " description in ilbadm(1M)")); + " description in ilbadm(8)")); rc = ILBADM_LIBERR; goto out; } @@ -546,7 +546,7 @@ ilbadm_add_server_to_group(int argc, char **argv) if (optind >= argc) { ilbadm_err(gettext("missing mandatory arguments - please refer" - " to 'add-server' subcommand description in ilbadm(1M)")); + " to 'add-server' subcommand description in ilbadm(8)")); rc = ILBADM_LIBERR; goto out; } diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/rdisc.xml b/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/rdisc.xml index eb223ee0e4..2ef0b8701b 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/rdisc.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/rdisc.xml @@ -78,7 +78,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Unstable' /> <propval name='protocol' type='astring' value='ipv4' /> @@ -89,7 +89,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routing' type='application'> <stability value='Evolving' /> @@ -102,7 +102,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho <!-- Equivalent to -r option if true --> <propval name='act_as_router' type='boolean' value='false' /> - <!-- Equivalent to -a option if true --> + <!-- Equivalent to -a option if true --> <propval name='accept_all' type='boolean' value='false' /> <!-- Equivalent to -p preference option if set --> @@ -127,7 +127,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho </loctext> </common_name> <documentation> - <manpage title='in.rdisc' section='1M' + <manpage title='in.rdisc' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/route.xml b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/route.xml index 530ec5bda7..e9d73eb57f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/route.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/route.xml @@ -80,7 +80,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Unstable' /> <propval name='protocol' type='astring' value='ipv4' /> @@ -90,7 +90,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho value='solaris.smf.value.routing' /> </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routing' type='application'> <stability value='Evolving' /> @@ -122,7 +122,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho <propval name='quiet_mode' type='boolean' value='false' /> <!-- Equivalent to -s option if true --> - <propval name='supply_routes' type='boolean' value='false' /> + <propval name='supply_routes' type='boolean' value='false' /> <!-- Equivalent to -S option if true --> <propval name='default_routes_only' type='boolean' @@ -162,7 +162,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho </loctext> </common_name> <documentation> - <manpage title='in.routed' section='1M' + <manpage title='in.routed' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/talk.xml b/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/talk.xml index c4d2494095..29b70d09cf 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/talk.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/talk.xml @@ -102,9 +102,9 @@ </loctext> </description> <documentation> - <manpage title='in.talkd' section='1M' + <manpage title='in.talkd' section='8' manpath='/usr/share/man' /> - <manpage title='talkd' section='1M' + <manpage title='talkd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c b/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c index bbd38a551c..08ad200c45 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c @@ -488,7 +488,7 @@ rd_and_store_forwarded_creds(krb5_context context, if ((retval = krb5_cc_close(context, ccache)) != 0) goto cleanup; - /* Register with ktkt_warnd(1M) */ + /* Register with ktkt_warnd(8) */ if ((retval = krb5_unparse_name(context, (*creds)->client, &client_name)) != 0) goto cleanup; @@ -496,11 +496,11 @@ rd_and_store_forwarded_creds(krb5_context context, if (kwarn_add_warning(client_name, (*creds)->times.endtime) != 0) { syslog(LOG_AUTH|LOG_NOTICE, "rd_and_store_forwarded_creds: kwarn_add_warning" - " failed: ktkt_warnd(1M) down? "); + " failed: ktkt_warnd(8) down? "); if (auth_debug) (void) fprintf(stderr, "kwarn_add_warning failed:" - " ktkt_warnd(1M) down?\n"); + " ktkt_warnd(8) down?\n"); } free(client_name); client_name = NULL; diff --git a/usr/src/cmd/cmd-inet/usr.sbin/inetconv/inetconv.c b/usr/src/cmd/cmd-inet/usr.sbin/inetconv/inetconv.c index 6419f9e074..376454019f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/inetconv/inetconv.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/inetconv/inetconv.c @@ -24,8 +24,8 @@ */ /* - * inetconv - convert inetd.conf entries into smf(5) service manifests, - * import them into smf(5) repository + * inetconv - convert inetd.conf entries into smf(7) service manifests, + * import them into smf(7) repository */ #include <sys/types.h> @@ -115,7 +115,7 @@ static const char xml_comment[] = "<!--\n" " Service manifest for the %s service.\n" "\n" -" Generated by inetconv(1M) from inetd.conf(4).\n" +" Generated by inetconv(8) from inetd.conf(5).\n" "-->\n\n"; static const char xml_service_bundle[] = diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/ipmpstat.c b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/ipmpstat.c index c9cbade079..a5d8f79bc4 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/ipmpstat.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/ipmpstat.c @@ -280,7 +280,7 @@ main(int argc, char **argv) die_ipmperr(err, "cannot create IPMP handle"); if (ipmp_ping_daemon(ih) != IPMP_SUCCESS) - die("cannot contact in.mpathd(1M) -- is IPMP in use?\n"); + die("cannot contact in.mpathd(8) -- is IPMP in use?\n"); /* * If we've been asked to display probes, then call the probe output diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c index e6257c6184..5ca927ca40 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c @@ -2253,7 +2253,7 @@ print_defaults(char *label, char *description, char *unit, * two ike_defaults_t's, the first contains the hard coded defaults, the second * contains the actual values used. If these differ, then the defaults have been * changed via a config file entry. Note that "-" indicates this default - * is not tunable via ike.config(4) or is system wide tunable. + * is not tunable via ike.config(5) or is system wide tunable. */ static void do_print_defaults(ike_defaults_t *dp) diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecalgs.xml b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecalgs.xml index cdf27133de..4d620d059d 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecalgs.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecalgs.xml @@ -113,7 +113,7 @@ svcadm mark <state> ipsecalgs svcadm clear ipsecalgs - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='action_authorization' @@ -125,7 +125,7 @@ svcadm disable ipsecalgs svcadm enable ipsecalgs - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='value_authorization' type='astring' @@ -158,7 +158,7 @@ <documentation> <manpage title='ipsecalgs' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecconf.c b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecconf.c index e8203530b4..fc94afe658 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecconf.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecconf.c @@ -1341,7 +1341,7 @@ main(int argc, char *argv[]) boolean_t replace_policy = B_FALSE; char *smf_warning = gettext( - "\n\tIPsec policy should be managed using smf(5). Modifying\n" + "\n\tIPsec policy should be managed using smf(7). Modifying\n" "\tthe IPsec policy from the command line while the 'policy'\n" "\tservice is enabled could result in an inconsistent\n" "\tsecurity policy.\n\n"); @@ -5247,7 +5247,7 @@ ipsec_conf_add(boolean_t just_check, boolean_t smf_managed, boolean_t replace) /* * Treat the non-existence of a policy file as a special - * case when ipsecconf is being managed by smf(5). + * case when ipsecconf is being managed by smf(7). * The assumption is the administrator has not yet * created a policy file, this should not force the service * into maintenance mode. diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c index 9667fa4047..cbf429a3e7 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c @@ -191,7 +191,7 @@ handle_errors(char *ep, char *ebuf, boolean_t fatal, boolean_t done) if (ep != NULL) { if (my_fmri == NULL) { /* - * For now suppress the errors when run from smf(5) + * For now suppress the errors when run from smf(7) * because potentially sensitive information could * end up in a publicly readable logfile. */ @@ -1093,7 +1093,7 @@ dodump(int satype, FILE *ofile) (void) fprintf(ofile, gettext("# This key file was generated by the")); (void) fprintf(ofile, - gettext(" ipseckey(1m) command's 'save' feature.\n\n")); + gettext(" ipseckey(8) command's 'save' feature.\n\n")); } msg_init(msg, SADB_DUMP, (uint8_t)satype); rc = key_write(keysock, msg, sizeof (*msg)); @@ -3590,7 +3590,7 @@ main(int argc, char *argv[]) (void) textdomain(TEXT_DOMAIN); /* - * Check to see if the command is being run from smf(5). + * Check to see if the command is being run from smf(7). */ my_fmri = getenv("SMF_FMRI"); @@ -3649,7 +3649,7 @@ main(int argc, char *argv[]) * this file if the file is root owned and only readable * by privileged users. If the command is being run by * the administrator, issue a warning, if this is run by - * smf(5) (IE: boot time) and the permissions are too + * smf(7) (IE: boot time) and the permissions are too * open, we will fail, the SMF service will end up in * maintenace mode. The check is made with fstat() to * eliminate any possible TOT to TOU window. @@ -3719,7 +3719,7 @@ main(int argc, char *argv[]) } /* - * When run from smf(5) flush any existing SA's first + * When run from smf(7) flush any existing SA's first * otherwise you will end up in maintenance mode. */ if ((my_fmri != NULL) && readfile) { diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/manual-key.xml b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/manual-key.xml index d1dac2b94c..fb4fd47374 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/manual-key.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/manual-key.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -86,7 +84,7 @@ <!-- To prevent ipseckey generating warnings about duplicate SAs when the service is refreshed, ipseckey will flush the - existing SAs when its called from smf(5). --> + existing SAs when its called from smf(7). --> <exec_method type='method' @@ -110,7 +108,7 @@ svcadm mark <state> manual-key svcadm clear manual-key - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='action_authorization' @@ -122,7 +120,7 @@ svcadm disable manual-key svcadm enable manual-key - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='value_authorization' @@ -132,8 +130,8 @@ </property_group> <!-- The properties defined below can be changed by a user - with 'solaris.smf.value.ipsec' authorization using the - svccfg(1M) command. + with 'solaris.smf.value.ipsec' authorization using the + svccfg(8) command. EG: @@ -183,7 +181,7 @@ </loctext> </description> <documentation> - <manpage title='ipseckey' section='1M' + <manpage title='ipseckey' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/policy.xml b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/policy.xml index 297e48d1b4..d63c65c3a4 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/policy.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/policy.xml @@ -102,7 +102,7 @@ svcadm mark <state> policy svcadm clear policy - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='action_authorization' @@ -113,7 +113,7 @@ svcadm disable policy svcadm enable policy - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='value_authorization' @@ -123,8 +123,8 @@ </property_group> <!-- The properties defined below can be changed by a user - with 'solaris.smf.value.ipsec' authorization using the - svccfg(1M) command. + with 'solaris.smf.value.ipsec' authorization using the + svccfg(8) command. EG: @@ -176,7 +176,7 @@ </loctext> </description> <documentation> - <manpage title='ipsecconf' section='1M' + <manpage title='ipsecconf' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/kssladm.c b/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/kssladm.c index c2978c564f..7eab57d0cc 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/kssladm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/kssladm.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <ctype.h> #include <stdio.h> #include <stdlib.h> @@ -39,10 +37,10 @@ /* - * kssladm(1M) + * kssladm(8) * * Command to manage the entries in kernel SSL proxy table. This is - * a private command called indirectly from ksslcfg(1M). + * a private command called indirectly from ksslcfg(8). */ boolean_t verbose = B_FALSE; diff --git a/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/kssl-proxy.xml b/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/kssl-proxy.xml index e2be94717c..3728239974 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/kssl-proxy.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/kssl-proxy.xml @@ -40,7 +40,7 @@ grouping='require_all' restart_on='restart' type='service'> - <service_fmri value='svc:/network/socket-filter:kssl' /> + <service_fmri value='svc:/network/socket-filter:kssl' /> </dependency> <dependency @@ -72,7 +72,7 @@ </loctext> </common_name> <documentation> - <manpage title='ksslcfg' section='1M' + <manpage title='ksslcfg' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/ksslcfg.c b/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/ksslcfg.c index 8b9a33349d..84336d0923 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/ksslcfg.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/ksslcfg.c @@ -38,10 +38,10 @@ #include "ksslcfg.h" /* - * ksslcfg(1M) + * ksslcfg(8) * - * ksslcfg manages smf(5) instances for the Kernel SSL proxy module. - * It makes use of kssladm(1M) which does the grunt work. + * ksslcfg manages smf(7) instances for the Kernel SSL proxy module. + * It makes use of kssladm(8) which does the grunt work. */ /* diff --git a/usr/src/cmd/cmd-inet/usr.sbin/login.xml b/usr/src/cmd/cmd-inet/usr.sbin/login.xml index f21084da5f..ba4d875d5f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/login.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/login.xml @@ -45,7 +45,7 @@ <service_fmri value='svc:/network/inetd:default' /> </restarter> - <property_group name='inetd' type='framework'> + <property_group name='inetd' type='framework'> <stability value='Evolving' /> <propval name='endpoint_type' type='astring' value='stream' /> <propval name='wait' type='boolean' value='false' /> @@ -87,7 +87,7 @@ value='solaris.smf.value.firewall.config' /> </property_group> - <property_group name='inetd' type='framework'> + <property_group name='inetd' type='framework'> <propval name='name' type='astring' value='login' /> <propval name='proto' type='astring' value='tcp6' /> </property_group> @@ -134,7 +134,7 @@ </property_group> <!-- Only works over IPv4 at the moment --> - <property_group name='inetd' type='framework'> + <property_group name='inetd' type='framework'> <propval name='name' type='astring' value='klogin' /> <propval name='proto' type='astring' value='tcp' /> </property_group> @@ -182,7 +182,7 @@ remote login with Kerberos authentication </property_group> <!-- Only works over IPv4 at the moment --> - <property_group name='inetd' type='framework'> + <property_group name='inetd' type='framework'> <propval name='name' type='astring' value='eklogin' /> <propval name='proto' type='astring' value='tcp' /> </property_group> @@ -205,9 +205,9 @@ remote login with Kerberos authentication and encryption </loctext> </common_name> <documentation> - <manpage title='in.rlogind' section='1M' + <manpage title='in.rlogind' section='8' manpath='/usr/share/man' /> - <manpage title='rlogind' section='1M' + <manpage title='rlogind' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ndd.c b/usr/src/cmd/cmd-inet/usr.sbin/ndd.c index 8d5fdfa91f..9adf3c8d2d 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ndd.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ndd.c @@ -170,8 +170,8 @@ ndd_perm2str(uint_t perm) * - replace leading underscores with protocol name. * For example: `_strong_iss' --> `tcp_strong_iss' * - * - don't print new public properties that are supported only by ipadm(1M) - * For example: `hostmodel' should be supported only from ipadm(1M). + * - don't print new public properties that are supported only by ipadm(8) + * For example: `hostmodel' should be supported only from ipadm(8). * Such properties are identified by not having leading '_' and not * being present in the mapping table. */ @@ -211,7 +211,7 @@ print_ipadm2ndd(char *oldbuf, uint_t obufsize) } /* * print only if it's a private property. We should - * not be printing any new public property in ndd(1M) + * not be printing any new public property in ndd(8) * output. */ if (!matched && pname[0] == '_') { @@ -234,7 +234,7 @@ print_ipadm2ndd(char *oldbuf, uint_t obufsize) * get/set the value for a given property by calling into libipadm. The * IPH_LEGACY flag is used by libipadm for special handling. For some * properties, libipadm.so displays strings (for e.g., on/off, - * never/passive/active, et al) instead of numerals. However ndd(1M) always + * never/passive/active, et al) instead of numerals. However ndd(8) always * printed numberals. This flag will help in avoiding printing strings. */ static boolean_t @@ -270,7 +270,7 @@ do_ipadm_getset(int cmd, char *buf, int buflen) } if (nimap->ndd_name == NULL && strcmp(pname, "?") != 0) { - /* do not allow set/get of public properties from ndd(1M) */ + /* do not allow set/get of public properties from ndd(8) */ if (ipadm_legacy2new_propname(pname, nname, sizeof (nname), &proto) != 0) { status = IPADM_PROP_UNKNOWN; @@ -371,7 +371,7 @@ gldv3_warning(char *module) "WARNING: The ndd commands for datalink " "administration are obsolete and may be " "removed in a future release of Solaris. " - "Use dladm(1M) to manage datalink tunables.\n")); + "Use dladm(8) to manage datalink tunables.\n")); } } dladm_close(handle); diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ndp.c b/usr/src/cmd/cmd-inet/usr.sbin/ndp.c index 2fc19775ad..c77e1587d9 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ndp.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ndp.c @@ -106,7 +106,7 @@ static boolean_t ndp_run = B_TRUE; #define NETSTAT_PATH "/usr/bin/netstat" /* - * Macros borrowed from route(1M) for working with PF_ROUTE messages + * Macros borrowed from route(8) for working with PF_ROUTE messages */ #define RT_ADVANCE(x, n) ((x) += ndp_salen(n)) #define RT_NEXTADDR(cp, w, u) \ diff --git a/usr/src/cmd/cmd-inet/usr.sbin/rarp.xml b/usr/src/cmd/cmd-inet/usr.sbin/rarp.xml index de1c254018..d7e052396b 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/rarp.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/rarp.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -104,9 +102,9 @@ Reverse Address Resolution Protocol (RARP) server </loctext> </common_name> <documentation> - <manpage title='rarp' section='7P' + <manpage title='rarp' section='4P' manpath='/usr/share/man' /> - <manpage title='in.rarpd' section='1M' + <manpage title='in.rarpd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/rexec.xml b/usr/src/cmd/cmd-inet/usr.sbin/rexec.xml index 98f83f3102..2514e2a04e 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/rexec.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/rexec.xml @@ -106,7 +106,7 @@ </loctext> </common_name> <documentation> - <manpage title='in.rexecd' section='1M' + <manpage title='in.rexecd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/route.c b/usr/src/cmd/cmd-inet/usr.sbin/route.c index 29ccf97bb1..17a63d6f95 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/route.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/route.c @@ -1659,7 +1659,7 @@ save_route(int argc, char **argv, int do_flush) struct flock lock; struct stat st; const char commentstr[] = - "# File generated by route(1M) - do not edit.\n"; + "# File generated by route(8) - do not edit.\n"; perm_fd = open(perm_file, O_RDWR | O_CREAT, fmode); if (perm_fd == -1 || fstat(perm_fd, &st) == -1) diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/forwarding.xml b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/forwarding.xml index b0e777ce50..2bdcaa6299 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/forwarding.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/forwarding.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -110,7 +108,7 @@ value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routeadm' type='application'> <propval name='default-ipv4-forwarding' type='boolean' value='false' /> @@ -132,7 +130,7 @@ </loctext> </description> <documentation> - <manpage title='routeadm' section='1M' + <manpage title='routeadm' section='8' manpath='/usr/share/man' /> </documentation> </template> @@ -214,7 +212,7 @@ value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routeadm' type='application'> <propval name='default-ipv6-forwarding' type='boolean' value='false' /> @@ -236,7 +234,7 @@ </loctext> </description> <documentation> - <manpage title='routeadm' section='1M' + <manpage title='routeadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/legacy-routing.xml b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/legacy-routing.xml index 5db846b48a..30902c43b5 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/legacy-routing.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/legacy-routing.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -96,7 +94,7 @@ <instance name='ipv4' enabled='false'> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Evolving' /> <propval name='protocol' type='astring' value='ipv4' /> @@ -118,7 +116,7 @@ <instance name='ipv6' enabled='false'> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Evolving' /> <propval name='protocol' type='astring' value='ipv6' /> @@ -152,7 +150,7 @@ </loctext> </description> <documentation> - <manpage title='routeadm' section='1M' + <manpage title='routeadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c index be826baba2..6fad8a3513 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c @@ -249,7 +249,7 @@ #define RA_SVC_FLAG_IPV6_ROUTING 0x2 #define RA_SMF_UPGRADE_FILE "/var/svc/profile/upgrade" -#define RA_SMF_UPGRADE_MSG " # added by routeadm(1M)" +#define RA_SMF_UPGRADE_MSG " # added by routeadm(8)" #define RA_CONF_FILE "/etc/inet/routing.conf" #define RA_CONF_FILE_OLD "/etc/inet/routing.conf.old" #define RA_MAX_CONF_LINE 256 diff --git a/usr/src/cmd/cmd-inet/usr.sbin/shell.xml b/usr/src/cmd/cmd-inet/usr.sbin/shell.xml index b841f99961..40be5f7572 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/shell.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/shell.xml @@ -92,10 +92,10 @@ </exec_method> <exec_method - type='method' - name='inetd_disable' - exec=':kill' - timeout_seconds='0'> + type='method' + name='inetd_disable' + exec=':kill' + timeout_seconds='0'> </exec_method> <property_group name='firewall_config' type='com.sun,fw_configuration'> @@ -176,9 +176,9 @@ remote shell with Kerberos authentication </loctext> </common_name> <documentation> - <manpage title='in.rshd' section='1M' + <manpage title='in.rshd' section='8' manpath='/usr/share/man' /> - <manpage title='rshd' section='1M' + <manpage title='rshd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c index 5ce947b476..63eb4973a0 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c @@ -112,7 +112,7 @@ select_datalink(const char *linkname, void *arg) /* * Open `linkname' in raw/passive mode (see dlpi_open(3DLPI)). If `linkname' - * is NULL, pick a datalink as per snoop(1M). Also gather some information + * is NULL, pick a datalink as per snoop(8). Also gather some information * about the datalink useful for building the proper packet filters. */ boolean_t diff --git a/usr/src/cmd/cmd-inet/usr.sbin/socket-filter-kssl.xml b/usr/src/cmd/cmd-inet/usr.sbin/socket-filter-kssl.xml index b91fcd47ea..e821a9c964 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/socket-filter-kssl.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/socket-filter-kssl.xml @@ -41,7 +41,7 @@ grouping='require_all' restart_on='none' type='service'> - <service_fmri value='svc:/system/filesystem/root' /> + <service_fmri value='svc:/system/filesystem/root' /> </dependency> <exec_method @@ -70,15 +70,15 @@ <propval name='socket_tuples' type='astring' value='2:2:0,2:2:6,26:2:0,26:2:6' /> </property_group> - + <template> <common_name> <loctext xml:lang='C'> - kernel SSL socket filter + kernel SSL socket filter </loctext> </common_name> <documentation> - <manpage title='ksslcfg' section='1M' + <manpage title='ksslcfg' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/telnet.xml b/usr/src/cmd/cmd-inet/usr.sbin/telnet.xml index a5425c3fc1..b2a8691372 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/telnet.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/telnet.xml @@ -98,9 +98,9 @@ in.telnetd supports the standard TELNET virtual terminal protocol. </loctext> </description> <documentation> - <manpage title='in.telnetd' section='1M' + <manpage title='in.telnetd' section='8' manpath='/usr/share/man' /> - <manpage title='telnetd' section='1M' + <manpage title='telnetd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/telnetd.dfl b/usr/src/cmd/cmd-inet/usr.sbin/telnetd.dfl index a712bd90fd..1228b273f1 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/telnetd.dfl +++ b/usr/src/cmd/cmd-inet/usr.sbin/telnetd.dfl @@ -1,4 +1,3 @@ -#ident "%Z%%M% %I% %E% SMI" # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -25,10 +24,10 @@ # # /etc/default/telnetd # -# telnetd default settings processed via telnetd(1M). +# telnetd default settings processed via telnetd(8). # # BANNER defines the connection banner which is displayed before the -# telnet login prompt, see telnetd(1M) for details. The following +# telnet login prompt, see telnetd(8) for details. The following # commented line shows the default value. # #BANNER="\\r\\n\\r\\n`uname -s` `uname -r`\\r\\n\\r\\n" diff --git a/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c b/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c index 98d452665a..1b9e1955b9 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c @@ -1299,7 +1299,7 @@ setup_socket(struct pr_set *pr, int packet_len) * or whether ICMP will be used instead of UDP. * * For historical reasons, the datagrams sent out by - * traceroute(1M) do not have the "don't fragment" flag set. For + * traceroute(8) do not have the "don't fragment" flag set. For * this reason as well as the ability to set the Loose Source and * Record Route (LSRR) option, a raw IP socket will be used for * IPv4 when run in the global zone. Otherwise, the actual |