diff options
Diffstat (limited to 'usr')
845 files changed, 1882 insertions, 2103 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index 6d31345421..4342f8d6dd 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -67,7 +67,7 @@ PARALLEL_HEADERS = sysheaders userheaders libheaders cmdheaders # PARALLEL_DIRS = data uts lib man -# The check target also causes smf(5) service manifests to be validated. +# The check target also causes smf(7) service manifests to be validated. CHKMFSTSUBDIRS= cmd # And man page formats diff --git a/usr/src/cmd/Adm/sun/README b/usr/src/cmd/Adm/sun/README index f333944663..2c89114b70 100644 --- a/usr/src/cmd/Adm/sun/README +++ b/usr/src/cmd/Adm/sun/README @@ -26,8 +26,6 @@ Elimination of /usr/kvm Copyright (c) 1995-2000 by Sun Microsystems, Inc. All rights reserved. -#ident "%Z%%M% %I% %E% SMI" - As of Solaris 2.5, the /usr/kvm directory is no longer needed by the operating environment. The mount point continues to be provided for backward compatibility although all of the contents have been removed. @@ -49,7 +47,7 @@ Implementation Interface(s) /usr/kvm/crash /usr/bin/mdb Note: Solaris Modular Debugger Guide describes how to - transition from crash(1M) to mdb(1). + transition from crash(8) to mdb(1). /usr/kvm/eeprom /usr/sbin/eeprom diff --git a/usr/src/cmd/Adm/sun/ftpusers b/usr/src/cmd/Adm/sun/ftpusers index e3a513b356..b821c641e7 100644 --- a/usr/src/cmd/Adm/sun/ftpusers +++ b/usr/src/cmd/Adm/sun/ftpusers @@ -1,5 +1,5 @@ # -# List of users denied access to the FTP server, see ftpusers(4). +# List of users denied access to the FTP server, see ftpusers(5). # root daemon diff --git a/usr/src/cmd/Adm/ttysrch b/usr/src/cmd/Adm/ttysrch index b4e2195503..daf8753ff3 100644 --- a/usr/src/cmd/Adm/ttysrch +++ b/usr/src/cmd/Adm/ttysrch @@ -42,7 +42,7 @@ # soon as it is found. This is especially useful for cloned # devices, which generally will not match inode numbers. # -# For additional information see ttysrch(4). +# For additional information see ttysrch(5). # # EXAMPLE: # diff --git a/usr/src/cmd/Adm/zones-index b/usr/src/cmd/Adm/zones-index index 91fe7a9421..a559897bb9 100644 --- a/usr/src/cmd/Adm/zones-index +++ b/usr/src/cmd/Adm/zones-index @@ -1,4 +1,3 @@ -# ident "%Z%%M% %I% %E% SMI" # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -23,7 +22,7 @@ # CDDL HEADER END # # -# DO NOT EDIT: this file is automatically generated by zoneadm(1M) -# and zonecfg(1M). Any manual changes will be lost. +# DO NOT EDIT: this file is automatically generated by zoneadm(8) +# and zonecfg(8). Any manual changes will be lost. # global:installed:/ diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd index 6ed70fb94b..8dd94c7aaa 100644 --- a/usr/src/cmd/Makefile.cmd +++ b/usr/src/cmd/Makefile.cmd @@ -198,7 +198,7 @@ ROOTADMIN_SRC_FILE= $(ADMINFILE:%=$(ROOTADMIN_SRC_DIR)/%) $(ROOTADMIN_SRC_FILE) := FILEMODE = 0444 # -# Directories for smf(5) service manifests and profiles. +# Directories for smf(7) service manifests and profiles. # ROOTSVC= $(ROOT)/lib/svc ROOTETCSVC= $(ROOT)/etc/svc diff --git a/usr/src/cmd/acct/wtmpfix.c b/usr/src/cmd/acct/wtmpfix.c index d5a7ac3a95..cd8f5434f2 100644 --- a/usr/src/cmd/acct/wtmpfix.c +++ b/usr/src/cmd/acct/wtmpfix.c @@ -27,8 +27,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * wtmpfix - adjust wtmpx file and remove date changes. * wtmpfix <wtmpx1 >wtmpx2 @@ -53,9 +51,9 @@ #define UTRSZ (sizeof (struct futmpx)) /* file record size */ /* - * The acctsh(1M) shell scripts startup(1M) and shutacct(1M) as well as the + * The acctsh(8) shell scripts startup(8) and shutacct(8) as well as the * runacct script each pass their own specific reason strings in the first - * argument to acctwtmp(1M), to be propagated into ut_line fields. Additional + * argument to acctwtmp(8), to be propagated into ut_line fields. Additional * reasons (RUNLVL_MSG, ..., DOWN_MSG), used by compiled code, are defined in * <utmp.h> as preprocessor constants. * For simplicity we predefine similar constants for the scripted strings @@ -326,7 +324,7 @@ invalid(char *name) * next. Aside from the temp file position, we remember whether we were * in multi-user mode or not. Absent evidence to the contrary, we begin * processing assuming multi-user mode, because runacct's wtmpx rotation - * normally gives us a file recently initialized by utmp2wtmp(1M) with no + * normally gives us a file recently initialized by utmp2wtmp(8) with no * older RUN_LVL records surviving. */ diff --git a/usr/src/cmd/acctadm/aconf.c b/usr/src/cmd/acctadm/aconf.c index cfb4a2e54a..1fdb081e0c 100644 --- a/usr/src/cmd/acctadm/aconf.c +++ b/usr/src/cmd/acctadm/aconf.c @@ -136,7 +136,7 @@ aconf_setup(const char *fmri) /* * Net/Flow accounting is not available in non-global zones and * the service instance should therefore never be 'enabled' in - * non-global zones. This is enforced by acctadm(1M), but there is + * non-global zones. This is enforced by acctadm(8), but there is * nothing that prevents someone from calling svcadm enable directly, * so we handle that case here by disabling the instance. */ diff --git a/usr/src/cmd/acctadm/extended-accounting.xml b/usr/src/cmd/acctadm/extended-accounting.xml index 318d6637dc..2b98c64e60 100644 --- a/usr/src/cmd/acctadm/extended-accounting.xml +++ b/usr/src/cmd/acctadm/extended-accounting.xml @@ -28,7 +28,7 @@ operating system upgrade. Make customizations in a different file. - NOTE: Do NOT edit the 'config' properties directly, use acctadm(1M) + NOTE: Do NOT edit the 'config' properties directly, use acctadm(8) instead. Service manifest for extended accounting. diff --git a/usr/src/cmd/acctadm/main.c b/usr/src/cmd/acctadm/main.c index 83cb63b314..0a554b4896 100644 --- a/usr/src/cmd/acctadm/main.c +++ b/usr/src/cmd/acctadm/main.c @@ -266,7 +266,7 @@ main(int argc, char *argv[]) die(gettext("failed to open dladm handle\n")); /* - * smf(5) start method. The FMRI to operate on is retrieved from the + * smf(7) start method. The FMRI to operate on is retrieved from the * SMF_FMRI environment variable that the restarter provides. */ if (sflg) { @@ -276,7 +276,7 @@ main(int argc, char *argv[]) return (ret); } - die(gettext("-s option should only be invoked by smf(5)\n")); + die(gettext("-s option should only be invoked by smf(7)\n")); } assert(type == AC_PROC || type == AC_TASK || type == AC_FLOW || @@ -292,7 +292,7 @@ main(int argc, char *argv[]) /* * Since the sys_acct the privilege allows use of acctctl() regardless - * of the accounting type, we check the smf(5) authorizations granted + * of the accounting type, we check the smf(7) authorizations granted * to the user to determine whether the user is allowed to change the * configuration for this particular accounting type. */ diff --git a/usr/src/cmd/allocate/allocate.c b/usr/src/cmd/allocate/allocate.c index 36aab83ba1..3730a11ed4 100644 --- a/usr/src/cmd/allocate/allocate.c +++ b/usr/src/cmd/allocate/allocate.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <errno.h> #include <locale.h> #include <pwd.h> @@ -194,7 +192,7 @@ print_error(int error, char *name) "Operation inconsistent with device's label range."); break; case LOGINDEVPERMERR: - msg = gettext("Device controlled by logindevperm(4)"); + msg = gettext("Device controlled by logindevperm(5)"); break; case NODAERR: msg = gettext("No entry for specified device."); diff --git a/usr/src/cmd/allocate/disk_clean.sh b/usr/src/cmd/allocate/disk_clean.sh index a523b66750..9e690af34f 100644 --- a/usr/src/cmd/allocate/disk_clean.sh +++ b/usr/src/cmd/allocate/disk_clean.sh @@ -182,13 +182,13 @@ get_reply() { # find_fs() { - # The list of files in device_maps(4) is in an unspecified order. - # To speed up the fstyp(1M) scanning below in most cases, perform + # The list of files in device_maps(5) is in an unspecified order. + # To speed up the fstyp(8) scanning below in most cases, perform # the search for filesystems as follows: # 1) Select only block device files of the form "/dev/dsk/*". # 2) Sort the list of files in an order more likely to yield - # matches: first the fdisk(1M) partitions ("/dev/dsk/cNtNdNpN") - # then the format(1M) slices ("/dev/dsk/cNtNdNsN"), in ascending + # matches: first the fdisk(8) partitions ("/dev/dsk/cNtNdNpN") + # then the format(8) slices ("/dev/dsk/cNtNdNsN"), in ascending # numeric order within each group. DEVall="`echo $FILES | \ /usr/bin/tr ' ' '\n' | \ diff --git a/usr/src/cmd/ast/Makefile.ast b/usr/src/cmd/ast/Makefile.ast index d450fffbf7..00b5893be0 100644 --- a/usr/src/cmd/ast/Makefile.ast +++ b/usr/src/cmd/ast/Makefile.ast @@ -88,7 +88,7 @@ CSTD= $(CSTD_GNU99) # SHOPT_FS_3D 3d file system # SHOPT_OLDTERMIO support both TCGETA and TCGETS # SHOPT_P_SUID real uid's that require -p for set[ug]id -# SHOPT_PFSH solaris exec_attr(4) profile execution +# SHOPT_PFSH solaris exec_attr(5) profile execution # SHOPT_REGRESS enable __regress__ builtin # SHOPT_REMOTE enable --rc if running as a remote shell # SHOPT_SEVENBIT strip the eigth bit from characters diff --git a/usr/src/cmd/audit/audit.c b/usr/src/cmd/audit/audit.c index 95eda0da4e..77b8771910 100644 --- a/usr/src/cmd/audit/audit.c +++ b/usr/src/cmd/audit/audit.c @@ -212,7 +212,7 @@ is_audit_config_ok() { /* * There must be at least one active plugin configured; if the - * configured plugin is audit_binfile(5), then the p_dir must not be + * configured plugin is audit_binfile(7), then the p_dir must not be * empty. */ if (!do_getpluginconfig_scf(NULL, &plugin_kva_ll)) { @@ -238,12 +238,12 @@ is_audit_config_ok() { cval_str = kva_match(kvlist, "p_dir"); if (cval_str == NULL || cval_str[0] == '\0') { (void) fprintf(stderr, - gettext("%s: audit_binfile(5) \"p_dir:\" " + gettext("%s: audit_binfile(7) \"p_dir:\" " "attribute empty\n"), progname); state = B_FALSE; } else if (!contains_valid_dirs(cval_str)) { (void) fprintf(stderr, - gettext("%s: audit_binfile(5) \"p_dir:\" " + gettext("%s: audit_binfile(7) \"p_dir:\" " "attribute invalid\n"), progname); state = B_FALSE; } @@ -252,7 +252,7 @@ is_audit_config_ok() { cval_int = atoi(cval_str); if (cval_int < 0 || cval_int > 100) { (void) fprintf(stderr, - gettext("%s: audit_binfile(5) " + gettext("%s: audit_binfile(7) " "\"p_minfree:\" attribute invalid\n"), progname); state = B_FALSE; diff --git a/usr/src/cmd/auditd/auditd.c b/usr/src/cmd/auditd/auditd.c index 16d4bfe572..5f15c93752 100644 --- a/usr/src/cmd/auditd/auditd.c +++ b/usr/src/cmd/auditd/auditd.c @@ -34,7 +34,7 @@ * used for the child to tell the parent that audit is ready. * * Configuration data comes from audit service configuration - * (AUDITD_FMRI/smf(5)) and the auditon system call. + * (AUDITD_FMRI/smf(7)) and the auditon system call. * * The major errors are EBUSY (auditing is already in use) and EINTR * (one of the above signals was received). File space errors are @@ -273,7 +273,7 @@ main(int argc, char *argv[]) */ (void) umask(007); - if (__logpost("")) { /* Cannot unlink pointer to audit.log(4) file */ + if (__logpost("")) { /* Cannot unlink pointer to audit.log(5) file */ DPRINT((dbfp, "logpost failed\n")); auditd_exit(1); } @@ -285,7 +285,7 @@ main(int argc, char *argv[]) while (running) { /* * Read auditd / auditd plugins related configuration from - * smf(5) repository and create plugin lists. + * smf(7) repository and create plugin lists. * * loadauditlist() and auditd_thread_init() are called * while under the plugin_mutex lock to avoid a race @@ -399,7 +399,7 @@ main(int argc, char *argv[]) * over unless audit configuration actually changed. * * They want to reread the audit configuration from - * smf(5) repository (AUDITD_FMRI). Set reset_list + * smf(7) repository (AUDITD_FMRI). Set reset_list * which will return us to the main while loop in the * main routine. */ @@ -579,7 +579,7 @@ init_plugin(char *name, kva_t *list, int cnt_flag) } /* - * loadauditlist() - read the auditd plugin configuration from smf(5) and + * loadauditlist() - read the auditd plugin configuration from smf(7) and * prepare appropriate plugin related structures (plugin_t). Set cnt policy here * based on currently active policy settings. (future could have a policy = * {+|-}cnt entry per plugin with auditconfig providing the default) @@ -814,7 +814,7 @@ fail: /* * conf_to_kernel() - configure the event to class mapping; see also - * auditconfig(1M) -conf option. + * auditconfig(8) -conf option. */ static void conf_to_kernel(void) diff --git a/usr/src/cmd/auditd/auditd.xml b/usr/src/cmd/auditd/auditd.xml index 0c63270a57..2c3208ad87 100644 --- a/usr/src/cmd/auditd/auditd.xml +++ b/usr/src/cmd/auditd/auditd.xml @@ -128,8 +128,8 @@ <instance name='default' enabled='false'> <!-- - System-wide audit preselection flags - see auditconfig(1M) - and audit_flags(5). + System-wide audit preselection flags - see auditconfig(8) + and audit_flags(7). The 'flags' property is the system-wide default set of audit classes that is combined with the per-user audit @@ -152,10 +152,10 @@ </property_group> <!-- - Audit Queue Control Properties - see auditconfig(1M) + Audit Queue Control Properties - see auditconfig(8) Note, that the default value for all the queue control - configuration parameters is 0, which makes auditd(1M) to + configuration parameters is 0, which makes auditd(8) to use current active system parameters. --> <property_group name='queuectrl' type='application' > @@ -174,10 +174,10 @@ </property_group> <!-- - Audit Policies - see auditconfig(1M) + Audit Policies - see auditconfig(8) Note, that "all" and "none" policies available as a - auditconfig(1M) policy flags actually means a full/empty set + auditconfig(8) policy flags actually means a full/empty set of other policy flags. Thus they are not configurable in the auditd service manifest, but set all the policies to true (all) or false (none). @@ -217,8 +217,8 @@ <!-- Plugins to configure where to send the audit trail - see - auditconfig(1M), audit_binfile(5), audit_remote(5), - audit_syslog(5) + auditconfig(8), audit_binfile(7), audit_remote(7), + audit_syslog(7) Each plugin type property group has properties: diff --git a/usr/src/cmd/auditd/svc-auditd b/usr/src/cmd/auditd/svc-auditd index ce95015fc1..79ac155b07 100644 --- a/usr/src/cmd/auditd/svc-auditd +++ b/usr/src/cmd/auditd/svc-auditd @@ -79,7 +79,7 @@ do_common() AUDITCOND="`$AUDITCONFIG -getcond 2>/dev/null`" if [ $? -ne 0 ]; then # The decision whether to start - # auditing is driven by bsmconv(1M) / bsmunconv(1M) + # auditing is driven by bsmconv(8) / bsmunconv(8) echo "$0: Unable to get current kernel auditing condition." $SVCADM mark maintenance $AUDITD_FMRI exit $SMF_EXIT_MON_OFFLINE @@ -91,9 +91,9 @@ do_common() $AUDITCONFIG -t -getpolicy | \ $EGREP "perzone|all" 1>/dev/null 2>&1 if [ $? -eq 1 ]; then - echo "$0: auditd(1M) is not configured to run in" + echo "$0: auditd(8) is not configured to run in" echo " a local zone, perzone policy not set" \ - "(see auditconfig(1M))." + "(see auditconfig(8))." $SVCADM disable $AUDITD_FMRI $SLEEP 5 & exit $SMF_EXIT_OK @@ -114,7 +114,7 @@ do_common() do_start() { # - # The transition of the audit_startup(1M) has to be performed. + # The transition of the audit_startup(8) has to be performed. if [ -f "$AUDIT_STARTUP" ]; then if [ -x "$AUDIT_STARTUP" ]; then @@ -125,7 +125,7 @@ do_start() exit $SMF_EXIT_MON_OFFLINE fi - echo "$0: Transition of audit_startup(1M) started." + echo "$0: Transition of audit_startup(8) started." $MV $AUDIT_STARTUP $AUDIT_STARTUP._transitioned_ if [ $? -ne 0 ]; then @@ -144,7 +144,7 @@ do_start() exit $SMF_EXIT_ERR_CONFIG fi - echo "$0: Transition of audit_startup(1M) finished." + echo "$0: Transition of audit_startup(8) finished." fi # @@ -158,7 +158,7 @@ do_refresh() { # # The refresh capability is available only for those systems - # with already transformed audit_startup(1M) into $AUDITD_FMRI + # with already transformed audit_startup(8) into $AUDITD_FMRI # service properties. See do_start() for more information. if [ ! -f "$AUDIT_STARTUP" ]; then # @@ -171,7 +171,7 @@ do_refresh() exit $SMF_EXIT_ERR_FATAL fi # - # signal to auditd(1M): + # signal to auditd(8): $PKILL -HUP -c ${contract_id} if [ $? -ne 0 ]; then echo "$0: SIGHUP was not successfully delivered to" \ @@ -182,8 +182,8 @@ do_refresh() $SLEEP 5 & else echo "$0: Service refresh method not supported on systems" \ - "without converted audit_startup(1M) into auditd service" \ - "SMF configuration. Clear the service (svcadm(1M))." + "without converted audit_startup(8) into auditd service" \ + "SMF configuration. Clear the service (svcadm(8))." $SVCADM mark maintenance $AUDITD_FMRI exit $SMF_EXIT_ERR_CONFIG fi diff --git a/usr/src/cmd/auditrecord/audit_record_attr.txt b/usr/src/cmd/auditrecord/audit_record_attr.txt index fdc4fa46eb..3a46bf4f59 100644 --- a/usr/src/cmd/auditrecord/audit_record_attr.txt +++ b/usr/src/cmd/auditrecord/audit_record_attr.txt @@ -119,7 +119,7 @@ user=head:subj:insert:ret # # Constraints - the string length; bear in mind, that any annotation of # primitives below longer than is specified, will be silently truncated -# to given/defined amount of characters in the auditrecord(1M) runtime: +# to given/defined amount of characters in the auditrecord(8) runtime: # # primitive <= max (non-truncated) string length # case <= unlimited; if necessary, text continues on a new line @@ -2321,7 +2321,7 @@ label=AUE_modify_user label=AUE_mountd_mount title=mountd: NFS mount program=/usr/lib/nfs/mountd - see=mountd(1M) + see=mountd(8) format=text1:path2 comment=remote client hostname: comment=mount dir @@ -2346,7 +2346,7 @@ label=AUE_reboot_solaris title=reboot format=user # See audit_reboot.c -# header,61,2,reboot(1m),,Fri Nov 09 13:52:34 2001, + 726 msec +# header,61,2,reboot(8),,Fri Nov 09 13:52:34 2001, + 726 msec # subject,tuser1,root,other,root,other,10422,497,0 0 tmach2 # return,success,0 diff --git a/usr/src/cmd/auditset/svc-auditset.c b/usr/src/cmd/auditset/svc-auditset.c index cc2b8482d2..b68829c172 100644 --- a/usr/src/cmd/auditset/svc-auditset.c +++ b/usr/src/cmd/auditset/svc-auditset.c @@ -86,7 +86,7 @@ main(void) #ifdef DEBUG if (errno == ENOTSUP) { (void) printf("c2audit module is excluded from " - "the system(4); kernel won't be updated.\n"); + "the system(5); kernel won't be updated.\n"); } else { (void) printf("%s\n", strerror(errno)); } diff --git a/usr/src/cmd/backup/dump/dumpoptr.c b/usr/src/cmd/backup/dump/dumpoptr.c index 631a494993..a614c19798 100644 --- a/usr/src/cmd/backup/dump/dumpoptr.c +++ b/usr/src/cmd/backup/dump/dumpoptr.c @@ -387,7 +387,7 @@ lastdump(int arg) /* w ==> just what to do; W ==> most recent dumps */ if (strncmp(lastname, itwalk->id_name, sizeof (itwalk->id_name)) == 0) continue; - /* must be ctime(), per ufsdump(4) */ + /* must be ctime(), per ufsdump(5) */ ddate = itwalk->id_ddate; date = (char *)ctime(&ddate); date[16] = '\0'; /* blow away seconds and year */ diff --git a/usr/src/cmd/bart/rules.c b/usr/src/cmd/bart/rules.c index 94258a858d..f12a04ef09 100644 --- a/usr/src/cmd/bart/rules.c +++ b/usr/src/cmd/bart/rules.c @@ -1025,7 +1025,7 @@ check_rules(const char *fname, char type) } /* - * Function to determine if an entry in a rules file (see bart_rules(4)) applies + * Function to determine if an entry in a rules file (see bart_rules(5)) applies * to a filename. We truncate "fname" such that it has the same number of * components as "rule" and let fnmatch(3C) do the rest. A "component" is one * part of an fname as delimited by slashes ('/'). So "/A/B/C/D" has four diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c index 62cbd6ef8c..d58b8c4159 100644 --- a/usr/src/cmd/boot/bootadm/bootadm.c +++ b/usr/src/cmd/boot/bootadm/bootadm.c @@ -29,7 +29,7 @@ */ /* - * bootadm(1M) is a new utility for managing bootability of + * bootadm(8) is a new utility for managing bootability of * Solaris *Newboot* environments. It has two primary tasks: * - Allow end users to manage bootability of Newboot Solaris instances * - Provide services to other subsystems in Solaris (primarily Install) @@ -604,7 +604,7 @@ static struct cmd_map { }; /* - * Commands syntax published in bootadm(1M) are parsed here + * Commands syntax published in bootadm(8) are parsed here */ static void parse_args(int argc, char *argv[]) @@ -4985,7 +4985,7 @@ line_parser(menu_t *mp, char *str, int *lineNum, int *entryNum) prev->entryNum = lp->entryNum; curr_ent = boot_entry_new(mp, prev, lp); curr_ent->flags |= BAM_ENTRY_BOOTADM; - BAM_DPRINTF(("%s: is bootadm(1M) entry: %s\n", + BAM_DPRINTF(("%s: is bootadm(8) entry: %s\n", fcn, arg)); } else { curr_ent = boot_entry_new(mp, lp, lp); diff --git a/usr/src/cmd/boot/bootadm/bootadm_upgrade.c b/usr/src/cmd/boot/bootadm/bootadm_upgrade.c index 86a184e623..c2d364f2c6 100644 --- a/usr/src/cmd/boot/bootadm/bootadm_upgrade.c +++ b/usr/src/cmd/boot/bootadm/bootadm_upgrade.c @@ -615,8 +615,8 @@ bam_warn_hand_entries(menu_t *mp, char *osroot) hand_list[hand_num - 1] = entry->entryNum; } - bam_error(_("bootadm(1M) will only upgrade GRUB menu entries added " - "by \nbootadm(1M) or lu(1M). The following entries on %s will " + bam_error(_("bootadm(8) will only upgrade GRUB menu entries added " + "by \nbootadm(8) or lu(8). The following entries on %s will " "not be upgraded.\nFor details on manually updating entries, " "see %s\n"), osroot, MENU_URL(osroot)); bam_print_stderr("Entry Number%s: ", (hand_num > 1) ? diff --git a/usr/src/cmd/boot/scripts/create_ramdisk.ksh b/usr/src/cmd/boot/scripts/create_ramdisk.ksh index 3a9ca046d8..4125ef886d 100644 --- a/usr/src/cmd/boot/scripts/create_ramdisk.ksh +++ b/usr/src/cmd/boot/scripts/create_ramdisk.ksh @@ -39,8 +39,8 @@ dirsize=0 usage() { cat <<- EOM -This utility is a component of the bootadm(1M) implementation and it is not -recommended for stand-alone use. Please use bootadm(1M) instead. +This utility is a component of the bootadm(8) implementation and it is not +recommended for stand-alone use. Please use bootadm(8) instead. Usage: ${0##*/}: [-R <root>] [-p <platform>] [ -f <format> ] [--nocompress] where <platform> is one of i86pc, sun4u or sun4v diff --git a/usr/src/cmd/boot/scripts/extract_boot_filelist.ksh b/usr/src/cmd/boot/scripts/extract_boot_filelist.ksh index 52479b7471..9c50f5d518 100644 --- a/usr/src/cmd/boot/scripts/extract_boot_filelist.ksh +++ b/usr/src/cmd/boot/scripts/extract_boot_filelist.ksh @@ -22,7 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # set path, but inherit /tmp/bfubin if it is sane @@ -35,9 +34,9 @@ else fi usage() { - echo "This utility is a component of the bootadm(1M) implementation" + echo "This utility is a component of the bootadm(8) implementation" echo "and it is not recommended for stand-alone use." - echo "Please use bootadm(1M) instead." + echo "Please use bootadm(8) instead." echo "" echo "Usage: ${0##*/}: [-R <root>] [-p <platform>] <filelist> ..." echo "where <platform> is one of i86pc, sun4u or sun4v" diff --git a/usr/src/cmd/cdrw/mmc.c b/usr/src/cmd/cdrw/mmc.c index 4b90cc5f3d..7624e16f10 100644 --- a/usr/src/cmd/cdrw/mmc.c +++ b/usr/src/cmd/cdrw/mmc.c @@ -672,7 +672,7 @@ read_format_capacity(int fd, uint_t *bsize) } /* - * Used to reset the device. Since, sd(7D) requires a + * Used to reset the device. Since, sd(4D) requires a * command to be issued when resetting a device we will * issue an innocuous command. The command chosen for this * purpose is the TEST UNIT READY (TUR) command. We also do @@ -692,7 +692,7 @@ reset_dev(int fd) */ scmd = get_uscsi_cmd(); - /* Tell sd(7D) to do a silent reset of the device. */ + /* Tell sd(4D) to do a silent reset of the device. */ scmd->uscsi_flags = USCSI_SILENT | USCSI_RESET; scmd->uscsi_timeout = DEFAULT_SCSI_TIMEOUT; diff --git a/usr/src/cmd/cfgadm/cfgadm.c b/usr/src/cmd/cfgadm/cfgadm.c index fd660c7298..848cdb1cb8 100644 --- a/usr/src/cmd/cfgadm/cfgadm.c +++ b/usr/src/cmd/cfgadm/cfgadm.c @@ -26,9 +26,9 @@ /* * This is the main program file for the configuration administration - * command as set out in manual page cfgadm(1M). It uses the configuration + * command as set out in manual page cfgadm(8). It uses the configuration * administration library interface, libcfgadm, as set out in manual - * page config_admin(3X). + * page config_admin(3CFGADM). */ #include <stdio.h> @@ -649,7 +649,7 @@ usage(void) /* * Emit an error message. * As a side-effect the hardware specific error message is deallocated - * as described in config_admin(3X). + * as described in config_admin(3CFGADM). */ static void cfgadm_error(int errnum, char *estrp) diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef.c b/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef.c index cd3737cc24..f20de9020b 100644 --- a/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef.c +++ b/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef.c @@ -311,7 +311,7 @@ disable_kef_hardware(char *provname, boolean_t rndflag, boolean_t allflag, * kCF treats random as an internal mechanism. So, we need to * filter it from the mechanism list here, if we are NOT disabling * or enabling the random feature. Note that we map random feature at - * cryptoadm(1M) level to the "random" mechanism in kCF. + * cryptoadm(8) level to the "random" mechanism in kCF. */ if (!rndflag) { (void) filter_mechlist(&dislist, RANDOM); @@ -459,7 +459,7 @@ disable_kef_software(char *provname, boolean_t rndflag, boolean_t allflag, * kCF treats random as an internal mechanism. So, we need to * filter it from the mechanism list here, if we are NOT disabling * or enabling the random feature. Note that we map random feature at - * cryptoadm(1M) level to the "random" mechanism in kCF. + * cryptoadm(8) level to the "random" mechanism in kCF. */ if (!rndflag) { (void) filter_mechlist(&infolist, RANDOM); @@ -574,7 +574,7 @@ enable_kef(char *provname, boolean_t rndflag, boolean_t allflag, * kCF treats random as an internal mechanism. So, we need to * filter it from the mechanism list here, if we are NOT disabling * or enabling the random feature. Note that we map random feature at - * cryptoadm(1M) level to the "random" mechanism in kCF. + * cryptoadm(8) level to the "random" mechanism in kCF. */ if (!rndflag) { redo_flag = filter_mechlist(&pent->dislist, RANDOM); diff --git a/usr/src/cmd/cmd-crypto/etc/kcf.conf b/usr/src/cmd/cmd-crypto/etc/kcf.conf index df9634b95f..46bc85dc1d 100644 --- a/usr/src/cmd/cmd-crypto/etc/kcf.conf +++ b/usr/src/cmd/cmd-crypto/etc/kcf.conf @@ -23,7 +23,7 @@ # # /etc/crypto/kcf.conf # -# Do NOT edit this file by hand. An administrator should use cryptoadm(1m) +# Do NOT edit this file by hand. An administrator should use cryptoadm(8) # to administer the cryptographic framework. # # This document does not constitute an API. The /etc/crypto/kcf.conf file may diff --git a/usr/src/cmd/cmd-crypto/etc/kmf.conf b/usr/src/cmd/cmd-crypto/etc/kmf.conf index e98dea72be..74c288648c 100644 --- a/usr/src/cmd/cmd-crypto/etc/kmf.conf +++ b/usr/src/cmd/cmd-crypto/etc/kmf.conf @@ -22,13 +22,12 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # /etc/crypto/kmf.conf # # This file contains non-default plugin entries to the Solaris Key Management # Framework (KMF). Do NOT edit this file by hand. An administrator should use -# kmfcfg(1m) to install or uninstall a non-default plugin. A developer for a +# kmfcfg(8) to install or uninstall a non-default plugin. A developer for a # KMF plugin package should provide an input file and use the {i,r}.kmfconf # class action scripts to update this file during the installation and removal # of the package. diff --git a/usr/src/cmd/cmd-crypto/etc/pkcs11.conf b/usr/src/cmd/cmd-crypto/etc/pkcs11.conf index 2b8971a85e..dafa22357b 100644 --- a/usr/src/cmd/cmd-crypto/etc/pkcs11.conf +++ b/usr/src/cmd/cmd-crypto/etc/pkcs11.conf @@ -23,7 +23,7 @@ # # /etc/crypto/pkcs11.conf # -# Do NOT edit this file by hand. An administrator should use cryptoadm(1m) +# Do NOT edit this file by hand. An administrator should use cryptoadm(8) # to administer the cryptographic framework. A developer for a user-level # cryptographic provider package should provide an input file and use the # {i,r}.pkcs11conf class action scripts to update this file during the 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 3573ca40ca..c31c91a547 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c @@ -495,7 +495,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/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.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/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.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 e9abc90720..322cca73d6 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml @@ -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' /> @@ -1013,7 +1013,7 @@ method profile RBAC profile specification <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/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/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/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_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/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.telnetd.c b/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c index afeb5a5c55..aa5a27c0b7 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 906bf911f9..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' 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 f7827bcc6c..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 @@ -84,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' @@ -108,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' @@ -120,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' @@ -131,7 +131,7 @@ <!-- The properties defined below can be changed by a user with 'solaris.smf.value.ipsec' authorization using the - svccfg(1M) command. + svccfg(8) command. EG: 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 90b3cc6c54..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' @@ -124,7 +124,7 @@ <!-- The properties defined below can be changed by a user with 'solaris.smf.value.ipsec' authorization using the - svccfg(1M) command. + svccfg(8) command. EG: 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/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/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 23b940c686..d2c26bf0b2 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ndp.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ndp.c @@ -105,7 +105,7 @@ static boolean_t ndp_run = B_TRUE; #define WORDSEPS " \t\r\n" /* - * 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/route.c b/usr/src/cmd/cmd-inet/usr.sbin/route.c index a2fd0d2d17..d8f11bd4a6 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/route.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/route.c @@ -1644,7 +1644,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/routeadm.c b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c index 71a2fc9853..657fc77f9d 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -249,7 +247,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/snoop/snoop_capture.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c index e8c2465c8c..b0cc78b5f2 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 @@ -111,7 +111,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/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 diff --git a/usr/src/cmd/consadm/consadm.c b/usr/src/cmd/consadm/consadm.c index cd8eb54394..efa24b6d95 100644 --- a/usr/src/cmd/consadm/consadm.c +++ b/usr/src/cmd/consadm/consadm.c @@ -75,7 +75,7 @@ static char usage[] = static char conshdr[] = "#\n# consadm.conf\n#" "# Configuration parameters for console message redirection.\n" - "# Do NOT edit this file by hand -- use consadm(1m) instead.\n" + "# Do NOT edit this file by hand -- use consadm(8) instead.\n" "#\n"; const char *pname; /* program name */ static sigjmp_buf deadline; diff --git a/usr/src/cmd/cpc/common/cputrack.c b/usr/src/cmd/cpc/common/cputrack.c index 41034aef6e..198cdd1a01 100644 --- a/usr/src/cmd/cpc/common/cputrack.c +++ b/usr/src/cmd/cpc/common/cputrack.c @@ -218,7 +218,7 @@ main(int argc, char *argv[]) "\t-o file\t write cpu statistics to this file\n" "\t-c events specify processor events to be monitored\n" "\t-p pid\t pid of existing process to capture\n\n" - "\tUse cpustat(1M) to monitor system-wide statistics.\n"), + "\tUse cpustat(8) to monitor system-wide statistics.\n"), opts->pgmname, CPC_TICKREG_NAME); if (opts->dohelp) { (void) putchar('\n'); diff --git a/usr/src/cmd/cron/at.c b/usr/src/cmd/cron/at.c index 711f27d1a0..532145b461 100644 --- a/usr/src/cmd/cron/at.c +++ b/usr/src/cmd/cron/at.c @@ -113,7 +113,7 @@ extern int audit_cron_is_anc_name(char *); extern int audit_cron_delete_anc_file(char *, char *); /* - * Error in getdate(3G) + * Error in getdate(3C) */ static char *errlist[] = { /* 0 */ "", diff --git a/usr/src/cmd/cron/cron.c b/usr/src/cmd/cron/cron.c index a34d98766e..1be2e71968 100644 --- a/usr/src/cmd/cron/cron.c +++ b/usr/src/cmd/cron/cron.c @@ -352,7 +352,7 @@ static void *get_obj(struct shared *obj); * it's original intended use. */ static time_t last_time, init_time, t_old; -static int reset_needed; /* set to 1 when cron(1M) needs to re-initialize */ +static int reset_needed; /* set to 1 when cron(8) needs to re-initialize */ static int refresh; static sigset_t defmask, sigmask; @@ -436,7 +436,7 @@ main(int argc, char *argv[]) /* * reset_needed is set to 1 whenever el_add() finds out that a cron - * job is scheduled to be run before the time when cron(1M) daemon + * job is scheduled to be run before the time when cron(8) daemon * initialized. * Other cases where a reset is needed is when ex() finds that the * event to be executed is being run at the wrong time, or when idle() @@ -688,7 +688,7 @@ initialize(int firstpass) REMOVE_FIFO|CONSOLE_MSG); } else { if (NOFORK) { - /* didn't fork... init(1M) is waiting */ + /* didn't fork... init(8) is waiting */ (void) sleep(60); } perror("FIFO"); @@ -697,7 +697,7 @@ initialize(int firstpass) } } else { if (NOFORK) { - /* didn't fork... init(1M) is waiting */ + /* didn't fork... init(8) is waiting */ (void) sleep(60); /* * the wait is painful, but we don't want diff --git a/usr/src/cmd/dcs/sparc/sun4u/dcs.h b/usr/src/cmd/dcs/sparc/sun4u/dcs.h index aa5d8dcb27..26a2a1d505 100644 --- a/usr/src/cmd/dcs/sparc/sun4u/dcs.h +++ b/usr/src/cmd/dcs/sparc/sun4u/dcs.h @@ -26,8 +26,6 @@ #ifndef _DCS_H #define _DCS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -61,7 +59,7 @@ extern "C" { /* - * The IPsec socket option struct, from ipsec(7P): + * The IPsec socket option struct, from ipsec(4P): * * typedef struct ipsec_req { * uint_t ipsr_ah_req; AH request @@ -79,7 +77,7 @@ extern "C" { * field. Allowable arguments are the same as -a. * * The arguments ("md5", "des", etc.) are named so that they match - * kmd(1m)'s accepted arguments which are listed on the SC in + * kmd(8)'s accepted arguments which are listed on the SC in * /etc/opt/SUNWSMS/SMS/config/kmd_policy.cf. */ #define AH_REQ (IPSEC_PREF_REQUIRED | IPSEC_PREF_UNIQUE) diff --git a/usr/src/cmd/devfsadm/devfsadm.c b/usr/src/cmd/devfsadm/devfsadm.c index 79082ace48..9be5e0a5ec 100644 --- a/usr/src/cmd/devfsadm/devfsadm.c +++ b/usr/src/cmd/devfsadm/devfsadm.c @@ -677,7 +677,7 @@ parse_args(int argc, char *argv[]) break; case 'u': /* - * Invoked via update_drv(1m) to update + * Invoked via update_drv(8) to update * the kernel's driver/alias binding * when removing one or more aliases. */ @@ -4826,7 +4826,7 @@ get_component(char *str, const char *comp_str) * rules[] is an array of devfsadm_enumerate_t structures which defines * the enumeration rules to be used for a specified set of links in /dev. * The set of links is specified through regular expressions (of the flavor - * described in regex(5)). These regular expressions are used to determine + * described in regex(7)). These regular expressions are used to determine * the set of links in /dev to examine. The last path component in these * regular expressions MUST contain a parenthesized subexpression surrounding * the RE which is to be considered the enumerating component. The subexp @@ -7041,7 +7041,7 @@ devfsadm_free_dev_names(char **dev_names, int len) * devfsadm_free_dev_names() is used to free the returned array. * NULL is returned on failure or when there are no matching devlinks. * - * re is an extended regular expression in regex(5) format used to further + * re is an extended regular expression in regex(7) format used to further * match devlinks pointing to phys_path; it may be NULL to match all */ char ** diff --git a/usr/src/cmd/devfsadm/port_link.c b/usr/src/cmd/devfsadm/port_link.c index f62254e3bc..f9bb0ff89d 100644 --- a/usr/src/cmd/devfsadm/port_link.c +++ b/usr/src/cmd/devfsadm/port_link.c @@ -770,10 +770,10 @@ update_sacadm_db(void) } /* - * Determine which port monitor entries already exist by invoking pmadm(1m) + * Determine which port monitor entries already exist by invoking pmadm(8) * to list all configured 'ttymon' port monitor entries. - * Do not explicitly report errors from executing pmadm(1m) or sacadm(1m) - * commands to remain compatible with the ports(1m) implementation. + * Do not explicitly report errors from executing pmadm(8) or sacadm(8) + * commands to remain compatible with the ports(8) implementation. */ static int load_ttymondb(void) @@ -930,7 +930,7 @@ delete_port_monitor(int port) return; } - /* some other sacadm(1m) error, log and return */ + /* some other sacadm(8) error, log and return */ if (sac_exitval != 0) { devfsadm_print(VERBOSE_MID, "sacadm: (%s) %s\n", SAC_EID(sac_exitval), SAC_EMSG(sac_exitval)); diff --git a/usr/src/cmd/dispadmin/dispadmin.c b/usr/src/cmd/dispadmin/dispadmin.c index 7de9e04c20..42d4560d8b 100644 --- a/usr/src/cmd/dispadmin/dispadmin.c +++ b/usr/src/cmd/dispadmin/dispadmin.c @@ -340,7 +340,7 @@ set_scheduler(char *clname) if (ftruncate(fd, (off_t)0) == -1) fatalerr("%s: Failed to truncate %s\n", cmdpath, CONFIGPATH); (void) fputs("#\n# /etc/dispadmin.conf\n#\n" - "# Do NOT edit this file by hand -- use dispadmin(1m) instead.\n" + "# Do NOT edit this file by hand -- use dispadmin(8) instead.\n" "#\n", fp); if ((fprintf(fp, "%s=%s\n", TOKENNAME, clname)) == -1) fatalerr("%s: Failed to write to %s\n", cmdpath, CONFIGPATH); diff --git a/usr/src/cmd/dladm/dladm.c b/usr/src/cmd/dladm/dladm.c index 04a520f537..21ff6ce195 100644 --- a/usr/src/cmd/dladm/dladm.c +++ b/usr/src/cmd/dladm/dladm.c @@ -85,7 +85,7 @@ #define MAXLINELEN 1024 #define SMF_UPGRADE_FILE "/var/svc/profile/upgrade" #define SMF_UPGRADEDATALINK_FILE "/var/svc/profile/upgrade_datalink" -#define SMF_DLADM_UPGRADE_MSG " # added by dladm(1M)" +#define SMF_DLADM_UPGRADE_MSG " # added by dladm(8)" #define DLADM_DEFAULT_COL 80 /* @@ -1980,7 +1980,7 @@ done: if (status != DLADM_STATUS_OK) { if (status == DLADM_STATUS_NONOTIF) { die("not all links have link up/down detection; must " - "use -f (see dladm(1M))"); + "use -f (see dladm(8))"); } else { die_dlerr(status, "create operation failed"); } @@ -2146,7 +2146,7 @@ done: "match"); } else if (status == DLADM_STATUS_NONOTIF) { die("not all links have link up/down detection; must " - "use -f (see dladm(1M))"); + "use -f (see dladm(8))"); } else { die_dlerr(status, "add operation failed"); } @@ -2448,12 +2448,12 @@ do_create_vlan(int argc, char *argv[], const char *use) case DLADM_STATUS_NOTSUP: die("VLAN over '%s' may require lowered MTU; must use -f (see " - "dladm(1M))", link); + "dladm(8))", link); break; case DLADM_STATUS_LINKBUSY: die("VLAN over '%s' may not use default_tag ID " - "(see dladm(1M))", link); + "(see dladm(8))", link); break; default: @@ -4808,7 +4808,7 @@ do_create_vnic(int argc, char *argv[], const char *use) case DLADM_STATUS_LINKBUSY: die("VLAN over '%s' may not use default_tag ID " - "(see dladm(1M))", devname); + "(see dladm(8))", devname); break; default: diff --git a/usr/src/cmd/dladm/secobj.conf b/usr/src/cmd/dladm/secobj.conf index dd196c1273..4457684bdf 100644 --- a/usr/src/cmd/dladm/secobj.conf +++ b/usr/src/cmd/dladm/secobj.conf @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # DO NOT EDIT OR PARSE THIS FILE! # -# Use the dladm(1m) command to change the contents of this file. +# Use the dladm(8) command to change the contents of this file. diff --git a/usr/src/cmd/dlmgmtd/datalink.conf b/usr/src/cmd/dlmgmtd/datalink.conf index 91c9931ff3..fcb9a56f4d 100644 --- a/usr/src/cmd/dlmgmtd/datalink.conf +++ b/usr/src/cmd/dlmgmtd/datalink.conf @@ -22,9 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # DO NOT EDIT OR PARSE THIS FILE! # -# Use the dladm(1m) command to change the contents of this file. +# Use the dladm(8) command to change the contents of this file. diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_main.c b/usr/src/cmd/dlmgmtd/dlmgmt_main.c index c02610bb5f..658078e624 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt_main.c +++ b/usr/src/cmd/dlmgmtd/dlmgmt_main.c @@ -271,7 +271,7 @@ dlmgmt_init(void) DLMGMT_TMPFS_DIR, progname, ".debug.cache"); } else { if ((fmri = getenv("SMF_FMRI")) == NULL) { - dlmgmt_log(LOG_ERR, "dlmgmtd is an smf(5) managed " + dlmgmt_log(LOG_ERR, "dlmgmtd is an smf(7) managed " "service and should not be run from the command " "line."); return (EINVAL); diff --git a/usr/src/cmd/dtrace/demo/spec/specopen.d b/usr/src/cmd/dtrace/demo/spec/specopen.d index f1975ff869..370153a05d 100644 --- a/usr/src/cmd/dtrace/demo/spec/specopen.d +++ b/usr/src/cmd/dtrace/demo/spec/specopen.d @@ -31,7 +31,7 @@ syscall::open64:entry { /* * The call to speculation() creates a new speculation. If this fails, - * dtrace(1M) will generate an error message indicating the reason for + * dtrace(8) will generate an error message indicating the reason for * the failed speculation(), but subsequent speculative tracing will be * silently discarded. */ diff --git a/usr/src/cmd/dtrace/dtrace.c b/usr/src/cmd/dtrace/dtrace.c index f005629fc9..95c0ba89d6 100644 --- a/usr/src/cmd/dtrace/dtrace.c +++ b/usr/src/cmd/dtrace/dtrace.c @@ -102,7 +102,7 @@ static const char *g_etcend = "* ^^^^ Added by DTrace"; static const char *g_etc[] = { "*", -"* The following forceload directives were added by dtrace(1M) to allow for", +"* The following forceload directives were added by dtrace(8) to allow for", "* tracing during boot. If these directives are removed, the system will", "* continue to function, but tracing will not occur during boot as desired.", "* To remove these directives (and this block comment) automatically, run", @@ -134,7 +134,7 @@ usage(FILE *fp) "\t-32 generate 32-bit D programs and ELF files\n" "\t-64 generate 64-bit D programs and ELF files\n\n" "\t-a claim anonymous tracing state\n" - "\t-A generate driver.conf(4) directives for anonymous tracing\n" + "\t-A generate driver.conf(5) directives for anonymous tracing\n" "\t-b set trace buffer size\n" "\t-c run specified command and exit upon its completion\n" "\t-C run cpp(1) preprocessor on script files\n" @@ -605,7 +605,7 @@ exec_prog(const dtrace_cmd_t *dcp) /* * Print out the specified DOF buffer as a set of ASCII bytes appropriate for - * storing in a driver.conf(4) file associated with the dtrace driver. + * storing in a driver.conf(5) file associated with the dtrace driver. */ static void anon_prog(const dtrace_cmd_t *dcp, dof_hdr_t *dof, int n) @@ -1659,7 +1659,7 @@ main(int argc, char *argv[]) */ error("saved anonymous enabling in %s\n", g_ofile); etcsystem_add(); - error("run update_drv(1M) or reboot to enable changes\n"); + error("run update_drv(8) or reboot to enable changes\n"); dtrace_close(g_dtp); return (g_status); @@ -1742,7 +1742,7 @@ main(int argc, char *argv[]) if ((g_ofp = fopen(g_ofile, "w")) == NULL) fatal("failed to open header file '%s'", g_ofile); - oprintf("/*\n * Generated by dtrace(1M).\n */\n\n"); + oprintf("/*\n * Generated by dtrace(8).\n */\n\n"); if (dtrace_program_header(g_dtp, g_ofp, g_ofile) != 0 || fclose(g_ofp) == EOF) diff --git a/usr/src/cmd/dtrace/test/cmd/jdtrace/JDTrace.java b/usr/src/cmd/dtrace/test/cmd/jdtrace/JDTrace.java index f8c9ab7337..b39535afb5 100644 --- a/usr/src/cmd/dtrace/test/cmd/jdtrace/JDTrace.java +++ b/usr/src/cmd/dtrace/test/cmd/jdtrace/JDTrace.java @@ -30,7 +30,7 @@ import java.util.*; import java.util.logging.*; /** - * Emulates {@code dtrace(1M)} using the Java DTrace API. + * Emulates {@code dtrace(8)} using the Java DTrace API. */ public class JDTrace { static Logger logger = Logger.getLogger(JDTrace.class.getName()); diff --git a/usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl b/usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl index d6f1c8c277..348e7be086 100644 --- a/usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl +++ b/usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl @@ -100,10 +100,10 @@ sub usage print "\t -i specify ISA to test instead of isaexec(3C) default\n"; print "\t -j execute test suite using jdtrace (Java API) only\n"; print "\t -l save log file of results and PIDs used by tests\n"; - print "\t -n execute test suite using dtrace(1m) only\n"; + print "\t -n execute test suite using dtrace(8) only\n"; print "\t -q set quiet mode (only report errors and summary)\n"; print "\t -s save results files even for tests that pass\n"; - print "\t -x pass corresponding -x argument to dtrace(1M)\n"; + print "\t -x pass corresponding -x argument to dtrace(8)\n"; exit(2); } @@ -397,7 +397,7 @@ sub run_tests { } # - # DTrace is gone. Now update_drv(1M), and rip + # DTrace is gone. Now update_drv(8), and rip # everything out again. # system("update_drv dtrace"); diff --git a/usr/src/cmd/dtrace/test/tst/common/cpc/err.cputrackfailtostart.ksh b/usr/src/cmd/dtrace/test/tst/common/cpc/err.cputrackfailtostart.ksh index f62b83d571..2e78256216 100644 --- a/usr/src/cmd/dtrace/test/tst/common/cpc/err.cputrackfailtostart.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/cpc/err.cputrackfailtostart.ksh @@ -25,7 +25,7 @@ # Use is subject to license terms. # -# This script ensures that cputrack(1M) will fail to start when the cpc +# This script ensures that cputrack(8) will fail to start when the cpc # provider has active enablings. # # The script will fail if: diff --git a/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl b/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl index d2dc8fdbee..439614a3a0 100755 --- a/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl +++ b/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl @@ -28,7 +28,7 @@ # # get.ipv4remote.pl [tcpport] # -# Find an IPv4 reachable remote host using both ifconfig(1M) and ping(1M). +# Find an IPv4 reachable remote host using both ifconfig(8) and ping(8). # If a tcpport is specified, return a host that is also listening on this # TCP port. Print the local address and the remote address, or an # error message if no suitable remote host was found. Exit status is 0 if diff --git a/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl b/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl index 3b1999f62b..a8956cd158 100755 --- a/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl +++ b/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl @@ -28,7 +28,7 @@ # # get.ipv6remote.pl # -# Find an IPv6 reachable remote host using both ifconfig(1M) and ping(1M). +# Find an IPv6 reachable remote host using both ifconfig(8) and ping(8). # Print the local address and the remote address, or print nothing if either # no IPv6 interfaces or remote hosts were found. (Remote IPv6 testing is # considered optional, and so not finding another IPv6 host is not an error diff --git a/usr/src/cmd/dtrace/test/tst/common/pid/tst.killonerror.ksh b/usr/src/cmd/dtrace/test/tst/common/pid/tst.killonerror.ksh index 587878c3fc..c8c389b3d2 100644 --- a/usr/src/cmd/dtrace/test/tst/common/pid/tst.killonerror.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/pid/tst.killonerror.ksh @@ -33,7 +33,7 @@ fi dtrace=$1 # -# Make sure we kill a process if the dtrace(1M) command fails. +# Make sure we kill a process if the dtrace(8) command fails. # rc=`$dtrace -c date -n jarod 2>/dev/null | /usr/bin/wc -l` diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh index df3fdb3d6d..2567ba75ba 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh @@ -23,14 +23,13 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This script tests that the proc:::exit probe fires with the correct argument # when the process core dumps. The problematic bit here is making sure that # a process _can_ dump core -- if core dumps are disabled on both a global # and per-process basis, this test will fail. Rather than having this test -# muck with coreadm(1M) settings, it will fail explicitly in this case and +# muck with coreadm(8) settings, it will fail explicitly in this case and # provide a hint as to the problem. In general, machines should never be # running with both per-process and global core dumps disabled -- so this # should be a non-issue in practice. @@ -52,7 +51,7 @@ script() /curpsinfo->pr_ppid == $child && curpsinfo->pr_psargs == "$longsleep" && args[0] != CLD_DUMPED/ { - printf("Child process could not dump core. Check coreadm(1M)"); + printf("Child process could not dump core. Check coreadm(8)"); printf(" settings; either per-process or global core dumps "); printf("must be enabled for this test to work properly."); exit(1); diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d index 958ce68612..7774f117c8 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d @@ -25,14 +25,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * ASSERTION: * Destructive actions may never be speculative. * * SECTION: Speculative Tracing/Using a Speculation - * SECTION: dtrace(1M) Utility/ -w option + * SECTION: dtrace(8) Utility/ -w option * */ #pragma D option quiet diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d index 9c14bb5a59..11420e40f5 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d @@ -25,14 +25,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * ASSERTION: * Destructive actions may never be speculative. * * SECTION: Speculative Tracing/Using a Speculation - * SECTION: dtrace(1M) Utility/ -w option + * SECTION: dtrace(8) Utility/ -w option * */ #pragma D option quiet diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d index 695eb8c8de..d14bf67dfa 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d @@ -25,14 +25,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * ASSERTION: * Destructive actions may never be speculative. * * SECTION: Speculative Tracing/Using a Speculation - * SECTION: dtrace(1M) Utility/ -w option + * SECTION: dtrace(8) Utility/ -w option */ #pragma D option quiet diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d index dcba080194..b5d80910d4 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d @@ -25,14 +25,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * ASSERTION: * Destructive actions may never be speculative. * * SECTION: Speculative Tracing/Using a Speculation - * SECTION: dtrace(1M) Utility/ -w option + * SECTION: dtrace(8) Utility/ -w option * */ #pragma D option quiet diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d index e4fe06b6a3..a463b25702 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d @@ -25,14 +25,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * ASSERTION: * Destructive actions may never be speculative. * * SECTION: Speculative Tracing/Using a Speculation - * SECTION: dtrace(1M) Utility/ -w option + * SECTION: dtrace(8) Utility/ -w option */ #pragma D option quiet diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d index 468e8f20e2..c02064c0d2 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d @@ -25,14 +25,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * ASSERTION: * Destructive actions may never be speculative. * * SECTION: Speculative Tracing/Using a Speculation - * SECTION: dtrace(1M) Utility/ -w option + * SECTION: dtrace(8) Utility/ -w option */ #pragma D option quiet diff --git a/usr/src/cmd/dtrace/test/tst/sparc/ustack/tst.trapstat.ksh b/usr/src/cmd/dtrace/test/tst/sparc/ustack/tst.trapstat.ksh index 84af800676..2adbba1d45 100644 --- a/usr/src/cmd/dtrace/test/tst/sparc/ustack/tst.trapstat.ksh +++ b/usr/src/cmd/dtrace/test/tst/sparc/ustack/tst.trapstat.ksh @@ -24,11 +24,10 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This script verifies that user-land stacks can be walked safely -# when the trapstat(1M) utility is running. An arbitrary program, w(1), +# when the trapstat(8) utility is running. An arbitrary program, w(1), # is started once a second to ensure stacks can be walked at all stages # of the process lifecycle. # diff --git a/usr/src/cmd/dumpadm/dconf.c b/usr/src/cmd/dumpadm/dconf.c index dc5355ba48..f39bdd3df9 100644 --- a/usr/src/cmd/dumpadm/dconf.c +++ b/usr/src/cmd/dumpadm/dconf.c @@ -263,7 +263,7 @@ dconf_write(dumpconf_t *dcp) (void) fputs("#\n# dumpadm.conf\n#\n" "# Configuration parameters for system crash dump.\n" - "# Do NOT edit this file by hand -- use dumpadm(1m) instead.\n" + "# Do NOT edit this file by hand -- use dumpadm(8) instead.\n" "#\n", dcp->dc_conf_fp); for (tokp = tokens; tokp->tok_name != NULL; tokp++) { @@ -359,9 +359,9 @@ dconf_dev_ioctl(dumpconf_t *dcp, int cmd) break; default: /* - * NOTE: The stmsboot(1M) command's boot-up script parses this + * NOTE: The stmsboot(8) command's boot-up script parses this * error to get the dump device name. If you change the format - * of this message, make sure that stmsboot(1M) is in sync. + * of this message, make sure that stmsboot(8) is in sync. */ warn(gettext("cannot use %s as dump device"), dcp->dc_device); } diff --git a/usr/src/cmd/dumpadm/dumpadm.xml b/usr/src/cmd/dumpadm/dumpadm.xml index f739a5724c..df8a280703 100644 --- a/usr/src/cmd/dumpadm/dumpadm.xml +++ b/usr/src/cmd/dumpadm/dumpadm.xml @@ -42,8 +42,8 @@ <single_instance /> <!-- - The dumpadm(1M) service reconfigures the kernel's dump settings - from /etc/dumpadm.conf and then invokes savecore(1M) to locate + The dumpadm(8) service reconfigures the kernel's dump settings + from /etc/dumpadm.conf and then invokes savecore(8) to locate and retrieve any saved crash dumps. It therefore needs to have local filesystems mounted, and must also have an *optional* dependency on nfs.client and autofs in case dumpadm -s has been diff --git a/usr/src/cmd/dumpadm/svc-dumpadm b/usr/src/cmd/dumpadm/svc-dumpadm index 316e075754..4ec5a5d794 100644 --- a/usr/src/cmd/dumpadm/svc-dumpadm +++ b/usr/src/cmd/dumpadm/svc-dumpadm @@ -96,7 +96,7 @@ fi # # Now run dumpadm to configure the dump device based on the settings -# previously saved by dumpadm. See dumpadm(1m) for instructions on +# previously saved by dumpadm. See dumpadm(8) for instructions on # how to modify the dump settings. # if [ -x /usr/sbin/dumpadm ]; then diff --git a/usr/src/cmd/dumpadm/swap.c b/usr/src/cmd/dumpadm/swap.c index 8f6ac7033e..ddae2228dc 100644 --- a/usr/src/cmd/dumpadm/swap.c +++ b/usr/src/cmd/dumpadm/swap.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/param.h> #include <string.h> #include <stdlib.h> @@ -89,7 +87,7 @@ swap_list(void) /* * If the pathname isn't absolute, assume it begins - * with /dev as swap(1m) does. + * with /dev as swap(8) does. */ if (swt->swt_ent[n].ste_path[0] != '/') { char buf[MAXPATHLEN]; diff --git a/usr/src/cmd/expr/compile.c b/usr/src/cmd/expr/compile.c index 92d71f20f3..b68e0a267e 100644 --- a/usr/src/cmd/expr/compile.c +++ b/usr/src/cmd/expr/compile.c @@ -119,7 +119,7 @@ advance(const char *instr, const char *expbuf) /* * the compile and step routines here simulate the old libgen routines of - * compile/step Re: regexpr(3G). in order to do this, we must assume + * compile/step Re: regexpr(3GEN). in order to do this, we must assume * that expbuf[] consists of the following format: * 1) the first two bytes consist of a special encoding - see below. * 2) the next part is a regex_t used by regexec()/regcomp() for step diff --git a/usr/src/cmd/fcinfo/fcinfo.c b/usr/src/cmd/fcinfo/fcinfo.c index 44e93541e3..08db555299 100644 --- a/usr/src/cmd/fcinfo/fcinfo.c +++ b/usr/src/cmd/fcinfo/fcinfo.c @@ -334,7 +334,7 @@ main(int argc, char *argv[]) /* call the CLI parser */ ret = cmdParse(argc, argv, synTables, subcommandArgs, &funcRet); if (ret == 1) { - fprintf(stdout, "%s %s(1M)\n", + fprintf(stdout, "%s %s(8)\n", gettext("For more information, please see"), cmdName); return (1); } else if (ret == -1) { diff --git a/usr/src/cmd/fdisk/fdisk.c b/usr/src/cmd/fdisk/fdisk.c index ba647a77e2..b0b3911c10 100644 --- a/usr/src/cmd/fdisk/fdisk.c +++ b/usr/src/cmd/fdisk/fdisk.c @@ -32,7 +32,7 @@ /* All Rights Reserved */ /* - * PROGRAM: fdisk(1M) + * PROGRAM: fdisk(8) * This program reads the partition table on the specified device and * also reads the drive parameters. The user can perform various * operations from a supplied menu or from the command line. Diagnostic @@ -102,7 +102,7 @@ #define VTOC_RWERR 3 /* couldn't read or write VTOC */ /* - * Support for fdisk(1M) on the SPARC platform + * Support for fdisk(8) on the SPARC platform * In order to convert little endian values to big endian for SPARC, * byte/short and long values must be swapped. * These swapping macros will be used to access information in the diff --git a/usr/src/cmd/file/magic b/usr/src/cmd/file/magic index 84e2915162..5df2d4d7c4 100644 --- a/usr/src/cmd/file/magic +++ b/usr/src/cmd/file/magic @@ -534,7 +534,7 @@ 0 string \043\040PaCkAgE\040DaTaStReAm package datastream 0 short 0xcff1 CTF data file 0 string \177DOF DTrace DOF data file -0 string \177FCF fmd(1M) checkpoint file +0 string \177FCF fmd(8) checkpoint file 0 string EFT\0 Fault tree file, >4 ushort x v%u >6 ushort x rev %u, diff --git a/usr/src/cmd/flowadm/flowadm.conf b/usr/src/cmd/flowadm/flowadm.conf index 3977ddf645..c4a4450b27 100644 --- a/usr/src/cmd/flowadm/flowadm.conf +++ b/usr/src/cmd/flowadm/flowadm.conf @@ -24,5 +24,5 @@ # # DO NOT EDIT OR PARSE THIS FILE! # -# Use the flowadm(1m) command to change the contents of this file. +# Use the flowadm(8) command to change the contents of this file. diff --git a/usr/src/cmd/flowadm/flowprop.conf b/usr/src/cmd/flowadm/flowprop.conf index ad6f802040..8d96210f51 100644 --- a/usr/src/cmd/flowadm/flowprop.conf +++ b/usr/src/cmd/flowadm/flowprop.conf @@ -25,5 +25,5 @@ # # DO NOT EDIT OR PARSE THIS FILE! # -# Use the flowadm(1m) command to change the contents of this file. +# Use the flowadm(8) command to change the contents of this file. diff --git a/usr/src/cmd/fm/dicts/FMD.po b/usr/src/cmd/fm/dicts/FMD.po index 16d7fd7c8d..4ff7e82e2d 100644 --- a/usr/src/cmd/fm/dicts/FMD.po +++ b/usr/src/cmd/fm/dicts/FMD.po @@ -61,7 +61,7 @@ msgstr "An illumos Fault Manager component generated a diagnosis for which no me msgid "FMD-8000-11.response" msgstr "The diagnosis has been saved in the fault log for examination by your illumos distribution team." msgid "FMD-8000-11.impact" -msgstr "The fault log will need to be manually examined using fmdump(1M) in order to determine if any human response is required." +msgstr "The fault log will need to be manually examined using fmdump(8) in order to determine if any human response is required." msgid "FMD-8000-11.action" msgstr "Use fmdump -v -u <EVENT-ID> to view the diagnosis result. Ensure that fault management software is installed properly." # diff --git a/usr/src/cmd/fm/dicts/SCA1000.po b/usr/src/cmd/fm/dicts/SCA1000.po index 2a8e1c8ab4..2767582f00 100644 --- a/usr/src/cmd/fm/dicts/SCA1000.po +++ b/usr/src/cmd/fm/dicts/SCA1000.po @@ -38,4 +38,4 @@ msgstr "The module has been disabled and un-registered as a hardware provider to msgid "SCA1000-8000-0V.impact" msgstr "The card will no longer function as a cryptographic accelerator." msgid "SCA1000-8000-0V.action" -msgstr "Ensure that the board is securely installed on the system.\n\nUse the cryptoadm(1M) command\n\ncryptoadm list -p\n\n\nto check whether 'dca/x' (where x is a number) is listed under 'kernel hardware\nproviders'. If so, run diagnostics on the hardware provider\nfollowing the procedures described in the Sun Crypto Accelerator 1000 Board\nUser's Guide.\n\nUse the fmdump(1M) command\n\nfmdump -vu event-id\n\n\nto view the results of diagnosis and the specific Field Replaceable\nUnit (FRU) identified for replacement.\n\nThe event-id can be found in the EVENT-ID field of the message.\nFor example:\n\n\nEVENT-ID: 39b30371-f009-c76c-90ee-b245784d2277\n" +msgstr "Ensure that the board is securely installed on the system.\n\nUse the cryptoadm(8) command\n\ncryptoadm list -p\n\n\nto check whether 'dca/x' (where x is a number) is listed under 'kernel hardware\nproviders'. If so, run diagnostics on the hardware provider\nfollowing the procedures described in the Sun Crypto Accelerator 1000 Board\nUser's Guide.\n\nUse the fmdump(8) command\n\nfmdump -vu event-id\n\n\nto view the results of diagnosis and the specific Field Replaceable\nUnit (FRU) identified for replacement.\n\nThe event-id can be found in the EVENT-ID field of the message.\nFor example:\n\n\nEVENT-ID: 39b30371-f009-c76c-90ee-b245784d2277\n" diff --git a/usr/src/cmd/fm/dicts/SCA500.po b/usr/src/cmd/fm/dicts/SCA500.po index 46a0475572..74cd55b4cb 100644 --- a/usr/src/cmd/fm/dicts/SCA500.po +++ b/usr/src/cmd/fm/dicts/SCA500.po @@ -38,4 +38,4 @@ msgstr "The module has been disabled and un-registered as a hardware provider to msgid "SCA500-8000-0D.impact" msgstr "The card will no longer function as a cryptographic accelerator." msgid "SCA500-8000-0D.action" -msgstr "Ensure that the board is securely installed on the system.\n\nUse the cryptoadm(1M) command\n\ncryptoadm list -p\n\n\nto check whether 'dca/x' (where x is a number) is listed under 'kernel hardware\nproviders'. If so, run diagnostics on the hardware provider\nfollowing the procedures described in the Sun Crypto Accelerator 500 Board\nUser's Guide.\n\nUse the fmdump(1M) command\n\nfmdump -vu event-id\n\n\nto view the results of diagnosis and the specific Field Replaceable\nUnit (FRU) identified for replacement.\n\nThe event-id can be found in the EVENT-ID field of the message.\nFor example:\n\n\nEVENT-ID: 39b30371-f009-c76c-90ee-b245784d2277\n" +msgstr "Ensure that the board is securely installed on the system.\n\nUse the cryptoadm(8) command\n\ncryptoadm list -p\n\n\nto check whether 'dca/x' (where x is a number) is listed under 'kernel hardware\nproviders'. If so, run diagnostics on the hardware provider\nfollowing the procedures described in the Sun Crypto Accelerator 500 Board\nUser's Guide.\n\nUse the fmdump(8) command\n\nfmdump -vu event-id\n\n\nto view the results of diagnosis and the specific Field Replaceable\nUnit (FRU) identified for replacement.\n\nThe event-id can be found in the EVENT-ID field of the message.\nFor example:\n\n\nEVENT-ID: 39b30371-f009-c76c-90ee-b245784d2277\n" diff --git a/usr/src/cmd/fm/dicts/SUN4U.po b/usr/src/cmd/fm/dicts/SUN4U.po index e6ea7d53e7..5451b04642 100644 --- a/usr/src/cmd/fm/dicts/SUN4U.po +++ b/usr/src/cmd/fm/dicts/SUN4U.po @@ -565,7 +565,7 @@ msgstr "The illumos Fault Manager received an event from the IO subsystem for wh msgid "SUN4U-8001-2X.response" msgstr "The error information has been saved for examination by your illumos distribution team." msgid "SUN4U-8001-2X.impact" -msgstr "The error log will need to be manually examined using fmdump(1M) in order to determine if any human response is required." +msgstr "The error log will need to be manually examined using fmdump(8) in order to determine if any human response is required." msgid "SUN4U-8001-2X.action" msgstr "Use fmdump -ev -u <EVENT-ID> to view and record the undiagnosed errors." # diff --git a/usr/src/cmd/fm/dicts/SUNOS.po b/usr/src/cmd/fm/dicts/SUNOS.po index caccdfc1b3..1dc86cc0ea 100644 --- a/usr/src/cmd/fm/dicts/SUNOS.po +++ b/usr/src/cmd/fm/dicts/SUNOS.po @@ -322,7 +322,7 @@ msgstr "Major" msgid "SUNOS-8000-KL.description" msgstr "The system has rebooted after a kernel panic. Refer to %s for more information." msgid "SUNOS-8000-KL.response" -msgstr "The failed system image was dumped to the dump device. If savecore is enabled (see dumpadm(1M)) a copy of the dump will be written to the savecore directory %<fault-list[0].dump-dir>." +msgstr "The failed system image was dumped to the dump device. If savecore is enabled (see dumpadm(8)) a copy of the dump will be written to the savecore directory %<fault-list[0].dump-dir>." msgid "SUNOS-8000-KL.impact" msgstr "There may be some performance impact while the panic is copied to the savecore directory. Disk space usage by panics can be substantial." msgid "SUNOS-8000-KL.action" diff --git a/usr/src/cmd/fm/eversholt/files/common/disk.esc b/usr/src/cmd/fm/eversholt/files/common/disk.esc index c94a0b675d..bd19f3a72c 100644 --- a/usr/src/cmd/fm/eversholt/files/common/disk.esc +++ b/usr/src/cmd/fm/eversholt/files/common/disk.esc @@ -33,7 +33,7 @@ asru P; /* * Over all comments for this file: * <disk-as-detector> The disk-as-detector DE provides the mapping between - * ereports generated by a kernel disk driver sd(7D) and resulting faults. + * ereports generated by a kernel disk driver sd(4D) and resulting faults. */ /* diff --git a/usr/src/cmd/fm/fmd/common/fmd_ctl.c b/usr/src/cmd/fm/fmd/common/fmd_ctl.c index b2c4d1fd5a..72a07b2bee 100644 --- a/usr/src/cmd/fm/fmd/common/fmd_ctl.c +++ b/usr/src/cmd/fm/fmd/common/fmd_ctl.c @@ -25,8 +25,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * FMD Control Event Subsystem * @@ -84,7 +82,7 @@ fmd_ctl_addhrt(nvlist_t *nvl) fmd_time_addhrtime(delta); /* - * If the non-adjustable clock has reached the apocalypse, fmd(1M) + * If the non-adjustable clock has reached the apocalypse, fmd(8) * should exit gracefully: queue a SIGTERM for the main thread. */ if (fmd_time_gethrtime() == INT64_MAX) diff --git a/usr/src/cmd/fm/fmd/common/fmd_eventq.c b/usr/src/cmd/fm/fmd/common/fmd_eventq.c index f245a8473c..f6778e8c7b 100644 --- a/usr/src/cmd/fm/fmd/common/fmd_eventq.c +++ b/usr/src/cmd/fm/fmd/common/fmd_eventq.c @@ -266,7 +266,7 @@ top: * If we dequeued a control event, release it and go back to sleep. * fmd_event_rele() on the event will block as described in fmd_ctl.c. * This effectively renders control events invisible to our callers - * as well as to statistics and observability tools (e.g. fmstat(1M)). + * as well as to statistics and observability tools (e.g. fmstat(8)). */ if (FMD_EVENT_TYPE(ep) == FMD_EVT_CTL) { fmd_event_rele(ep); diff --git a/usr/src/cmd/fm/fmd/common/fmd_log.c b/usr/src/cmd/fm/fmd/common/fmd_log.c index 7f86d30767..ad182f2594 100644 --- a/usr/src/cmd/fm/fmd/common/fmd_log.c +++ b/usr/src/cmd/fm/fmd/common/fmd_log.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * FMD Log File Subsystem * @@ -619,10 +617,10 @@ fmd_log_append(fmd_log_t *lp, fmd_event_t *e, fmd_case_t *cp) * Before writing the record, check to see if this would cause the free * space in the filesystem to drop below our minfree threshold. If so, * don't bother attempting the write and instead pretend it failed. As - * fmd(1M) runs as root, it will be able to access the space "reserved" + * fmd(8) runs as root, it will be able to access the space "reserved" * for root, and therefore can run the system of out of disk space in a * heavy error load situation, violating the basic design principle of - * fmd(1M) that we don't want to make a bad situation even worse. + * fmd(8) that we don't want to make a bad situation even worse. */ (void) pthread_mutex_lock(&lp->log_lock); @@ -1006,7 +1004,7 @@ fmd_log_update(fmd_log_t *lp) /* * Rotate the specified log by renaming its underlying file to a staging file - * that can be handed off to logadm(1M) or an administrator script. If the + * that can be handed off to logadm(8) or an administrator script. If the * rename succeeds, open a new log file using the old path and return it. * Note that we are relying our caller to use some higher-level mechanism to * ensure that fmd_log_rotate() cannot be called while other threads are diff --git a/usr/src/cmd/fm/fmd/common/fmd_module.h b/usr/src/cmd/fm/fmd/common/fmd_module.h index 04917065b7..89f21dd521 100644 --- a/usr/src/cmd/fm/fmd/common/fmd_module.h +++ b/usr/src/cmd/fm/fmd/common/fmd_module.h @@ -65,7 +65,7 @@ typedef struct fmd_modhash { } fmd_modhash_t; /* - * Statistics maintained by fmd itself on behalf of all modules for fmstat(1M). + * Statistics maintained by fmd itself on behalf of all modules for fmstat(8). * NOTE: FMD_TYPE_STRING statistics should not be used here. If they are * required in the future, the FMD_ADM_MODDSTAT service routine must change. */ diff --git a/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.c b/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.c index 5890c6dc99..fec7969997 100644 --- a/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.c +++ b/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.c @@ -167,7 +167,7 @@ fmd_adm_moddstat_1_svc(char *name, * Note: the bcopy() here is valid only if no FMD_TYPE_STRING stats * are present in mp->mod_stats. We don't use any for the daemon- * maintained stats and provide this function in order to reduce the - * overhead of the fmstat(1M) default view, where these minimal stats + * overhead of the fmstat(8) default view, where these minimal stats * must be retrieved for all of the active modules. */ (void) pthread_mutex_lock(&mp->mod_stats_lock); diff --git a/usr/src/cmd/fm/fmd/common/fmd_scheme.c b/usr/src/cmd/fm/fmd/common/fmd_scheme.c index 367ecde455..a04a5764a5 100644 --- a/usr/src/cmd/fm/fmd/common/fmd_scheme.c +++ b/usr/src/cmd/fm/fmd/common/fmd_scheme.c @@ -40,7 +40,7 @@ /* * The fmd resource scheme, used for fmd modules, must be implemented here for - * the benefit of fmd-self-diagnosis and also in schemes/fmd for fmdump(1M). + * the benefit of fmd-self-diagnosis and also in schemes/fmd for fmdump(8). */ ssize_t fmd_scheme_fmd_nvl2str(nvlist_t *nvl, char *buf, size_t buflen) diff --git a/usr/src/cmd/fm/fmd/common/fmd_sysevent.c b/usr/src/cmd/fm/fmd/common/fmd_sysevent.c index 9f46f13411..06ec7f2d4d 100644 --- a/usr/src/cmd/fm/fmd/common/fmd_sysevent.c +++ b/usr/src/cmd/fm/fmd/common/fmd_sysevent.c @@ -535,8 +535,8 @@ sysev_init(fmd_hdl_t *hdl) * the system default, we do *not* want to unsubscribe because the kernel will * remove the subscriber queue and any events published in our absence will * therefore be lost. This scenario may occur when, for example, fmd is sent - * a SIGTERM by init(1M) during reboot but an error is detected and makes it - * into the sysevent channel queue before init(1M) manages to call uadmin(2). + * a SIGTERM by init(8) during reboot but an error is detected and makes it + * into the sysevent channel queue before init(8) manages to call uadmin(2). */ void sysev_fini(fmd_hdl_t *hdl) diff --git a/usr/src/cmd/fm/fmstat/common/fmstat.c b/usr/src/cmd/fm/fmstat/common/fmstat.c index e779fca00b..69fa34c7a3 100644 --- a/usr/src/cmd/fm/fmstat/common/fmstat.c +++ b/usr/src/cmd/fm/fmstat/common/fmstat.c @@ -540,7 +540,7 @@ stat_mod(const char *name, int aflag, int zflag) if (fmd_adm_stats_read(g_adm, name, &ams) != 0) { die("failed to retrieve statistics for %s", - name ? name : "fmd(1M)"); + name ? name : "fmd(8)"); } (void) printf("%20s %-16s %s\n", "NAME", "VALUE", "DESCRIPTION"); diff --git a/usr/src/cmd/fm/modules/SUNW,Netra-CP3060/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,Netra-CP3060/etm/etm.conf index 496754759c..f90226df2c 100644 --- a/usr/src/cmd/fm/modules/SUNW,Netra-CP3060/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,Netra-CP3060/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -48,7 +47,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/SUNW,Netra-CP3260/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,Netra-CP3260/etm/etm.conf index 6d03fba94c..301291548c 100644 --- a/usr/src/cmd/fm/modules/SUNW,Netra-CP3260/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,Netra-CP3260/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -49,7 +48,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/SUNW,Netra-T5220/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,Netra-T5220/etm/etm.conf index 6d03fba94c..301291548c 100644 --- a/usr/src/cmd/fm/modules/SUNW,Netra-T5220/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,Netra-T5220/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -49,7 +48,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/SUNW,Netra-T5440/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,Netra-T5440/etm/etm.conf index e61897c85a..463952123c 100644 --- a/usr/src/cmd/fm/modules/SUNW,Netra-T5440/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,Netra-T5440/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -51,7 +50,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise-T5120/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise-T5120/etm/etm.conf index 6d03fba94c..301291548c 100644 --- a/usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise-T5120/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise-T5120/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -49,7 +48,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6300/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6300/etm/etm.conf index be3964512c..f90226df2c 100644 --- a/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6300/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6300/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -48,7 +47,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6320/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6320/etm/etm.conf index 224a7d5f4b..301291548c 100644 --- a/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6320/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6320/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -49,7 +48,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/SUNW,Sun-Fire-T200/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,Sun-Fire-T200/etm/etm.conf index be3964512c..f90226df2c 100644 --- a/usr/src/cmd/fm/modules/SUNW,Sun-Fire-T200/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,Sun-Fire-T200/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -48,7 +47,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/SUNW,T5140/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,T5140/etm/etm.conf index e61897c85a..463952123c 100644 --- a/usr/src/cmd/fm/modules/SUNW,T5140/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,T5140/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -51,7 +50,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/SUNW,USBRDT-5240/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,USBRDT-5240/etm/etm.conf index 0b12e90d96..f481dd6f77 100644 --- a/usr/src/cmd/fm/modules/SUNW,USBRDT-5240/etm/etm.conf +++ b/usr/src/cmd/fm/modules/SUNW,USBRDT-5240/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP subscribe fault.cpu.* @@ -50,7 +49,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog-msgs.conf b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog-msgs.conf index 313ec49ac2..61c2774799 100644 --- a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog-msgs.conf +++ b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog-msgs.conf @@ -23,7 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # # syslog-msgs agent properties: @@ -36,7 +35,7 @@ # # The "facility" property may only be configured to use LOG_DAEMON (which is # the default) or one of LOG_LOCAL[0-7]. For information about the use of -# local log facilities, refer to syslog(3C), syslogd(1M), and syslog.conf(4). +# local log facilities, refer to syslog(3C), syslogd(8), and syslog.conf(5). # # Example settings: # setprop gmt true diff --git a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c index 8f54d3493c..7837910fb6 100644 --- a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c +++ b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c @@ -49,8 +49,8 @@ static struct stats { } syslog_stats = { { "bad_vers", FMD_TYPE_UINT64, "event version is missing or invalid" }, { "bad_code", FMD_TYPE_UINT64, "event code has no dictionary name" }, - { "log_err", FMD_TYPE_UINT64, "failed to log message to log(7D)" }, - { "msg_err", FMD_TYPE_UINT64, "failed to log message to sysmsg(7D)" }, + { "log_err", FMD_TYPE_UINT64, "failed to log message to log(4D)" }, + { "msg_err", FMD_TYPE_UINT64, "failed to log message to sysmsg(4D)" }, { "no_msg", FMD_TYPE_UINT64, "message logging suppressed" } }; @@ -72,18 +72,18 @@ static const struct facility { static fmd_msg_hdl_t *syslog_msghdl; /* handle for libfmd_msg calls */ static int syslog_msgall; /* set to message all faults */ -static log_ctl_t syslog_ctl; /* log(7D) meta-data for each msg */ -static int syslog_logfd = -1; /* log(7D) file descriptor */ -static int syslog_msgfd = -1; /* sysmsg(7D) file descriptor */ +static log_ctl_t syslog_ctl; /* log(4D) meta-data for each msg */ +static int syslog_logfd = -1; /* log(4D) file descriptor */ +static int syslog_msgfd = -1; /* sysmsg(4D) file descriptor */ static int syslog_file; /* log to syslog_logfd */ static int syslog_cons; /* log to syslog_msgfd */ static const char SYSLOG_POINTER[] = "syslog-msgs-pointer"; /* * Ideally we would just use syslog(3C) for outputting our messages, but our - * messaging standard defines a nice multi-line format and syslogd(1M) is very + * messaging standard defines a nice multi-line format and syslogd(8) is very * inflexible and stupid when it comes to multi-line messages. It pulls data - * out of log(7D) and splits it up by \n, printing each line to the console + * out of log(4D) and splits it up by \n, printing each line to the console * with its usual prefix of date and sender; it uses the same behavior for the * messages file as well. Further, syslog(3C) provides no CE_CONT equivalent * for userland callers (which at least works around repeated file prefixing). @@ -97,12 +97,12 @@ static const char SYSLOG_POINTER[] = "syslog-msgs-pointer"; * messages and some knowledge of how the Solaris log drivers work. We first * construct an enlarged format string containing the appropriate msgid(1). * We then format the caller's message using the provided format and buffer. - * We send this message to log(7D) using putmsg() with SL_CONSOLE | SL_LOGONLY + * We send this message to log(4D) using putmsg() with SL_CONSOLE | SL_LOGONLY * set in the log_ctl_t. The log driver allows us to set SL_LOGONLY when we * construct messages ourself, indicating that syslogd should only emit the * message to /var/adm/messages and any remote hosts, and skip the console. * Then we emit the message a second time, without the special prefix, to the - * sysmsg(7D) device, which handles console redirection and also permits us + * sysmsg(4D) device, which handles console redirection and also permits us * to output any characters we like to the console, including \n and \r. */ static void diff --git a/usr/src/cmd/fm/modules/sun4v/etm/etm.c b/usr/src/cmd/fm/modules/sun4v/etm/etm.c index af8768f6d3..cde89e5065 100644 --- a/usr/src/cmd/fm/modules/sun4v/etm/etm.c +++ b/usr/src/cmd/fm/modules/sun4v/etm/etm.c @@ -233,10 +233,10 @@ etm_fma_resp_wait_time = 30; /* time (sec) wait for fma event resp */ static pthread_mutex_t etm_write_lock = PTHREAD_MUTEX_INITIALIZER; /* for write operations */ -static log_ctl_t syslog_ctl; /* log(7D) meta-data for each msg */ -static int syslog_facility; /* log(7D) facility (part of priority) */ -static int syslog_logfd = -1; /* log(7D) file descriptor */ -static int syslog_msgfd = -1; /* sysmsg(7D) file descriptor */ +static log_ctl_t syslog_ctl; /* log(4D) meta-data for each msg */ +static int syslog_facility; /* log(4D) facility (part of priority) */ +static int syslog_logfd = -1; /* log(4D) file descriptor */ +static int syslog_msgfd = -1; /* sysmsg(4D) file descriptor */ static int syslog_file = 0; /* log to syslog_logfd */ static int syslog_cons = 0; /* log to syslog_msgfd */ @@ -517,9 +517,9 @@ static struct stats { /* Alert logging errors */ { "etm_log_err", FMD_TYPE_UINT64, - "failed to log message to log(7D)" }, + "failed to log message to log(4D)" }, { "etm_msg_err", FMD_TYPE_UINT64, - "failed to log message to sysmsg(7D)" }, + "failed to log message to sysmsg(4D)" }, /* miscellaneous stats */ @@ -1342,7 +1342,7 @@ etm_post_to_fmd(fmd_hdl_t *hdl, fmd_xprt_t *fmd_xprt, nvlist_t *evp) * that would create the situation where this module's openlog() would * have the monopoly on syslog(3C) for the daemon and all its modules. * To avoid that situation, this module uses the same logic as the - * syslog-msgs FM module to directly call into the log(7D) and sysmsg(7D) + * syslog-msgs FM module to directly call into the log(4D) and sysmsg(4D) * devices for syslog and console. */ diff --git a/usr/src/cmd/fm/modules/sun4v/etm/etm.conf b/usr/src/cmd/fm/modules/sun4v/etm/etm.conf index b5118e2b19..4291a9ca20 100644 --- a/usr/src/cmd/fm/modules/sun4v/etm/etm.conf +++ b/usr/src/cmd/fm/modules/sun4v/etm/etm.conf @@ -21,7 +21,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # transport these FMA events from the domain to the SP @@ -45,7 +44,7 @@ subscribe list.repaired # The "etm_alert_facility" property may only be configured to use # LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7]. For # information about the use of local log facilities, refer to syslog(3C), -# syslogd(1M), and syslog.conf(4). +# syslogd(8), and syslog.conf(5). # # Example settings: # setprop etm_alert_console true diff --git a/usr/src/cmd/fm/schemes/fmd/scheme.c b/usr/src/cmd/fm/schemes/fmd/scheme.c index 0b2039cd81..929b4dbd0b 100644 --- a/usr/src/cmd/fm/schemes/fmd/scheme.c +++ b/usr/src/cmd/fm/schemes/fmd/scheme.c @@ -27,7 +27,7 @@ /* * This routine should be kept in sync with the built-in version provided - * as part of fmd(1M) itself -- see usr/src/cmd/fm/fmd/common/fmd_scheme.c + * as part of fmd(8) itself -- see usr/src/cmd/fm/fmd/common/fmd_scheme.c */ ssize_t fmd_fmri_nvl2str(nvlist_t *nvl, char *buf, size_t buflen) diff --git a/usr/src/cmd/fm/scripts/fmsim.ksh b/usr/src/cmd/fm/scripts/fmsim.ksh index 6e20f25d43..907bebecff 100644 --- a/usr/src/cmd/fm/scripts/fmsim.ksh +++ b/usr/src/cmd/fm/scripts/fmsim.ksh @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" export PATH=/usr/bin:/usr/sbin:/usr/ccs/bin unset ENV TMPDIR @@ -176,13 +175,13 @@ if $opt_h || [[ -z "$files" && $opt_i = false ]]; then "[-t args] [file ...]" echo "\t-d set the simulation root directory to the given location" - echo "\t-D start fmd(1M) using dtrace(1M) and specified D script" + echo "\t-D start fmd(8) using dtrace(8) and specified D script" echo "\t-e display error log content instead of fault log content" echo "\t-h display usage information for fmsim and exit" echo "\t-i set interactive mode: do not stop after sending events" - echo "\t-o set fmd(1M) option to specified value during simulation" + echo "\t-o set fmd(8) option to specified value during simulation" echo "\t-s set up simulation world but do not actually run simulation" - echo "\t-t start fmd(1M) using truss(1) and specified arguments" + echo "\t-t start fmd(8) using truss(1) and specified arguments" echo "\t-v set verbose mode: display additional event detail" echo "\t-V set very verbose mode: display complete event contents" echo "\t-w wait for a keypress after simulation completes" @@ -255,7 +254,7 @@ cat >$simscript <<EOS #ident "@(#)fmsim.ksh 1.5 06/10/11 SMI" # -# fmsim(1M) script generated for $simroot $(date) +# fmsim(8) script generated for $simroot $(date) # export LD_LIBRARY_PATH=$simroot/usr/lib:$simroot/usr/lib/fm @@ -282,7 +281,7 @@ fi export LD_LIBRARY_PATH=$simroot/usr/lib:$simroot/usr/lib/fm export LD_LIBRARY_PATH_64=$simroot/usr/lib/64:$simroot/usr/lib/fm/$isa64 -echo "fmsim: simulation $$ running fmd(1M)\c" +echo "fmsim: simulation $$ running fmd(8)\c" ./usr/lib/fm/fmd/fmd -V | cut -d: -f2 ./$simscript & diff --git a/usr/src/cmd/fmthard/fmthard.c b/usr/src/cmd/fmthard/fmthard.c index 02577c1445..46754e1b76 100644 --- a/usr/src/cmd/fmthard/fmthard.c +++ b/usr/src/cmd/fmthard/fmthard.c @@ -121,7 +121,7 @@ static diskaddr_t lastlba = 0; /* last LBA on 64-bit VTOC */ static char *uboot = "boot"; #elif defined(i386) -/* use installgrub(1M) to install boot blocks */ +/* use installgrub(8) to install boot blocks */ static char *uboot = ""; #else #error No platform defined. @@ -168,7 +168,7 @@ main(int argc, char **argv) case 'b': (void) fprintf(stderr, "fmthard: -p and -b no longer supported." - " Use installgrub(1M) to install boot blocks\n"); + " Use installgrub(8) to install boot blocks\n"); break; #endif /* defined(i386) */ diff --git a/usr/src/cmd/format/label.c b/usr/src/cmd/format/label.c index 9ce00d0082..56a5f3d394 100644 --- a/usr/src/cmd/format/label.c +++ b/usr/src/cmd/format/label.c @@ -670,7 +670,7 @@ read_efi_label(int fd, struct efi_info *label, struct disk_info *disk_info) /* * We've read a 64-bit label which has no geometry information. Use * some heuristics to fake up a geometry that would match the disk in - * order to make the rest of format(1M) happy. + * order to make the rest of format(8) happy. */ static int vtoc64_to_label(struct efi_info *label, struct dk_gpt *vtoc) diff --git a/usr/src/cmd/fs.d/autofs/auto_subr.c b/usr/src/cmd/fs.d/autofs/auto_subr.c index 200d118ea8..97ccb2387d 100644 --- a/usr/src/cmd/fs.d/autofs/auto_subr.c +++ b/usr/src/cmd/fs.d/autofs/auto_subr.c @@ -939,7 +939,7 @@ trace_prt(int id, char *fmt, ...) } /* - * Extract the isalist(5) for userland from the kernel. + * Extract the isalist(7) for userland from the kernel. */ static char * isalist(void) diff --git a/usr/src/cmd/fs.d/autofs/autofs.dfl b/usr/src/cmd/fs.d/autofs/autofs.dfl index 8d3c53e6b9..c7b44d3f0d 100644 --- a/usr/src/cmd/fs.d/autofs/autofs.dfl +++ b/usr/src/cmd/fs.d/autofs/autofs.dfl @@ -23,5 +23,5 @@ # # -# Moved to SMF. Use sharectl(1M) to manage AUTOFS properties. +# Moved to SMF. Use sharectl(8) to manage AUTOFS properties. # diff --git a/usr/src/cmd/fs.d/nfs/etc/nfs.dfl b/usr/src/cmd/fs.d/nfs/etc/nfs.dfl index 13bdb75d68..0abad9ac63 100644 --- a/usr/src/cmd/fs.d/nfs/etc/nfs.dfl +++ b/usr/src/cmd/fs.d/nfs/etc/nfs.dfl @@ -23,5 +23,5 @@ # # -# Moved to SMF. Use sharectl(1M) to manage NFS properties. +# Moved to SMF. Use sharectl(8) to manage NFS properties. # diff --git a/usr/src/cmd/fs.d/nfs/nfsmapid/nfsmapid_server.c b/usr/src/cmd/fs.d/nfs/nfsmapid/nfsmapid_server.c index 3fde3ce099..66ffafbdb5 100644 --- a/usr/src/cmd/fs.d/nfs/nfsmapid/nfsmapid_server.c +++ b/usr/src/cmd/fs.d/nfs/nfsmapid/nfsmapid_server.c @@ -832,7 +832,7 @@ check_domain(int sighup) } /* - * Need to be able to open the DIAG_FILE before nfsmapid(1m) + * Need to be able to open the DIAG_FILE before nfsmapid(8) * releases it's root priviledges. The DIAG_FILE then remains * open for the duration of this nfsmapid instance via n4_fd. */ @@ -880,7 +880,7 @@ update_diag_file(char *new) /* * Callback function for libmapid. This will be called - * by the lib, everytime the nfsmapid(1m) domain changes. + * by the lib, everytime the nfsmapid(8) domain changes. */ void * cb_update_domain(void *arg) diff --git a/usr/src/cmd/fs.d/pcfs/mount/mount.c b/usr/src/cmd/fs.d/pcfs/mount/mount.c index 9936ebdc36..b47e608aac 100644 --- a/usr/src/cmd/fs.d/pcfs/mount/mount.c +++ b/usr/src/cmd/fs.d/pcfs/mount/mount.c @@ -18,7 +18,6 @@ * * CDDL HEADER END */ -#pragma ident "%Z%%M% %I% %E% SMI" /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. @@ -195,7 +194,7 @@ main(int argc, char *argv[]) tzset(); /* * We perform this validation only in case the user of - * mount(1m) specified the "timezone=..." option. That's + * mount(8) specified the "timezone=..." option. That's * because we don't want PCFS mounts to fail due to a * botched $TZ environment variable. If the admin's * environment contains garbage, it'll just parse as diff --git a/usr/src/cmd/fs.d/udfs/mkfs/mkfs.c b/usr/src/cmd/fs.d/udfs/mkfs/mkfs.c index 115ada72ff..dce29722a6 100644 --- a/usr/src/cmd/fs.d/udfs/mkfs/mkfs.c +++ b/usr/src/cmd/fs.d/udfs/mkfs/mkfs.c @@ -390,7 +390,7 @@ main(int32_t argc, int8_t *argv[]) (void) fprintf(stdout, gettext("can't check mount point; ")); (void) fprintf(stdout, - gettext("%s is mounted but not in mnttab(4)\n"), + gettext("%s is mounted but not in mnttab(5)\n"), special); exit(32); } diff --git a/usr/src/cmd/fs.d/ufs/fsck/inode.c b/usr/src/cmd/fs.d/ufs/fsck/inode.c index d5ba38d358..db24d93976 100644 --- a/usr/src/cmd/fs.d/ufs/fsck/inode.c +++ b/usr/src/cmd/fs.d/ufs/fsck/inode.c @@ -1331,7 +1331,7 @@ truncino(fsck_ino_t ino, offset_t new_length, int update) */ pwarn("Could not determine former parent of " "inode %d, link counts are possibly\n" - "incorrect. Please rerun fsck(1M) to " + "incorrect. Please rerun fsck(8) to " "correct this.\n", ino); iscorrupt = 1; diff --git a/usr/src/cmd/fs.d/ufs/fsck/setup.c b/usr/src/cmd/fs.d/ufs/fsck/setup.c index b128533412..c31ede6a8f 100644 --- a/usr/src/cmd/fs.d/ufs/fsck/setup.c +++ b/usr/src/cmd/fs.d/ufs/fsck/setup.c @@ -640,7 +640,7 @@ find_superblock(caddr_t devstr) "YOU MUST USE THE -o b OPTION\n" "TO FSCK TO SPECIFY THE LOCATION OF A VALID " "ALTERNATE SUPERBLOCK TO\n" - "SUPPLY NEEDED INFORMATION; SEE fsck(1M).\n"); + "SUPPLY NEEDED INFORMATION; SEE fsck(8).\n"); bflag = 0; retval = -1; goto finish; @@ -669,7 +669,7 @@ find_superblock(caddr_t devstr) if (cg >= 0) { pwarn("Please verify that the indicated block " "contains a proper\nsuperblock for the " - "filesystem (see fsdb(1M)).\n"); + "filesystem (see fsdb(8)).\n"); if (yflag) pwarn("\nFSCK was running in YES " "mode. If you wish to run in " @@ -1231,7 +1231,7 @@ badsb(int listerr, caddr_t s) pwarn("e.g. fsck [-F ufs] -o b=# [special ...] \n"); exitstat = EXERRFATAL; pfatal( - "where # is the alternate super block. SEE fsck_ufs(1M). \n"); + "where # is the alternate super block. SEE fsck_ufs(8). \n"); } /* we're expected to return if not preening */ } diff --git a/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c b/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c index 1fee268983..3d4a865fe7 100644 --- a/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c +++ b/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c @@ -404,7 +404,7 @@ main(int argc, char *argv[]) "Warning: The '-z' option of 'fsdb_ufs' has been declared obsolete", "and may not be supported in a future version of Solaris.", "While this functionality is currently still supported, the", -"recommended procedure to clear an inode is to use clri(1M)."); +"recommended procedure to clear an inode is to use clri(8)."); if (isnumber(optarg)) { inum = atoi(optarg); special = argv[optind]; diff --git a/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c b/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c index 940827d156..110c66c49b 100644 --- a/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c +++ b/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c @@ -1090,11 +1090,11 @@ main(int argc, char *argv[]) dprintf(("DeBuG mtb : %c\n", mtb)); /* - * With newer and much larger disks, the newfs(1M) and mkfs_ufs(1M) + * With newer and much larger disks, the newfs(8) and mkfs_ufs(8) * commands had problems in correctly handling the "native" geometries * for various storage devices. * - * To handle the new age disks, mkfs_ufs(1M) will use the EFI style + * To handle the new age disks, mkfs_ufs(8) will use the EFI style * for non-EFI disks that are larger than the CHS addressing limit * ( > 8GB approx ) and ignore the disk geometry information for * these drives. This is what is currently done for multi-terrabyte @@ -3807,7 +3807,7 @@ lockexit(int exitstatus) if (isbad) { (void) fprintf(stderr, gettext( "Filesystem is currently inconsistent. It " - "must be repaired with fsck(1M)\nbefore being " + "must be repaired with fsck(8)\nbefore being " "used. Use the following command to " "do this:\n\n\tfsck %s\n\n"), fsys); @@ -3946,7 +3946,7 @@ checksummarysize() /* * checksblock() has two uses: - * - One is to sanity test the superblock and is used when newfs(1M) + * - One is to sanity test the superblock and is used when newfs(8) * is invoked with the "-N" option. If any discrepancy was found, * just return whatever error was found and do not exit. * - the other use of it is in places where you expect the superblock @@ -4242,7 +4242,7 @@ checkmount(struct mnttab *mntp, char *bdevname) } if (statdir.st_dev != statdev.st_rdev) { (void) fprintf(stderr, gettext( - "%s is not mounted on %s; mnttab(4) wrong\n"), + "%s is not mounted on %s; mnttab(5) wrong\n"), mntp->mnt_special, mntp->mnt_mountp); lockexit(32); } diff --git a/usr/src/cmd/fs.d/ufs/mount/mount.c b/usr/src/cmd/fs.d/ufs/mount/mount.c index 38d44db746..a98de3c65d 100644 --- a/usr/src/cmd/fs.d/ufs/mount/mount.c +++ b/usr/src/cmd/fs.d/ufs/mount/mount.c @@ -302,37 +302,37 @@ reportlogerror(int ret, char *mp, char *special, char *cmd, fiolog_t *flp) (void) fprintf(stderr, gettext("Solaris Volume Manager logging" " is already enabled.\n")); (void) fprintf(stderr, gettext("Please see the" - " commands metadetach(1M)" - " or metaclear(1M).\n")); + " commands metadetach(8)" + " or metaclear(8).\n")); break; case FIOLOG_EROFS : (void) fprintf(stderr, gettext("File system is mounted read " "only.\n")); (void) fprintf(stderr, gettext("Please see the remount " - "option described in mount_ufs(1M).\n")); + "option described in mount_ufs(8).\n")); break; case FIOLOG_EULOCK : (void) fprintf(stderr, gettext("File system is locked.\n")); (void) fprintf(stderr, gettext("Please see the -u option " - "described in lockfs(1M).\n")); + "described in lockfs(8).\n")); break; case FIOLOG_EWLOCK : (void) fprintf(stderr, gettext("The file system could not be" " write locked.\n")); (void) fprintf(stderr, gettext("Please see the -w option " - "described in lockfs(1M).\n")); + "described in lockfs(8).\n")); break; case FIOLOG_ECLEAN : (void) fprintf(stderr, gettext("The file system may not be" " stable.\n")); (void) fprintf(stderr, gettext("Please see the -n option" - " for fsck(1M).\n")); + " for fsck(8).\n")); break; case FIOLOG_ENOULOCK : (void) fprintf(stderr, gettext("The file system could not be" " unlocked.\n")); (void) fprintf(stderr, gettext("Please see the -u option " - "described in lockfs(1M).\n")); + "described in lockfs(8).\n")); break; default : (void) fprintf(stderr, gettext("Unknown internal error" diff --git a/usr/src/cmd/fwflash/common/fwflash.h b/usr/src/cmd/fwflash/common/fwflash.h index 46bffe3372..d4ae6f1948 100644 --- a/usr/src/cmd/fwflash/common/fwflash.h +++ b/usr/src/cmd/fwflash/common/fwflash.h @@ -72,7 +72,7 @@ struct fw_plugin { * * eg /usr/lib/fwflash/identify/ses.so * is the identification plugin for devices attached to - * the host using the ses(7D) driver. + * the host using the ses(4D) driver. */ char *filename; @@ -140,7 +140,7 @@ struct pluginlist { * * eg /usr/lib/fwflash/identify/ses.so * is the identification plugin for devices attached to - * the host using the ses(7D) driver. + * the host using the ses(4D) driver. */ char *filename; @@ -218,7 +218,7 @@ struct devicelist { struct vpr *ident; /* - * In the original fwflash(1M), it was possible to select a + * In the original fwflash(8), it was possible to select a * device for flashing by using an index number called a * dev_num. We retain that concept for pluggable fwflash, with * the following change - whenever our identification plugin has @@ -240,7 +240,7 @@ struct devicelist { /* * Pointer to the plugin needed to flash this device, and * to use for printing appropriate device-specific information - * as required by the "-l" option to fwflash(1M). + * as required by the "-l" option to fwflash(8). */ struct fw_plugin *plugin; diff --git a/usr/src/cmd/fwflash/plugins/transport/common/ufm.c b/usr/src/cmd/fwflash/plugins/transport/common/ufm.c index ec21b27efd..5e9cb3abc6 100644 --- a/usr/src/cmd/fwflash/plugins/transport/common/ufm.c +++ b/usr/src/cmd/fwflash/plugins/transport/common/ufm.c @@ -14,7 +14,7 @@ */ /* - * fwflash(1M) backend for UFMs. + * fwflash(8) backend for UFMs. */ #include <libdevinfo.h> diff --git a/usr/src/cmd/fwflash/plugins/vendor/sd-GENERIC.c b/usr/src/cmd/fwflash/plugins/vendor/sd-GENERIC.c index e99655d3e5..3322297928 100644 --- a/usr/src/cmd/fwflash/plugins/vendor/sd-GENERIC.c +++ b/usr/src/cmd/fwflash/plugins/vendor/sd-GENERIC.c @@ -15,9 +15,9 @@ /* * This is a general firmware flash plugin that does basic verification for - * devices backed by sd(7D). + * devices backed by sd(4D). * - * The sd(7D) target for firmware flashing uses the general SCSI WRITE BUFFER + * The sd(4D) target for firmware flashing uses the general SCSI WRITE BUFFER * options with various modes to instruct the drive to download and install * microcode (what SPC-3 calls firmware). To verify that something fits, we can * use the READ BUFFER command with mode 03h to indicate that we want to diff --git a/usr/src/cmd/getfacl/getfacl.c b/usr/src/cmd/getfacl/getfacl.c index 337a09a960..6cd12bb492 100644 --- a/usr/src/cmd/getfacl/getfacl.c +++ b/usr/src/cmd/getfacl/getfacl.c @@ -110,7 +110,7 @@ main(int argc, char *argv[]) (void) fprintf(stderr, gettext("File system doesn't support " "aclent_t style ACL's.\n" - "See acl(5) for more information on " + "See acl(7) for more information on " "POSIX-draft ACL support.\n")); exit(2); } diff --git a/usr/src/cmd/growfs/growfs.sh b/usr/src/cmd/growfs/growfs.sh index f17199aad1..fa9855cada 100644 --- a/usr/src/cmd/growfs/growfs.sh +++ b/usr/src/cmd/growfs/growfs.sh @@ -131,8 +131,8 @@ if [ $retv -eq $UFS_MKFS_NOTENOUGHSPACE ]; then done echo \ "\nThe incremental grow has successfully completed, but since the first growth \ -attempt failed (see output from first mkfs(1M) run), the filesystem is still \ -locked and needs to be checked with fsck(1M).\n\ +attempt failed (see output from first mkfs(8) run), the filesystem is still \ +locked and needs to be checked with fsck(8).\n\ Please run \`fsck -F ufs $raw_special' and then unlock the filesystem \ with \`lockfs -u $mount_pt'." | fmt; diff --git a/usr/src/cmd/gss/gssd/gssd.c b/usr/src/cmd/gss/gssd/gssd.c index 9b9e1e5546..0c5975c9d7 100644 --- a/usr/src/cmd/gss/gssd/gssd.c +++ b/usr/src/cmd/gss/gssd/gssd.c @@ -102,7 +102,7 @@ main(int argc, char **argv) /* * Take special note that "getuid()" is called here. This call is used - * rather than app_krb5_user_uid(), to ensure gssd(1M) is running as + * rather than app_krb5_user_uid(), to ensure gssd(8) is running as * root. */ #ifdef DEBUG diff --git a/usr/src/cmd/hal/probing/printer/probe-printer.c b/usr/src/cmd/hal/probing/printer/probe-printer.c index 181008e10d..d6df17ddcc 100644 --- a/usr/src/cmd/hal/probing/printer/probe-printer.c +++ b/usr/src/cmd/hal/probing/printer/probe-printer.c @@ -1,6 +1,6 @@ /*************************************************************************** * - * probe-printer.c : Probe for prnio(7i) printer device information + * probe-printer.c : Probe for prnio(4I) printer device information * * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -9,8 +9,6 @@ * **************************************************************************/ -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -69,8 +67,8 @@ prnio_out: } /* - * It is assumed that all devices that support prnio(7i), also have a link - * in /dev/printers. + * It is assumed that all devices that support prnio(4I), also have a link + * in /dev/printers. */ static char * prnio_device_name(void) @@ -135,7 +133,7 @@ main(int argc, char *argv[]) goto out; } - /* Probe the printer for characteristics via prnio(7i) */ + /* Probe the printer for characteristics via prnio(4I) */ ret = prnio_printer_info(device_file, &manufacturer, &model, &description, &serial_number, &command_set); if (ret < 0) { diff --git a/usr/src/cmd/hal/tools/hal-fdi-validate.sh b/usr/src/cmd/hal/tools/hal-fdi-validate.sh index 280c30bf34..5efff9e4a7 100644 --- a/usr/src/cmd/hal/tools/hal-fdi-validate.sh +++ b/usr/src/cmd/hal/tools/hal-fdi-validate.sh @@ -1,13 +1,11 @@ # -# hal-fdi-validate.sh : Validate one or more fdi(4) files +# hal-fdi-validate.sh : Validate one or more fdi(5) files # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Licensed under the Academic Free License version 2.1 # -# ident "%Z%%M% %I% %E% SMI" -# usage() { echo "Usage: hal-fdi-validate [-f dtd] file [file ...]" diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c index 52d7314b05..c4f04609fc 100644 --- a/usr/src/cmd/halt/halt.c +++ b/usr/src/cmd/halt/halt.c @@ -45,7 +45,7 @@ /* - * Common code for halt(1M), poweroff(1M), and reboot(1M). We use + * Common code for halt(8), poweroff(8), and reboot(8). We use * argv[0] to determine which behavior to exhibit. */ @@ -1529,7 +1529,7 @@ main(int argc, char *argv[]) /* * If we're not forcing a crash dump, mark the system as quiescing for - * smf(5)'s benefit, and idle the init process. + * smf(7)'s benefit, and idle the init process. */ if (cmd != A_DUMP) { if (direct_init(PCDSTOP) == -1) { diff --git a/usr/src/cmd/halt/smf.i386/boot-config.xml b/usr/src/cmd/halt/smf.i386/boot-config.xml index 6a7949e66e..ee053cc700 100644 --- a/usr/src/cmd/halt/smf.i386/boot-config.xml +++ b/usr/src/cmd/halt/smf.i386/boot-config.xml @@ -159,7 +159,7 @@ Parameters for controlling the reboot behavior. </common_name> <description> <loctext xml:lang='C'> -When set to true, reboot(1M) and init(1M) 6 will call uadmin(2) with AD_FASTREOOT, which will bypass firmware. +When set to true, reboot(8) and init(8) 6 will call uadmin(2) with AD_FASTREOOT, which will bypass firmware. </loctext> </description> </prop_pattern> diff --git a/usr/src/cmd/halt/smf.sparc/boot-config.xml b/usr/src/cmd/halt/smf.sparc/boot-config.xml index b0c392de95..80a2f2414b 100644 --- a/usr/src/cmd/halt/smf.sparc/boot-config.xml +++ b/usr/src/cmd/halt/smf.sparc/boot-config.xml @@ -158,7 +158,7 @@ Parameters for controlling the reboot behavior. </common_name> <description> <loctext xml:lang='C'> -When set to true, reboot(1M) and init(1M) 6 will call uadmin(2) with AD_FASTREOOT, which will bypass firmware. +When set to true, reboot(8) and init(8) 6 will call uadmin(2) with AD_FASTREOOT, which will bypass firmware. </loctext> </description> </prop_pattern> diff --git a/usr/src/cmd/hotplug/hotplug.c b/usr/src/cmd/hotplug/hotplug.c index 8ffb8d48dd..2b457f8cd4 100644 --- a/usr/src/cmd/hotplug/hotplug.c +++ b/usr/src/cmd/hotplug/hotplug.c @@ -1208,7 +1208,7 @@ print_error(int error) (void) fprintf(stderr, gettext("ERROR: there are no connections to display.\n")); (void) fprintf(stderr, - gettext("(See hotplug(1m) for more information.)\n")); + gettext("(See hotplug(8) for more information.)\n")); break; case ENXIO: (void) fprintf(stderr, diff --git a/usr/src/cmd/hotplugd/svc-hotplug b/usr/src/cmd/hotplugd/svc-hotplug index ad140b6b39..2aa45c6896 100644 --- a/usr/src/cmd/hotplugd/svc-hotplug +++ b/usr/src/cmd/hotplugd/svc-hotplug @@ -26,7 +26,7 @@ # # -# Startup script for the hotplugd(1M) daemon. +# Startup script for the hotplugd(8) daemon. # . /lib/svc/share/smf_include.sh diff --git a/usr/src/cmd/idmap/idmap/idmap.c b/usr/src/cmd/idmap/idmap/idmap.c index 64644f4aae..d95a7d226a 100644 --- a/usr/src/cmd/idmap/idmap/idmap.c +++ b/usr/src/cmd/idmap/idmap/idmap.c @@ -2983,7 +2983,7 @@ do_show_mapping(flag_t *f, int argc, char **argv, cmd_pos_t *pos) if (stat != IDMAP_SUCCESS) { print_error(pos, gettext("Unable to create handle for communicating" - " with idmapd(1M) (%s)\n"), + " with idmapd(8) (%s)\n"), idmap_stat2string(stat)); idmap_get_destroy(ghandle); goto cleanup; @@ -3078,7 +3078,7 @@ do_show_mapping(flag_t *f, int argc, char **argv, cmd_pos_t *pos) * idmapd returns fallback uid/gid in case of errors. However * it uses special sentinel value i.e 4294967295 (or -1) to * indicate that falbback pid is not available either. In such - * case idmap(1M) should not display the mapping because there + * case idmap(8) should not display the mapping because there * is no fallback mapping. */ diff --git a/usr/src/cmd/idmap/idmapd/idmap_config.c b/usr/src/cmd/idmap/idmapd/idmap_config.c index 5d92d12503..eeec9562ea 100644 --- a/usr/src/cmd/idmap/idmapd/idmap_config.c +++ b/usr/src/cmd/idmap/idmapd/idmap_config.c @@ -25,7 +25,7 @@ /* - * Config routines common to idmap(1M) and idmapd(1M) + * Config routines common to idmap(8) and idmapd(8) */ #include <stdlib.h> diff --git a/usr/src/cmd/idmap/idmapd/idmapd.c b/usr/src/cmd/idmap/idmapd/idmapd.c index 51db388832..207cedc063 100644 --- a/usr/src/cmd/idmap/idmapd/idmapd.c +++ b/usr/src/cmd/idmap/idmapd/idmapd.c @@ -25,7 +25,7 @@ /* - * main() of idmapd(1M) + * main() of idmapd(8) */ #include "idmapd.h" diff --git a/usr/src/cmd/init/init.c b/usr/src/cmd/init/init.c index 844f22d895..1afc73b976 100644 --- a/usr/src/cmd/init/init.c +++ b/usr/src/cmd/init/init.c @@ -41,8 +41,8 @@ */ /* - * init(1M) is the general process spawning program. Its primary job is to - * start and restart svc.startd for smf(5). For backwards-compatibility it also + * init(8) is the general process spawning program. Its primary job is to + * start and restart svc.startd for smf(7). For backwards-compatibility it also * spawns and respawns processes according to /etc/inittab and the current * run-level. It reads /etc/default/inittab for general configuration. * @@ -58,35 +58,35 @@ * which each inittab entry is valid. * * State File and Restartability - * Premature exit by init(1M) is handled as a special case by the kernel: - * init(1M) will be immediately re-executed, retaining its original PID. (PID + * Premature exit by init(8) is handled as a special case by the kernel: + * init(8) will be immediately re-executed, retaining its original PID. (PID * 1 in the global zone.) To track the processes it has previously spawned, - * as well as other mutable state, init(1M) regularly updates a state file + * as well as other mutable state, init(8) regularly updates a state file * such that its subsequent invocations have knowledge of its various * dependent processes and duties. * * Process Contracts - * We start svc.startd(1M) in a contract and transfer inherited contracts when + * We start svc.startd(8) in a contract and transfer inherited contracts when * restarting it. Everything else is started using the legacy contract * template, and the created contracts are abandoned when they become empty. * * utmpx Entry Handling - * Because init(1M) no longer governs the startup process, its knowledge of + * Because init(8) no longer governs the startup process, its knowledge of * when utmpx becomes writable is indirect. However, spawned processes * expect to be constructed with valid utmpx entries. As a result, attempts * to write normal entries will be retried until successful. * * Maintenance Mode - * In certain failure scenarios, init(1M) will enter a maintenance mode, in - * which it invokes sulogin(1M) to allow the operator an opportunity to + * In certain failure scenarios, init(8) will enter a maintenance mode, in + * which it invokes sulogin(8) to allow the operator an opportunity to * repair the system. Normally, this operation is performed as a * fork(2)-exec(2)-waitpid(3C) sequence with the parent waiting for repair or * diagnosis to be completed. In the cases that fork(2) requests themselves - * fail, init(1M) will directly execute sulogin(1M), and allow the kernel to - * restart init(1M) on exit from the operator session. + * fail, init(8) will directly execute sulogin(8), and allow the kernel to + * restart init(8) on exit from the operator session. * - * One scenario where init(1M) enters its maintenance mode is when - * svc.startd(1M) begins to fail rapidly, defined as when the average time + * One scenario where init(8) enters its maintenance mode is when + * svc.startd(8) begins to fail rapidly, defined as when the average time * between recent failures drops below a given threshold. */ @@ -547,7 +547,7 @@ static char startd_svc_aux[SVC_AUX_SIZE]; static char startd_cline[256] = ""; /* svc.startd's command line */ static int do_restart_startd = 1; /* Whether to restart svc.startd. */ static char *smf_options = NULL; /* Options to give to startd. */ -static int smf_debug = 0; /* Messages for debugging smf(5) */ +static int smf_debug = 0; /* Messages for debugging smf(7) */ static time_t init_boot_time; /* Substitute for kernel boot time. */ #define NSTARTD_FAILURE_TIMES 3 /* trigger after 3 failures */ @@ -940,8 +940,8 @@ update_boot_archive(int new_state) /* * void enter_maintenance() - * A simple invocation of sulogin(1M), with no baggage, in the case that we - * are unable to activate svc.startd(1M). We fork; the child runs sulogin; + * A simple invocation of sulogin(8), with no baggage, in the case that we + * are unable to activate svc.startd(8). We fork; the child runs sulogin; * we wait for it to exit. */ static void @@ -2021,7 +2021,7 @@ boot_init() (void) strcpy(glob_envp[0], INIT_PATH); /* - * Scan inittab(4) and process the special svc.startd entry, initdefault + * Scan inittab(5) and process the special svc.startd entry, initdefault * and sysinit entries. */ while (getcmd(&cmd, &line[0]) == TRUE) { @@ -2104,7 +2104,7 @@ boot_init() write_ioctl_syscon(); /* - * Start svc.startd(1M), which does most of the work. + * Start svc.startd(8), which does most of the work. */ if (startd_cline[0] != '\0' && startd_tmpl >= 0) { /* Start svc.startd. */ @@ -2223,7 +2223,7 @@ setup_pipe() } /* - * siglvl - handle an asynchronous signal from init(1M) telling us that we + * siglvl - handle an asynchronous signal from init(8) telling us that we * should change the current run level. We set new_state accordingly. */ void @@ -2233,7 +2233,7 @@ siglvl(int sig, siginfo_t *sip, ucontext_t *ucp) struct sigaction act; /* - * If the signal was from the kernel (rather than init(1M)) then init + * If the signal was from the kernel (rather than init(8)) then init * itself tripped the signal. That is, we might have a bug and tripped * a real SIGSEGV instead of receiving it as an alias for SIGLVLa. In * such a case we reset the disposition to SIG_DFL, block all signals @@ -3070,7 +3070,7 @@ get_scope: case SCF_ERROR_NOT_FOUND: (void) fputs(gettext( - "smf(5) repository missing local scope.\n"), + "smf(7) repository missing local scope.\n"), stderr); exit(1); /* NOTREACHED */ @@ -3262,12 +3262,12 @@ scferr(void) case SCF_ERROR_CONNECTION_BROKEN: console(B_TRUE, gettext( - "Connection to smf(5) repository server broken.\n")); + "Connection to smf(7) repository server broken.\n")); break; case SCF_ERROR_NO_RESOURCES: console(B_TRUE, gettext( - "smf(5) repository server is out of memory.\n")); + "smf(7) repository server is out of memory.\n")); break; case SCF_ERROR_PERMISSION_DENIED: @@ -3302,7 +3302,7 @@ lscf_set_runlevel(char rl) switch (scf_error()) { case SCF_ERROR_NO_SERVER: console(B_TRUE, - gettext("smf(5) repository server not running.\n")); + gettext("smf(7) repository server not running.\n")); goto bail; default: @@ -3864,7 +3864,7 @@ st_init() do { /* * If we can exclusively create the file, then we're the - * initial invocation of init(1M). + * initial invocation of init(8). */ st_fd = open(init_state_file, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); @@ -4134,7 +4134,7 @@ contracts_init() if (legacy_tmpl < 0 && startd_tmpl < 0) { /* The creation errors have already been reported. */ console(B_TRUE, - "Ignoring contract events. Core smf(5) services will not " + "Ignoring contract events. Core smf(7) services will not " "be restarted.\n"); return; } @@ -4148,7 +4148,7 @@ contracts_init() ; if (fd < 0) { console(B_TRUE, - "Couldn't open process pbundle: %s. Core smf(5) services " + "Couldn't open process pbundle: %s. Core smf(7) services " "will not be restarted.\n", strerror(errno)); return; } @@ -4316,11 +4316,11 @@ contract_event(struct pollfd *poll) } /* - * svc.startd(1M) Management + * svc.startd(8) Management */ /* - * (Re)start svc.startd(1M). old_ctid should be the contract ID of the old + * (Re)start svc.startd(8). old_ctid should be the contract ID of the old * contract, or 0 if we're starting it for the first time. If wait is true * we'll wait for and return the exit value of the child. */ diff --git a/usr/src/cmd/initpkg/dfstab.sh b/usr/src/cmd/initpkg/dfstab.sh index 9ee99002e8..d4e93f9832 100644 --- a/usr/src/cmd/initpkg/dfstab.sh +++ b/usr/src/cmd/initpkg/dfstab.sh @@ -25,12 +25,12 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1.2.1 */ + case "$MACH" in "u3b2"|"sparc"|"i386"|"ppc" ) echo " # Do not modify this file directly. -# Use the sharemgr(1m) command for all share management +# Use the sharemgr(8) command for all share management # This file is reconstructed and only maintained for backward # compatibility. Configuration lines could be lost. # diff --git a/usr/src/cmd/initpkg/init.d/README b/usr/src/cmd/initpkg/init.d/README index d70545ccc7..bf817a7699 100644 --- a/usr/src/cmd/initpkg/init.d/README +++ b/usr/src/cmd/initpkg/init.d/README @@ -19,14 +19,14 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" + Copyright 2004 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. NOTE: This directory contains legacy initialization and termination scripts for managing services. The preferred method of service management is via the Service Management Facility; to read more about -SMF, consult smf(5). +SMF, consult smf(7). File names in rc?.d directories are of the form [SK]nn<init.d filename> where 'S' means start this job, 'K' means kill this job, and 'nn' is the @@ -44,7 +44,7 @@ be sourced, allowing scripts to modify the environment of other scripts executed later. This behavior is no longer supported; for altering the environment in which services are run, refer to the SMF documentation. -Legacy services are reported by the default svcs(1m) output, and (where +Legacy services are reported by the default svcs(1) output, and (where appropriate) the utility's '-p' option. This reporting assumes a behavior as described above, such that each 'S' script has a suitable matching 'K' script, and they are both hard linked to a script in diff --git a/usr/src/cmd/initpkg/init.d/README.rc2 b/usr/src/cmd/initpkg/init.d/README.rc2 index d5267e5ca4..fc85f0e9c5 100644 --- a/usr/src/cmd/initpkg/init.d/README.rc2 +++ b/usr/src/cmd/initpkg/init.d/README.rc2 @@ -19,14 +19,14 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" + Copyright 2004 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. NOTE: This directory contains legacy initialization and termination scripts for managing services. The preferred method of service management is via the Service Management Facility; to read more about -SMF, consult smf(5). +SMF, consult smf(7). For a general discussion of the mechanism used to invoke these scripts see the file /etc/init.d/README. diff --git a/usr/src/cmd/initpkg/init.d/README.rc3 b/usr/src/cmd/initpkg/init.d/README.rc3 index cb3f9a1377..a37a7b3a37 100644 --- a/usr/src/cmd/initpkg/init.d/README.rc3 +++ b/usr/src/cmd/initpkg/init.d/README.rc3 @@ -19,14 +19,14 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" + Copyright 2004 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. NOTE: This directory contains legacy initialization and termination scripts for managing services. The preferred method of service management is via the Service Management Facility; to read more about -SMF, consult smf(5). +SMF, consult smf(7). For a general discussion of the mechanism used to invoke these scripts see the file /etc/init.d/README. diff --git a/usr/src/cmd/initpkg/init.d/README.rcS b/usr/src/cmd/initpkg/init.d/README.rcS index f2e151645c..4534b40cd1 100644 --- a/usr/src/cmd/initpkg/init.d/README.rcS +++ b/usr/src/cmd/initpkg/init.d/README.rcS @@ -19,14 +19,14 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" + Copyright 2004 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. NOTE: This directory contains legacy initialization and termination scripts for managing services. The preferred method of service management is via the Service Management Facility; to read more about -SMF, consult smf(5). +SMF, consult smf(7). For a general discussion of the mechanism used to invoke these scripts see the file /etc/init.d/README. diff --git a/usr/src/cmd/initpkg/init.d/sysetup b/usr/src/cmd/initpkg/init.d/sysetup index b6fced4e9b..b939093eda 100644 --- a/usr/src/cmd/initpkg/init.d/sysetup +++ b/usr/src/cmd/initpkg/init.d/sysetup @@ -24,7 +24,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" if [ -z "$_INIT_PREV_LEVEL" ]; then set -- `/usr/bin/who -r` @@ -42,7 +41,7 @@ fi # # Run rctladm to configure system resource controls based on the settings -# previously saved by rctladm. See rctladm(1m) for instructions on how to +# previously saved by rctladm. See rctladm(8) for instructions on how to # modify resource control settings. # if [ -f /etc/rctladm.conf ] && [ -x /usr/sbin/rctladm ]; then diff --git a/usr/src/cmd/initpkg/inittab b/usr/src/cmd/initpkg/inittab index 1e615cd8f5..6059a3e701 100644 --- a/usr/src/cmd/initpkg/inittab +++ b/usr/src/cmd/initpkg/inittab @@ -19,14 +19,14 @@ # # Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. # -# The /etc/inittab file controls the configuration of init(1M); for more -# information refer to init(1M) and inittab(4). It is no longer -# necessary to edit inittab(4) directly; administrators should use the +# The /etc/inittab file controls the configuration of init(8); for more +# information refer to init(8) and inittab(5). It is no longer +# necessary to edit inittab(5) directly; administrators should use the # Solaris Service Management Facility (SMF) to define services instead. -# Refer to smf(5) and the System Administration Guide for more +# Refer to smf(7) and the System Administration Guide for more # information on SMF. # -# For modifying parameters passed to ttymon, use svccfg(1m) to modify +# For modifying parameters passed to ttymon, use svccfg(8) to modify # the SMF repository. For example: # # # svccfg diff --git a/usr/src/cmd/initpkg/rc0.sh b/usr/src/cmd/initpkg/rc0.sh index 8b1018ad57..cc798b32bb 100644 --- a/usr/src/cmd/initpkg/rc0.sh +++ b/usr/src/cmd/initpkg/rc0.sh @@ -33,7 +33,7 @@ PATH=/usr/sbin:/usr/bin if [ -z "$SMF_RESTARTER" ]; then - echo "Cannot be run outside smf(5)" + echo "Cannot be run outside smf(7)" exit 1 fi diff --git a/usr/src/cmd/initpkg/rc1.sh b/usr/src/cmd/initpkg/rc1.sh index edb61f7b9b..ba68bb3d66 100644 --- a/usr/src/cmd/initpkg/rc1.sh +++ b/usr/src/cmd/initpkg/rc1.sh @@ -28,12 +28,11 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # "Run Commands" executed when the system is changing to init state 1 if [ -z "$SMF_RESTARTER" ]; then - echo "Cannot be run outside smf(5)" + echo "Cannot be run outside smf(7)" exit 1 fi diff --git a/usr/src/cmd/initpkg/rc2.sh b/usr/src/cmd/initpkg/rc2.sh index 05dda3cd59..0a2b14aa93 100644 --- a/usr/src/cmd/initpkg/rc2.sh +++ b/usr/src/cmd/initpkg/rc2.sh @@ -27,7 +27,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # Run Commands executed when the system is changing to init state 2, # traditionally called "multi-user". Pick up start-up packages for mounts, @@ -36,7 +35,7 @@ PATH=/usr/sbin:/usr/bin if [ -z "$SMF_RESTARTER" ]; then - echo "Cannot be run outside smf(5)" + echo "Cannot be run outside smf(7)" exit 1 fi diff --git a/usr/src/cmd/initpkg/rc3.sh b/usr/src/cmd/initpkg/rc3.sh index fc9d743cb2..1277e56776 100644 --- a/usr/src/cmd/initpkg/rc3.sh +++ b/usr/src/cmd/initpkg/rc3.sh @@ -27,7 +27,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # Run Commands executed when the system is changing to init state 3, # same as state 2 (multi-user) but with remote file sharing. @@ -35,7 +34,7 @@ PATH=/usr/sbin:/usr/bin if [ -z "$SMF_RESTARTER" ]; then - echo "This script cannot be run outside smf(5)." + echo "This script cannot be run outside smf(7)." exit 1 fi diff --git a/usr/src/cmd/initpkg/rcS.sh b/usr/src/cmd/initpkg/rcS.sh index 5e41614d7e..2ee19e0ab8 100644 --- a/usr/src/cmd/initpkg/rcS.sh +++ b/usr/src/cmd/initpkg/rcS.sh @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T. # All rights reserved. @@ -43,7 +43,7 @@ # check and mount other file systems to be mounted in single user mode if [ -z "$SMF_RESTARTER" ]; then - echo "Cannot be run outside smf(5)" + echo "Cannot be run outside smf(7)" exit 1 fi diff --git a/usr/src/cmd/initpkg/shutdown.sh b/usr/src/cmd/initpkg/shutdown.sh index a90213cd81..e58e6b9918 100644 --- a/usr/src/cmd/initpkg/shutdown.sh +++ b/usr/src/cmd/initpkg/shutdown.sh @@ -218,7 +218,7 @@ fi echo "Changing to init state $initstate - please wait" # We might be racing with a system that's still booting. -# Before starting init, check to see if smf(5) is running. The easiest way +# Before starting init, check to see if smf(7) is running. The easiest way # to do this is to check for the existence of the repository service door. i=0 diff --git a/usr/src/cmd/ipf/etc/ipf.conf b/usr/src/cmd/ipf/etc/ipf.conf index 2fa701c9ee..59e158093c 100644 --- a/usr/src/cmd/ipf/etc/ipf.conf +++ b/usr/src/cmd/ipf/etc/ipf.conf @@ -3,5 +3,5 @@ # # IP Filter rules to be loaded during startup # -# See ipf(4) manpage for more information on +# See ipf(5) manpage for more information on # IP Filter rules syntax. diff --git a/usr/src/cmd/ipf/tools/ipfzone.c b/usr/src/cmd/ipf/tools/ipfzone.c index d4e1bb8427..d82360db6f 100644 --- a/usr/src/cmd/ipf/tools/ipfzone.c +++ b/usr/src/cmd/ipf/tools/ipfzone.c @@ -27,7 +27,7 @@ extern char *optarg; /* * Get the zonename if it's the last argument and set the zonename - * in ipfzo to it. This is used by ipf(1m) only - all of the other tools + * in ipfzo to it. This is used by ipf(8) only - all of the other tools * specify the zone with the -z option, and therefore use getzoneopt() below. */ void diff --git a/usr/src/cmd/iscsiadm/iscsiadm_main.c b/usr/src/cmd/iscsiadm/iscsiadm_main.c index 2ccf2cf66e..c7b0dd143a 100644 --- a/usr/src/cmd/iscsiadm/iscsiadm_main.c +++ b/usr/src/cmd/iscsiadm/iscsiadm_main.c @@ -5449,7 +5449,7 @@ checkServiceStatus(void) gettext("Unable to query the service status of" " iSCSI initiator."), gettext("For more information, please refer to" - " iscsi(7D).")); + " iscsi(4D).")); return (B_FALSE); } @@ -5459,7 +5459,7 @@ checkServiceStatus(void) " try 'svcadm enable network/iscsi/initiator' to" " enable the service."), gettext("For more information, please refer to" - " iscsi(7D).")); + " iscsi(4D).")); return (B_FALSE); } @@ -5478,7 +5478,7 @@ seeMan(void) if (sent) return; - (void) fprintf(stdout, "%s %s(1M)\n", + (void) fprintf(stdout, "%s %s(8)\n", gettext("For more information, please see"), cmdName); sent = 1; diff --git a/usr/src/cmd/isns/isnsadm/isnsadm_msg.c b/usr/src/cmd/isns/isnsadm/isnsadm_msg.c index a84bc274c7..28fdcbb881 100644 --- a/usr/src/cmd/isns/isnsadm/isnsadm_msg.c +++ b/usr/src/cmd/isns/isnsadm/isnsadm_msg.c @@ -128,7 +128,7 @@ char *getTextMessage(msg_code_t code) { "server failed.")); case ERROR_ISNS_SMF_SERVICE_NOT_ONLINE: return (gettext - ("Error: network/isns_server smf(5) " + ("Error: network/isns_server smf(7) " "service is not online.")); case ERROR_MALLOC_FAILED: return (gettext diff --git a/usr/src/cmd/keyserv/keylogin.c b/usr/src/cmd/keyserv/keylogin.c index d42595ccd9..5816dde923 100644 --- a/usr/src/cmd/keyserv/keylogin.c +++ b/usr/src/cmd/keyserv/keylogin.c @@ -36,8 +36,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Set secret key on local machine */ @@ -238,7 +236,7 @@ oldkeylogin(char *fullname, char *pass) "The system default domain '%s' is different from the Secure RPC\n\ domain %s where the key is stored. The Secure RPC domainname is\n\ defined by the directory object stored in the /var/nis/NIS_COLD_START file.\n\ -If you need to change this Secure RPC domainname, please use the nisinit(1M)\n\ +If you need to change this Secure RPC domainname, please use the nisinit(8)\n\ command with the `-k` option.\n", local_domain, sec_domain); } else { fprintf(stderr, diff --git a/usr/src/cmd/keyserv/keyserv.c b/usr/src/cmd/keyserv/keyserv.c index 8bb6171772..2b5420a166 100644 --- a/usr/src/cmd/keyserv/keyserv.c +++ b/usr/src/cmd/keyserv/keyserv.c @@ -40,9 +40,9 @@ /* * keyserv - server for storing private encryption keys - * keyserv(1M) performs multiple functions: it stores secret keys per uid; it + * keyserv(8) performs multiple functions: it stores secret keys per uid; it * performs public key encryption and decryption operations; and it generates - * "random" keys. keyserv(1M) will talk to no one but a local root process on + * "random" keys. keyserv(8) will talk to no one but a local root process on * the local transport only. */ diff --git a/usr/src/cmd/keyserv/keyserv.dfl b/usr/src/cmd/keyserv/keyserv.dfl index bed51f1614..77048988fc 100644 --- a/usr/src/cmd/keyserv/keyserv.dfl +++ b/usr/src/cmd/keyserv/keyserv.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/keyserv # -# keyserv default settings processed via keyserv(1M). +# keyserv default settings processed via keyserv(8). # # ENABLE_NOBODY_KEYS affects whether default keys for nobody are used, see -# keyserv(1M) for details. The default value is "YES". A value of "NO" +# keyserv(8) for details. The default value is "YES". A value of "NO" # (any case) results in disabling of these keys; any other value is # ignored. # diff --git a/usr/src/cmd/keyserv/setkey.c b/usr/src/cmd/keyserv/setkey.c index 39ac5dfaef..05de2e5ce7 100644 --- a/usr/src/cmd/keyserv/setkey.c +++ b/usr/src/cmd/keyserv/setkey.c @@ -34,8 +34,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Do the real work of the keyserver. * Store secret keys. Compute common keys, @@ -1838,8 +1836,8 @@ hash_keys(pub, sec) } /* - * problem: keyserv loads keys from /etc/.rootkey based on nisauthconf(1M) - * which is too nis+-centric (see secure_rpc(3N)). + * problem: keyserv loads keys from /etc/.rootkey based on nisauthconf(8) + * which is too nis+-centric (see secure_rpc(3NSL)). * * So we want to make sure there is always a AUTH_DES compat entry * in the "list" of nis+ mechs so that the 192bit key always gets loaded so diff --git a/usr/src/cmd/krb5/kadmin/cli/kadmin.c b/usr/src/cmd/krb5/kadmin/cli/kadmin.c index 0d86fb06e4..88556cda9b 100644 --- a/usr/src/cmd/krb5/kadmin/cli/kadmin.c +++ b/usr/src/cmd/krb5/kadmin/cli/kadmin.c @@ -1360,8 +1360,8 @@ void kadmin_addprinc(argc, argv) gettext("while doing a get_principal on \"%s\"."), canon); printf(gettext("\nWarning: Principal \"%s\" could have incomplete " "flag settings, as a result of a failed get_principal.\n" - "Check the 'default_principal_flags' setting in kdc.conf(4).\n" - "If there is a mismatch, use modprinc in kadmin(1M) to rectify " + "Check the 'default_principal_flags' setting in kdc.conf(5).\n" + "If there is a mismatch, use modprinc in kadmin(8) to rectify " "the same.\n\n"), canon); } diff --git a/usr/src/cmd/krb5/kadmin/kclient/kclient.sh b/usr/src/cmd/krb5/kadmin/kclient/kclient.sh index 575f0a8c63..ab579e9757 100644 --- a/usr/src/cmd/krb5/kadmin/kclient/kclient.sh +++ b/usr/src/cmd/krb5/kadmin/kclient/kclient.sh @@ -608,7 +608,7 @@ function setup_keytab { # # 2. Do we want to create and/or add service principal(s) for fqdn's - # other than the one listed in resolv.conf(4) ? + # other than the one listed in resolv.conf(5) ? # if [[ -z $options ]]; then query "$(gettext "Do you have multiple DNS domains spanning the Kerberos realm") $realm ?" @@ -1456,7 +1456,7 @@ EOF if [[ ${#enctypes[@]} -eq 0 ]] then printf "$(gettext "No enctypes are supported").\n" - printf "$(gettext "Please enable arcfour or 1DES, then re-join; see cryptoadm(1M)").\n" >&2 + printf "$(gettext "Please enable arcfour or 1DES, then re-join; see cryptoadm(8)").\n" >&2 error_message fi @@ -1787,7 +1787,7 @@ else # /etc/resolv.conf not present, exit ... # printf "\n$(gettext "%s does not exist and is required for Kerberos setup")\n" $RESOLV_CONF_FILE >&2 - printf "$(gettext "Refer to resolv.conf(4), exiting").\n" >&2 + printf "$(gettext "Refer to resolv.conf(5), exiting").\n" >&2 error_message fi @@ -1798,7 +1798,7 @@ check_nss_conf || printf "$(gettext "/etc/nsswitch.conf does not make use of DNS if [[ -z $dnsarg && (-z $options || -z $filepath) ]]; then query "$(gettext "Do you want to use DNS for kerberos lookups") ?" if [[ $answer == yes ]]; then - printf "\n$(gettext "Valid DNS lookup options are dns_lookup_kdc, dns_lookup_realm,\nand dns_fallback. Refer krb5.conf(4) for further details").\n" + printf "\n$(gettext "Valid DNS lookup options are dns_lookup_kdc, dns_lookup_realm,\nand dns_fallback. Refer krb5.conf(5) for further details").\n" printf "\n$(gettext "Enter required DNS option"): " read dnsarg checkval="DNS_OPTIONS"; check_value $dnsarg @@ -1948,7 +1948,7 @@ doKRB5config if [[ $no_keytab != yes ]]; then setup_keytab else - printf "\n$(gettext "Note: %s file not created, please refer to verify_ap_req_nofail in krb5.conf(4) for the implications").\n" $KRB5_KEYTAB_FILE + printf "\n$(gettext "Note: %s file not created, please refer to verify_ap_req_nofail in krb5.conf(5) for the implications").\n" $KRB5_KEYTAB_FILE printf "$(gettext "Client will also not be able to host services that use Kerberos").\n" fi diff --git a/usr/src/cmd/krb5/kadmin/kdcmgr/klookup.c b/usr/src/cmd/krb5/kadmin/kdcmgr/klookup.c index 6fa9641093..c962ea1faf 100644 --- a/usr/src/cmd/krb5/kadmin/kdcmgr/klookup.c +++ b/usr/src/cmd/krb5/kadmin/kdcmgr/klookup.c @@ -43,7 +43,7 @@ * klooukp [ target [ RR_type ] ] * * Utitilizes DNS lookups to discover domain and realm information. This CLI - * is used primarily by kdcmgr(1M) and kclient(1M). + * is used primarily by kdcmgr(8) and kclient(8). */ int diff --git a/usr/src/cmd/krb5/kadmin/server/ipropd_svc.c b/usr/src/cmd/krb5/kadmin/server/ipropd_svc.c index 6e75e2428d..e708ad17a3 100644 --- a/usr/src/cmd/krb5/kadmin/server/ipropd_svc.c +++ b/usr/src/cmd/krb5/kadmin/server/ipropd_svc.c @@ -348,7 +348,7 @@ iprop_full_resync_1( #else (void) signal(SIGCHLD, SIG_DFL); #endif /* POSIX_SIGNALS */ - /* run kdb5_util(1M) dump for IProp */ + /* run kdb5_util(8) dump for IProp */ pret = pclose(popen(ubuf, "w")); DPRINT(("%s: pclose=%d\n", whoami, pret)); if (pret == -1) { diff --git a/usr/src/cmd/krb5/kadmin/server/ovsec_kadmd.c b/usr/src/cmd/krb5/kadmin/server/ovsec_kadmd.c index 11fe918c06..ad015d52b1 100644 --- a/usr/src/cmd/krb5/kadmin/server/ovsec_kadmd.c +++ b/usr/src/cmd/krb5/kadmin/server/ovsec_kadmd.c @@ -720,7 +720,7 @@ int main(int argc, char *argv[]) * The option value is "1". This will allow the server to restart * whilst the previous process is cleaning up after itself in a * FIN_WAIT_2 or TIME_WAIT state. If another process is started - * outside of smf(5) then bind will fail anyway, which is what we want. + * outside of smf(7) then bind will fail anyway, which is what we want. */ reqbuf[sizeof (struct opthdr)] = 1; diff --git a/usr/src/cmd/krb5/kwarn/kwarnd.c b/usr/src/cmd/krb5/kwarn/kwarnd.c index 34355b4143..395367c7e3 100644 --- a/usr/src/cmd/krb5/kwarn/kwarnd.c +++ b/usr/src/cmd/krb5/kwarn/kwarnd.c @@ -92,7 +92,7 @@ main(int argc, char **argv) /* * Take special note that "getuid()" is called here. This call is used - * rather that app_krb5_user_uid(), to ensure ktkt_warnd(1M) is running + * rather that app_krb5_user_uid(), to ensure ktkt_warnd(8) is running * as root. */ #ifdef DEBUG diff --git a/usr/src/cmd/krb5/slave/krb5_prop.xml b/usr/src/cmd/krb5/slave/krb5_prop.xml index 627aaa3245..00581ae1ff 100644 --- a/usr/src/cmd/krb5/slave/krb5_prop.xml +++ b/usr/src/cmd/krb5/slave/krb5_prop.xml @@ -18,7 +18,7 @@ the old mode of nonincremental passively receives full propagations from the master KDC - refer to kdc.conf(4) to configure incremental or nonincremental modes + refer to kdc.conf(5) to configure incremental or nonincremental modes --> <service_bundle type='manifest' name='SUNWkdcr:kpropd'> diff --git a/usr/src/cmd/ldap/ns_ldap/idsconfig.sh b/usr/src/cmd/ldap/ns_ldap/idsconfig.sh index 4d3df78e42..786c95ce07 100644 --- a/usr/src/cmd/ldap/ns_ldap/idsconfig.sh +++ b/usr/src/cmd/ldap/ns_ldap/idsconfig.sh @@ -56,7 +56,7 @@ EOF Note: idsconfig has created entries for VLV indexes. - For DS5.x, use the directoryserver(1m) script on ${IDS_SERVER} + For DS5.x, use the directoryserver(8) script on ${IDS_SERVER} to stop the server. Then, using directoryserver, follow the directoryserver examples below to create the actual VLV indexes. @@ -266,7 +266,7 @@ EOF HELP - Name of the configuration profile with which the clients will be configured. A directory server can store various profiles for multiple - groups of clients. The initialization tool, (ldapclient(1M)), assumes + groups of clients. The initialization tool, (ldapclient(8)), assumes "default" unless another is specified. EOF @@ -347,7 +347,7 @@ EOF ;; keyserv_help) cat <<EOF -HELP - The authentication method(s) to be used by newkey(1M) and chkey(1) +HELP - The authentication method(s) to be used by newkey(8) and chkey(1) when contacting the directory server. This is a ordered list and if provided will override the default authentication method parameter. @@ -428,7 +428,7 @@ HELP - Using Service Search Descriptors (SSD), you can override the used to override the default search base DN, the default search scope, and the default search filter to be used for directory lookups. SSD are supported for all services (databases) - defined in nsswitch.conf(4). The default base DN is defined + defined in nsswitch.conf(5). The default base DN is defined in ldap(1). Note: SSD are powerful tools in defining configuration profiles @@ -472,12 +472,12 @@ EOF HELP - Enter 'y' to set up the LDAP server for shadow update. The setup will add an administrator identity/credential and modify the necessary access controls for the client - to update shadow(4) data on the LDAP server. If sasl/GSSAPI + to update shadow(5) data on the LDAP server. If sasl/GSSAPI is in use, the Kerberos host principal will be used as the administrator identity. Shadow data is used for password aging and account locking. - Please refer to the shadow(4) manual page for details. + Please refer to the shadow(5) manual page for details. EOF ;; @@ -485,10 +485,10 @@ EOF HELP - Start the setup to add an administrator identity/credential and to modify access controls for the client to update - shadow(4) data on the LDAP server. + shadow(5) data on the LDAP server. Shadow data is used for password aging and account locking. - Please refer to the shadow(4) manual page for details. + Please refer to the shadow(5) manual page for details. EOF ;; @@ -496,11 +496,11 @@ EOF HELP - A profile with a 'sasl/GSSAPI' authentication method and a 'self' credential level is detected, enter 'y' to modify the necessary - access controls for allowing the client to update shadow(4) data + access controls for allowing the client to update shadow(5) data on the LDAP server. Shadow data is used for password aging and account locking. - Please refer to the shadow(4) manual page for details. + Please refer to the shadow(5) manual page for details. EOF ;; @@ -5230,7 +5230,7 @@ cleanup() # This script assumes that the iPlanet Directory Server (iDS) is # installed and that setup has been run. This script takes the # iDS server from that point and sets up the infrastructure for -# LDAP Naming Services. After running this script, ldapaddent(1M) +# LDAP Naming Services. After running this script, ldapaddent(8) # or some other tools can be used to populate data. # Initialize the variables that need to be set to NULL, or some diff --git a/usr/src/cmd/ldap/ns_ldap/ldapaddent.c b/usr/src/cmd/ldap/ns_ldap/ldapaddent.c index 6c4e83f0b9..0f95da88c5 100644 --- a/usr/src/cmd/ldap/ns_ldap/ldapaddent.c +++ b/usr/src/cmd/ldap/ns_ldap/ldapaddent.c @@ -575,7 +575,7 @@ check_ipaddr(char *addr, char **newaddr) } /* - * Verifies that project name meets the restrictions defined by project(4). + * Verifies that project name meets the restrictions defined by project(5). */ static int check_projname(char *addr) @@ -2357,7 +2357,7 @@ genent_publickey(char *line, int (*cback)()) * {DES} and {DH192-0} means same thing. * However, nisplus uses "DES" and ldap uses "DH192-0" * internally. - * See newkey(1M), __nis_mechalias2authtype() which is + * See newkey(8), __nis_mechalias2authtype() which is * called by __nis_keyalg2authtype() and getkey_ldap_g() */ (void) strlcpy(auth_type, "DH192-0", BUFSIZ+1); diff --git a/usr/src/cmd/ldap/ns_ldap/ldapclient.c b/usr/src/cmd/ldap/ns_ldap/ldapclient.c index c36401f35e..b5fcbccb13 100644 --- a/usr/src/cmd/ldap/ns_ldap/ldapclient.c +++ b/usr/src/cmd/ldap/ns_ldap/ldapclient.c @@ -79,7 +79,7 @@ * generate (gen_profile). (formerly -P) * profileTTL * Client info TTL. If set to 0 this information will not be - * automatically updated by the ldap_cachemgr(1M). + * automatically updated by the ldap_cachemgr(8). * (formerly -e) * proxyDN * Binding DN. Ex. cn=client,ou=people,cd=eng,dc=sun,dc=com @@ -1964,7 +1964,7 @@ usage(void) gettext("<args> take the form of \'-a attrName=attrVal\' as " "described in the\n"), stderr); - CLIENT_FPUTS(gettext("man page: ldapclient(1M)\n"), stderr); + CLIENT_FPUTS(gettext("man page: ldapclient(8)\n"), stderr); } diff --git a/usr/src/cmd/lofiadm/main.c b/usr/src/cmd/lofiadm/main.c index 4a4ee348c0..758632b8ec 100644 --- a/usr/src/cmd/lofiadm/main.c +++ b/usr/src/cmd/lofiadm/main.c @@ -29,7 +29,7 @@ */ /* - * lofiadm - administer lofi(7d). Very simple, add and remove file<->device + * lofiadm - administer lofi(4D). Very simple, add and remove file<->device * associations, and display status. All the ioctls are private between * lofi and lofiadm, and so are very simple - device information is * communicated via a minor number. @@ -1750,7 +1750,7 @@ lofi_compress(int *lfd, const char *filename, int compress_index, /* * Round up the compressed file size to be a multiple of - * DEV_BSIZE. lofi(7D) likes it that way. + * DEV_BSIZE. lofi(4D) likes it that way. */ if ((offset = statbuf.st_size % DEV_BSIZE) > 0) { diff --git a/usr/src/cmd/logadm/conf.c b/usr/src/cmd/logadm/conf.c index 7c82690351..a4275ce378 100644 --- a/usr/src/cmd/logadm/conf.c +++ b/usr/src/cmd/logadm/conf.c @@ -655,7 +655,7 @@ conf_print(FILE *cstream, FILE *tstream) exclude_opts++; /* -P option goes to config file */ } else { (void) fprintf(tstream, gettext( - "# This file holds internal data for logadm(1M).\n" + "# This file holds internal data for logadm(8).\n" "# Do not edit.\n")); } for (cp = Confinfo; cp; cp = cp->cf_next) { diff --git a/usr/src/cmd/logadm/logadm-upgrade b/usr/src/cmd/logadm/logadm-upgrade index e606b32365..04a1114af5 100644 --- a/usr/src/cmd/logadm/logadm-upgrade +++ b/usr/src/cmd/logadm/logadm-upgrade @@ -33,7 +33,7 @@ GREP=/usr/bin/grep # # This is a temporary service to allow addition (only) to /etc/logadm.conf -# It is temporary in the sense that logadm(1M) should have its configuration +# It is temporary in the sense that logadm(8) should have its configuration # migrated to SMF in the future. # diff --git a/usr/src/cmd/logadm/logadm.conf b/usr/src/cmd/logadm/logadm.conf index 7b19473a19..706bcff7b5 100644 --- a/usr/src/cmd/logadm/logadm.conf +++ b/usr/src/cmd/logadm/logadm.conf @@ -23,7 +23,7 @@ # logadm.conf # # Default settings for system log file management. -# The -w option to logadm(1M) is the preferred way to write to this file, +# The -w option to logadm(8) is the preferred way to write to this file, # but if you do edit it by hand, use "logadm -V" to check it for errors. # # The format of lines in this file is: @@ -43,10 +43,10 @@ /var/fm/fmd/fltlog -N -A 6m -s 10m -M '/usr/sbin/fmadm -q rotate fltlog && mv /var/fm/fmd/fltlog.0- $nfile' smf_logs /var/svc/log/*.log -C 8 -s 1m -c # -# The entry below is used by turnacct(1M) +# The entry below is used by turnacct(8) # /var/adm/pacct -C 0 -N -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never # -# The entry below manages the Dynamic Resource Pools daemon (poold(1M)) logfile. +# The entry below manages the Dynamic Resource Pools daemon (poold(8)) logfile. # /var/log/pool/poold -N -s 512k -a 'pkill -HUP poold; true' diff --git a/usr/src/cmd/logadm/tester b/usr/src/cmd/logadm/tester index 742bc03209..242df62cdf 100644 --- a/usr/src/cmd/logadm/tester +++ b/usr/src/cmd/logadm/tester @@ -274,7 +274,7 @@ sub set_testconffile { # logadm.conf # # Default settings for system log file management. -# The -w option to logadm(1M) is the preferred way to write to this file, +# The -w option to logadm(8) is the preferred way to write to this file, # but if you do edit it by hand, use "logadm -V" to check it for errors. # # The format of lines in this file is: @@ -290,7 +290,7 @@ sub set_testconffile { /var/cron/log -s 512k -t /var/cron/olog /var/lp/logs/lpsched -C 2 -N -t '$file.$N' # -# The entry below is used by turnacct(1M) +# The entry below is used by turnacct(8) # /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never apache -C 24 -a '/usr/apache/bin/apachectl graceful' -p 1m -t '/var/apache/old-logs/$basename.%Y-%m' '/var/apache/logs/*{access,error}_log' @@ -1171,7 +1171,7 @@ sub logadm7 { # this comment # has at least another #-sign in it #... # # Default settings for system log file management. -# The -w option to logadm(1M) is the preferred way to write to this file, +# The -w option to logadm(8) is the preferred way to write to this file, # but if you do edit it by hand, use "logadm -V" to check it for errors. # but if you do edit it by hand, use "logadm -V" to check it for errors. # @@ -1187,7 +1187,7 @@ sub logadm7 { dir1/syslog -C 8 -a 'echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out' dir2/messages -C 4 -a 'echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out' # -# The entry below is used by turnacct(1M) +# The entry below is used by turnacct(8) # /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never EOF @@ -1202,7 +1202,7 @@ second kill -HUP $pid EOF set_file('sed.out.expect', <<'EOF'); -# This file holds internal data for logadm(1M). +# This file holds internal data for logadm(8). # Do not edit. dir1/syslog dir2/messages @@ -1382,7 +1382,7 @@ dir2/messages -P '$lessthanweek' EOF set_file('sed.out.expect', <<"EOF"); -# This file holds internal data for logadm(1M). +# This file holds internal data for logadm(8). # Do not edit. dir1/syslog dir2/log @@ -1740,7 +1740,7 @@ sub logadm14 { # logadm.conf # # Default settings for system log file management. -# The -w option to logadm(1M) is the preferred way to write to this file, +# The -w option to logadm(8) is the preferred way to write to this file, # but if you do edit it by hand, use "logadm -V" to check it for errors. # but if you do edit it by hand, use "logadm -V" to check it for errors. # @@ -1756,7 +1756,7 @@ sub logadm14 { dir1/syslog -C 8 -a 'echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out' dir2/messages -C 4 -a 'echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out' # -# The entry below is used by turnacct(1M) +# The entry below is used by turnacct(8) # /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never EOF @@ -2155,7 +2155,7 @@ dir3/test.log -A 3d EOF set_file('logadm.timestamps', <<'EOF'); -# This file holds internal data for logadm(1M). +# This file holds internal data for logadm(8). # Do not edit. dir1/foo.log -P 'Thu Nov 1 16:56:42 2001' dir2/test.log -P 'Thu Nov 1 16:56:42 2001' @@ -2194,7 +2194,7 @@ wildcard_test -A 3d dir1/*.log EOF set_file('logadm.timestamps', <<'EOF'); -# This file holds internal data for logadm(1M). +# This file holds internal data for logadm(8). # Do not edit. dir1/foo.log -P 'Thu Nov 1 16:56:42 2001' dir2/test.log -P 'Thu Nov 1 16:56:42 2001' diff --git a/usr/src/cmd/login/login.dfl b/usr/src/cmd/login/login.dfl index 13ecd51113..e2913bcf55 100644 --- a/usr/src/cmd/login/login.dfl +++ b/usr/src/cmd/login/login.dfl @@ -87,8 +87,8 @@ SYSLOG=YES # RETRIES determines the number of failed logins that will be # allowed before login exits. Default is 5 and maximum is 15. -# If account locking is configured (user_attr(4)/policy.conf(4)) -# for a local user's account (passwd(4)/shadow(4)), that account +# If account locking is configured (user_attr(5)/policy.conf(5)) +# for a local user's account (passwd(5)/shadow(5)), that account # will be locked if failed logins equals or exceeds RETRIES. # #RETRIES=5 diff --git a/usr/src/cmd/login/logindevperm.sh b/usr/src/cmd/login/logindevperm.sh index d02ff2aeca..32ff330877 100644 --- a/usr/src/cmd/login/logindevperm.sh +++ b/usr/src/cmd/login/logindevperm.sh @@ -51,7 +51,7 @@ cat <<EOM # ending in "/*", such as "/dev/fbs/*", specifies all entries (except "." # and "..") in a directory. A '#' begins a comment and may appear # anywhere in an entry. -# In addition, regular expressions may be used. Refer to logindevperm(4) +# In addition, regular expressions may be used. Refer to logindevperm(5) # man page. # Note that any changes in this file should be made when logged in as # root as devfs provides persistence on minor node attributes. diff --git a/usr/src/cmd/lp/crontab/lp b/usr/src/cmd/lp/crontab/lp index 610cf71a44..dad7bcf43c 100644 --- a/usr/src/cmd/lp/crontab/lp +++ b/usr/src/cmd/lp/crontab/lp @@ -22,7 +22,7 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" + # # At 03:13am on Sundays: # Move a weeks worth of 'requests' to 'requests.1'. @@ -31,5 +31,5 @@ # 13 3 * * 0 cd /var/lp/logs; if [ -f requests ]; then if [ -f requests.1 ]; then /bin/mv requests.1 requests.2; fi; /usr/bin/cp requests requests.1; >requests; fi # -# Rotating of the "lpsched" log files is handled by logadm(1M). +# Rotating of the "lpsched" log files is handled by logadm(8). # diff --git a/usr/src/cmd/lp/filter/postscript/postio/parallel.c b/usr/src/cmd/lp/filter/postscript/postio/parallel.c index a8bca7e41e..75c1cee7a4 100644 --- a/usr/src/cmd/lp/filter/postscript/postio/parallel.c +++ b/usr/src/cmd/lp/filter/postscript/postio/parallel.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - extern char *postbegin; #include <stdio.h> @@ -101,7 +99,7 @@ char *BppState(int state) static char buf[BUFSIZ]; memset(buf, 0, sizeof(buf)); - sprintf(buf, "State (0x%.4x) - (%s%s%s%s)\n", state, + sprintf(buf, "State (0x%.4x) - (%s%s%s%s)\n", state, ((state & BPP_SLCT_ERR) ? "offline " : ""), ((state & BPP_BUSY_ERR) ? "busy " : ""), ((state & BPP_PE_ERR) ? "paper " : ""), @@ -121,10 +119,10 @@ int bpp_state(int fd) exit(PRINTER_IO_ERROR); state = bpp_stat.pin_status; -#if defined(DEBUG) && defined(NOTDEF) +#if defined(DEBUG) && defined(NOTDEF) logit("%s", BppState(state)); #endif - + if (state == (BPP_PE_ERR | BPP_ERR_ERR | BPP_SLCT_ERR)) { /* paper is out */ return(PRINTER_ERROR_PAPER_OUT); @@ -148,7 +146,7 @@ int bpp_state(int fd) return(0); } -int +int get_ecpp_status(int fd) { int state; @@ -179,7 +177,7 @@ get_ecpp_status(int fd) } /** - * For prnio(7I) - generic printer interface + * For prnio(4I) - generic printer interface **/ int is_a_prnio(int fd) { @@ -235,7 +233,7 @@ int prnio_state(int fd) } return(0); } - + /** * Common routines **/ diff --git a/usr/src/cmd/lp/include/lp.h b/usr/src/cmd/lp/include/lp.h index a07acfd494..81a11f88b6 100644 --- a/usr/src/cmd/lp/include/lp.h +++ b/usr/src/cmd/lp/include/lp.h @@ -240,7 +240,7 @@ typedef struct FALERT { although a common cause is that the printer's buffer capacity\n\ was exceeded. Using XON/XOFF flow control, adding carriage-return\n\ delays, or lowering the baud rate may fix the problem.\n\ -See stty(1) and lpadmin(1M) man-pages for help in doing this.\n" +See stty(1) and lpadmin(8) man-pages for help in doing this.\n" #define PIPE_FAULT \ "The output ``port'', a FIFO, was closed before all output was written.\n" @@ -266,7 +266,7 @@ See stty(1) and lpadmin(1M) man-pages for help in doing this.\n" #define LP_EKEYWORD 12 #define LP_EPATTERN 13 #define LP_ERESULT 14 -#define LP_EREGEX 15 /* and see extern int regerrno, regexpr(3G) */ +#define LP_EREGEX 15 /* and see extern int regerrno, regexpr(3GEN) */ #define LP_ENOMEM 99 extern int lp_errno; diff --git a/usr/src/cmd/lp/lib/oam/msg.source b/usr/src/cmd/lp/lib/oam/msg.source index d0650c00cf..4c762fed65 100644 --- a/usr/src/cmd/lp/lib/oam/msg.source +++ b/usr/src/cmd/lp/lib/oam/msg.source @@ -19,8 +19,6 @@ * CDDL HEADER END */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -344,7 +342,7 @@ E_FL_BADTEMPLATE "There appears to be an incomplete option\ntemplate. This can be caused by a double\ncomma in the option list. Resubmit the\nentire input." E_FL_BADKEY "Unrecognized keyword in option template." - "Resubmit the entire input. Check the\nlpfilter(1M) manual page for the list of\nvalid keywords." + "Resubmit the entire input. Check the\nlpfilter(8) manual page for the list of\nvalid keywords." E_FL_BADPATT "Missing pattern in option template." "Resubmit the entire input; make sure all\noption templates include a keyword,\npattern, and replacement:\nkeyword pattern = replacement\n(e.g. MODES * = -m *)." diff --git a/usr/src/cmd/lp/model/lp.cat.c b/usr/src/cmd/lp/model/lp.cat.c index 1b94b0afd8..8575427c50 100644 --- a/usr/src/cmd/lp/model/lp.cat.c +++ b/usr/src/cmd/lp/model/lp.cat.c @@ -196,7 +196,7 @@ get_ecpp_status(int fd) } /* - * For prnio(7I) - generic printer interface + * For prnio(4I) - generic printer interface */ int is_a_prnio(int fd) diff --git a/usr/src/cmd/mailwrapper/mailer.conf b/usr/src/cmd/mailwrapper/mailer.conf index fc17c7e16d..9abfb6ab9d 100644 --- a/usr/src/cmd/mailwrapper/mailer.conf +++ b/usr/src/cmd/mailwrapper/mailer.conf @@ -1,7 +1,7 @@ # -# This file configures mailwrapper(1M). -# For details see mailer.conf(4). -# The following configuration is correct for sendmail(1M). +# This file configures mailwrapper(8). +# For details see mailer.conf(5). +# The following configuration is correct for sendmail(8). # sendmail /usr/lib/smtp/sendmail/sendmail diff --git a/usr/src/cmd/mailx/hdr/rcv.h b/usr/src/cmd/mailx/hdr/rcv.h index ba68da067f..d61639d5d2 100644 --- a/usr/src/cmd/mailx/hdr/rcv.h +++ b/usr/src/cmd/mailx/hdr/rcv.h @@ -33,8 +33,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * mailx -- a modified version of a University of California at Berkeley * mail program @@ -44,7 +42,7 @@ */ /*#define USG 1 */ /* System V */ -#define USG_TTY 1 /* termio(7) */ +#define USG_TTY 1 /* termio(4I) */ #include "def.h" #include "glob.h" diff --git a/usr/src/cmd/mandoc/mandoc_msg.c b/usr/src/cmd/mandoc/mandoc_msg.c index edd804d9a3..beec5059a2 100644 --- a/usr/src/cmd/mandoc/mandoc_msg.c +++ b/usr/src/cmd/mandoc/mandoc_msg.c @@ -58,7 +58,7 @@ static const char *const type_message[MANDOCERR_MAX] = { "generic style suggestion", - "legacy man(5) date format", + "legacy man(7) date format", "normalizing date format to", "lower case character in document title", "duplicate RCS id", @@ -257,7 +257,7 @@ static const char *const type_message[MANDOCERR_MAX] = { "bad option value", "duplicate option value", "no such tag", - "-Tmarkdown unsupported for man(5) input", + "-Tmarkdown unsupported for man(7) input", /* system errors */ NULL, diff --git a/usr/src/cmd/mdb/common/mdb/mdb_cmds.c b/usr/src/cmd/mdb/common/mdb/mdb_cmds.c index 9936745bb9..9b42344351 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_cmds.c +++ b/usr/src/cmd/mdb/common/mdb/mdb_cmds.c @@ -1738,7 +1738,7 @@ showrev_objectversions(int showall) } /* - * Display information similar to what showrev(1M) displays when invoked + * Display information similar to what showrev(8) displays when invoked * with no arguments. */ static int @@ -1755,7 +1755,7 @@ showrev_sysinfo(void) } /* - * Match the order of the showrev(1M) output and put "Application + * Match the order of the showrev(8) output and put "Application * architecture" before "Kernel version" */ if ((s = mdb_tgt_isa(mdb.m_target)) != NULL) diff --git a/usr/src/cmd/mdb/common/mdb/mdb_io.c b/usr/src/cmd/mdb/common/mdb/mdb_io.c index 752c6f5c35..988fc7aa71 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_io.c +++ b/usr/src/cmd/mdb/common/mdb/mdb_io.c @@ -1168,8 +1168,8 @@ iob_getvar(const char *s, size_t len) /* * The iob_doprnt function forms the main engine of the debugger's output * formatting capabilities. Note that this is NOT exactly compatible with - * the printf(3S) family, nor is it intended to be so. We support some - * extensions and format characters not supported by printf(3S), and we + * the printf(3C) family, nor is it intended to be so. We support some + * extensions and format characters not supported by printf(3C), and we * explicitly do NOT provide support for %C, %S, %ws (wide-character strings), * do NOT provide for the complete functionality of %f, %e, %E, %g, %G * (alternate double formats), and do NOT support %.x (precision specification). diff --git a/usr/src/cmd/mdb/common/mdb/mdb_target.c b/usr/src/cmd/mdb/common/mdb/mdb_target.c index 29339f734f..57d91ba3dd 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_target.c +++ b/usr/src/cmd/mdb/common/mdb/mdb_target.c @@ -92,7 +92,7 @@ * +------------------------------+ * * The MDB execution control model is based upon the synchronous debugging - * model exported by Solaris proc(4). A target program is set running or the + * model exported by Solaris proc(5). A target program is set running or the * debugger is attached to a running target. On ISTOP (stop on event of * interest), one target thread is selected as the representative. The * algorithm for selecting the representative is target-specific, but we assume diff --git a/usr/src/cmd/mdb/common/mdb/mdb_termio.c b/usr/src/cmd/mdb/common/mdb/mdb_termio.c index f1d0f55654..1a951ead65 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_termio.c +++ b/usr/src/cmd/mdb/common/mdb/mdb_termio.c @@ -45,7 +45,7 @@ * response to editing commands. * * The terminal backend is also responsible for maintaining and manipulating - * the settings (see stty(1) and termio(7I)) associated with the terminal. + * the settings (see stty(1) and termio(4I)) associated with the terminal. * The debugger makes use of four distinct sets of terminal attributes: * * (1) the settings used by the debugger's parent process (tio_ptios), @@ -834,7 +834,7 @@ termio_resume_tty(termio_data_t *td, struct termios *iosp) warn("failed to reset terminal attributes"); /* - * Compute the terminal speed as described in termio(7I), and then + * Compute the terminal speed as described in termio(4I), and then * look up the corresponding microseconds-per-char in our table. */ if (ntios->c_cflag & CBAUDEXT) @@ -926,7 +926,7 @@ termio_delay(termio_data_t *td, uint_t usec) } /* - * Parse the terminfo(4) padding sequence "$<...>" and delay for the specified + * Parse the terminfo(5) padding sequence "$<...>" and delay for the specified * amount of time by sending pad characters to the terminal. */ static const char * @@ -1020,7 +1020,7 @@ termio_puts(termio_data_t *td, const char *s, uint_t lines) /* * Print a padded escape sequence string to the terminal. The caller specifies * the string 's' and a count of the affected lines. If the string contains an - * embedded delay sequence delimited by "$<>" (see terminfo(4)), appropriate + * embedded delay sequence delimited by "$<>" (see terminfo(5)), appropriate * padding will be included in the output. We determine whether or not padding * is required during initialization, and set tio_putp to the proper subroutine. */ @@ -1476,7 +1476,7 @@ termio_setup_attrs(termio_data_t *td, const char *name) * While "xenl" doesn't dictate our TIO_AUTOWRAP setting, it does have * a subtle impact on the way we process input: in addition to its * eponymous behavior of eating newlines, "xenl" denotes a second, - * entirely orthogonal idiosyncracy. As terminfo(4) tells it: "Those + * entirely orthogonal idiosyncracy. As terminfo(5) tells it: "Those * terminals whose cursor remains on the right-most column until * another character has been received, rather than wrapping * immediately upon receiving the right- most character, such as the diff --git a/usr/src/cmd/mdb/common/mdb/mdb_typedef.c b/usr/src/cmd/mdb/common/mdb/mdb_typedef.c index bff36274a3..4d2ed85bfd 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_typedef.c +++ b/usr/src/cmd/mdb/common/mdb/mdb_typedef.c @@ -729,7 +729,7 @@ static char typedef_desc[] = "All built up definitions may be exported as a valid CTF container that can\n" "be used again with ::typedef -r or anything that uses libctf. To write them\n" "out, use ::typedef -w and specify the name of a file. For more information\n" -"on the CTF file format, see ctf(4).\n" +"on the CTF file format, see ctf(5).\n" "\n"; static char typedef_opts[] = diff --git a/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c b/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c index 8acc470844..aaf430f82d 100644 --- a/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c +++ b/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c @@ -84,7 +84,7 @@ dtrace_help(void) mdb_printf("Given a dtrace_state_t structure that represents a " "DTrace consumer, prints\n" - "dtrace(1M)-like output for in-kernel DTrace data. (The " + "dtrace(8)-like output for in-kernel DTrace data. (The " "dtrace_state_t\n" "structures for all DTrace consumers may be obtained by running " "the \n" @@ -1653,7 +1653,7 @@ dtrace_state_help(void) "no state structure is provided, iterates\nover all state " "structures.\n\n" "Addresses in ADDR column may be provided to ::dtrace to obtain\n" - "dtrace(1M)-like output for in-kernel DTrace data.\n"); + "dtrace(8)-like output for in-kernel DTrace data.\n"); } int @@ -2764,7 +2764,7 @@ dtrace_probes(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) const mdb_dcmd_t kernel_dcmds[] = { { "id2probe", ":", "translate a dtrace_id_t to a dtrace_probe_t", id2probe }, - { "dtrace", ":[-c cpu]", "print dtrace(1M)-like output", + { "dtrace", ":[-c cpu]", "print dtrace(8)-like output", dtrace, dtrace_help }, { "dtrace_errhash", ":", "print DTrace error hash", dtrace_errhash }, { "dtrace_helptrace", ":", "print DTrace helper trace", diff --git a/usr/src/cmd/mdb/common/modules/genunix/genunix.c b/usr/src/cmd/mdb/common/modules/genunix/genunix.c index 2ef51166f6..32273e11a9 100644 --- a/usr/src/cmd/mdb/common/modules/genunix/genunix.c +++ b/usr/src/cmd/mdb/common/modules/genunix/genunix.c @@ -2492,7 +2492,7 @@ kgrep_subr(kgrep_cb_func *cb, void *cbdata) if (mdb_get_state() == MDB_STATE_RUNNING) { mdb_warn("kgrep can only be run on a system " - "dump or under kmdb; see dumpadm(1M)\n"); + "dump or under kmdb; see dumpadm(8)\n"); return (DCMD_ERR); } @@ -4050,7 +4050,7 @@ panicinfo(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) if (!mdb_prop_postmortem) { mdb_warn("panicinfo can only be run on a system " - "dump; see dumpadm(1M)\n"); + "dump; see dumpadm(8)\n"); return (DCMD_ERR); } diff --git a/usr/src/cmd/mdb/common/modules/genunix/kmem.c b/usr/src/cmd/mdb/common/modules/genunix/kmem.c index 87ae1430f9..7bc93f0d84 100644 --- a/usr/src/cmd/mdb/common/modules/genunix/kmem.c +++ b/usr/src/cmd/mdb/common/modules/genunix/kmem.c @@ -1010,7 +1010,7 @@ kmem_read_magazines(kmem_cache_t *cp, uintptr_t addr, int ncpus, * list plus at most two magazines per CPU (the loaded and the * spare). Toss in 100 magazines as a fudge factor in case this * is live (the number "100" comes from the same fudge factor in - * crash(1M)). + * crash(8)). */ magmax = (cp->cache_full.ml_total + 2 * ncpus + 100) * magsize; magbsize = offsetof(kmem_magazine_t, mag_round[magsize]); @@ -3937,7 +3937,7 @@ kmalog(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) } /* - * As the final lure for die-hard crash(1M) users, we provide ::kmausers here. + * As the final lure for die-hard crash(8) users, we provide ::kmausers here. * The first piece is a structure which we use to accumulate kmem_cache_t * addresses of interest. The kmc_add is used as a callback for the kmem_cache * walker; we either add all caches, or ones named explicitly as arguments. diff --git a/usr/src/cmd/mdb/common/modules/genunix/leaky_subr.c b/usr/src/cmd/mdb/common/modules/genunix/leaky_subr.c index 4f69c2f7bf..f435ce4646 100644 --- a/usr/src/cmd/mdb/common/modules/genunix/leaky_subr.c +++ b/usr/src/cmd/mdb/common/modules/genunix/leaky_subr.c @@ -382,7 +382,7 @@ leaky_subr_estimate(size_t *estp) if ((state = mdb_get_state()) == MDB_STATE_RUNNING) { mdb_warn("findleaks: can only be run on a system " - "dump or under kmdb; see dumpadm(1M)\n"); + "dump or under kmdb; see dumpadm(8)\n"); return (DCMD_ERR); } diff --git a/usr/src/cmd/mdb/common/modules/genunix/typegraph.c b/usr/src/cmd/mdb/common/modules/genunix/typegraph.c index ad68c39279..ea97c78460 100644 --- a/usr/src/cmd/mdb/common/modules/genunix/typegraph.c +++ b/usr/src/cmd/mdb/common/modules/genunix/typegraph.c @@ -2383,7 +2383,7 @@ typegraph(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) if (!mdb_prop_postmortem) { mdb_warn("typegraph: can only be run on a system " - "dump; see dumpadm(1M)\n"); + "dump; see dumpadm(8)\n"); return (DCMD_ERR); } diff --git a/usr/src/cmd/mdb/common/modules/libumem/misc.c b/usr/src/cmd/mdb/common/modules/libumem/misc.c index 8f07d475df..e72c41ee91 100644 --- a/usr/src/cmd/mdb/common/modules/libumem/misc.c +++ b/usr/src/cmd/mdb/common/modules/libumem/misc.c @@ -44,7 +44,7 @@ umem_debug(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) /* * To further confuse the issue, this dmod can run against either - * libumem.so.1 *or* the libstandumem.so linked into kmdb(1M). To figure + * libumem.so.1 *or* the libstandumem.so linked into kmdb(1). To figure * out which one we are working against, we look up "umem_alloc" in both * libumem.so and the executable. * diff --git a/usr/src/cmd/mdb/common/modules/libumem/umem.c b/usr/src/cmd/mdb/common/modules/libumem/umem.c index a1b3df481b..85fd2abcd6 100644 --- a/usr/src/cmd/mdb/common/modules/libumem/umem.c +++ b/usr/src/cmd/mdb/common/modules/libumem/umem.c @@ -927,7 +927,7 @@ umem_read_magazines(umem_cache_t *cp, uintptr_t addr, * list plus at most two magazines per CPU (the loaded and the * spare). Toss in 100 magazines as a fudge factor in case this * is live (the number "100" comes from the same fudge factor in - * crash(1M)). + * crash(8)). */ magmax = (cp->cache_full.ml_total + 2 * umem_max_ncpus + 100) * magsize; magbsize = offsetof(umem_magazine_t, mag_round[magsize]); @@ -3543,7 +3543,7 @@ umalog(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) } /* - * As the final lure for die-hard crash(1M) users, we provide ::umausers here. + * As the final lure for die-hard crash(8) users, we provide ::umausers here. * The first piece is a structure which we use to accumulate umem_cache_t * addresses of interest. The umc_add is used as a callback for the umem_cache * walker; we either add all caches, or ones named explicitly as arguments. diff --git a/usr/src/cmd/mdb/common/modules/sockfs/sockfs.c b/usr/src/cmd/mdb/common/modules/sockfs/sockfs.c index 01e888657f..3fb06bcacf 100644 --- a/usr/src/cmd/mdb/common/modules/sockfs/sockfs.c +++ b/usr/src/cmd/mdb/common/modules/sockfs/sockfs.c @@ -143,7 +143,7 @@ sockparams_help(void) mdb_printf("Print sockparams information for a give sockparams ptr.\n" "Without the address, list available sockparams. Default " "behavior is to list only entries that were installed by the " - "admin (via soconfig(1M)).\n\n" + "admin (via soconfig(8)).\n\n" "Options:\n" " -e:\t\tlist ephemeral sockparams\n" " -E:\t\tonly list ephemeral sockparams\n"); diff --git a/usr/src/cmd/mdb/i86pc/modules/uppc/uppc.c b/usr/src/cmd/mdb/i86pc/modules/uppc/uppc.c index d3ebde66b3..09146f4247 100644 --- a/usr/src/cmd/mdb/i86pc/modules/uppc/uppc.c +++ b/usr/src/cmd/mdb/i86pc/modules/uppc/uppc.c @@ -57,7 +57,7 @@ interrupt_print_bus(uintptr_t dip_addr) /* * uppc_interrupt_dump: - * Dump uppc(7d) interrupt information. + * Dump uppc(4D) interrupt information. */ /* ARGSUSED */ int diff --git a/usr/src/cmd/mdb/i86xpv/modules/xpv_uppc/xpv_uppc.c b/usr/src/cmd/mdb/i86xpv/modules/xpv_uppc/xpv_uppc.c index f5b4144285..eea3573477 100644 --- a/usr/src/cmd/mdb/i86xpv/modules/xpv_uppc/xpv_uppc.c +++ b/usr/src/cmd/mdb/i86xpv/modules/xpv_uppc/xpv_uppc.c @@ -286,7 +286,7 @@ ec_interrupt_dump(int i) /* * uppc_interrupt_dump: - * Dump uppc(7d) interrupt information. + * Dump uppc(4D) interrupt information. */ /* ARGSUSED */ int @@ -308,8 +308,8 @@ xen_uppc_interrupt_dump(uintptr_t addr, uint_t flags, int argc, return (DCMD_ERR); /* - * By default, on all x86 systems ::interrupts from xen_uppc(7d) gets - * loaded first. For APIC systems the ::interrupts from xpv_psm(7d) + * By default, on all x86 systems ::interrupts from xen_uppc(4D) gets + * loaded first. For APIC systems the ::interrupts from xpv_psm(4D) * ought to be executed. Confusion stems as both modules export the * same dcmd. */ @@ -407,8 +407,8 @@ evtchns_dump(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) return (DCMD_ERR); /* - * By default, on all x86 systems ::evtchns from xen_uppc(7d) gets - * loaded first. For APIC systems the ::evtchns from xpv_psm(7d) + * By default, on all x86 systems ::evtchns from xen_uppc(4D) gets + * loaded first. For APIC systems the ::evtchns from xpv_psm(4D) * ought to be executed. Confusion stems as both modules export the * same dcmd. */ diff --git a/usr/src/cmd/modload/extra_privs b/usr/src/cmd/modload/extra_privs index efce95ad52..8b444f400a 100644 --- a/usr/src/cmd/modload/extra_privs +++ b/usr/src/cmd/modload/extra_privs @@ -22,11 +22,11 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" + # # File which defines additional driver specific privileges. # -# This file is loaded by devfsadm(1m) at system boot. +# This file is loaded by devfsadm(8) at system boot. # -# DO NOT EDIT. This file is maintained by add_drv(1m), -# rem_drv(1m) and update_drv(1m). +# DO NOT EDIT. This file is maintained by add_drv(8), +# rem_drv(8) and update_drv(8). diff --git a/usr/src/cmd/modload/rem_drv.c b/usr/src/cmd/modload/rem_drv.c index 14b6d45959..d155a01336 100644 --- a/usr/src/cmd/modload/rem_drv.c +++ b/usr/src/cmd/modload/rem_drv.c @@ -131,7 +131,7 @@ main(int argc, char *argv[]) exit(1); } - /* must be only running version of add_drv/mod_drv/rem_drv */ + /* must be only running version of add_drv/update_drv/rem_drv */ enter_lock(); if ((check_perms_aliases(1, 1)) == ERROR) diff --git a/usr/src/cmd/mpathadm/mpathadm.c b/usr/src/cmd/mpathadm/mpathadm.c index 85256368b1..cf2a231762 100644 --- a/usr/src/cmd/mpathadm/mpathadm.c +++ b/usr/src/cmd/mpathadm/mpathadm.c @@ -3399,7 +3399,7 @@ main(int argc, char *argv[]) ret = cmdParse(argc, argv, /* SUB_COMMAND_ISSUED, */ synTables, subcommandArgs, &funcRet); if (ret == 1) { - (void) fprintf(stdout, "%s %s(1M)\n", + (void) fprintf(stdout, "%s %s(8)\n", getTextString(TEXT_MORE_INFO), cmdName); return (ERROR_CLI_FAILED); } else if (ret == -1) { diff --git a/usr/src/cmd/netfiles/nsswitch.ad b/usr/src/cmd/netfiles/nsswitch.ad index bec5c72c2d..a7d7b0c5ad 100644 --- a/usr/src/cmd/netfiles/nsswitch.ad +++ b/usr/src/cmd/netfiles/nsswitch.ad @@ -29,10 +29,10 @@ # uses Microsoft's Active Directory (AD) for passwd and group; DNS for # hosts lookups; and files for the remaining databases. # -# AD name service currently only supports passwd(4) and group(4) +# AD name service currently only supports passwd(5) and group(5) # databases. # -# Other name service databases such as audit_user(4) and user_attr(4) +# Other name service databases such as audit_user(5) and user_attr(5) # that follow passwd entry in nsswitch.conf are not supported by AD. # If the AD backend is processed (based on the configuration) it will # return NOT FOUND for these databases. diff --git a/usr/src/cmd/netfiles/nsswitch.dns b/usr/src/cmd/netfiles/nsswitch.dns index cb58c3bc0a..c649f1e8b9 100644 --- a/usr/src/cmd/netfiles/nsswitch.dns +++ b/usr/src/cmd/netfiles/nsswitch.dns @@ -38,8 +38,8 @@ passwd: files group: files # You must also set up the /etc/resolv.conf file for DNS name -# server lookup. See resolv.conf(4). For lookup via mdns -# svc:/network/dns/multicast:default must also be enabled. See mdnsd(1M) +# server lookup. See resolv.conf(5). For lookup via mdns +# svc:/network/dns/multicast:default must also be enabled. See mdnsd(8) hosts: files dns mdns # Note that IPv4 addresses are searched for in all of the ipnodes databases diff --git a/usr/src/cmd/nsadmin/system b/usr/src/cmd/nsadmin/system index 29da0b787c..542788923e 100644 --- a/usr/src/cmd/nsadmin/system +++ b/usr/src/cmd/nsadmin/system @@ -30,7 +30,7 @@ * files in /etc/system.d are combined in alphabetical order and read by * the kernel before this file (/etc/system) is processed. * -* Refer to the system(4) manual page for more information and +* Refer to the system(5) manual page for more information and * recommendations on naming fragment files. * * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! NOTE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -95,7 +95,7 @@ * set: * * Set an integer variable in the kernel or a module to a new value. -* This facility should be used with caution. See system(4). +* This facility should be used with caution. See system(5). * * Examples: * diff --git a/usr/src/cmd/nscd/nscd_switch.c b/usr/src/cmd/nscd/nscd_switch.c index 40f0e5da62..5234debbde 100644 --- a/usr/src/cmd/nscd/nscd_switch.c +++ b/usr/src/cmd/nscd/nscd_switch.c @@ -771,7 +771,7 @@ nss_search(nss_db_root_t *rootp, nss_db_initf_t initf, int search_fnum, /* * If no privilege to look up, skip. - * 'files' requires PRIV_FILE_DAC_READ to read shadow(4) data, + * 'files' requires PRIV_FILE_DAC_READ to read shadow(5) data, * 'ldap' requires all zones privilege. */ if (params.privdb == 1 && swret != NULL) { diff --git a/usr/src/cmd/nvmeadm/nvmeadm.c b/usr/src/cmd/nvmeadm/nvmeadm.c index e177e04d82..80f63b0767 100644 --- a/usr/src/cmd/nvmeadm/nvmeadm.c +++ b/usr/src/cmd/nvmeadm/nvmeadm.c @@ -158,13 +158,13 @@ static const nvmeadm_cmd_t nvmeadm_cmds[] = { }, { "detach", - "detach blkdev(7d) from namespace(s) of a controller", + "detach blkdev(4D) from namespace(s) of a controller", NULL, do_attach_detach, usage_attach_detach, B_FALSE }, { "attach", - "attach blkdev(7d) to namespace(s) of a controller", + "attach blkdev(4D) to namespace(s) of a controller", NULL, do_attach_detach, usage_attach_detach, B_FALSE }, @@ -1213,7 +1213,7 @@ static void usage_attach_detach(const char *c_name) { (void) fprintf(stderr, "%s <ctl>[/<ns>]\n\n" - " %c%s blkdev(7d) %s one or all namespaces of the " + " %c%s blkdev(4D) %s one or all namespaces of the " "specified NVMe controller.\n", c_name, toupper(c_name[0]), &c_name[1], c_name[0] == 'd' ? "from" : "to"); diff --git a/usr/src/cmd/oamuser/user/messages.c b/usr/src/cmd/oamuser/user/messages.c index a0e0661a03..2345923dc0 100644 --- a/usr/src/cmd/oamuser/user/messages.c +++ b/usr/src/cmd/oamuser/user/messages.c @@ -68,7 +68,7 @@ char *errmsgs[] = { "ERROR: Unable to %s: %s.\n", "ERROR: %s is not a full path name. Choose another.\n", "ERROR: %s is the primary group name. Choose another.\n", - "ERROR: Inconsistent password files. See pwconv(1M).\n", + "ERROR: Inconsistent password files. See pwconv(8).\n", "ERROR: %s is not a local user.\n", "ERROR: Permission denied.\n", "WARNING: Group entry exceeds 2048 char: /etc/group entry truncated.\n", diff --git a/usr/src/cmd/oamuser/user/messages.h b/usr/src/cmd/oamuser/user/messages.h index 5e208574f2..c01708320b 100644 --- a/usr/src/cmd/oamuser/user/messages.h +++ b/usr/src/cmd/oamuser/user/messages.h @@ -98,7 +98,7 @@ extern void errmsg(int, ...); /* ERROR: %s is the primary group name. Choose another. */ #define M_SAME_GRP 20 -/* ERROR: Inconsistent password files. See pwconv(1M). */ +/* ERROR: Inconsistent password files. See pwconv(8). */ #define M_HOSED_FILES 21 /* ERROR: %s is not a local user. */ diff --git a/usr/src/cmd/oamuser/user/useradd.c b/usr/src/cmd/oamuser/user/useradd.c index de4f97e953..156402db91 100644 --- a/usr/src/cmd/oamuser/user/useradd.c +++ b/usr/src/cmd/oamuser/user/useradd.c @@ -76,10 +76,10 @@ * base_dir - a directory * login - a string of printable chars except colon(:) * authorization - One or more comma separated authorizations defined - * in auth_attr(4). + * in auth_attr(5). * profile - One or more comma separated execution profiles defined - * in prof_attr(4) - * role - One or more comma-separated role names defined in user_attr(4) + * in prof_attr(5) + * role - One or more comma-separated role names defined in user_attr(5) * project - One or more comma-separated project names or numbers * */ diff --git a/usr/src/cmd/oamuser/user/usermod.c b/usr/src/cmd/oamuser/user/usermod.c index 0264660fe3..91c8d2a44f 100644 --- a/usr/src/cmd/oamuser/user/usermod.c +++ b/usr/src/cmd/oamuser/user/usermod.c @@ -74,11 +74,11 @@ * inactive - number of days a login maybe inactive before it is locked * expire - date when a login is no longer valid * authorization - One or more comma separated authorizations defined - * in auth_attr(4). + * in auth_attr(5). * profile - One or more comma separated execution profiles defined - * in prof_attr(4) - * role - One or more comma-separated role names defined in user_attr(4) - * key=value - One or more -K options each specifying a valid user_attr(4) + * in prof_attr(5) + * role - One or more comma-separated role names defined in user_attr(5) + * key=value - One or more -K options each specifying a valid user_attr(5) * attribute. * */ diff --git a/usr/src/cmd/passwd/passwd.dfl b/usr/src/cmd/passwd/passwd.dfl index baa3c705fe..a6fd54ea8d 100644 --- a/usr/src/cmd/passwd/passwd.dfl +++ b/usr/src/cmd/passwd/passwd.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. @@ -42,13 +41,13 @@ PASSLENGTH=6 # The maximum value of HISTORY is 26. # # This flag is only enforced for user accounts defined in the -# local passwd(4)/shadow(4) files. +# local passwd(5)/shadow(5) files. # #HISTORY=0 # # Password complexity tunables. The values listed are the defaults # which are compatible with previous releases of passwd. -# See passwd(1) and pam_authtok_check(5) for use warnings and +# See passwd(1) and pam_authtok_check(7) for use warnings and # discussion of the use of these options. # #MINDIFF=3 @@ -64,8 +63,8 @@ PASSLENGTH=6 # # passwd performs dictionary lookups if DICTIONLIST or DICTIONDBDIR # is defined. If the password database does not yet exist, it is -# created by passwd. See passwd(1), pam_authtok_check(5) and -# mkpwdict(1M) for more information. +# created by passwd. See passwd(1), pam_authtok_check(7) and +# mkpwdict(8) for more information. # #DICTIONLIST= #DICTIONDBDIR=/var/passwd diff --git a/usr/src/cmd/pcidr/pcidr_common.c b/usr/src/cmd/pcidr/pcidr_common.c index 31f198520c..eb919c0e90 100644 --- a/usr/src/cmd/pcidr/pcidr_common.c +++ b/usr/src/cmd/pcidr/pcidr_common.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -51,7 +49,7 @@ * * Be careful of some priorities (facility + severity) that get "lost" by * default since they have no syslog.conf entries such as daemon.info and - * daemon.debug; see syslog(3C) and syslog.conf(4) for more info + * daemon.debug; see syslog(3C) and syslog.conf(5) for more info */ int dpritab[] = {LOG_INFO, LOG_WARNING, LOG_NOTICE, LOG_NOTICE}; int dpritab_len = sizeof (dpritab) / sizeof (dpritab[0]); diff --git a/usr/src/cmd/pcieadm/pcieadm.h b/usr/src/cmd/pcieadm/pcieadm.h index 7ebdc148ca..de7fd43e47 100644 --- a/usr/src/cmd/pcieadm/pcieadm.h +++ b/usr/src/cmd/pcieadm/pcieadm.h @@ -17,7 +17,7 @@ #define _PCIEADM_H /* - * Common definitions for pcieadm(1M). + * Common definitions for pcieadm(8). */ #include <libdevinfo.h> diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/pod/Lgrp.pod b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/pod/Lgrp.pod index 00d07c0a9c..8f75ba3e36 100644 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/pod/Lgrp.pod +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/pod/Lgrp.pod @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # Sun::Solaris::Lgrp documentation. @@ -702,7 +700,7 @@ version 1. =head1 ATTRIBUTES -See L<attributes(5)> for descriptions of the following attributes: +See L<attributes(7)> for descriptions of the following attributes: ___________________________________________________________ | ATTRIBUTE TYPE | ATTRIBUTE VALUE | @@ -733,6 +731,6 @@ L<lgrp_version(3LGRP)>, L<lgrp_view(3LGRP)>, L<lgrp_resources(3LGRP)>, L<lgrp_latency_cookie(3LGRP)>, -L<attributes(5)> +L<attributes(7)> =cut diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm index aaeff1a450..0e9c6c8256 100644 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm @@ -5,7 +5,7 @@ # # Project.pm provides the bootstrap for the Sun::Solaris::Project module, and -# also functions for reading, validating and writing out project(4) format +# also functions for reading, validating and writing out project(5) format # files. # ################################################################################ @@ -132,7 +132,7 @@ sub projf_combine_errors # # projf_read(filename, flags) # -# Reads and parses a project(4) file, and returns a list of projent hashes. +# Reads and parses a project(5) file, and returns a list of projent hashes. # # Inputs: # filename - file to read @@ -979,7 +979,7 @@ sub projent_attribute2string # # Converts a ref to a projent hash (as returned by projent_parse()) to -# a project(4) database entry line. +# a project(5) database entry line. # sub projent_2string { diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README index e35f759204..43eed14003 100644 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README @@ -15,7 +15,7 @@ Description This module provided access to the Solaris Project subsystem, which is part of the Solaris resource management infrastructure. -For more information on Solaris Projects, see the project(4) manpage and the +For more information on Solaris Projects, see the project(5) manpage and the following on-line documentation: System Administration Guide: Resource Management and Network Services diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/pod/Project.pod b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/pod/Project.pod index 2f9771df89..0e9d1e00d2 100644 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/pod/Project.pod +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/pod/Project.pod @@ -89,7 +89,7 @@ process. B<C<fgetprojent($filehandle)>> This function returns the next project entry from C<$filehandle>, a Perl file -handle that must refer to a previously opened file in C<project(4)> format. +handle that must refer to a previously opened file in C<project(5)> format. Return values are the same as for C<getprojent()>. B<C<inproj($user, $project)>> @@ -129,7 +129,7 @@ used to selectively import constants and functions defined in this module: =head1 ATTRIBUTES -See C<attributes(5)> for descriptions of the following attributes: +See C<attributes(7)> for descriptions of the following attributes: ___________________________________________________________ | ATTRIBUTE TYPE | ATTRIBUTE VALUE | @@ -142,4 +142,4 @@ See C<attributes(5)> for descriptions of the following attributes: =head1 SEE ALSO C<getprojid(2)>, C<getdefaultproj(3PROJECT)>, C<inproj(3PROJECT)>, -C<libproject(3LIB)>, C<setproject(3PROJECT)>, C<project(4)>, C<attributes(5)> +C<libproject(3LIB)>, C<setproject(3PROJECT)>, C<project(5)>, C<attributes(7)> diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README index 119e6cda5a..4c6d716c0e 100644 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README @@ -15,7 +15,7 @@ Description This module provided access to the Solaris Task subsystem, which is part of the Solaris resource management infrastructure. -For more information on Solaris Tasks, see the project(4) manpage and the +For more information on Solaris Tasks, see the project(5) manpage and the following on-line documentation: System Administration Guide: Resource Management and Network Services diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/pod/Task.pod b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/pod/Task.pod index 9927ec5b6c..e96f92ea5a 100644 --- a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/pod/Task.pod +++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/pod/Task.pod @@ -57,7 +57,7 @@ used to selectively import constants and functions defined in this module: =head1 ATTRIBUTES -See C<attributes(5)> for descriptions of the following attributes: +See C<attributes(7)> for descriptions of the following attributes: ___________________________________________________________ | ATTRIBUTE TYPE | ATTRIBUTE VALUE | @@ -69,4 +69,4 @@ See C<attributes(5)> for descriptions of the following attributes: =head1 SEE ALSO -C<gettaskid(2)>, C<settaskid(2)>, C<attributes(5)> +C<gettaskid(2)>, C<settaskid(2)>, C<attributes(7)> diff --git a/usr/src/cmd/pfexecd/pfexecd.c b/usr/src/cmd/pfexecd/pfexecd.c index ae04a5fe4c..c75d8c4314 100644 --- a/usr/src/cmd/pfexecd/pfexecd.c +++ b/usr/src/cmd/pfexecd/pfexecd.c @@ -79,7 +79,7 @@ init_isa_regex(void) char *p; /* - * Extract the isalist(5) for userland from the kernel. + * Extract the isalist(7) for userland from the kernel. */ isalist = malloc(isalen); do { diff --git a/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c b/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c index c74c5f85a7..ce58a8f1ed 100644 --- a/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c +++ b/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c @@ -1764,7 +1764,7 @@ update_subtree(picl_nodehdl_t nodeh, di_node_t dinode) } /* - * Check for a stale OBP node. EINVAL is returned from the openprom(7D) driver + * Check for a stale OBP node. EINVAL is returned from the openprom(4D) driver * if the nodeid stored in the snapshot is not valid. */ static int diff --git a/usr/src/cmd/pools/poold/poold.properties b/usr/src/cmd/pools/poold/poold.properties index 2e56ce9d4a..ad8d0cbe3b 100644 --- a/usr/src/cmd/pools/poold/poold.properties +++ b/usr/src/cmd/pools/poold/poold.properties @@ -22,9 +22,9 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" + # -# NOTICE: This file contains default settings for poold(1M). Do not +# NOTICE: This file contains default settings for poold(8). Do not # edit this file. Its format and contents are subject to change in # future releases of Solaris. @@ -37,7 +37,7 @@ pset.objectives= com.sun.solaris.domain.pools.LocalityObjective, com.sun.solaris .level= ALL # Set defaults for all logfiles (poold and API-generated) which are suitable -# for management by logadm(1M). +# for management by logadm(8). java.util.logging.FileHandler.limit = 0 java.util.logging.FileHandler.count = 1 java.util.logging.FileHandler.append = true diff --git a/usr/src/cmd/power/power.dfl b/usr/src/cmd/power/power.dfl index 7f29d24425..c06fd37528 100644 --- a/usr/src/cmd/power/power.dfl +++ b/usr/src/cmd/power/power.dfl @@ -1,4 +1,3 @@ -#pragma ident "%Z%%M% %I% %E% SMI" # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -24,8 +23,8 @@ # # # This file contains tunable parameters for Power Management (PM) and -# Checkpoint-Resume (CPR). See power.conf(4), pmconfig(1M), pm(7D), -# and cpr(7) for details. +# Checkpoint-Resume (CPR). See power.conf(5), pmconfig(8), pm(4D), +# and cpr(4) for details. # # # diff --git a/usr/src/cmd/power/sys-suspend.c b/usr/src/cmd/power/sys-suspend.c index 048b86d89a..34481c57d1 100644 --- a/usr/src/cmd/power/sys-suspend.c +++ b/usr/src/cmd/power/sys-suspend.c @@ -173,7 +173,7 @@ change_audit_file(void) int retries = RETRY_COUNT; /* - * Wait for audit(1M) -n process to complete + * Wait for audit(8) -n process to complete * */ do { @@ -219,9 +219,9 @@ alarm_handler(int sig) */ /* - * pm_poweroff - similar to poweroff(1M) - * This should do the same auditing as poweroff(1m) would do when it - * becomes a libpower function. Till then we use poweroff(1m). + * pm_poweroff - similar to poweroff(8) + * This should do the same auditing as poweroff(8) would do when it + * becomes a libpower function. Till then we use poweroff(8). */ static void pm_poweroff(void) @@ -236,7 +236,7 @@ pm_poweroff(void) closelog(); /* - * Call poweroff(1m) to shut down the system. + * Call poweroff(8) to shut down the system. */ (void) execl("/usr/sbin/poweroff", "poweroff", NULL); diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddAccess.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddAccess.rawhlp index 9898ecfa8e..54eb381ad6 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddAccess.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddAccess.rawhlp @@ -29,7 +29,7 @@ <p> Use the Add Access to Printer dialog to make an installed printer -accessible to print client computers. See the printers.conf(4) man +accessible to print client computers. See the printers.conf(5) man page if you need more information about print client commands. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddAccessFailed.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddAccessFailed.rawhlp index b0153bb465..65fb190f04 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddAccessFailed.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddAccessFailed.rawhlp @@ -23,7 +23,6 @@ -- Copyright 2001 Sun Microsystems, Inc. All rights reserved. -- Use is subject to license terms. -- --- ident "%Z%%M% %I% %E% SMI" --> <!-- Tag=AddAccessFailed --> @@ -33,7 +32,7 @@ You must enter a printer name and a printer server name; the printer server must be a remote server (not the current server). See the man -page for lpadmin(1M) for more information. +page for lpadmin(8) for more information. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddPrinterFailed.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddPrinterFailed.rawhlp index 948abce0f6..0fc7163331 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddPrinterFailed.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/AddPrinterFailed.rawhlp @@ -23,7 +23,6 @@ -- Copyright 2001 Sun Microsystems, Inc. All rights reserved. -- Use is subject to license terms. -- --- ident "%Z%%M% %I% %E% SMI" --> <!-- Tag=AddPrinterFailed --> @@ -40,7 +39,7 @@ or underscores. A printer name can be a maximum of 14 characters long. Display the Command-Line Console to help pinpoint where the error may have occurred. Choose Show Command-Line Console from the Print Manager menu to display the Command-Line Console. See the man -page for lpadmin(1M) for more information. +page for lpadmin(8) for more information. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/DeletePrinterFailed.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/DeletePrinterFailed.rawhlp index ea10c85462..57e56f291d 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/DeletePrinterFailed.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/DeletePrinterFailed.rawhlp @@ -22,7 +22,6 @@ -- Copyright 2001 Sun Microsystems, Inc. All rights reserved. -- Use is subject to license terms. -- --- ident "%Z%%M% %I% %E% SMI" --> <!-- Tag=DeletePrinterFailed --> @@ -34,7 +33,7 @@ If the Delete printer process fails, follow the instructions in the error dialog. If the instructions are incomplete or unclear, display the Command-Line Console to help pinpoint where the error may have occurred. Choose Show Command-Line Console from the Print Manager menu -to display the Command-Line Console. See the man page for lpadmin(1M) +to display the Command-Line Console. See the man page for lpadmin(8) for more information. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallLocal.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallLocal.rawhlp index ff8602be43..6a604e064a 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallLocal.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallLocal.rawhlp @@ -97,7 +97,7 @@ Note that this is the last place the print subsystem looks to determine where a particular print job will be printed; the destination option of the lp command is the first place looked, and other environment variables are checked before this one. See the man -page for printers.conf(4) for a full explanation of the search order. +page for printers.conf(5) for a full explanation of the search order. <p> @@ -129,7 +129,7 @@ If you want to restrict its use to individual users, enter a user name in the text field below the list and click Add. Other legal constructs are system-name!login-ID (user "login-ID" on system "system-name"), system-name!all (all users on system "system-name"), and all!login-ID -(user "login-ID" on all systems). Use the lpadmin(1M) command to deny +(user "login-ID" on all systems). Use the lpadmin(8) command to deny access to users. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallLocalPPD.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallLocalPPD.rawhlp index c344d43861..d024810d8f 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallLocalPPD.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallLocalPPD.rawhlp @@ -103,7 +103,7 @@ Note that this is the last place the print subsystem looks to determine where a particular print job will be printed; the destination option of the lp command is the first place looked, and other environment variables are checked before this one. See the man -page for printers.conf(4) for a full explanation of the search order. +page for printers.conf(5) for a full explanation of the search order. <p> @@ -135,7 +135,7 @@ If you want to restrict its use to individual users, enter a user name in the text field below the list and click Add. Other legal constructs are system-name!login-ID (user "login-ID" on system "system-name"), system-name!all (all users on system "system-name"), and all!login-ID -(user "login-ID" on all systems). Use the lpadmin(1M) command to deny +(user "login-ID" on all systems). Use the lpadmin(8) command to deny access to users. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallNetwork.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallNetwork.rawhlp index c6d372193e..a4f5afb56a 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallNetwork.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallNetwork.rawhlp @@ -102,7 +102,7 @@ for the naming service, also. determine where a particular print job will be printed; the destination option of the lp command is the first place looked, and other environment variables are checked before this one. See the man -page for printers.conf(4) for a full explanation of the search order. +page for printers.conf(5) for a full explanation of the search order. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallNetworkPPD.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallNetworkPPD.rawhlp index 77c3217898..cb41672c9f 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallNetworkPPD.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/InstallNetworkPPD.rawhlp @@ -111,7 +111,7 @@ for the naming service, also. determine where a particular print job will be printed; the destination option of the lp command is the first place looked, and other environment variables are checked before this one. See the man -page for printers.conf(4) for a full explanation of the search order. +page for printers.conf(5) for a full explanation of the search order. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/LDAPAuthentication.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/LDAPAuthentication.rawhlp index 2e6070dc66..a2d86b8c9c 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/LDAPAuthentication.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/LDAPAuthentication.rawhlp @@ -77,7 +77,7 @@ the default distinguished name is "cn=Directory Manager". If the LDAP server is Sun Directory Server then an example of the distinguished name is "cn=admin, dc=XYZ, dc=COM". -The Oracle Solaris Print Manager uses ldapclient(1M) to determine +The Oracle Solaris Print Manager uses ldapclient(8) to determine the default LDAP server name. If there is more than one server specified then the first one will be used. diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/LoginFailed.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/LoginFailed.rawhlp index 8844f2323b..e0bbdcb5d8 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/LoginFailed.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/LoginFailed.rawhlp @@ -32,7 +32,7 @@ If the NIS naming service is being used, you will need to know the password for the naming service master. If LDAP is being used then a fully distinguished name with update privilege and password will be required. Note that default values may need to be overridden. -See the man page for lpadmin(1M) and the help articles, "About +See the man page for lpadmin(8) and the help articles, "About Naming Services" and "NIS Authentication," for further information. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/Modify.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/Modify.rawhlp index 019f379c43..b09304a420 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/Modify.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/Modify.rawhlp @@ -92,7 +92,7 @@ Note that this is the last place the print subsystem looks to determine where a particular print job will be printed; the destination option of the lp command is the first place looked, and other environment variables are checked before this one. See the man -page for printers.conf(4) for a full explanation of the search order. +page for printers.conf(5) for a full explanation of the search order. <p> @@ -124,7 +124,7 @@ If you want to restrict its use to individual users, enter a user name in the text field below the list and click Add. Other legal constructs are system-name!login-ID (user "login-ID" on system "system-name"), system-name!all (all users on system "system-name"), and all!login-ID -(user "login-ID" on all systems). Use the lpadmin(1M) command to deny +(user "login-ID" on all systems). Use the lpadmin(8) command to deny access to users. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ModifyFailed.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ModifyFailed.rawhlp index 97a59c6a46..477cf95fdd 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ModifyFailed.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ModifyFailed.rawhlp @@ -23,7 +23,6 @@ -- Copyright 2001 Sun Microsystems, Inc. All rights reserved. -- Use is subject to license terms. -- --- ident "%Z%%M% %I% %E% SMI" --> <!-- Tag=ModifyFailed --> @@ -39,7 +38,7 @@ someone has deleted the printer before this modify operation completed. Display the Command-Line Console to help pinpoint where the error may have occurred. Choose Show Command-Line Console from the Print Manager menu to display the Command-Line Console. See the man page for -lpadmin(1M) for further information. +lpadmin(8) for further information. </CONTENT> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ModifyPPD.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ModifyPPD.rawhlp index 6399b8ac94..507a9681a9 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ModifyPPD.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ModifyPPD.rawhlp @@ -100,7 +100,7 @@ Note that this is the last place the print subsystem looks to determine where a particular print job will be printed; the destination option of the lp command is the first place looked, and other environment variables are checked before this one. See the man -page for printers.conf(4) for a full explanation of the search order. +page for printers.conf(5) for a full explanation of the search order. <p> @@ -132,7 +132,7 @@ If you want to restrict its use to individual users, enter a user name in the text field below the list and click Add. Other legal constructs are system-name!login-ID (user "login-ID" on system "system-name"), system-name!all (all users on system "system-name"), and all!login-ID -(user "login-ID" on all systems). Use the lpadmin(1M) command to deny +(user "login-ID" on all systems). Use the lpadmin(8) command to deny access to users. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/NISAuthentication.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/NISAuthentication.rawhlp index 6294176d9b..1d28ee3761 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/NISAuthentication.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/NISAuthentication.rawhlp @@ -59,7 +59,7 @@ Manager to update printer information in the NIS name service: - If your network is set up with NIS master and slave servers, the NIS slaves may not see the updated printer information -until the NIS slaves are updated. See ypmake(1M) for more +until the NIS slaves are updated. See ypmake(8) for more information. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/NameService.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/NameService.rawhlp index 885356086f..0914d54f79 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/NameService.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/NameService.rawhlp @@ -57,13 +57,13 @@ the file /etc/printers.conf. <b>NIS</b>: Use the printers.conf.byname map stored in the Network Information Service for retrieving or updating printer information. -See the ypserv(1M) man page for more information. +See the ypserv(8) man page for more information. <p> <b>Note: </b>When a site is set up with a NIS master and slaves, if the host binds to a slave, a user may not see NIS updates made through -Print Manager until the slave computers are updated. See the ypmake(1M) +Print Manager until the slave computers are updated. See the ypmake(8) man page for more information. <p> @@ -75,7 +75,7 @@ See the ldap(1) man page for more information. <p> To used the LDAP naming service the host computer must be configured as a -LDAP client, see ldapclient(1M). +LDAP client, see ldapclient(8). <p> @@ -115,7 +115,7 @@ rhosts entry on the NIS server allowing root on the print server root access on the NIS server. You must have explicit permissions on the NIS master server to update the maps. This means an entry for your host name must reside in root's .rhosts file on the NIS master server. -See the hosts.equiv(4) man page for more information. +See the hosts.equiv(5) man page for more information. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/PrinterType.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/PrinterType.rawhlp index 5ef9a49fce..6485d36493 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/PrinterType.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/PrinterType.rawhlp @@ -23,7 +23,6 @@ -- Copyright 2001 Sun Microsystems, Inc. All rights reserved. -- Use is subject to license terms. -- --- ident "%Z%%M% %I% %E% SMI" --> <!-- Tag=PrinterType --> @@ -40,7 +39,7 @@ understands the printer type. Examples are PostScript, Daisy, and Diablo. If you have a PostScript printer, for example, select PostScript as the Printer Type. To install a printer type that is not listed select Other. The printer type you enter must correspond to an entry in the -/usr/share/lib/terminfo directories. See the terminfo(4) man page for +/usr/share/lib/terminfo directories. See the terminfo(5) man page for more information. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToAddAccess.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToAddAccess.rawhlp index d1c994ae88..06700297f1 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToAddAccess.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToAddAccess.rawhlp @@ -29,7 +29,7 @@ <p> Do the following to make an installed printer accessible to print -client computers. See the printers.conf(4) man page for more +client computers. See the printers.conf(5) man page for more information about print client commands. <p> @@ -38,7 +38,7 @@ information about print client commands. add access to a private printer (one that is not listed in the naming service) or to make the printer usable even if the naming service server is down. This adds access for all users in the naming service -domain; see the man page for domainname(1M) for more information about +domain; see the man page for domainname(8) for more information about domains. <p> @@ -83,7 +83,7 @@ Print Manager. Note that this is the last place the print commands will look to determine the printer for a specific print command; see the -man page for printers.conf(4) for more information about resolving +man page for printers.conf(5) for more information about resolving printer conflicts. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToInstallLocal.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToInstallLocal.rawhlp index ce6cc22764..3c79d71ac0 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToInstallLocal.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToInstallLocal.rawhlp @@ -113,7 +113,7 @@ If you want to restrict its use to individual users, enter a user name in the text field below the list and click Add. Other legal constructs are system-name!login-ID (user "login-ID" on system "system-name"), system-name!all (all users on system "system-name"), and all!login-ID -(user "login-ID" on all systems). Use the lpadmin(1M) command to deny +(user "login-ID" on all systems). Use the lpadmin(8) command to deny access to users. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToInstallNetwork.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToInstallNetwork.rawhlp index 60c41b168d..d2d9747d04 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToInstallNetwork.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToInstallNetwork.rawhlp @@ -121,7 +121,7 @@ If you want to restrict its use to individual users, enter a user name in the text field below the list and click Add. Other legal constructs are system-name!login-ID (user "login-ID" on system "system-name"), system-name!all (all users on system "system-name"), and all!login-ID -(user "login-ID" on all systems). Use the lpadmin(1M) command to deny +(user "login-ID" on all systems). Use the lpadmin(8) command to deny access to users. <p> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToSelectName.rawhlp b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToSelectName.rawhlp index 80eebff891..dc3e2a6e22 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToSelectName.rawhlp +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/raw-help/ToSelectName.rawhlp @@ -63,7 +63,7 @@ naming service's printer configuration database. <p> -See the man page for printers.conf(4) for more information. +See the man page for printers.conf(5) for more information. </CONTENT> diff --git a/usr/src/cmd/print/scripts/printers.conf b/usr/src/cmd/print/scripts/printers.conf index 69327e9915..7d1f2616cd 100644 --- a/usr/src/cmd/print/scripts/printers.conf +++ b/usr/src/cmd/print/scripts/printers.conf @@ -22,10 +22,9 @@ # Copyright 1996 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # If you hand edit this file, comments and structure may change. # The prefered method of modifying this file is though the use of -# lpset(1M) or lpadmin(1M) +# lpset(8) or lpadmin(8) # diff --git a/usr/src/cmd/prtdiag/i386/smbios.c b/usr/src/cmd/prtdiag/i386/smbios.c index a7ba98d562..aa43e3fcb9 100644 --- a/usr/src/cmd/prtdiag/i386/smbios.c +++ b/usr/src/cmd/prtdiag/i386/smbios.c @@ -33,7 +33,7 @@ * Most modern x86 systems support a System Management BIOS, which is a memory * buffer filled in by the BIOS at boot time that describes the hardware. This * data format is described by DMTF specification DSP0134 (see http://dmtf.org) - * This file implements a rudimentary prtdiag(1M) display using the SMBIOS. + * This file implements a rudimentary prtdiag(8) display using the SMBIOS. * Access to the data is provided by libsmbios: see <sys/smbios.h> for info. * * NOTE: It is important to understand that x86 hardware varies extremely @@ -44,7 +44,7 @@ * file should not be extended to report every SMBIOS tidbit or structure in * the spec unless we have good reason to believe it tends to be reliable. * - * Similarly, the prtdiag(1M) utility itself should not be used to spit out + * Similarly, the prtdiag(8) utility itself should not be used to spit out * every possible bit of x86 configuration data from every possible source; * otherwise this code will become an unmaintainable and untestable disaster. * Extensions to prtdiag should prefer to use more stable kernel mechanisms @@ -52,7 +52,7 @@ * and should generally limit themselves to commonly needed h/w data. As such, * extensions to x86 prtdiag should focus on integration with the device tree. * - * The prtdiag(1M) utility is for service personnel and system administrators: + * The prtdiag(8) utility is for service personnel and system administrators: * it is not your personal ACPI disassembler or CPUID decoder ring. The * complete SMBIOS data is available from smbdump(1), and other specialized * tools can be created to display the state of other x86 features, especially diff --git a/usr/src/cmd/psrinfo/psrinfo.c b/usr/src/cmd/psrinfo/psrinfo.c index a6d8a99c60..19c4ef41ba 100644 --- a/usr/src/cmd/psrinfo/psrinfo.c +++ b/usr/src/cmd/psrinfo/psrinfo.c @@ -16,7 +16,7 @@ */ /* - * This implements psrinfo(1M), a utility to report various information + * This implements psrinfo(8), a utility to report various information * about processors, cores, and threads (virtual cpus). This is mostly * intended for human consumption - this utility doesn't do much more than * simply process kstats for human readability. diff --git a/usr/src/cmd/ptools/pargs/pargs.c b/usr/src/cmd/ptools/pargs/pargs.c index 55876dea65..9f284e0731 100644 --- a/usr/src/cmd/ptools/pargs/pargs.c +++ b/usr/src/cmd/ptools/pargs/pargs.c @@ -140,7 +140,7 @@ safe_strdup(const char *s1) /* * Given a wchar_t which might represent an 'escapable' sequence (see - * formats(5)), return the base ascii character needed to print that + * formats(7)), return the base ascii character needed to print that * sequence. * * The comparisons performed may look suspect at first, but all are valid; @@ -202,7 +202,7 @@ unctrl_str_strict_ascii(const char *src, int escape_slash, int *unprintable) } /* - * Convert control characters as described in format(5) to their readable + * Convert control characters as described in formats(7) to their readable * representation; special care is taken to handle multibyte character sets. * * If escape_slash is true, escaping of '\' occurs. The first time a string diff --git a/usr/src/cmd/ramdiskadm/main.c b/usr/src/cmd/ramdiskadm/main.c index 429cebf40f..58fc1e0798 100644 --- a/usr/src/cmd/ramdiskadm/main.c +++ b/usr/src/cmd/ramdiskadm/main.c @@ -23,14 +23,12 @@ * Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * - * ramdiskadm - administer ramdisk(7d). Allows creation and deletion of + * ramdiskadm - administer ramdisk(4D). Allows creation and deletion of * ramdisks, and display status. All the ioctls are private between * ramdisk and ramdiskadm, and so are very simple - device information is * communicated via a name or a minor number. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/param.h> #include <sys/ramdisk.h> diff --git a/usr/src/cmd/rcap/rcapd/rcapd_collection.c b/usr/src/cmd/rcap/rcapd/rcapd_collection.c index fdaf8dbfe0..b6072d37fe 100644 --- a/usr/src/cmd/rcap/rcapd/rcapd_collection.c +++ b/usr/src/cmd/rcap/rcapd/rcapd_collection.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdlib.h> #include <strings.h> @@ -34,7 +32,7 @@ /* * An abstract "collection" of processes. Multiple types of collections can * exist, one of which is selected at run-time. Currently, the only one - * defined corresponds to project(4)s. + * defined corresponds to project(5)s. */ #define MAX(x, y) (((x) > (y)) ? (x) : (y)) diff --git a/usr/src/cmd/rcap/rcapd/rcapd_main.c b/usr/src/cmd/rcap/rcapd/rcapd_main.c index 4dda9818be..abeea97fc6 100644 --- a/usr/src/cmd/rcap/rcapd/rcapd_main.c +++ b/usr/src/cmd/rcap/rcapd/rcapd_main.c @@ -25,12 +25,12 @@ /* * rcapd is a long-running daemon enforcing project-based resource caps (see - * rcapd(1M)). Each instance of a process aggregate (project or, generically, + * rcapd(8)). Each instance of a process aggregate (project or, generically, * "collection") may have a memory cap. A single thread monitors the resource * utilization of capped collections, enforces caps when they are exceeded (and * other conditions are met), and incorporates changes in configuration or * caps. Each of these actions occurs not more frequently than the rate - * specified with rcapadm(1M). + * specified with rcapadm(8). */ #include <sys/priocntl.h> diff --git a/usr/src/cmd/rcm_daemon/common/SUNW,vdevices.pl b/usr/src/cmd/rcm_daemon/common/SUNW,vdevices.pl index 0c5d4d9ca7..3bac48673f 100755 --- a/usr/src/cmd/rcm_daemon/common/SUNW,vdevices.pl +++ b/usr/src/cmd/rcm_daemon/common/SUNW,vdevices.pl @@ -24,8 +24,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# # # RCM script to allow/deny removal of miscellaneous virtual devices @@ -95,7 +93,7 @@ sub do_queryremove print "rcm_log_debug=do_queryremove: '$rsrc'\n"; # - # fuser(1M) sends to stdout the pids of any processes using the + # fuser(8) sends to stdout the pids of any processes using the # device. Some other information always appears on stderr and # must be discarded to avoid invalidating the test. # diff --git a/usr/src/cmd/rcm_daemon/common/dump_rcm.c b/usr/src/cmd/rcm_daemon/common/dump_rcm.c index 2cbe3b99d3..f2edeab32c 100644 --- a/usr/src/cmd/rcm_daemon/common/dump_rcm.c +++ b/usr/src/cmd/rcm_daemon/common/dump_rcm.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * RCM module for managing dump device during dynamic * reconfiguration. @@ -313,10 +311,10 @@ dump_remove(rcm_handle_t *hdl, char *rsrcname, id_t id, uint_t flags, } /* - * For dedicated dump devices, invoke dumpadm(1M) + * For dedicated dump devices, invoke dumpadm(8) * to relocate dump to swap. For dump device on * swap, this is a no-op as the RCM swap module - * will relocate by invoking swap(1M). + * will relocate by invoking swap(8). * * Call with cache_lock held. */ diff --git a/usr/src/cmd/rcm_daemon/common/ip_rcm.c b/usr/src/cmd/rcm_daemon/common/ip_rcm.c index 3c86f2b868..7f6785e9a7 100644 --- a/usr/src/cmd/rcm_daemon/common/ip_rcm.c +++ b/usr/src/cmd/rcm_daemon/common/ip_rcm.c @@ -482,14 +482,14 @@ ip_offline(rcm_handle_t *hd, char *rsrc, id_t id, uint_t flags, /* * This is an IPMP interface that can be offlined. - * Request in.mpathd(1M) to offline the physical interface. + * Request in.mpathd(8) to offline the physical interface. */ if ((retval = ip_ipmp_offline(node)) != IPMP_SUCCESS) ip_log_err(node, errorp, "in.mpathd offline failed"); if (retval == IPMP_EMINRED && !detachable) { /* - * in.mpathd(1M) could not offline the device because it was + * in.mpathd(8) could not offline the device because it was * the last interface in the group. However, it's possible * that it's still okay to offline it as long as there are * higher-level failover mechanisms for the addresses it owns diff --git a/usr/src/cmd/rcm_daemon/common/swap_rcm.c b/usr/src/cmd/rcm_daemon/common/swap_rcm.c index 8b7bc0d2a9..a5d3ed15d4 100644 --- a/usr/src/cmd/rcm_daemon/common/swap_rcm.c +++ b/usr/src/cmd/rcm_daemon/common/swap_rcm.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * RCM module providing support for swap areas * during reconfiguration operations. @@ -323,7 +321,7 @@ swap_remove(rcm_handle_t *hdl, char *rsrcname, id_t id, uint_t flags, /* * Delete all swap areas for swap file. - * Invoke swap(1M) instead of swapctl(2) to + * Invoke swap(8) instead of swapctl(2) to * handle relocation of dump device. * If dump device is configured, fail if * unable to relocate dump. @@ -345,7 +343,7 @@ swap_delete(swap_file_t *sf, char **errstr) have_dump = 0; for (sa = sf->areas; sa != NULL; sa = sa->next) { - /* swap(1M) is not idempotent */ + /* swap(8) is not idempotent */ if (sa->cache_flags & SWAP_CACHE_OFFLINED) { continue; } @@ -399,7 +397,7 @@ out: } /* - * Invoke swap(1M) to add each registered swap area. + * Invoke swap(8) to add each registered swap area. * * Call with cache_lock held. */ @@ -413,7 +411,7 @@ swap_add(swap_file_t *sf, char **errstr) int rv = RCM_SUCCESS; for (sa = sf->areas; sa != NULL; sa = sa->next) { - /* swap(1M) is not idempotent */ + /* swap(8) is not idempotent */ if (!(sa->cache_flags & SWAP_CACHE_OFFLINED)) { continue; } diff --git a/usr/src/cmd/rctladm/rctladm.c b/usr/src/cmd/rctladm/rctladm.c index c60cb9471b..c1b0f68315 100644 --- a/usr/src/cmd/rctladm/rctladm.c +++ b/usr/src/cmd/rctladm/rctladm.c @@ -161,7 +161,7 @@ rctladm_save_config() "# rctladm.conf\n" "#\n" "# Parameters for resource controls configuration.\n" - "# Do NOT edit this file by hand -- use rctladm(1m) instead.\n" + "# Do NOT edit this file by hand -- use rctladm(8) instead.\n" "#\n", fp); diff --git a/usr/src/cmd/rmvolmgr/vold.c b/usr/src/cmd/rmvolmgr/vold.c index 30a2f267e8..8bf6985674 100644 --- a/usr/src/cmd/rmvolmgr/vold.c +++ b/usr/src/cmd/rmvolmgr/vold.c @@ -158,7 +158,7 @@ vold_init(int argc, char **argv) } /* - * Old version of rmmount(1M) + * Old version of rmmount(8) */ /* ARGSUSED */ int @@ -601,7 +601,7 @@ vold_action(struct action_arg *aap) if (result == TRUE) { /* * File Manager is running. return 0. - * see man page rmmount.conf(4). + * see man page rmmount.conf(5). */ return (0); } else { diff --git a/usr/src/cmd/rpcbind/bind.xml b/usr/src/cmd/rpcbind/bind.xml index 99b9586388..eb26f25d9b 100644 --- a/usr/src/cmd/rpcbind/bind.xml +++ b/usr/src/cmd/rpcbind/bind.xml @@ -55,7 +55,7 @@ </dependency> <!-- - rpcbind(1M) depends on multicast routes installed by the + rpcbind(8) depends on multicast routes installed by the routing-setup service, and should be started after any IPsec policy is configured and TCP ndd tunables are set (both currently carried out by network/initial). @@ -113,14 +113,14 @@ </exec_method> <property_group name='config' type='application' > - <!-- default property settings for rpcbind(1M). --> + <!-- default property settings for rpcbind(8). --> <!-- enable_tcpwrappers affects the wrapping of rpcbind, - see rpcbind(1M) and tcpd(1M) for details. + see rpcbind(8) and tcpd(8) for details. The default value is 'false'. A values of 'true' results in wrapping all UDP/TCP calls to the portmapper with libwrap. Note that - rpcbind(1M) will not resolve or lookup names while + rpcbind(8) will not resolve or lookup names while doing tcp wrapper processing. --> <propval diff --git a/usr/src/cmd/saf/sac.xml b/usr/src/cmd/saf/sac.xml index 84063b4db0..c887e04ee4 100644 --- a/usr/src/cmd/saf/sac.xml +++ b/usr/src/cmd/saf/sac.xml @@ -50,7 +50,7 @@ </dependency> <!-- - sac(1M) has historically started as prior to run level 2. Its + sac(8) has historically started as prior to run level 2. Its components have no dependents of their own. --> <dependency diff --git a/usr/src/cmd/sasinfo/sasinfo.c b/usr/src/cmd/sasinfo/sasinfo.c index 5e032543fd..af2c3b6eda 100644 --- a/usr/src/cmd/sasinfo/sasinfo.c +++ b/usr/src/cmd/sasinfo/sasinfo.c @@ -204,7 +204,7 @@ main(int argc, char *argv[]) /* call the CLI parser */ ret = cmdParse(argc, argv, synTables, subcommandArgs, &funcRet); if (ret == 1) { - (void *) fprintf(stdout, "%s %s(1M)\n", + (void *) fprintf(stdout, "%s %s(8)\n", gettext("For more information, please see"), cmdName); return (1); } else if (ret == -1) { diff --git a/usr/src/cmd/savecore/savecore.c b/usr/src/cmd/savecore/savecore.c index 9b8e43e488..b5ac0397aa 100644 --- a/usr/src/cmd/savecore/savecore.c +++ b/usr/src/cmd/savecore/savecore.c @@ -1431,7 +1431,7 @@ build_corefile(const char *namelist, const char *corefile) /* * When the system panics, the kernel saves all undelivered messages (messages - * that never made it out to syslogd(1M)) in the dump. At a mimimum, the + * that never made it out to syslogd(8)) in the dump. At a mimimum, the * panic message itself will always fall into this category. Upon reboot, * the syslog startup script runs savecore -m to recover these messages. * @@ -1442,7 +1442,7 @@ build_corefile(const char *namelist, const char *corefile) * * Note: since savecore -m is used *only* for this purpose, it does *not* * attempt to save the crash dump. The dump will be saved later, after - * syslogd(1M) starts, by the savecore startup script. + * syslogd(8) starts, by the savecore startup script. */ static int message_save(void) @@ -1830,7 +1830,7 @@ main(int argc, char *argv[]) logprint(lvl | ec, "Panic crashdump pending on dump device%s " - "run savecore(1M) manually to extract. " + "run savecore(8) manually to extract. " "Image UUID %s%s.", disabled ? " but dumpadm -n in effect;" : ";", corehdr.dump_uuid, diff --git a/usr/src/cmd/sendmail/include/sm/conf.h b/usr/src/cmd/sendmail/include/sm/conf.h index b5cbc00b9c..5575ff6849 100644 --- a/usr/src/cmd/sendmail/include/sm/conf.h +++ b/usr/src/cmd/sendmail/include/sm/conf.h @@ -420,7 +420,7 @@ typedef int pid_t; # endif /* SOLARIS >= 20600 || (SOLARIS < 10000 && SOLARIS >= 206) */ # if SOLARIS < 207 || (SOLARIS > 10000 && SOLARIS < 20700) # ifndef LA_TYPE -# define LA_TYPE LA_KSTAT /* use kstat(3k) -- may work in < 2.5 */ +# define LA_TYPE LA_KSTAT /* use kstat(3KSTAT) -- may work in < 2.5 */ # endif /* ! LA_TYPE */ # ifndef RANDOMSHIFT /* random() doesn't work well (sometimes) */ # define RANDOMSHIFT 8 diff --git a/usr/src/cmd/sendmail/lib/smtp-sendmail b/usr/src/cmd/sendmail/lib/smtp-sendmail index be3149ba42..cf372d5e6f 100644 --- a/usr/src/cmd/sendmail/lib/smtp-sendmail +++ b/usr/src/cmd/sendmail/lib/smtp-sendmail @@ -82,7 +82,7 @@ case "$1" in # "s1:c1.1,c1.2 s2:c2.1 s3:c3.1,c3.2,c3.3" # i.e., white-space separated groups of server:client where # client can be one or more comma-separated names; N.B. that - # the :client part is optional; see etrn(1M) for details. + # the :client part is optional; see etrn(8) for details. # server is the name of the server to prod; a mail queue run # is requested for each client name. This is comparable to # running "/usr/lib/sendmail -qRclient" on the host server. diff --git a/usr/src/cmd/sendmail/src/conf.c b/usr/src/cmd/sendmail/src/conf.c index 8c8ca6e788..551edfef26 100644 --- a/usr/src/cmd/sendmail/src/conf.c +++ b/usr/src/cmd/sendmail/src/conf.c @@ -1385,7 +1385,7 @@ init_vendor_macros(e) #define LA_DGUX 9 /* special DGUX implementation */ #define LA_HPUX 10 /* special HPUX implementation */ #define LA_IRIX6 11 /* special IRIX 6.2 implementation */ -#define LA_KSTAT 12 /* special Solaris kstat(3k) implementation */ +#define LA_KSTAT 12 /* special Solaris kstat(3KSTAT) implementation */ #define LA_DEVSHORT 13 /* read short from a device */ #define LA_ALPHAOSF 14 /* Digital UNIX (OSF/1 on Alpha) table() call */ #define LA_PSET 15 /* Solaris per-processor-set load average */ @@ -6436,4 +6436,3 @@ char *FFRCompileOptions[] = #endif /* _FFR_USE_SETLOGIN */ NULL }; - diff --git a/usr/src/cmd/setfacl/setfacl.c b/usr/src/cmd/setfacl/setfacl.c index d069945661..c7c3cdba05 100644 --- a/usr/src/cmd/setfacl/setfacl.c +++ b/usr/src/cmd/setfacl/setfacl.c @@ -200,7 +200,7 @@ get_acl_info(char *filep, aclent_t **aclpp) (void) fprintf(stderr, gettext("File system doesn't support aclent_t " "style ACL's.\n" - "See acl(5) for more information on " + "See acl(7) for more information on " "POSIX-draft ACL support.\n")); return (-1); } diff --git a/usr/src/cmd/sgs/elfdump/common/corenote.c b/usr/src/cmd/sgs/elfdump/common/corenote.c index 7b768a0309..d848221648 100644 --- a/usr/src/cmd/sgs/elfdump/common/corenote.c +++ b/usr/src/cmd/sgs/elfdump/common/corenote.c @@ -47,7 +47,7 @@ /* * This module contains the code that displays data from the note * sections found in Solaris core files. The format of these - * note sections are described in the core(4) manpage. + * note sections are described in the core(5) manpage. */ diff --git a/usr/src/cmd/sgs/include/libld.h b/usr/src/cmd/sgs/include/libld.h index 01734885f0..bf451f8f2a 100644 --- a/usr/src/cmd/sgs/include/libld.h +++ b/usr/src/cmd/sgs/include/libld.h @@ -1497,7 +1497,7 @@ typedef enum { /* * Structure to manage archive member caching. Each archive has an archive * descriptor (Ar_desc) associated with it. This contains pointers to the - * archive symbol table (obtained by elf_getarsyms(3e)) and an auxiliary + * archive symbol table (obtained by elf_getarsyms(3ELF)) and an auxiliary * structure (Ar_uax[]) that parallels this symbol table. The member element * of this auxiliary table indicates whether the archive member associated with * the symbol offset has already been extracted (AREXTRACTED) or partially diff --git a/usr/src/cmd/sgs/include/rtc.h b/usr/src/cmd/sgs/include/rtc.h index 4418702026..8b967fd587 100644 --- a/usr/src/cmd/sgs/include/rtc.h +++ b/usr/src/cmd/sgs/include/rtc.h @@ -26,8 +26,6 @@ #ifndef _RTC_H #define _RTC_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Global include file for the runtime configuration support. */ @@ -148,7 +146,7 @@ typedef struct { #define RTC_OBJ_NOEXIST 0x0004 /* object does not exist */ #define RTC_OBJ_EXEC 0x0008 /* object identifies executable */ #define RTC_OBJ_ALTER 0x0010 /* object has an alternate */ -#define RTC_OBJ_DUMP 0x0020 /* alternate created by dldump(3x) */ +#define RTC_OBJ_DUMP 0x0020 /* alternate created by dldump(3C) */ #define RTC_OBJ_REALPTH 0x0040 /* object identifies real path */ #define RTC_OBJ_NOALTER 0x0080 /* object can't have an alternate */ #define RTC_OBJ_GROUP 0x0100 /* object was expanded as a group */ diff --git a/usr/src/cmd/sgs/include/rtld.h b/usr/src/cmd/sgs/include/rtld.h index 0378b7390e..cab7896559 100644 --- a/usr/src/cmd/sgs/include/rtld.h +++ b/usr/src/cmd/sgs/include/rtld.h @@ -823,7 +823,7 @@ typedef struct rt_map32 { #define FLG_RT_CAP 0x00000010 /* process $CAPABILITY expansion */ #define FLG_RT_OBJECT 0x00000020 /* object processing (ie. .o's) */ #define FLG_RT_NEWLOAD 0x00000040 /* object is newly loaded */ -#define FLG_RT_NODUMP 0x00000080 /* object can't be dldump(3x)'ed */ +#define FLG_RT_NODUMP 0x00000080 /* object can't be dldump(3C)'ed */ #define FLG_RT_DELETE 0x00000100 /* object can be deleted */ #define FLG_RT_ANALYZED 0x00000200 /* object has been analyzed */ #define FLG_RT_INITDONE 0x00000400 /* objects .init has been completed */ diff --git a/usr/src/cmd/sgs/libconv/common/corenote.c b/usr/src/cmd/sgs/libconv/common/corenote.c index e8b1e7509c..79f976bda1 100644 --- a/usr/src/cmd/sgs/libconv/common/corenote.c +++ b/usr/src/cmd/sgs/libconv/common/corenote.c @@ -517,7 +517,7 @@ conv_cnote_pr_what(short why, short what, Conv_fmt_flags_t fmt_flags, { /* * The meaning of pr_what depends on the corresponding - * value of pr_why, as discussed in the proc(4) manpage. + * value of pr_why, as discussed in the proc(5) manpage. */ switch (why) { case PR_SIGNALLED: diff --git a/usr/src/cmd/sgs/libcrle/common/audit.c b/usr/src/cmd/sgs/libcrle/common/audit.c index d5e94d7679..75ab6472b5 100644 --- a/usr/src/cmd/sgs/libcrle/common/audit.c +++ b/usr/src/cmd/sgs/libcrle/common/audit.c @@ -56,7 +56,7 @@ * process (used for CRLE_AUD_DEPENDS and CRLE_AUD_DUMP). * * CRLE_FLAGS this signals CRLE_AUD_DLDUMP mode, and indicates the required - * flags for the dldump(3x) calls. + * flags for the dldump(3C) calls. */ static int auflag; diff --git a/usr/src/cmd/sgs/prof/common/symintErr.c b/usr/src/cmd/sgs/prof/common/symintErr.c index a2450543c4..a209b50d38 100644 --- a/usr/src/cmd/sgs/prof/common/symintErr.c +++ b/usr/src/cmd/sgs/prof/common/symintErr.c @@ -26,9 +26,6 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - #include "symint.h" #include <stdio.h> @@ -48,8 +45,8 @@ /* * _err_exit(format_s, va_alist) - * format_s - printf(3S) arg string. - * va_alist - var_args(3?) printf() arguments. + * format_s - printf(3C) arg string. + * va_alist - varargs(3EXT) printf() arguments. * * does not return - prints message and calls exit(3). * diff --git a/usr/src/cmd/sgs/tsort/common/zfopen.c b/usr/src/cmd/sgs/tsort/common/zfopen.c index b574c0750a..6e80503d60 100644 --- a/usr/src/cmd/sgs/tsort/common/zfopen.c +++ b/usr/src/cmd/sgs/tsort/common/zfopen.c @@ -28,11 +28,8 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - /* - * fopen(3S) with error checking + * fopen(3C) with error checking */ #include "errmsg.h" diff --git a/usr/src/cmd/smbsrv/smbadm/smbadm.c b/usr/src/cmd/smbsrv/smbadm/smbadm.c index 4d06c00b36..e41667200c 100644 --- a/usr/src/cmd/smbsrv/smbadm/smbadm.c +++ b/usr/src/cmd/smbsrv/smbadm/smbadm.c @@ -123,7 +123,7 @@ static int smbadm_user_delete(int, char **); static int smbadm_user_disable(int, char **); static int smbadm_user_enable(int, char **); -/* Please keep the order consistent with smbadm(1M) man page */ +/* Please keep the order consistent with smbadm(8) man page */ static smbadm_cmdinfo_t smbadm_cmdtable[] = { { "create", smbadm_group_create, HELP_CREATE, diff --git a/usr/src/cmd/smserverd/smediad.c b/usr/src/cmd/smserverd/smediad.c index dcd3dd7028..d4e6378cc8 100644 --- a/usr/src/cmd/smserverd/smediad.c +++ b/usr/src/cmd/smserverd/smediad.c @@ -121,7 +121,7 @@ * The sole function of this descriptor HAD been to inform the server of * the untimely death of the client. This descriptor is no longer used, though * it is still created, as libsmedia expects to use it. This descriptor's - * service procedure had used pthread cancellation(5) to terminate the thread of + * service procedure had used pthread cancellation(7) to terminate the thread of * the associated client_door_descriptor. The client_door_descriptor now * handles the scenarios where a door_call/client are aborted/terminated. * @@ -1374,8 +1374,8 @@ sm_server_thread(void *arg) door_dp->dd_cdoor_descriptor); /* - * Set these two cancellation(5) attributes. Ensure that the - * pthread we create has cancellation(5) DISABLED and DEFERRED, + * Set these two cancellation(7) attributes. Ensure that the + * pthread we create has cancellation(7) DISABLED and DEFERRED, * as our implementation is based on this. DEFERRED is the * default, but set it anyways, in case the defaults change in * the future. diff --git a/usr/src/cmd/ssh/etc/sshd b/usr/src/cmd/ssh/etc/sshd index d52b1afd25..0cc1d90267 100644 --- a/usr/src/cmd/ssh/etc/sshd +++ b/usr/src/cmd/ssh/etc/sshd @@ -69,7 +69,7 @@ create_ipf_rules() } # This script is being used for two purposes: as part of an SMF -# start/stop/refresh method, and as a sysidconfig(1M)/sys-unconfig(1M) +# start/stop/refresh method, and as a sysidconfig(8)/sys-unconfig(8) # application. # # Both, the SMF methods and sysidconfig/sys-unconfig use different @@ -86,7 +86,7 @@ case $1 in ;; '-u') - # sys-unconfig(1M) knows how to remove ssh host keys, so there's + # sys-unconfig(8) knows how to remove ssh host keys, so there's # nothing to do here. : ;; diff --git a/usr/src/cmd/ssh/etc/sshd_config b/usr/src/cmd/ssh/etc/sshd_config index fd4aa5df46..60d3941ebb 100644 --- a/usr/src/cmd/ssh/etc/sshd_config +++ b/usr/src/cmd/ssh/etc/sshd_config @@ -1,7 +1,7 @@ # # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # -# Configuration file for sshd(1m) (see also sshd_config(4)) +# Configuration file for sshd(8) (see also sshd_config(5)) # # Protocol versions supported diff --git a/usr/src/cmd/stmfsvc/stmfsvc.c b/usr/src/cmd/stmfsvc/stmfsvc.c index 9f83338edb..c5f86276b4 100644 --- a/usr/src/cmd/stmfsvc/stmfsvc.c +++ b/usr/src/cmd/stmfsvc/stmfsvc.c @@ -172,11 +172,11 @@ svcStart(int operandLen, char *operands[], cmdOptions_t *options, gettext("For information on reverting the " "stmf:default instance to a previously " "running configuration see the man page " - "for svccfg(1M)")); + "for svccfg(8)")); (void) fprintf(stderr, "%s: %s\n", cmdName, gettext("After reverting the instance " "you must clear the service maintenance " - "state. See the man page for svcadm(1M)")); + "state. See the man page for svcadm(8)")); break; } return (1); diff --git a/usr/src/cmd/stmsboot/mpxio-upgrade.xml b/usr/src/cmd/stmsboot/mpxio-upgrade.xml index 88fd94fd1f..c7e9e9a37b 100644 --- a/usr/src/cmd/stmsboot/mpxio-upgrade.xml +++ b/usr/src/cmd/stmsboot/mpxio-upgrade.xml @@ -28,7 +28,7 @@ operating system upgrade. Make customizations in a different file. - Service manifest for mpxio upgrade, enabled by stmsboot(1M). + Service manifest for mpxio upgrade, enabled by stmsboot(8). --> <service_bundle type='manifest' name='SUNWcsr:mpxio-upgrade'> diff --git a/usr/src/cmd/svc/common/i.manifest b/usr/src/cmd/svc/common/i.manifest index 18d2c2622d..62e73ee50f 100644 --- a/usr/src/cmd/svc/common/i.manifest +++ b/usr/src/cmd/svc/common/i.manifest @@ -23,7 +23,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# i.manifest - smf(5) service manifest install class action script +# i.manifest - smf(7) service manifest install class action script # repfile=$PKG_INSTALL_ROOT/etc/svc/repository.db @@ -75,7 +75,7 @@ svc_deathrow() # # If the repository does not yet exist, create it from the appropriate seed. If -# for some reason the seeds do not exist, svccfg(1M) will create the repository +# for some reason the seeds do not exist, svccfg(8) will create the repository # automatically. # if [ ! -f $repfile ]; then @@ -93,8 +93,8 @@ fi if [ ! -r $PKG_INSTALL_ROOT/etc/svc/volatile/repository_door ]; then # - # smf(5) is not presently running for the destination environment. - # Since we presently cannot refresh without a running svc.startd(1M), we + # smf(7) is not presently running for the destination environment. + # Since we presently cannot refresh without a running svc.startd(8), we # cannot consistently handle dependent placement. Defer to next boot. # while read src dst; do diff --git a/usr/src/cmd/svc/common/r.manifest b/usr/src/cmd/svc/common/r.manifest index 98c6e48f19..e47494f67a 100644 --- a/usr/src/cmd/svc/common/r.manifest +++ b/usr/src/cmd/svc/common/r.manifest @@ -24,7 +24,7 @@ # Use is subject to license terms. # # -# r.manifest - smf(5) manifest remove class action script +# r.manifest - smf(7) manifest remove class action script # MFSTSCAN=/lib/svc/bin/mfstscan diff --git a/usr/src/cmd/svc/configd/backend.c b/usr/src/cmd/svc/configd/backend.c index b7ed400cfd..466d2d54cc 100644 --- a/usr/src/cmd/svc/configd/backend.c +++ b/usr/src/cmd/svc/configd/backend.c @@ -27,7 +27,7 @@ /* * sqlite is not compatible with _FILE_OFFSET_BITS=64, but we need to * be able to statvfs(2) possibly large systems. This define gives us - * access to the transitional interfaces. See lfcompile64(5) for how + * access to the transitional interfaces. See lfcompile64(7) for how * _LARGEFILE64_SOURCE works. */ #define _LARGEFILE64_SOURCE @@ -1978,7 +1978,7 @@ integrity_fail: } else { (void) fprintf(stderr, "\n" -"svc.configd: smf(5) database integrity check of:\n" +"svc.configd: smf(7) database integrity check of:\n" "\n" " %s\n" "\n" @@ -1987,7 +1987,7 @@ integrity_fail: " your service provider%s%s\n" "\n" " The system will not be able to boot until you have restored a working\n" -" database. svc.startd(1M) will provide a sulogin(1M) prompt for recovery\n" +" database. svc.startd(8) will provide a sulogin(8) prompt for recovery\n" " purposes. The command:\n" "\n" " /lib/svc/bin/restore_repository\n" diff --git a/usr/src/cmd/svc/configd/restore_repository.sh b/usr/src/cmd/svc/configd/restore_repository.sh index fa3b5e2e4f..4d7bd233a6 100644 --- a/usr/src/cmd/svc/configd/restore_repository.sh +++ b/usr/src/cmd/svc/configd/restore_repository.sh @@ -87,7 +87,7 @@ fi echo >&2 " See http://illumos.org/msg/SMF-8000-MY for more information on the use of -this script to restore backup copies of the smf(5) repository. +this script to restore backup copies of the smf(7) repository. If there are any problems which need human intervention, this script will give instructions and then exit back to your shell." @@ -97,7 +97,7 @@ if [ "$myroot" = "/" ]; then [ "`/sbin/zonename`" != global ] && system="zone" echo >&2 " Note that upon full completion of this script, the $system will be rebooted -using reboot(1M), which will interrupt any active services. +using reboot(8), which will interrupt any active services. " fi @@ -242,7 +242,7 @@ new="$repo"_old_"`date +%Y''%m''%d'_'%H''%M''%S`" steps= if [ "$myroot" = / ]; then steps="$steps -svc.startd(1M) and svc.configd(1M) will be quiesced, if running." +svc.startd(8) and svc.configd(8) will be quiesced, if running." fi if [ -r $repo ]; then @@ -265,7 +265,7 @@ $file EOF if [ "$myroot" = / ]; then - echo "and the system will be rebooted with reboot(1M)." + echo "and the system will be rebooted with reboot(8)." fi echo @@ -291,11 +291,11 @@ if [ "$myroot" = / ]; then startd="`pgrep -z "$zone" -f svc.startd`" echo - echo "Quiescing svc.startd(1M) and svc.configd(1M): \c" + echo "Quiescing svc.startd(8) and svc.configd(8): \c" if [ -n "$startd" ]; then pstop $startd startd_msg=\ -"To start svc.start(1M) running, do: /usr/bin/prun $startd" +"To start svc.start(8) running, do: /usr/bin/prun $startd" fi pkill -z "$zone" -f svc.configd diff --git a/usr/src/cmd/svc/dtd/service_bundle.dtd.1 b/usr/src/cmd/svc/dtd/service_bundle.dtd.1 index b92b70c6c4..032b77aabe 100644 --- a/usr/src/cmd/svc/dtd/service_bundle.dtd.1 +++ b/usr/src/cmd/svc/dtd/service_bundle.dtd.1 @@ -34,7 +34,7 @@ XInclude support A series of service bundles may be composed via the xi:include tag. - smf(5) tools enforce that all bundles be of the same type. + smf(7) tools enforce that all bundles be of the same type. --> <!-- @@ -67,7 +67,7 @@ stability This element associates an SMI stability level with the parent - element. See attributes(5) for an explanation of interface + element. See attributes(7) for an explanation of interface stability levels. Its attribute is @@ -529,7 +529,7 @@ resource_pool The resource pool name to launch the method on. ":default" can be used as a token to indicate use of the - pool specified in the project(4) entry given in the + pool specified in the project(5) entry given in the "project" attribute above. --> <!ELEMENT method_context @@ -562,7 +562,7 @@ instance of this service is delegated. exec The string identifying the action to take. For - svc.startd(1M), this is a string suitable to pass to + svc.startd(8), this is a string suitable to pass to exec(2). timeout_seconds [integer] Duration, in seconds, to wait for this @@ -668,7 +668,7 @@ Its sole attribute is xml:lang The name of the locale, in the form accepted by LC_ALL, - etc. See locale(5). + etc. See locale(7). --> <!ELEMENT loctext (#PCDATA) > @@ -1017,7 +1017,7 @@ element, a set of dependencies on other services, potentially customized methods or configuration data, an optional method context, and a pointer to its restarter. (If no restarter is - specified, the master restarter, svc.startd(1M), is assumed to be + specified, the master restarter, svc.startd(8), is assumed to be responsible for the service.) Its attributes are diff --git a/usr/src/cmd/svc/lsvcrun/lsvcrun.c b/usr/src/cmd/svc/lsvcrun/lsvcrun.c index 74eeaefe5a..7599766a01 100644 --- a/usr/src/cmd/svc/lsvcrun/lsvcrun.c +++ b/usr/src/cmd/svc/lsvcrun/lsvcrun.c @@ -31,7 +31,7 @@ * group identifies a service, named in the form 'rc2_d_S10foo'. * * Each group has the following properties: name, the script name - * displayed by svcs(1m); state_timestamp; contract, contract ID; + * displayed by svcs(1); state_timestamp; contract, contract ID; * inode, the inode of the script; and suffix, the suffix of the * script name, e.g. 'foo'. * @@ -818,7 +818,7 @@ main(int argc, char *argv[], char *envp[]) /* Make sure we were run by svc.startd. */ if ((restarter = getenv("SMF_RESTARTER")) == NULL || strcmp(restarter, SCF_SERVICE_STARTD) != 0) - uu_die(gettext("invocation outside smf(5) inappropriate\n")); + uu_die(gettext("invocation outside smf(7) inappropriate\n")); while ((o = getopt(argc, argv, "s")) != -1) { switch (o) { diff --git a/usr/src/cmd/svc/milestone/README.share b/usr/src/cmd/svc/milestone/README.share index e69a82cedc..fe16191b42 100644 --- a/usr/src/cmd/svc/milestone/README.share +++ b/usr/src/cmd/svc/milestone/README.share @@ -24,21 +24,21 @@ Use is subject to license terms. /lib/svc/share/README -smf(5): Notes on maintenance mode and recovery +smf(7): Notes on maintenance mode and recovery Failures that bring the system to maintenance mode may include hardware or critical software failures. The procedures below are given so that some software repairs can be made; the recommended exit approach once a repair has been made is to reboot the system. The system can be brought -to maintenance mode deliberately via the '-s' option to boot(1M), or via -the 's' option to init(1M). +to maintenance mode deliberately via the '-s' option to boot(8), or via +the 's' option to init(8). -In failure scenarios, smf(5) may or may not be running, depending on -which component has failed. If smf(5) is running, and the /usr -filesystem is reachable, then the usual svcadm(1M) invocations to clear +In failure scenarios, smf(7) may or may not be running, depending on +which component has failed. If smf(7) is running, and the /usr +filesystem is reachable, then the usual svcadm(8) invocations to clear maintenance state and restart services instances can be used. Otherwise, the following instructions describe the direct execution of -service methods, so that capabilities that svc.startd(1M) would normally +service methods, so that capabilities that svc.startd(8) would normally start automatically can be started manually. In the case that the document recommends an invocation like @@ -85,13 +85,13 @@ to directly execute the corresponding service methods # /lib/svc/method/fs-minimal to mount the various filesystems. In the case that these methods fail, -a direct invocation of mount(1M), and potentially fsck(1M), should be +a direct invocation of mount(8), and potentially fsck(8), should be attempted for file systems required for recovery purposes. /lib/svc/method/fs-usr attempts to remount the root file system read-write, such that persistent changes can be made to the system's configuration. If this method is failing, one can directly remount -using the mount(1M) command via +using the mount(8) command via # /sbin/mount -o rw,remount / @@ -99,44 +99,44 @@ using the mount(1M) command via private use. It may prove a useful location to create mount points if the root file system cannot be remounted read-write. -3. Failure to run svc.configd(1M). +3. Failure to run svc.configd(8). -svc.configd(1M) will give detailed instructions for recovery if the -corruption is detected in the repository. If svc.configd(1M) cannot be +svc.configd(8) will give detailed instructions for recovery if the +corruption is detected in the repository. If svc.configd(8) cannot be run because of missing or corrupt library components, then the affected components will need to be replaced. Components could be copied from a CD-ROM or DVD-ROM, or from another system. -4. Failure to run svc.startd(1M). +4. Failure to run svc.startd(8). -If the inittab(4) line to invoke svc.startd(1M) is missing or incorrect, +If the inittab(5) line to invoke svc.startd(8) is missing or incorrect, it will need to be restored. A valid entry is smf::sysinit:/lib/svc/bin/svc.startd >/dev/msglog 2<>/dev/msglog </dev/console -If svc.startd(1M) cannot be run because of missing or corrupt library +If svc.startd(8) cannot be run because of missing or corrupt library components, then the affected components will need to be replaced, as -for svc.configd(1M) above. +for svc.configd(8) above. 5. Activating basic networking configuration. -If svc.startd(1M) did not execute successfully, it may also be necessary +If svc.startd(8) did not execute successfully, it may also be necessary to activate network interfaces manually, such that other hosts can be contacted. The service methods can be invoked directly as # /lib/svc/method/net-loopback # /lib/svc/method/net-physical -If these methods fail, a direct invocation of ifconfig(1M) can be +If these methods fail, a direct invocation of ifconfig(8) can be attempted. -In some scenarios, one may be able to use routeadm(1M) to activate more +In some scenarios, one may be able to use routeadm(8) to activate more dynamic route management functionality; restoring the default dynamic routing behaviour can be done using the '-u' option. (Invoking routeadm with no arguments will display which commands must be accessible for the current routing configuration to be invoked.) Otherwise, once interfaces are up, a default route can be manually added using the -route(1M) command. On typical IPv4 networks, this invocation would be +route(8) command. On typical IPv4 networks, this invocation would be # /sbin/route add net default _gateway_IP_ diff --git a/usr/src/cmd/svc/milestone/console-login b/usr/src/cmd/svc/milestone/console-login index c7003b103b..4c87b6332b 100644 --- a/usr/src/cmd/svc/milestone/console-login +++ b/usr/src/cmd/svc/milestone/console-login @@ -28,7 +28,7 @@ # console login. # # For modifying parameters passed to ttymon, do not edit -# this script. Instead use svccfg(1m) to modify the SMF +# this script. Instead use svccfg(8) to modify the SMF # repository. For example: # # # svccfg diff --git a/usr/src/cmd/svc/milestone/global.xml b/usr/src/cmd/svc/milestone/global.xml index 40327ff100..10597f8211 100644 --- a/usr/src/cmd/svc/milestone/global.xml +++ b/usr/src/cmd/svc/milestone/global.xml @@ -540,7 +540,7 @@ The project ID in numeric or text form. ":default" can be used as a token to in <description> <loctext xml:lang='C'> The resource pool name in 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> @@ -550,7 +550,7 @@ the project attribute. required='false'> <description> <loctext xml:lang='C'> -An optional string specifying the security flags as defined in security-flags(5). +An optional string specifying the security flags as defined in security-flags(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -589,7 +589,7 @@ in numeric or text form. required='false'> <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'/> @@ -599,7 +599,7 @@ An optional string specifying the privilege set as defined in privileges(5). <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'/> @@ -621,7 +621,7 @@ user, group, privileges, and limit_privileges properties. <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'/> @@ -649,7 +649,7 @@ Service name </common_name> <description> <loctext xml:lang='C'> -IANA name or RPC name for non-inetd service, equivalent to inetd/name property. For RPC services, the value of this property is not an IANA name but is either an RPC program number or name, see rpc(4). +IANA name or RPC name for non-inetd service, equivalent to inetd/name property. For RPC services, the value of this property is not an IANA name but is either an RPC program number or name, see rpc(5). </loctext> </description> </prop_pattern> diff --git a/usr/src/cmd/svc/milestone/make-console-login-xml b/usr/src/cmd/svc/milestone/make-console-login-xml index 8fd3b0b81b..336ba8fe45 100644 --- a/usr/src/cmd/svc/milestone/make-console-login-xml +++ b/usr/src/cmd/svc/milestone/make-console-login-xml @@ -120,7 +120,7 @@ cat >console-login.xml <<EOF <!-- these are passed to ttymon in the method script. note that value_authorization is not passed to ttymon - and it's for smf_security(5). + and it's for smf_security(7). --> <property_group name='ttymon' type='application'> <propval name='value_authorization' type='astring' diff --git a/usr/src/cmd/svc/milestone/manifest-import b/usr/src/cmd/svc/milestone/manifest-import index 81cd780583..30f23c26b4 100644 --- a/usr/src/cmd/svc/milestone/manifest-import +++ b/usr/src/cmd/svc/milestone/manifest-import @@ -234,13 +234,13 @@ function import_manifests { $X /usr/sbin/svccfg import $dirs > $logf 2>&1 fi - grep "Loaded .*. smf(5) service descriptions" $logf > /dev/null 2>&1 + grep "Loaded .*. smf(7) service descriptions" $logf > /dev/null 2>&1 if [ $? -eq 0 ]; then activity=true fi if [ -s $logf ]; then - grep "smf(5) service descriptions failed to load" $logf > /dev/null 2>&1 + grep "smf(7) service descriptions failed to load" $logf > /dev/null 2>&1 failures=$? if [ $failures -eq 0 ]; then echo "svccfg warnings:" @@ -313,7 +313,7 @@ function apply_profile { # # 4. Upgrade handling. The upgrade file generally consists of a series -# of svcadm(1M) and svccfg(1M) commands. +# of svcadm(8) and svccfg(8) commands. # function handle_upgrade { diff --git a/usr/src/cmd/svc/milestone/net-loc b/usr/src/cmd/svc/milestone/net-loc index e4d0a8c994..b8358b64ff 100644 --- a/usr/src/cmd/svc/milestone/net-loc +++ b/usr/src/cmd/svc/milestone/net-loc @@ -66,12 +66,12 @@ SCRIPT_PATH=/etc/svc/volatile/nwam # # echoes DHCP controlled interfaces separated by commas # -# Don't parse the output of ifconfig(1M) because interfaces that haven't +# Don't parse the output of ifconfig(8) because interfaces that haven't # acquired a DHCP lease also have the DHCP flag set. # get_dhcp_interfaces () { # - # 1. parse netstat(1M) output for v4 interfaces in BOUND + # 1. parse netstat(8) output for v4 interfaces in BOUND # or INFORMATION state # 2. make a space-separated list of interface names # @@ -302,7 +302,7 @@ do_nis () { # # do_ldap <location> # -# Installs LDAP information using ldapclient(1M) for location +# Installs LDAP information using ldapclient(8) for location # # Returns 0 on success, 1 on failure # @@ -334,7 +334,7 @@ do_ldap () { ;; esac - # Use ldapclient(1M) to initialize LDAP client settings. + # Use ldapclient(8) to initialize LDAP client settings. if [ -n "$DEFAULT_DOMAIN" -o -n "$LDAP_SERVERS" ]; then $LDAPCLIENT init -a domainName=$DEFAULT_DOMAIN \ $LDAP_SERVERS @@ -367,9 +367,9 @@ do_ns () { stop_svc $LDAP_CLIENT_FMRI # - # Remove /etc/defaultdomain and unset domainname(1M). If NIS + # Remove /etc/defaultdomain and unset domainname(8). If NIS # and/or LDAP is configured, they will create /etc/defaultdomain - # and set the domainname(1M). + # and set the domainname(8). # $RM -f $ETC_DEFAULT_DOMAIN $DOMAINNAME " " diff --git a/usr/src/cmd/svc/milestone/net-nwam b/usr/src/cmd/svc/milestone/net-nwam index 9f1de2fd76..fb012d7bee 100644 --- a/usr/src/cmd/svc/milestone/net-nwam +++ b/usr/src/cmd/svc/milestone/net-nwam @@ -203,7 +203,7 @@ create_legacy_loc () { done fi - # Gather LDAP info via ldapclient(1M). + # Gather LDAP info via ldapclient(8). if [ -f /var/ldap/ldap_client_file ]; then copy_to_legacy /var/ldap/ldap_client_file NAMESERVICES="${NAMESERVICES}ldap," @@ -350,7 +350,7 @@ revert_to_legacy_loc () { $SVCADM enable dns/client fi - # set /etc/defaultdomain and domainname(1M) + # set /etc/defaultdomain and domainname(8) DEFAULT_DOMAIN=`nwam_get_loc_prop Legacy default-domain` if [ -n "$DEFAULT_DOMAIN" ]; then $DOMAINNAME $DEFAULT_DOMAIN @@ -526,7 +526,7 @@ case "$1" in # # Upgrade handling. The upgrade file consists of a series - # of dladm(1M) commands. Note that after we are done, we + # of dladm(8) commands. Note that after we are done, we # cannot rename the upgrade script file as the file system # is still read-only at this point. Defer this to the # manifest-import service. diff --git a/usr/src/cmd/svc/milestone/net-physical b/usr/src/cmd/svc/milestone/net-physical index 2d7d76d9b0..ef72bee9e6 100644 --- a/usr/src/cmd/svc/milestone/net-physical +++ b/usr/src/cmd/svc/milestone/net-physical @@ -52,7 +52,7 @@ if smf_is_globalzone; then update_pvid # - # Upgrade handling. The upgrade file consists of a series of dladm(1M) + # Upgrade handling. The upgrade file consists of a series of dladm(8) # commands. Note that after we are done, we cannot rename the upgrade # script file as the file system is still read-only at this point. # Defer this to the manifest-import service. diff --git a/usr/src/cmd/svc/milestone/net-routing-setup b/usr/src/cmd/svc/milestone/net-routing-setup index 23644ebd45..5b65f90d91 100644 --- a/usr/src/cmd/svc/milestone/net-routing-setup +++ b/usr/src/cmd/svc/milestone/net-routing-setup @@ -49,7 +49,7 @@ smf_configure_ip || exit $SMF_EXIT_OK /sbin/routeadm -u # -# Are we routing dynamically? routeadm(1M) reports this in the +# Are we routing dynamically? routeadm(8) reports this in the # "current" values of ipv4/6-routing - if either are true, we are running # routing daemons (or at least they are enabled to run). # @@ -162,7 +162,7 @@ else fi # -# Use routeadm(1M) to configure forwarding and launch routing daemons +# Use routeadm(8) to configure forwarding and launch routing daemons # for IPv4 and IPv6 based on preset values. These settings only apply # to the global zone. For IPv4 dynamic routing, the system will default # to disabled if a default route was previously added via BOOTP, DHCP, diff --git a/usr/src/cmd/svc/milestone/net-svc b/usr/src/cmd/svc/milestone/net-svc index 0ede5cfb3f..c7bea42f53 100644 --- a/usr/src/cmd/svc/milestone/net-svc +++ b/usr/src/cmd/svc/milestone/net-svc @@ -123,7 +123,7 @@ dhcp_edits () # it is important to preserve order of domain entries vs. search # entries; the search entries are reserved for administrator # customization and if placed after the domain entry will override -# it. See resolv.conf(4). +# it. See resolv.conf(5). # # The first arg should be the dns servers string, the second # should be the dns domain. diff --git a/usr/src/cmd/svc/milestone/network-install.xml b/usr/src/cmd/svc/milestone/network-install.xml index 86dd638058..461a6c4832 100644 --- a/usr/src/cmd/svc/milestone/network-install.xml +++ b/usr/src/cmd/svc/milestone/network-install.xml @@ -116,14 +116,14 @@ <prop_pattern name='name' type='astring' required='true'> <description> <loctext xml:lang='C'> - The "addrobj" value to be passed to the ipadm(1M) "create-addr" command. + The "addrobj" value to be passed to the ipadm(8) "create-addr" command. </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> <prop_pattern name='address_type' type='astring' required='true'> <description> <loctext xml:lang='C'> - The "-T" option value to be passed to the ipadm(1M) "create-addr" command. + The "-T" option value to be passed to the ipadm(8) "create-addr" command. </loctext> </description> <cardinality min='1' max='1'/> <constraints> @@ -142,14 +142,14 @@ <prop_pattern name='static_address' type='net_address_v4' required='false'> <description> <loctext xml:lang='C'> - The "local" address value to be passed to the ipadm(1M) "create-addr" command. Only required if "address_type" has a value of "static". + The "local" address value to be passed to the ipadm(8) "create-addr" command. Only required if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> <prop_pattern name='dhcp_wait' type='astring' required='false'> <description> <loctext xml:lang='C'> - The "-w" option value to be passed to the ipadm(1M) "create-addr" command. Represents the maximum time to wait for DHCP offer. + The "-w" option value to be passed to the ipadm(8) "create-addr" command. Represents the maximum time to wait for DHCP offer. </loctext> </description> <units> <loctext xml:lang='C'>seconds</loctext> @@ -159,7 +159,7 @@ <prop_pattern name='default_route' type='net_address_v4' required='false'> <description> <loctext xml:lang='C'> - The default route associated with this interface. Used to add a default route using route(1M). + The default route associated with this interface. Used to add a default route using route(8). </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> @@ -172,14 +172,14 @@ <prop_pattern name='name' type='astring' required='true'> <description> <loctext xml:lang='C'> - The "addrobj" value to be passed to the ipadm(1M) "create-addr" command. + The "addrobj" value to be passed to the ipadm(8) "create-addr" command. </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> <prop_pattern name='address_type' type='astring' required='true'> <description> <loctext xml:lang='C'> - The "-T" option value to be passed to the ipadm(1M) "create-addr" command. + The "-T" option value to be passed to the ipadm(8) "create-addr" command. </loctext> </description> <cardinality min='1' max='1'/> <constraints> @@ -198,14 +198,14 @@ <prop_pattern name='static_address' type='net_address_v6' required='false'> <description> <loctext xml:lang='C'> - The "local" address value to be passed to the ipadm(1M) "create-addr" command. Only required if "address_type" has a value of "static". + The "local" address value to be passed to the ipadm(8) "create-addr" command. Only required if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> <prop_pattern name='interface_id' type='net_address_v6' required='false'> <description> <loctext xml:lang='C'> - The "-i" token value to be passed to the ipadm(1M) "create-addr" command. Ignored if "address_type" has a value of "static". + The "-i" token value to be passed to the ipadm(8) "create-addr" command. Ignored if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> @@ -213,7 +213,7 @@ <prop_pattern name='stateless' type='astring' required='false'> <description> <loctext xml:lang='C'> - The "stateless" value to be passed to the ipadm(1M) "create-addr" command. Ignored if "address_type" has a value of "static". + The "stateless" value to be passed to the ipadm(8) "create-addr" command. Ignored if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> <constraints> @@ -224,7 +224,7 @@ <prop_pattern name='stateful' type='astring' required='false'> <description> <loctext xml:lang='C'> - The "stateful" value to be passed to the ipadm(1M) "create-addr" command. Ignored if "address_type" has a value of "static". + The "stateful" value to be passed to the ipadm(8) "create-addr" command. Ignored if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> <constraints> @@ -235,7 +235,7 @@ <prop_pattern name='default_route' type='net_address_v6' required='false'> <description> <loctext xml:lang='C'> - The default route associated with this interface. Used to add a default route using route(1M). + The default route associated with this interface. Used to add a default route using route(8). </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> diff --git a/usr/src/cmd/svc/milestone/network-location.xml b/usr/src/cmd/svc/milestone/network-location.xml index ab25c52807..a53dfce90a 100644 --- a/usr/src/cmd/svc/milestone/network-location.xml +++ b/usr/src/cmd/svc/milestone/network-location.xml @@ -33,8 +33,8 @@ <!-- network/location is used as a medium to refresh and restart SMF - services dependent on network/location whenever nwamd(1M) changes - locations. nwamd(1M) updates the different configuration files + services dependent on network/location whenever nwamd(8) changes + locations. nwamd(8) updates the different configuration files according to the location being (de)activated and refreshes network/location. This causes the services dependent on network/location to restart and read in the updated configuration files. @@ -69,7 +69,7 @@ <instance name='default' enabled='false'> <!-- - nwamd(1M) refreshes network/location when a new location is + nwamd(8) refreshes network/location when a new location is activated, thus the "restart_on none" dependency. --> <dependency diff --git a/usr/src/cmd/svc/milestone/restarter.xml b/usr/src/cmd/svc/milestone/restarter.xml index c3fa8ad7b0..f25d133192 100644 --- a/usr/src/cmd/svc/milestone/restarter.xml +++ b/usr/src/cmd/svc/milestone/restarter.xml @@ -650,7 +650,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> @@ -666,7 +666,7 @@ method credential security flags </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the security flags as defined in security-flags(5). +An optional string specifying the security flags as defined in security-flags(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -727,7 +727,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'/> @@ -743,7 +743,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'/> @@ -771,7 +771,7 @@ method profile RBAC profile specification <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'/> @@ -913,7 +913,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> @@ -929,7 +929,7 @@ method credential security flags </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the security flags as defined in security-flags(5). +An optional string specifying the security flags as defined in security-flags(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -990,7 +990,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'/> @@ -1006,7 +1006,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'/> @@ -1034,7 +1034,7 @@ method profile RBAC profile specification <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'/> @@ -1176,7 +1176,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> @@ -1191,7 +1191,7 @@ method security flags </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the security flags as defined in security-flags(5). +An optional string specifying the security flags as defined in security-flags(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -1252,7 +1252,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'/> @@ -1268,7 +1268,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'/> @@ -1296,7 +1296,7 @@ method profile RBAC profile specification <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/svc/milestone/rmtmpfiles b/usr/src/cmd/svc/milestone/rmtmpfiles index f08782a9a8..8c09c0387f 100644 --- a/usr/src/cmd/svc/milestone/rmtmpfiles +++ b/usr/src/cmd/svc/milestone/rmtmpfiles @@ -24,7 +24,7 @@ # Use is subject to license terms. # For modifying the behavior of rmtmpfiles, do not edit this script. -# Instead use svccfg(1m) to modify the SMF repository. To achieve +# Instead use svccfg(8) to modify the SMF repository. To achieve # traditional System V treatment of /var/tmp, invoke the following # commands.: # diff --git a/usr/src/cmd/svc/profile/README b/usr/src/cmd/svc/profile/README index 6e93615b5f..e0f11ab7e4 100644 --- a/usr/src/cmd/svc/profile/README +++ b/usr/src/cmd/svc/profile/README @@ -24,8 +24,6 @@ # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" - Notes Regarding Modification of generic_open.xml Any changes made to generic_open.xml will need to be considered for @@ -35,7 +33,7 @@ in PSARC/2004/781: ... The generic_limited_net profile explicitly disables all - smf(5) converted inetd services that are not required to + smf(7) converted inetd services that are not required to run the window system, SVM, or vold. It retains ssh and X remote login as the remote login methods available. ... diff --git a/usr/src/cmd/svc/profile/generic_limited_net.xml b/usr/src/cmd/svc/profile/generic_limited_net.xml index 44814441e6..a79d59c1f7 100644 --- a/usr/src/cmd/svc/profile/generic_limited_net.xml +++ b/usr/src/cmd/svc/profile/generic_limited_net.xml @@ -44,7 +44,7 @@ <xi:include href='file:/etc/svc/profile/name_service.xml' /> <!-- - svc.startd(1M) services + svc.startd(8) services --> <service name='system/coreadm' version='1' type='service'> <instance name='default' enabled='true'/> @@ -201,7 +201,7 @@ </service> <!-- - default inetd(1M) services + default inetd(8) services --> <service name='network/finger' version='1' type='service'> <instance name='default' enabled='false'/> @@ -220,7 +220,7 @@ </service> <!-- - non-default inetd(1M) services + non-default inetd(8) services --> <service name='network/uucp' version='1' type='service'> <instance name='default' enabled='false'/> @@ -262,7 +262,7 @@ </service> <!-- - default inetd(1M) RPC services enabled + default inetd(8) RPC services enabled --> <service name='network/rpc/gss' version='1' type='service'> <instance name='default' enabled='true'/> @@ -278,7 +278,7 @@ </service> <!-- - default inetd(1M) RPC services disabled + default inetd(8) RPC services disabled --> <service name='network/rpc/rstat' version='1' type='service'> <instance name='default' enabled='false'/> @@ -288,7 +288,7 @@ </service> <!-- - non-default inetd(1M) RPC services disabled + non-default inetd(8) RPC services disabled --> <service name='network/rpc/rex' version='1' type='service'> <instance name='default' enabled='false'/> diff --git a/usr/src/cmd/svc/profile/generic_open.xml b/usr/src/cmd/svc/profile/generic_open.xml index ce23b8efdd..47b00fb4de 100644 --- a/usr/src/cmd/svc/profile/generic_open.xml +++ b/usr/src/cmd/svc/profile/generic_open.xml @@ -41,7 +41,7 @@ <xi:include href='file:/etc/svc/profile/name_service.xml' /> <!-- - svc.startd(1M) services + svc.startd(8) services --> <service name='system/coreadm' version='1' type='service'> <instance name='default' enabled='true'/> @@ -186,7 +186,7 @@ </service> <!-- - Include inetd(1M) services profile. + Include inetd(8) services profile. --> <xi:include href='file:/etc/svc/profile/inetd_services.xml' /> </service_bundle> diff --git a/usr/src/cmd/svc/profile/inetd_generic.xml b/usr/src/cmd/svc/profile/inetd_generic.xml index 8d2df20219..e95a0608ba 100644 --- a/usr/src/cmd/svc/profile/inetd_generic.xml +++ b/usr/src/cmd/svc/profile/inetd_generic.xml @@ -32,7 +32,7 @@ --> <service_bundle type='profile' name='default'> <!-- - inetd(1M) services + inetd(8) services --> <service name='network/finger' version='1' type='service'> <instance name='default' enabled='true'/> @@ -48,7 +48,7 @@ </service> <!-- - inetd(1M) RPC services + inetd(8) RPC services --> <service name='network/nfs/rquota' version='1' type='service'> <instance name='default' enabled='true'/> diff --git a/usr/src/cmd/svc/shell/fs_include.sh b/usr/src/cmd/svc/shell/fs_include.sh index 99810383cc..f0ee2748a7 100644 --- a/usr/src/cmd/svc/shell/fs_include.sh +++ b/usr/src/cmd/svc/shell/fs_include.sh @@ -27,7 +27,6 @@ # All rights reserved. # # -#ident "%Z%%M% %I% %E% SMI" vfstab=${vfstab:=/etc/vfstab} @@ -43,7 +42,7 @@ vfstab=${vfstab:=/etc/vfstab} # fsckdev raw device # mountp mount point (must match $1, if found) # fstype file system type -# fsckpass fsck(1M) pass number +# fsckpass fsck(8) pass number # automnt automount flag (yes or no) # mntopts file system-specific mount options. # @@ -307,7 +306,7 @@ mounted() { # to our service log. # # Arguments: -# $opts - options for mount(1M) [optional] +# $opts - options for mount(8) [optional] # $path - mount point # $type - file system type [optional] # $fsopts - file system specific options (-o) [optional] @@ -315,7 +314,7 @@ mounted() { # # Return codes: # 0 - success. -# otherwise - error code returned by mount(1M). +# otherwise - error code returned by mount(8). # mountfs() { opts="$1" diff --git a/usr/src/cmd/svc/shell/smf_include.sh b/usr/src/cmd/svc/shell/smf_include.sh index 25bffca1bf..e7285c42e7 100644 --- a/usr/src/cmd/svc/shell/smf_include.sh +++ b/usr/src/cmd/svc/shell/smf_include.sh @@ -242,7 +242,7 @@ smf_kill_contract() { } # -# smf(5) method and monitor exit status definitions +# smf(7) method and monitor exit status definitions # SMF_EXIT_ERR_OTHER, although not defined, encompasses all non-zero # exit status values. # diff --git a/usr/src/cmd/svc/startd/fork.c b/usr/src/cmd/svc/startd/fork.c index 7bce347854..df91d174ca 100644 --- a/usr/src/cmd/svc/startd/fork.c +++ b/usr/src/cmd/svc/startd/fork.c @@ -94,7 +94,7 @@ startd_fork1(int *forkerr) /* * void fork_mount(char *, char *) - * Run mount(1M) with the given options and mount point. (mount(1M) has much + * Run mount(8) with the given options and mount point. (mount(8) has much * hidden knowledge; it's much less correct to reimplement that logic here to * save a fork(2)/exec(2) invocation.) */ @@ -116,7 +116,7 @@ fork_mount(char *path, char *opts) (void) waitpid(pid, &status, 0); /* - * If our mount(1M) invocation exited by peculiar means, or with + * If our mount(8) invocation exited by peculiar means, or with * a non-zero status, our mount likelihood is low. */ if (!WIFEXITED(status) || @@ -183,8 +183,8 @@ fork_common(const char *name, const char *svc_fmri, int retries, ctid_t *ctidp, for (pid = fork1(); pid == -1; pid = fork1()) { if (++tries > retries) { /* - * When we exit the sulogin session, init(1M) - * will restart svc.startd(1M). + * When we exit the sulogin session, init(8) + * will restart svc.startd(8). */ err = errno; (void) ct_tmpl_clear(ctfd); @@ -217,7 +217,7 @@ fork_common(const char *name, const char *svc_fmri, int retries, ctid_t *ctidp, * is ended, we continue. This is the last fallback action for system * maintenance. * - * If immediate is true, fork_sulogin() executes sulogin(1M) directly, without + * If immediate is true, fork_sulogin() executes sulogin(8) directly, without * forking. * * Because fork_sulogin() is needed potentially before we daemonize, we leave diff --git a/usr/src/cmd/svc/startd/graph.c b/usr/src/cmd/svc/startd/graph.c index f63be7f941..f8d5f2b0ce 100644 --- a/usr/src/cmd/svc/startd/graph.c +++ b/usr/src/cmd/svc/startd/graph.c @@ -127,8 +127,8 @@ * stn_global for the system-wide set. They are re-read when instances are * refreshed. * - * The GPEC events published by svc.startd are consumed by fmd(1M). After - * processing these events, fmd(1M) publishes the processed events to + * The GPEC events published by svc.startd are consumed by fmd(8). After + * processing these events, fmd(8) publishes the processed events to * notification agents. The notification agents read the notification * parameters from the SMF repository through libscf(3LIB) interfaces and send * the notification, or not, based on those parameters. diff --git a/usr/src/cmd/svc/startd/log.c b/usr/src/cmd/svc/startd/log.c index 7ea39a9a1c..bce86b75fd 100644 --- a/usr/src/cmd/svc/startd/log.c +++ b/usr/src/cmd/svc/startd/log.c @@ -28,13 +28,13 @@ * log.c - debugging and logging functions * * Logging destinations - * svc.startd(1M) supports three logging destinations: the system log, a + * svc.startd(8) supports three logging destinations: the system log, a * daemon-specific log (in the /var/svc/log hierarchy by default), and to the * standard output (redirected to the /var/svc/log/svc.startd.log file by * default). Any or all of these destinations may be used to * communicate a specific message; the audiences for each destination differ. * - * Generic messages associated with svc.startd(1M) are made by the + * Generic messages associated with svc.startd(8) are made by the * log_framework() and log_error() functions. For these messages, svc.startd * logs under its own name and under the LOG_DAEMON facility when issuing * events to the system log. By design, severities below LOG_NOTICE are never @@ -64,30 +64,30 @@ * * LOG_ALERT An unrecoverable operation requiring external * intervention has occurred. Includes an inability to - * write to the smf(5) repository (due to svc.configd(1M) + * write to the smf(7) repository (due to svc.configd(8) * absence, due to permissions failures, etc.). Message * should identify component at fault. * - * LOG_CRIT An unrecoverable operation internal to svc.startd(1M) + * LOG_CRIT An unrecoverable operation internal to svc.startd(8) * has occurred. Failure should be recoverable by restart - * of svc.startd(1M). + * of svc.startd(8). * - * LOG_ERR An smf(5) event requiring administrative intervention + * LOG_ERR An smf(7) event requiring administrative intervention * has occurred. Includes instance being moved to the * maintenance state. * - * LOG_WARNING A potentially destabilizing smf(5) event not requiring + * LOG_WARNING A potentially destabilizing smf(7) event not requiring * administrative intervention has occurred. * - * LOG_NOTICE A noteworthy smf(5) event has occurred. Includes + * LOG_NOTICE A noteworthy smf(7) event has occurred. Includes * individual instance failures. * - * LOG_INFO A noteworthy operation internal to svc.startd(1M) has + * LOG_INFO A noteworthy operation internal to svc.startd(8) has * occurred. Includes recoverable failures or otherwise * unexpected outcomes. * * LOG_DEBUG An internal operation only of interest to a - * svc.startd(1M) developer has occurred. + * svc.startd(8) developer has occurred. * * Logging configuration * The preferred approach is to set the logging property values diff --git a/usr/src/cmd/svc/startd/protocol.c b/usr/src/cmd/svc/startd/protocol.c index e4fc9f73c5..a21e7e709a 100644 --- a/usr/src/cmd/svc/startd/protocol.c +++ b/usr/src/cmd/svc/startd/protocol.c @@ -476,7 +476,7 @@ restarter_protocol_send_event(const char *inst, evchan_t *chan, /* * For the purposes of loading state after interruption, this is - * sufficient, as svc.startd(1M) won't receive events on the contracts + * sufficient, as svc.startd(8) won't receive events on the contracts * associated with each delegate. */ MUTEX_LOCK(&st->st_load_lock); diff --git a/usr/src/cmd/svc/startd/restarter.c b/usr/src/cmd/svc/startd/restarter.c index 70f84a06d6..6003c81c87 100644 --- a/usr/src/cmd/svc/startd/restarter.c +++ b/usr/src/cmd/svc/startd/restarter.c @@ -2272,7 +2272,7 @@ restarter_contracts_event_thread(void *unused) startd_close(sfd); /* - * svc.configd(1M) restart handling performed by the + * svc.configd(8) restart handling performed by the * fork_configd_thread. We don't acknowledge, as that thread * will do so. */ diff --git a/usr/src/cmd/svc/startd/specials.c b/usr/src/cmd/svc/startd/specials.c index 3c8858b527..5f7c328a83 100644 --- a/usr/src/cmd/svc/startd/specials.c +++ b/usr/src/cmd/svc/startd/specials.c @@ -23,12 +23,10 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * specials.c - knowledge of special services * - * svc.startd(1M) has duties that cannot be carried out without knowledge of the + * svc.startd(8) has duties that cannot be carried out without knowledge of the * transition of various services, such as the milestones, to their online * states. Hooks are called with the restarter instance's ri_lock held, so * operations on all instances (or on the graph) should be performed diff --git a/usr/src/cmd/svc/startd/startd.c b/usr/src/cmd/svc/startd/startd.c index d28687e761..ea9c4efbe4 100644 --- a/usr/src/cmd/svc/startd/startd.c +++ b/usr/src/cmd/svc/startd/startd.c @@ -47,16 +47,16 @@ * There are a few different components that make up SMF and are responsible * for different pieces of functionality that are used: * - * svc.startd(1M): A daemon that is in charge of starting, stopping, and + * svc.startd(8): A daemon that is in charge of starting, stopping, and * restarting services and instances. - * svc.configd(1M): A daemon that manages the repository that stores + * svc.configd(8): A daemon that manages the repository that stores * information, property groups, and state of the different services and * instances. * libscf(3LIB): A C library that provides the glue for communicating, * accessing, and updating information about services and instances. - * svccfg(1M): A utility to add and remove services as well as change the + * svccfg(8): A utility to add and remove services as well as change the * properties associated with different services and instances. - * svcadm(1M): A utility to control the different instance of a service. You + * svcadm(8): A utility to control the different instance of a service. You * can use this to enable and disable them among some other useful things. * svcs(1): A utility that reports on the status of various services on the * system. diff --git a/usr/src/cmd/svc/startd/utmpx.c b/usr/src/cmd/svc/startd/utmpx.c index 1b3ca95010..1fd55b6592 100644 --- a/usr/src/cmd/svc/startd/utmpx.c +++ b/usr/src/cmd/svc/startd/utmpx.c @@ -31,7 +31,7 @@ /* * utmpx.c - utmpx utility routines * - * Since svc.startd(1M) places utmpx records for its launched instances, it must + * Since svc.startd(8) places utmpx records for its launched instances, it must * also mark them as dead once completed. */ diff --git a/usr/src/cmd/svc/startd/wait.c b/usr/src/cmd/svc/startd/wait.c index 12856ff639..970bd63f6d 100644 --- a/usr/src/cmd/svc/startd/wait.c +++ b/usr/src/cmd/svc/startd/wait.c @@ -294,7 +294,7 @@ wait_thread(void *args) psi.pr_lwp.pr_lwpid != 0) { /* * We have determined, in accordance with the - * definition in proc(4), this process is not a + * definition in proc(5), this process is not a * zombie. Reassociate. */ if (port_associate(port_fd, PORT_SOURCE_FD, fd, diff --git a/usr/src/cmd/svc/svcadm/svcadm.c b/usr/src/cmd/svc/svcadm/svcadm.c index c5a046565f..0330305c98 100644 --- a/usr/src/cmd/svc/svcadm/svcadm.c +++ b/usr/src/cmd/svc/svcadm/svcadm.c @@ -167,7 +167,7 @@ usage() "\t%1$s clear [<service> ...]\t\t- clear maintenance state\n" "\t%1$s milestone [-d] <milestone>\t- advance to a service milestone\n" "\n\t" - "Services can be specified using an FMRI, abbreviation, or fnmatch(5)\n" + "Services can be specified using an FMRI, abbreviation, or fnmatch(7)\n" "\tpattern, as shown in these examples for svc:/network/smtp:sendmail\n" "\n" "\t%1$s <cmd> svc:/network/smtp:sendmail\n" diff --git a/usr/src/cmd/svc/svccfg/svccfg_engine.c b/usr/src/cmd/svc/svccfg/svccfg_engine.c index d0d690f231..cafaeac254 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_engine.c +++ b/usr/src/cmd/svc/svccfg/svccfg_engine.c @@ -467,13 +467,13 @@ fail: /* * Initialize svccfg state. We recognize four environment variables: * - * SVCCFG_REPOSITORY Create a private instance of svc.configd(1M) to answer + * SVCCFG_REPOSITORY Create a private instance of svc.configd(8) to answer * requests for the specified repository file. * SVCCFG_DOOR_PATH Directory for door creation. * * SVCCFG_DOOR Rendezvous via an alternative repository door. * - * SVCCFG_CONFIGD_PATH Resolvable path to alternative svc.configd(1M) binary. + * SVCCFG_CONFIGD_PATH Resolvable path to alternative svc.configd(8) binary. */ void engine_init() @@ -761,7 +761,7 @@ engine_import(uu_list_t *args) if (progress_out != NULL) (void) fprintf(progress_out, - "Loading smf(5) service descriptions: "); + "Loading smf(7) service descriptions: "); failed_manifests = 0; progress_count = 0; @@ -793,11 +793,11 @@ engine_import(uu_list_t *args) if (dirarg && total_manifests > 0) { char *msg; - msg = "Loaded %d smf(5) service descriptions\n"; + msg = "Loaded %d smf(7) service descriptions\n"; warn(gettext(msg), progress_count); if (failed_manifests) { - msg = "%d smf(5) service descriptions failed to load\n"; + msg = "%d smf(7) service descriptions failed to load\n"; warn(gettext(msg), failed_manifests); } } diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c index 1e565d795f..a1a3a44ad2 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c +++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c @@ -756,7 +756,7 @@ remove_tempfile(void) } /* - * Launch private svc.configd(1M) for manipulating alternate repositories. + * Launch private svc.configd(8) for manipulating alternate repositories. */ static void start_private_repository(engine_state_t *est) @@ -832,7 +832,7 @@ void lscf_cleanup(void) { /* - * In the case where we've launched a private svc.configd(1M) + * In the case where we've launched a private svc.configd(8) * instance, we must terminate our child and remove the temporary * rendezvous point. */ diff --git a/usr/src/cmd/svc/svccfg/svccfg_tmpl.c b/usr/src/cmd/svc/svccfg/svccfg_tmpl.c index 2f17e6b85d..e7b71950f5 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_tmpl.c +++ b/usr/src/cmd/svc/svccfg/svccfg_tmpl.c @@ -25,7 +25,7 @@ */ /* - * This file provides the code that allows svccfg(1M) to validate a + * This file provides the code that allows svccfg(8) to validate a * manifest against the template specifications. svccfg uses the * validation facilities for the import and validate subcommands. * diff --git a/usr/src/cmd/svc/svccfg/svccfg_xml.c b/usr/src/cmd/svc/svccfg/svccfg_xml.c index c0810de2ab..70e62a83bd 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_xml.c +++ b/usr/src/cmd/svc/svccfg/svccfg_xml.c @@ -552,7 +552,7 @@ lxml_store_value(value_t *v, element_t type, const xmlChar *value) /* * Although an SC_COUNT represents a uint64_t the use * of a negative value is acceptable due to the usage - * established by inetd(1M). + * established by inetd(8). */ errno = 0; v->sc_u.sc_count = strtoull((char *)value, &endptr, 10); @@ -1085,7 +1085,7 @@ lxml_get_exec_method(entity_t *entity, xmlNodePtr emeth) /* * Although an SC_COUNT represents a uint64_t the use * of a negative value is acceptable due to the usage - * established by inetd(1M). + * established by inetd(8). */ errno = 0; u_timeout = strtoull((char *)timeout, &endptr, 10); diff --git a/usr/src/cmd/svc/svcs/svcs.c b/usr/src/cmd/svc/svcs/svcs.c index b6cf4f7fd1..87735a69c7 100644 --- a/usr/src/cmd/svc/svcs/svcs.c +++ b/usr/src/cmd/svc/svcs/svcs.c @@ -88,7 +88,7 @@ #define LEGACY_UNKNOWN "unknown" /* - * Per proc(4) when pr_nlwp, pr_nzomb, and pr_lwp.pr_lwpid are all 0, + * Per proc(5) when pr_nlwp, pr_nzomb, and pr_lwp.pr_lwpid are all 0, * the process is a zombie. */ #define IS_ZOMBIE(_psip) \ @@ -1802,7 +1802,7 @@ description_of_column(int c) switch (c) { case 0: - s = gettext("contract ID for service (see contract(4))"); + s = gettext("contract ID for service (see contract(5))"); break; case 1: s = gettext("human-readable description of the service"); @@ -1899,7 +1899,7 @@ print_help(const char *progname) "\t-z from global zone, show services in a specified zone\n" "\t-Z from global zone, show services in all zones\n" "\n\t" - "Services can be specified using an FMRI, abbreviation, or fnmatch(5)\n" + "Services can be specified using an FMRI, abbreviation, or fnmatch(7)\n" "\tpattern, as shown in these examples for svc:/network/smtp:sendmail\n" "\n" "\t%1$s [opts] svc:/network/smtp:sendmail\n" diff --git a/usr/src/cmd/svr4pkg/libinst/open_package_datastream.c b/usr/src/cmd/svr4pkg/libinst/open_package_datastream.c index 2896a99e80..4cc1965024 100644 --- a/usr/src/cmd/svr4pkg/libinst/open_package_datastream.c +++ b/usr/src/cmd/svr4pkg/libinst/open_package_datastream.c @@ -135,7 +135,7 @@ open_package_datastream(int a_argc, char **a_argv, char *a_spoolDir, * _getvol verifies that the specified device is accessible and * that a volume of the appropriate medium has been inserted. * _getvol is in libadm.h - delivered by ON as part of SUNWcsl - * is somewhat analagous to getvol(1M) - args are: + * is somewhat analagous to getvol(8) - args are: * - char *device * - char *label * - int options diff --git a/usr/src/cmd/svr4pkg/pkgadd/main.c b/usr/src/cmd/svr4pkg/pkgadd/main.c index 4f05b28318..ee5e8e5f3f 100644 --- a/usr/src/cmd/svr4pkg/pkgadd/main.c +++ b/usr/src/cmd/svr4pkg/pkgadd/main.c @@ -631,7 +631,7 @@ main(int argc, char **argv) /* * Public interface: Identify a file or directory which - * contains output from a previous pkgask(1M) + * contains output from a previous pkgask(8) * session. This file supplies the interaction responses * that would be requested by the package in interactive * mode. response must be a full pathname. @@ -698,7 +698,7 @@ main(int argc, char **argv) /* * Public interface: Install packages based on the value * of the CATEGORY parameter stored in the package's - * pkginfo(4) file. All packages on the source medium + * pkginfo(5) file. All packages on the source medium * whose CATEGORY matches one of the specified categories * will be selected for installation or spooling. Install * packages that contain the same CATEGORY as the one @@ -910,7 +910,7 @@ main(int argc, char **argv) /* * This function is in the libinst library; it reads the specified - * admin(4) file and, using fpkgparam(), sets the global "adm" structure + * admin(5) file and, using fpkgparam(), sets the global "adm" structure * values to match what is in the specified admin file. */ diff --git a/usr/src/cmd/svr4pkg/pkgcond/main.c b/usr/src/cmd/svr4pkg/pkgcond/main.c index e5710241e4..b09129cd83 100644 --- a/usr/src/cmd/svr4pkg/pkgcond/main.c +++ b/usr/src/cmd/svr4pkg/pkgcond/main.c @@ -31,7 +31,7 @@ /* * Program: pkgcond * - * Function: Implements the package command suite public utility pkgcond(1M) + * Function: Implements the package command suite public utility pkgcond(8) * * Usage: pkgcond [-nv] [-O debug] condition [ argument ] * diff --git a/usr/src/cmd/svr4pkg/pkginstall/main.c b/usr/src/cmd/svr4pkg/pkginstall/main.c index 666d7e3a32..cbe50ebcb9 100644 --- a/usr/src/cmd/svr4pkg/pkginstall/main.c +++ b/usr/src/cmd/svr4pkg/pkginstall/main.c @@ -686,7 +686,7 @@ main(int argc, char *argv[]) /* * Same as pkgadd: Identify a file or directory which - * contains output from a previous pkgask(1M) + * contains output from a previous pkgask(8) * session. This file supplies the interaction responses * that would be requested by the package in interactive * mode. response must be a full pathname. diff --git a/usr/src/cmd/svr4pkg/pkgscripts/pkgserv.xml b/usr/src/cmd/svr4pkg/pkgscripts/pkgserv.xml index fdc2102d7c..43ee6cc045 100644 --- a/usr/src/cmd/svr4pkg/pkgscripts/pkgserv.xml +++ b/usr/src/cmd/svr4pkg/pkgscripts/pkgserv.xml @@ -77,7 +77,7 @@ <template> <common_name> <loctext xml:lang='C'> - Flush package command database to disk (see pkgadm(1m)). + Flush package command database to disk (see pkgadm(8)). </loctext> </common_name> </template> diff --git a/usr/src/cmd/swap/swap.c b/usr/src/cmd/swap/swap.c index 6b4522745d..6370eeb23b 100644 --- a/usr/src/cmd/swap/swap.c +++ b/usr/src/cmd/swap/swap.c @@ -497,7 +497,7 @@ dumpadm_err(const char *warning) { (void) fprintf(stderr, "%s (%s):\n", warning, strerror(errno)); (void) fprintf(stderr, gettext( - "run dumpadm(1M) to verify dump configuration\n")); + "run dumpadm(8) to verify dump configuration\n")); } static int @@ -535,7 +535,7 @@ delete(char *path, off_t offset) if (ioctl(fd, DIOCGETDEV, dumpdev) == -1) { if (errno == ENODEV) { (void) printf(gettext("%s was dump device --\n" - "invoking dumpadm(1M) -d swap to " + "invoking dumpadm(8) -d swap to " "select new dump device\n"), path); /* * Close /dev/dump prior to executing dumpadm @@ -643,7 +643,7 @@ add(char *path, off_t offset, off_t cnt, int flags) (void) printf( gettext("operating system crash dump was previously " - "disabled --\ninvoking dumpadm(1M) -d swap to select " + "disabled --\ninvoking dumpadm(8) -d swap to select " "new dump device\n")); if (system("/usr/sbin/dumpadm -ud swap") == -1) diff --git a/usr/src/cmd/sysdef/sdevinfo.c b/usr/src/cmd/sysdef/sdevinfo.c index 448833ae61..cc43f7b052 100644 --- a/usr/src/cmd/sysdef/sdevinfo.c +++ b/usr/src/cmd/sysdef/sdevinfo.c @@ -23,8 +23,6 @@ * Copyright (c) 1990 - 1997, Sun Microsystems, Inc. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * For machines that support the openprom, fetch and print the list * of devices that the kernel has fetched from the prom or conjured up. @@ -103,7 +101,7 @@ dump_node(di_node_t node, void *arg) } } else { /* - * prtconf(1M) compatible.. + * prtconf(8) compatible.. */ (void) printf("%s", di_node_name(node)); if (di_instance(node) >= 0) diff --git a/usr/src/cmd/syseventd/etc/README b/usr/src/cmd/syseventd/etc/README index 27287c08c0..c6fb286679 100644 --- a/usr/src/cmd/syseventd/etc/README +++ b/usr/src/cmd/syseventd/etc/README @@ -20,13 +20,13 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -Configuration files for syseventd(1M). +Configuration files for syseventd(8). These files are not intended to be edited and any changes made will not be preserved across upgrades. diff --git a/usr/src/cmd/syslogd/newsyslog b/usr/src/cmd/syslogd/newsyslog index 09041e2833..71ba3c9df8 100644 --- a/usr/src/cmd/syslogd/newsyslog +++ b/usr/src/cmd/syslogd/newsyslog @@ -24,9 +24,9 @@ # Copyright (c) 1997-2001 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" + # -# NOTE: This script is no longer used -- see logadm(1M) +# NOTE: This script is no longer used -- see logadm(8) # # Running this script checks to see if /var/log/syslog or /var/adm/messages # need rotating, according to the policies in /etc/logadm.conf. Since logadm diff --git a/usr/src/cmd/syslogd/syslogd.dfl b/usr/src/cmd/syslogd/syslogd.dfl index 3055a926b7..6035891e0d 100644 --- a/usr/src/cmd/syslogd/syslogd.dfl +++ b/usr/src/cmd/syslogd/syslogd.dfl @@ -1,4 +1,3 @@ -#ident "%Z%%M% %I% %E% SMI" # # CDDL HEADER START # @@ -24,14 +23,14 @@ # # /etc/default/syslogd # -# Legacy configuration file for syslogd(1M). See syslogd(1M). +# Legacy configuration file for syslogd(8). See syslogd(8). # # This file should no longer be directly used to configure syslogd. # These settings are kept here for backwards compatibility only. -# Please use svccfg(1M) to modify the properties of syslogd(1M). +# Please use svccfg(8) to modify the properties of syslogd(8). # # The LOG_FROM_REMOTE setting used to affect the logging of remote -# messages. Its definition here will override the svccfg(1M) settings +# messages. Its definition here will override the svccfg(8) settings # for log_from_remote. # #LOG_FROM_REMOTE=YES diff --git a/usr/src/cmd/syslogd/system-log b/usr/src/cmd/syslogd/system-log index b7608219fc..a8264d4b78 100644 --- a/usr/src/cmd/syslogd/system-log +++ b/usr/src/cmd/syslogd/system-log @@ -22,7 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" OLD_CONF=/etc/default/syslogd @@ -40,11 +39,11 @@ convert() exit $SMF_EXIT_ERR_CONFIG fi fi - echo "Incorporated ${OLD_CONF} settings into SMF. See syslogd(1m)." + echo "Incorporated ${OLD_CONF} settings into SMF. See syslogd(8)." awk '{ if ($1 ~ /^LOG_FROM_REMOTE=/) { print "# LOG_FROM_REMOTE is now set using " - "svccfg(1m), see syslog(1m)."; + "svccfg(8), see syslogd(8)."; } else { print $0; } diff --git a/usr/src/cmd/syslogd/system-log.xml b/usr/src/cmd/syslogd/system-log.xml index cbe94246a8..71cd75bf72 100644 --- a/usr/src/cmd/syslogd/system-log.xml +++ b/usr/src/cmd/syslogd/system-log.xml @@ -51,7 +51,7 @@ </dependency> <!-- - syslogd(1M) can log to non-root local directories. + syslogd(8) can log to non-root local directories. --> <dependency name='filesystem' @@ -62,7 +62,7 @@ </dependency> <!-- - syslogd(1M) can log to automounted files. + syslogd(8) can log to automounted files. --> <dependency name='autofs' @@ -73,7 +73,7 @@ </dependency> <!-- - syslogd(1M) needs nameservice resolution to log to remote hosts. + syslogd(8) needs nameservice resolution to log to remote hosts. --> <dependency name='name-services' @@ -119,7 +119,7 @@ </property_group> <property_group name='config' type='application'> - <!-- default property settings for syslogd(1m) --> + <!-- default property settings for syslogd(8) --> <!-- Specifies whether remote messages are logged. log_from_remote=false is equivalent to the -t diff --git a/usr/src/cmd/th_tools/th_define.c b/usr/src/cmd/th_tools/th_define.c index 955dc724fa..a196dc70e9 100644 --- a/usr/src/cmd/th_tools/th_define.c +++ b/usr/src/cmd/th_tools/th_define.c @@ -181,7 +181,7 @@ static FILE *outfile; * the errdef become satisfied (in practice, this will occur when the access * counts go to zero). * - * When the resulting errdef is activated using the th_manage(1M) user command + * When the resulting errdef is activated using the th_manage(8) user command * utility, the bofi driver will act upon the errdef by matching the number of * hardware accesses - specified in count, that are of the type specified in * acc_types, made by instance number instance - of the driver whose name is diff --git a/usr/src/cmd/tnf/prex/help.c b/usr/src/cmd/tnf/prex/help.c index 4af6ee3317..33ca6c8821 100644 --- a/usr/src/cmd/tnf/prex/help.c +++ b/usr/src/cmd/tnf/prex/help.c @@ -23,8 +23,6 @@ * Copyright (c) 1994, by Sun Microsytems, Inc. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <strings.h> #include "expr.h" @@ -85,7 +83,7 @@ static char *helptopicstrings[NUMHELPTOPICS] = { "Controlling Kernel Probes\n" "\n" "The Solaris kernel is instrumented with a small number of strategically\n" -"placed probes, documented in tnf_kernel_probes(4). The superuser can\n" +"placed probes, documented in tnf_kernel_probes(5). The superuser can\n" "control these probes by running prex with the \"-k\" option.\n" "\n" "In kernel mode, trace output is written to an in-core buffer, rather\n" diff --git a/usr/src/cmd/truss/main.c b/usr/src/cmd/truss/main.c index 9b7d7bac54..4be915b37b 100644 --- a/usr/src/cmd/truss/main.c +++ b/usr/src/cmd/truss/main.c @@ -2003,7 +2003,7 @@ xcreat(char *path) /* * Make sure it's not one of 0, 1, or 2. - * This allows truss to work when spawned by init(1m). + * This allows truss to work when spawned by init(8). */ if (0 <= fd && fd <= 2) { int dfd = fcntl(fd, F_DUPFD, 3); diff --git a/usr/src/cmd/tsol/labeld/svc-labeld b/usr/src/cmd/tsol/labeld/svc-labeld index ed8f0ab647..d2f0143892 100644 --- a/usr/src/cmd/tsol/labeld/svc-labeld +++ b/usr/src/cmd/tsol/labeld/svc-labeld @@ -366,7 +366,7 @@ case "$1" in # native if [ -z "$SMF_FMRI" ]; then - echo "$0: this script can only be invoked by smf(5)" + echo "$0: this script can only be invoked by smf(7)" exit $SMF_EXIT_ERR_NOSMF fi diff --git a/usr/src/cmd/tsol/zones/SUNWtsoldef.xml b/usr/src/cmd/tsol/zones/SUNWtsoldef.xml index cc0cf6f47c..49c77dd9f4 100644 --- a/usr/src/cmd/tsol/zones/SUNWtsoldef.xml +++ b/usr/src/cmd/tsol/zones/SUNWtsoldef.xml @@ -22,7 +22,7 @@ Copyright 2010 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - DO NOT EDIT THIS FILE. Use zonecfg(1M) instead. + DO NOT EDIT THIS FILE. Use zonecfg(8) instead. --> <!DOCTYPE zone PUBLIC "-//Sun Microsystems Inc//DTD Zones//EN" "file:///usr/share/lib/xml/dtd/zonecfg.dtd.1"> diff --git a/usr/src/cmd/uadmin/uadmin.c b/usr/src/cmd/uadmin/uadmin.c index 25fd7f8f7d..896060df6b 100644 --- a/usr/src/cmd/uadmin/uadmin.c +++ b/usr/src/cmd/uadmin/uadmin.c @@ -47,7 +47,7 @@ #include <sys/wait.h> #define SMF_RST "/etc/svc/volatile/resetting" -#define RETRY_COUNT 15 /* number of 1 sec retries for audit(1M) to complete */ +#define RETRY_COUNT 15 /* number of 1 sec retries for audit(8) to complete */ static const char *Usage = "Usage: %s cmd fcn [mdep]\n"; @@ -411,7 +411,7 @@ change_audit_file(void) int retries = RETRY_COUNT; /* - * Wait for audit(1M) -n process to complete + * Wait for audit(8) -n process to complete * */ do { diff --git a/usr/src/cmd/utmpd/utmpd.c b/usr/src/cmd/utmpd/utmpd.c index d1abc313b8..74a9238a81 100644 --- a/usr/src/cmd/utmpd/utmpd.c +++ b/usr/src/cmd/utmpd/utmpd.c @@ -51,7 +51,7 @@ * the process has removed its entry it cleans the entry when the * the process terminates. * The AT&T Copyright above is there since we borrowed the pipe - * mechanism from init(1m). + * mechanism from init(8). */ @@ -1093,7 +1093,7 @@ warn_utmp() if (lstat(UTMP_FILE, &s) == 0 && s.st_size % sizeof (struct utmp) == 0) { nonfatal("WARNING: /var/adm/utmp exists!\nSee " - "utmp(4) for more information"); + "utmp(5) for more information"); } } diff --git a/usr/src/cmd/vntsd/auth.c b/usr/src/cmd/vntsd/auth.c index e3c3e6995f..439e2c876f 100644 --- a/usr/src/cmd/vntsd/auth.c +++ b/usr/src/cmd/vntsd/auth.c @@ -45,7 +45,7 @@ * such as 'root'); the group name in this example is "ldg1" : * solaris.vntsd.console-ldg1:::Access Specific LDoms Guest Console:: * - * Specific users are authorized with usermod(1M). To add an authorization + * Specific users are authorized with usermod(8). To add an authorization * (to /etc/user_attr) type a command similar to this (when user NOT * logged in): * diff --git a/usr/src/cmd/vntsd/svc-vntsd b/usr/src/cmd/vntsd/svc-vntsd index 3bea6c0274..0711252b18 100644 --- a/usr/src/cmd/vntsd/svc-vntsd +++ b/usr/src/cmd/vntsd/svc-vntsd @@ -25,7 +25,7 @@ # Start script for vntsd # # For modifying parameters passed to vntsd, do not edit -# this script. Instead use svccfg(1m) to modify the SMF +# this script. Instead use svccfg(8) to modify the SMF # repository. For example: # # svccfg diff --git a/usr/src/cmd/vt/vtdaemon.c b/usr/src/cmd/vt/vtdaemon.c index 585f23a6db..a64b5d00e7 100644 --- a/usr/src/cmd/vt/vtdaemon.c +++ b/usr/src/cmd/vt/vtdaemon.c @@ -26,7 +26,7 @@ /* * vtdaemon is responsible for the session secure switch via hotkeys. * - * vtdaemon itself, like ttymon(1M), is also running on a virtual + * vtdaemon itself, like ttymon(8), is also running on a virtual * console device (/dev/vt/1), and provides a text console session * for password input and authentication. The /dev/vt/1 special text * console is reserved and end users cannot switch to it via hotkeys. diff --git a/usr/src/cmd/xargs/xargs.c b/usr/src/cmd/xargs/xargs.c index d16ff2fc16..7e46ad1135 100644 --- a/usr/src/cmd/xargs/xargs.c +++ b/usr/src/cmd/xargs/xargs.c @@ -718,7 +718,7 @@ getarg(char *arg) * * Assumes that message has already been gettext()'d. It would be * nice if we could just do the gettext() here, but we can't, since - * since xgettext(1M) wouldn't be able to pick up our error message. + * since xgettext(1) wouldn't be able to pick up our error message. */ /* PRINTFLIKE1 */ static void diff --git a/usr/src/cmd/ypcmd/net_files/publickey b/usr/src/cmd/ypcmd/net_files/publickey index dd81478400..db1c6ef27a 100644 --- a/usr/src/cmd/ypcmd/net_files/publickey +++ b/usr/src/cmd/ypcmd/net_files/publickey @@ -19,11 +19,11 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ + # Public Key Database # # To add an entry to this file, an administrator should use the command -# newkey(1M) on the local machine. +# newkey(8) on the local machine. # Non root users are not allowed to change their key-pair in this file. # Entries in this file are only available to services on the local host # and can be compromised. Hence, we recommend that Users store their diff --git a/usr/src/cmd/ypcmd/yp2lscripts/inityp2l.sh b/usr/src/cmd/ypcmd/yp2lscripts/inityp2l.sh index 1d3ad768a1..f4e41fdc6b 100644 --- a/usr/src/cmd/ypcmd/yp2lscripts/inityp2l.sh +++ b/usr/src/cmd/ypcmd/yp2lscripts/inityp2l.sh @@ -293,7 +293,7 @@ HELP - The bind DN of the proxy user the ypserv to read or write to read and modify LDAP data. There is no default value. If the value ends with a comma, the value of the context for the current domain (as defined by a nisLDAPdomainContext - attribute (NISLDAPmapping(4))) is appended. + attribute (NISLDAPmapping(5))) is appended. EOF ;; @@ -2030,8 +2030,8 @@ put_config_file_copyright_info echo "\ # -# Configuration file for ypserv(1M); see ypserv(4) for more information, -# and NISLDAPmapping(4) for configuration of NIS to LDAP mapping. +# Configuration file for ypserv(8); see ypserv(5) for more information, +# and NISLDAPmapping(5) for configuration of NIS to LDAP mapping. # Unless otherwise noted, commented lines show default values. " >> $CONFIG_FILE @@ -3746,7 +3746,7 @@ nisLDAPnameFields passwd: \ # # It is believed that 'min','max' and 'def' labels were reserved fields in # SunOS 4.x and are now unused. 'always' and 'never' audit information is -# now contained in audit_user(4) so is now unused. +# now contained in audit_user(5) so is now unused. # ' >> $MAP_FILE diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index 56ae2c177a..b00317f900 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -6158,7 +6158,7 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol, (void) fprintf(stderr, gettext("cannot share '%s': " "legacy share\n"), zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use share(1M) to " + (void) fprintf(stderr, gettext("use share(8) to " "share this filesystem, or set " "sharenfs property on\n")); return (1); @@ -6175,7 +6175,7 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol, (void) fprintf(stderr, gettext("cannot %s '%s': " "legacy mountpoint\n"), cmdname, zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use %s(1M) to " + (void) fprintf(stderr, gettext("use %s(8) to " "%s this filesystem\n"), cmdname, cmdname); return (1); } @@ -6676,7 +6676,7 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual) (void) fprintf(stderr, gettext("cannot unshare " "'%s': legacy share\n"), path); (void) fprintf(stderr, gettext("use " - "unshare(1M) to unshare this filesystem\n")); + "unshare(8) to unshare this filesystem\n")); } else if (!zfs_is_shared(zhp)) { (void) fprintf(stderr, gettext("cannot unshare '%s': " "not currently shared\n"), path); @@ -6695,7 +6695,7 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual) (void) fprintf(stderr, gettext("cannot unmount " "'%s': legacy mountpoint\n"), zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use umount(1M) " + (void) fprintf(stderr, gettext("use umount(8) " "to unmount this filesystem\n")); } else { ret = zfs_unmountall(zhp, flags); @@ -6951,7 +6951,7 @@ unshare_unmount(int op, int argc, char **argv) "unshare '%s': legacy share\n"), zfs_get_name(zhp)); (void) fprintf(stderr, gettext("use " - "unshare(1M) to unshare this " + "unshare(8) to unshare this " "filesystem\n")); ret = 1; } else if (!zfs_is_shared(zhp)) { @@ -6970,7 +6970,7 @@ unshare_unmount(int op, int argc, char **argv) "unmount '%s': legacy " "mountpoint\n"), zfs_get_name(zhp)); (void) fprintf(stderr, gettext("use " - "umount(1M) to unmount this " + "umount(8) to unmount this " "filesystem\n")); ret = 1; } else if (!zfs_is_mounted(zhp, NULL)) { @@ -7099,7 +7099,7 @@ manual_mount(int argc, char **argv) "instead.\n"), path); (void) fprintf(stderr, gettext("If you must use 'mount -F zfs' " "or /etc/vfstab, use 'zfs set mountpoint=legacy'.\n")); - (void) fprintf(stderr, gettext("See zfs(1M) for more " + (void) fprintf(stderr, gettext("See zfs(8) for more " "information.\n")); ret = 1; } diff --git a/usr/src/cmd/zlogin/zlogin.c b/usr/src/cmd/zlogin/zlogin.c index e942e66e71..0ad4013e84 100644 --- a/usr/src/cmd/zlogin/zlogin.c +++ b/usr/src/cmd/zlogin/zlogin.c @@ -39,7 +39,7 @@ * "already authenticated") is employed to take care of the initialization * of the user's session. * - * - "non-interactive login" is similar to su(1M); the user could issue + * - "non-interactive login" is similar to su(8); the user could issue * 'zlogin my-zone ls -l' and the command would be run as specified. * In this mode, zlogin sets up pipes as the communication channel, and * 'su' is used to do the login setup work. @@ -972,7 +972,7 @@ retry: } /* - * Fetch the user_cmd brand hook for getting a user's passwd(4) entry. + * Fetch the user_cmd brand hook for getting a user's passwd(5) entry. */ static const char * zone_get_user_cmd(brand_handle_t bh, const char *login, char *user_cmd, @@ -1094,7 +1094,7 @@ zone_login_cmd(brand_handle_t bh, const char *login) /* * Prepare argv array for exec'd process; if we're passing commands to the - * new process, then use su(1M) to do the invocation. Otherwise, use + * new process, then use su(8) to do the invocation. Otherwise, use * 'login -z <from_zonename> -f' (-z is an undocumented option which tells * login that we're coming from another zone, and to disregard its CONSOLE * checks). @@ -1553,7 +1553,7 @@ noninteractive_login(char *zonename, const char *user_cmd, zoneid_t zoneid, * When the user types ^D, we get a zero length message on STDIN. * We need to echo that down the pipe to send it to the other side; * but by default, pipes don't propagate zero-length messages. We - * toggle that behavior off using I_SWROPT. See streamio(7i). + * toggle that behavior off using I_SWROPT. See streamio(4I). */ if (ioctl(stdin_pipe[0], I_SWROPT, SNDZERO) != 0) { zperror(gettext("could not configure STDIN pipe")); @@ -2059,7 +2059,7 @@ main(int argc, char **argv) } /* * Get the brand specific user_cmd. This command is used to get - * a passwd(4) entry for login. + * a passwd(5) entry for login. */ if (!interactive && !failsafe) { if (zone_get_user_cmd(bh, login, user_cmd, diff --git a/usr/src/cmd/zoneadm/svc-zones b/usr/src/cmd/zoneadm/svc-zones index 9d307835bd..cd06d0789a 100644 --- a/usr/src/cmd/zoneadm/svc-zones +++ b/usr/src/cmd/zoneadm/svc-zones @@ -41,7 +41,7 @@ shutdown_zones() [ ! -x /usr/sbin/zoneadm ] && exit 0 # SUNWzoneu not installed 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/zoneadm/zoneadm.c b/usr/src/cmd/zoneadm/zoneadm.c index e5b1bc4a07..6ee7bf244c 100644 --- a/usr/src/cmd/zoneadm/zoneadm.c +++ b/usr/src/cmd/zoneadm/zoneadm.c @@ -230,7 +230,7 @@ long_help(int cmd_num) return (gettext("Print usage message.")); case CMD_BOOT: return (gettext("Activates (boots) specified zone. See " - "zoneadm(1m) for valid boot\n\targuments.")); + "zoneadm(8) for valid boot\n\targuments.")); case CMD_HALT: return (gettext("Halts specified zone, bypassing shutdown " "scripts and removing runtime\n\tresources of the zone.")); @@ -240,11 +240,11 @@ long_help(int cmd_num) case CMD_SHUTDOWN: return (gettext("Gracefully shutdown the zone or reboot if " "the '-r' option is specified.\n\t" - "See zoneadm(1m) for valid boot arguments.")); + "See zoneadm(8) for valid boot arguments.")); case CMD_REBOOT: return (gettext("Restarts the zone (equivalent to a halt / " "boot sequence).\n\tFails if the zone is not active. " - "See zoneadm(1m) for valid boot\n\targuments.")); + "See zoneadm(8) for valid boot\n\targuments.")); case CMD_LIST: return (gettext("Lists the current zones, or a " "specific zone if indicated. By default,\n\tall " @@ -268,12 +268,12 @@ long_help(int cmd_num) case CMD_INSTALL: return (gettext("Install the configuration on to the system. " "All arguments are passed to the brand installation " - "function;\n\tsee brands(5) for more information.")); + "function;\n\tsee brands(7) for more information.")); case CMD_UNINSTALL: return (gettext("Uninstall the configuration from the system. " "The -F flag can be used\n\tto force the action. All " "other arguments are passed to the brand\n\tuninstall " - "function; see brands(5) for more information.")); + "function; see brands(7) for more information.")); case CMD_CLONE: return (gettext("Clone the installation of another zone. " "The -m option can be used to\n\tspecify 'copy' which " @@ -283,7 +283,7 @@ long_help(int cmd_num) "snapshot will be used as the source\n\tinstead of " "creating a new ZFS snapshot. All other arguments are " "passed\n\tto the brand clone function; see " - "brands(5) for more information.")); + "brands(7) for more information.")); case CMD_MOVE: return (gettext("Move the zone to a new zonepath.")); case CMD_DETACH: @@ -296,7 +296,7 @@ long_help(int cmd_num) "needed to attach\n\tthe zone is sent to standard output " "but the zone is not actually\n\tdetached. All other " "arguments are passed to the brand detach function;\n\tsee " - "brands(5) for more information.")); + "brands(7) for more information.")); case CMD_ATTACH: return (gettext("Attach the zone to the system. The zone " "state must be 'configured'\n\tprior to attach; upon " @@ -312,7 +312,7 @@ long_help(int cmd_num) "can\n\tbe '-' to specify standard input. The -F and -n " "options are mutually\n\texclusive. All other arguments " "are passed to the brand attach\n\tfunction; see " - "brands(5) for more information.")); + "brands(7) for more information.")); case CMD_MARK: return (gettext("Set the state of the zone. This can be used " "to force the zone\n\tstate to 'incomplete' " @@ -1635,16 +1635,16 @@ sanity_check(char *zone, int cmd_num, boolean_t running, if (getzoneid() != GLOBAL_ZONEID) { switch (cmd_num) { case CMD_HALT: - zerror(gettext("use %s to %s this zone."), "halt(1M)", + zerror(gettext("use %s to %s this zone."), "halt(8)", cmd_to_str(cmd_num)); break; case CMD_SHUTDOWN: zerror(gettext("use %s to %s this zone."), - "shutdown(1M)", cmd_to_str(cmd_num)); + "shutdown(8)", cmd_to_str(cmd_num)); break; case CMD_REBOOT: zerror(gettext("use %s to %s this zone."), - "reboot(1M)", cmd_to_str(cmd_num)); + "reboot(8)", cmd_to_str(cmd_num)); break; default: zerror(gettext("must be in the global zone to %s a " @@ -2413,7 +2413,7 @@ free_local_netifs(int if_cnt, struct net_if **if_list) /* * Get a list of the network interfaces, along with their address families, - * that are plumbed in the global zone. See if_tcp(7p) for a description + * that are plumbed in the global zone. See if_tcp(4P) for a description * of the ioctls used here. */ static int @@ -2760,10 +2760,10 @@ no_net: modctl(MODLOAD, 1, "fs/lofs", NULL) != 0) { if (errno == ENXIO) (void) fprintf(stderr, gettext("could not verify " - "lofs(7FS): possibly excluded in /etc/system\n")); + "lofs(4FS): possibly excluded in /etc/system\n")); else (void) fprintf(stderr, gettext("could not verify " - "lofs(7FS): %s\n"), strerror(errno)); + "lofs(4FS): %s\n"), strerror(errno)); return_code = Z_ERR; } @@ -5249,7 +5249,7 @@ check_sched_fss(zone_dochandle_t handle) "FSS is not the default scheduling class for this zone. " "FSS will be\nused for processes in the zone but to get " "the full benefit of FSS,\nit should be the default " - "scheduling class. See dispadmin(1M) for\nmore details.")); + "scheduling class. See dispadmin(8) for\nmore details.")); return (Z_SYSTEM); } diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c index 682bf20ac4..47b2954327 100644 --- a/usr/src/cmd/zoneadmd/vplat.c +++ b/usr/src/cmd/zoneadmd/vplat.c @@ -1244,7 +1244,7 @@ mount_one(zlog_t *zlogp, struct zone_fstab *fsptr, const char *rootpath, /* * In general the strategy here is to do just as much verification as * necessary to avoid crashing or otherwise doing something bad; if the - * administrator initiated the operation via zoneadm(1m), they'll get + * administrator initiated the operation via zoneadm(8), they'll get * auto-verification which will let them know what's wrong. If they * modify the zone configuration of a running zone, and don't attempt * to verify that it's OK, then we won't crash but won't bother trying @@ -2204,7 +2204,7 @@ configure_one_interface(zlog_t *zlogp, zoneid_t zone_id, /* * Here, we know that the interface can't be brought up. * A similar warning message was already printed out to - * the console by zoneadm(1M) so instead we log the + * the console by zoneadm(8) so instead we log the * message to syslog and continue. */ zerror(&logsys, B_TRUE, "WARNING: skipping network interface " @@ -2351,7 +2351,7 @@ configure_one_interface(zlog_t *zlogp, zoneid_t zone_id, */ char buffer[INET6_ADDRSTRLEN]; void *addr; - const char *nomatch = "no matching subnet found in netmasks(4)"; + const char *nomatch = "no matching subnet found in netmasks(5)"; if (af == AF_INET) addr = &((struct sockaddr_in *) @@ -4248,7 +4248,7 @@ get_zone_label(zlog_t *zlogp, priv_set_t *privs) if (zcent == NULL) { zerror(zlogp, B_FALSE, "zone requires a label assignment. " - "See tnzonecfg(4)"); + "See tnzonecfg(5)"); } else { if (zlabel == NULL) zlabel = m_label_alloc(MAC_LABEL); @@ -4488,7 +4488,7 @@ setup_zone_rm(zlog_t *zlogp, char *zone_name, zoneid_t zoneid) "scheduling class for\nthis zone. FSS will be " "used for processes\nin the zone but to get the " "full benefit of FSS,\nit should be the default " - "scheduling class.\nSee dispadmin(1M) for more " + "scheduling class.\nSee dispadmin(8) for more " "details."); if (zone_setattr(zoneid, ZONE_ATTR_SCHED_CLASS, "FSS", @@ -4532,7 +4532,7 @@ setup_zone_rm(zlog_t *zlogp, char *zone_name, zoneid_t zoneid) "enabled.\nThe system will not dynamically adjust the\n" "processor allocation within the specified range\n" "until svc:/system/pools/dynamic is enabled.\n" - "See poold(1M)."); + "See poold(8)."); } /* The following is a warning, not an error. */ diff --git a/usr/src/cmd/zoneadmd/zcons.c b/usr/src/cmd/zoneadmd/zcons.c index 5f6fc4973c..49a935c638 100644 --- a/usr/src/cmd/zoneadmd/zcons.c +++ b/usr/src/cmd/zoneadmd/zcons.c @@ -29,8 +29,8 @@ /* * Console support for zones requires a significant infrastructure. The * core pieces are contained in this file, but other portions of note - * are in the zlogin(1M) command, the zcons(7D) driver, and in the - * devfsadm(1M) misc_link generator. + * are in the zlogin(1) command, the zcons(4D) driver, and in the + * devfsadm(8) misc_link generator. * * Care is taken to make the console behave in an "intuitive" fashion for * administrators. Essentially, we try as much as possible to mimic the @@ -71,7 +71,7 @@ * to online new instances of zcons as needed. Care is taken to * prune and manage these appropriately; see init_console_dev() and * destroy_console_dev(). The end result is the creation of the - * zcons(7D) instance and an open file descriptor to the master side. + * zcons(4D) instance and an open file descriptor to the master side. * zcons instances are associated with zones via their zonename device * property. This the console instance to persist across reboots, * and while the zone is halted. diff --git a/usr/src/cmd/zoneadmd/zoneadmd.c b/usr/src/cmd/zoneadmd/zoneadmd.c index cbabae7f14..4bc7d86582 100644 --- a/usr/src/cmd/zoneadmd/zoneadmd.c +++ b/usr/src/cmd/zoneadmd/zoneadmd.c @@ -35,7 +35,7 @@ * console device; configure process runtime attributes such as resource * controls, pool bindings, fine-grained privileges. * - * - Launch the zone's init(1M) process. + * - Launch the zone's init(8) process. * * - Implement a door server; clients (like zoneadm) connect to the door * server and request zone state changes. The kernel is also a client of @@ -259,7 +259,7 @@ zerror(zlog_t *zlogp, boolean_t use_strerror, const char *fmt, ...) /* * Emit a warning for any boot arguments which are unrecognized. Since - * Solaris boot arguments are getopt(3c) compatible (see kernel(1m)), we + * Solaris boot arguments are getopt(3c) compatible (see kernel(8)), we * put the arguments into an argv style array, use getopt to process them, * and put the resultant argument string back into outargs. * @@ -867,10 +867,10 @@ zone_bootup(zlog_t *zlogp, const char *bootargs, int zstate) goto bad; } - /* Get the path for this zone's init(1M) (or equivalent) process. */ + /* Get the path for this zone's init(8) (or equivalent) process. */ if (brand_get_initname(bh, init_file, MAXPATHLEN) != 0) { zerror(zlogp, B_FALSE, - "unable to determine zone's init(1M) location"); + "unable to determine zone's init(8) location"); brand_close(bh); goto bad; } @@ -1669,7 +1669,7 @@ setup_door(zlog_t *zlogp) } /* - * zoneadm(1m) will start zoneadmd if it thinks it isn't running; this + * zoneadm(8) will start zoneadmd if it thinks it isn't running; this * is where zoneadmd itself will check to see that another instance of * zoneadmd isn't already controlling this zone. * @@ -1684,7 +1684,7 @@ setup_door(zlog_t *zlogp) * There is no fattach(3c)ed door, so we have a chance of becoming * the managing zoneadmd. We attempt to lock the file: if it is * already locked, that means someone else raced us here, so we - * lose and give up. zoneadm(1m) will try to contact the zoneadmd + * lose and give up. zoneadm(8) will try to contact the zoneadmd * that beat us to it. * * - If the file we opened is a namefs file: @@ -1694,7 +1694,7 @@ setup_door(zlog_t *zlogp) * will succeed in acquiring it since the vnode locked by the * "winning" zoneadmd was a regular one, and the one we locked was * the fattach(3c)'ed door node. At any rate, no harm is done, and - * we just return to zoneadm(1m) which knows to retry. + * we just return to zoneadm(8) which knows to retry. */ static int make_daemon_exclusive(zlog_t *zlogp) @@ -1752,7 +1752,7 @@ top: * * If the door has been revoked, the zoneadmd * process currently managing the zone is going - * away. We'll return control to zoneadm(1m) + * away. We'll return control to zoneadm(8) * which will try again (by which time zoneadmd * will hopefully have exited). */ diff --git a/usr/src/cmd/zonecfg/zonecfg.c b/usr/src/cmd/zonecfg/zonecfg.c index d1aaec81db..a97444dd88 100644 --- a/usr/src/cmd/zonecfg/zonecfg.c +++ b/usr/src/cmd/zonecfg/zonecfg.c @@ -1092,7 +1092,7 @@ usage(boolean_t verbose, uint_t flags) cmd_to_str(CMD_REMOVE), pt_to_str(PT_OPTIONS), gettext("<file-system options>")); (void) fprintf(fp, gettext("Consult the file-system " - "specific manual page, such as mount_ufs(1M), " + "specific manual page, such as mount_ufs(8), " "for\ndetails about file-system options. Note " "that any file-system options with an\nembedded " "'=' character must be enclosed in double quotes, " @@ -1111,7 +1111,7 @@ usage(boolean_t verbose, uint_t flags) gettext("<IP-address>")); (void) fprintf(fp, "\t%s %s=%s\n", cmd_to_str(CMD_SET), pt_to_str(PT_PHYSICAL), gettext("<interface>")); - (void) fprintf(fp, gettext("See ifconfig(1M) for " + (void) fprintf(fp, gettext("See ifconfig(8) for " "details of the <interface> string.\n")); (void) fprintf(fp, gettext("%s %s is valid " "if the %s property is set to %s, otherwise it " @@ -4186,7 +4186,7 @@ valid_fs_type(const char *type) strcmp(type, ".") == 0 || strcmp(type, "..") == 0) return (B_FALSE); /* - * More detailed verification happens later by zoneadm(1m). + * More detailed verification happens later by zoneadm(8). */ return (B_TRUE); } @@ -5958,7 +5958,7 @@ brand_verify(zone_dochandle_t handle) } /* - * Track the network interfaces listed in zonecfg(1m) in a linked list + * Track the network interfaces listed in zonecfg(8) in a linked list * so that we can later check that defrouter is specified for an exclusive IP * zone if and only if at least one allowed-address has been specified. */ diff --git a/usr/src/cmd/zonecfg/zonecfg_grammar.y b/usr/src/cmd/zonecfg/zonecfg_grammar.y index 2e950512ec..fe660bb607 100644 --- a/usr/src/cmd/zonecfg/zonecfg_grammar.y +++ b/usr/src/cmd/zonecfg/zonecfg_grammar.y @@ -25,7 +25,7 @@ */ /* - * This file defines zonecfg(1M)'s grammar. + * This file defines zonecfg(8)'s grammar. * * Reduction rules that consume TOKENs must invoke claim_token() immediately * before freeing the TOKENs or adding them to data structures (e.g., cmd) that diff --git a/usr/src/cmd/zonestat/zonestat/zonestat.c b/usr/src/cmd/zonestat/zonestat/zonestat.c index 358c31c4fa..c65344dec7 100644 --- a/usr/src/cmd/zonestat/zonestat/zonestat.c +++ b/usr/src/cmd/zonestat/zonestat/zonestat.c @@ -288,7 +288,7 @@ zonestat_usage(boolean_t explicit) " \"%s\"\n" " \"%s\"\n" " Name of a pool processor set\n" -" Id of a processor set created with psrset(1m)\n" +" Id of a processor set created with psrset(8)\n" " Name of a zone using dedicated-cpu\n"), "-z", "-n", ZONESTAT_NAME_MEM_DEFAULT, ZONESTAT_NAME_VM_DEFAULT); diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c index 55f9bd3c94..79febacacb 100644 --- a/usr/src/cmd/zpool/zpool_main.c +++ b/usr/src/cmd/zpool/zpool_main.c @@ -502,7 +502,7 @@ usage(boolean_t requested) (void) fprintf(fp, "YES disabled | enabled | active\n"); (void) fprintf(fp, gettext("\nThe feature@ properties must be " - "appended with a feature name.\nSee zpool-features(5).\n")); + "appended with a feature name.\nSee zpool-features(7).\n")); } /* @@ -7191,7 +7191,7 @@ status_callback(zpool_handle_t *zhp, void *data) (void) printf(gettext("action: Enable all features using " "'zpool upgrade'. Once this is done,\n\tthe pool may no " "longer be accessible by software that does not support\n\t" - "the features. See zpool-features(5) for details.\n")); + "the features. See zpool-features(7) for details.\n")); break; case ZPOOL_STATUS_UNSUP_FEAT_READ: @@ -7712,7 +7712,7 @@ upgrade_list_disabled_cb(zpool_handle_t *zhp, void *arg) "pool may become incompatible with " "software\nthat does not support " "the feature. See " - "zpool-features(5) for " + "zpool-features(7) for " "details.\n\n")); (void) printf(gettext("POOL " "FEATURE\n")); diff --git a/usr/src/cmd/zpool/zpool_vdev.c b/usr/src/cmd/zpool/zpool_vdev.c index 652bece3ab..88acaa7f81 100644 --- a/usr/src/cmd/zpool/zpool_vdev.c +++ b/usr/src/cmd/zpool/zpool_vdev.c @@ -295,7 +295,7 @@ check_file(const char *file, boolean_t force, boolean_t isspare) libdiskmgt_error(err); else vdev_error(gettext("%s is currently used by swap. " - "Please see swap(1M).\n"), file); + "Please see swap(8).\n"), file); return (-1); } diff --git a/usr/src/common/smbios/mktables.sh b/usr/src/common/smbios/mktables.sh index 7256eedfb8..8cb9d60052 100644 --- a/usr/src/common/smbios/mktables.sh +++ b/usr/src/common/smbios/mktables.sh @@ -31,7 +31,7 @@ # # The SMBIOS interfaces defined in <sys/smbios.h> include a set of integer-to- # string conversion routines for the various constants defined in the SMBIOS -# spec. These functions are used by smbios(1M) and prtdiag(1M) and can be +# spec. These functions are used by smbios(8) and prtdiag(8) and can be # leveraged by other clients as well. To simplify maintenance of the source # base, this shell script automatically generates the source code for all of # these functions from the <sys/smbios.h> header file and its comments. Each diff --git a/usr/src/common/svc/repcache_protocol.h b/usr/src/common/svc/repcache_protocol.h index 07504a467e..a334cea34a 100644 --- a/usr/src/common/svc/repcache_protocol.h +++ b/usr/src/common/svc/repcache_protocol.h @@ -34,7 +34,7 @@ * 1. Introduction * --------------- * This header file defines the private protocols between libscf(3lib) and - * svc.configd(1m). There are two separate protocols: + * svc.configd(8). There are two separate protocols: * * 1. The 'global' protocol, accessible via an fattach(3C)ed door located * at REPOSITORY_DOOR_NAME. @@ -50,7 +50,7 @@ * 1. If libscf(3lib) recieves an EINTR from door_call(), it doesn't know * whether or not the server recieved (and is processing) its request. * - * 2. When svc.configd(1M) calls door_return(), the client may have already + * 2. When svc.configd(8) calls door_return(), the client may have already * received an EINTR, aborting its door_call(). In this case, the * returned values are dropped on the floor. * diff --git a/usr/src/common/util/string.c b/usr/src/common/util/string.c index 2ed2791eda..66d0cc0414 100644 --- a/usr/src/common/util/string.c +++ b/usr/src/common/util/string.c @@ -61,7 +61,7 @@ * described by <fmt, args> as possible. The string will always be * null-terminated, so the maximum string length is 'buflen - 1'. * Returns the number of bytes that would be necessary to render the - * entire string, not including null terminator (just like vsnprintf(3S)). + * entire string, not including null terminator (just like vsnprintf(3C)). * To determine buffer size in advance, use vsnprintf(NULL, 0, fmt, args) + 1. * * There is no support for floating point, and the C locale is assumed. diff --git a/usr/src/common/zfs/zfs_prop.c b/usr/src/common/zfs/zfs_prop.c index a4f02b18db..dd79442179 100644 --- a/usr/src/common/zfs/zfs_prop.c +++ b/usr/src/common/zfs/zfs_prop.c @@ -396,14 +396,14 @@ zfs_prop_init(void) PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "<path> | legacy | none", "MOUNTPOINT"); zprop_register_string(ZFS_PROP_SHARENFS, "sharenfs", "off", - PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off | share(1M) options", + PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off | share(8) options", "SHARENFS"); zprop_register_string(ZFS_PROP_TYPE, "type", NULL, PROP_READONLY, ZFS_TYPE_DATASET | ZFS_TYPE_BOOKMARK, "filesystem | volume | snapshot | bookmark", "TYPE"); zprop_register_string(ZFS_PROP_SHARESMB, "sharesmb", "off", PROP_INHERIT, ZFS_TYPE_FILESYSTEM, - "on | off | sharemgr(1M) options", "SHARESMB"); + "on | off | sharemgr(8) options", "SHARESMB"); zprop_register_string(ZFS_PROP_MLSLABEL, "mlslabel", ZFS_MLSLABEL_DEFAULT, PROP_INHERIT, ZFS_TYPE_DATASET, "<sensitivity label>", "MLSLABEL"); diff --git a/usr/src/contrib/ast/src/cmd/ksh93/Makefile b/usr/src/contrib/ast/src/cmd/ksh93/Makefile index f56a1e1cc0..b285b12e7e 100644 --- a/usr/src/contrib/ast/src/cmd/ksh93/Makefile +++ b/usr/src/contrib/ast/src/cmd/ksh93/Makefile @@ -40,7 +40,7 @@ SHOPT_MULTIBYTE == 1 /* multibyte character handling */ SHOPT_NAMESPACE == 1 /* allow namespaces */ SHOPT_OLDTERMIO == /* support both TCGETA and TCGETS */ SHOPT_OPTIMIZE == 1 /* optimize loop invariants */ -SHOPT_PFSH == 1 /* solaris exec_attr(4) profile execution */ +SHOPT_PFSH == 1 /* solaris exec_attr(5) profile execution */ SHOPT_P_SUID == /* real uid's that require -p for set[ug]id */ SHOPT_RAWONLY == 1 /* make viraw the only vi mode */ SHOPT_REGRESS == /* enable __regress__ builtin and instrumented intercepts for testing */ diff --git a/usr/src/contrib/ast/src/cmd/ksh93/sh/path.c b/usr/src/contrib/ast/src/cmd/ksh93/sh/path.c index 73670fe833..926dee5c06 100644 --- a/usr/src/contrib/ast/src/cmd/ksh93/sh/path.c +++ b/usr/src/contrib/ast/src/cmd/ksh93/sh/path.c @@ -121,7 +121,7 @@ static pid_t path_pfexecve(Shell_t *shp,const char *path, char *argv[],char *con /* system call so we can save us to call access(2) first */ /* we can exec the command directly instead of via pfexec(1) if */ - /* there is a matching entry without attributes in exec_attr(4) */ + /* there is a matching entry without attributes in exec_attr(5) */ if(!path_xattr(shp,path,resolvedpath)) return(execve(path, argv, envp)); --argv; diff --git a/usr/src/contrib/ast/src/lib/libcmd/expr.c b/usr/src/contrib/ast/src/lib/libcmd/expr.c index a19b042215..8a30c3b0d0 100644 --- a/usr/src/contrib/ast/src/lib/libcmd/expr.c +++ b/usr/src/contrib/ast/src/lib/libcmd/expr.c @@ -107,7 +107,7 @@ USAGE_LICENSE "[+2?Invalid expressions.]" "[+>2?An error occurred.]" "}" -"[+SEE ALSO?\bregcomp\b(5), \bgrep\b(1), \bsh\b(1)]" +"[+SEE ALSO?\bregex\b(5), \bgrep\b(1), \bsh\b(1)]" ; #include <cmd.h> diff --git a/usr/src/data/terminfo/termcap.src b/usr/src/data/terminfo/termcap.src index ba9fa1b3df..e77b43694c 100644 --- a/usr/src/data/terminfo/termcap.src +++ b/usr/src/data/terminfo/termcap.src @@ -96,7 +96,7 @@ # library can handle multiple tc capabilities in an entry. 4.4BSD has this # capability. Older versions of GNU termcap, through 1.3, do not. # -# For details on these formats, see terminfo(5) in the ncurses distribution, +# For details on these formats, see terminfo(7) in the ncurses distribution, # and termcap(5) in the 4.4BSD Unix Programmer's Manual. Be aware that 4.4BSD # curses has been declared obsolete by the caretakers of the 4.4BSD sources # as of June 1995; they are encouraging everyone to migrate to ncurses. diff --git a/usr/src/data/terminfo/terminfo.src b/usr/src/data/terminfo/terminfo.src index dfa1b722b3..0a265bc9b1 100644 --- a/usr/src/data/terminfo/terminfo.src +++ b/usr/src/data/terminfo/terminfo.src @@ -96,7 +96,7 @@ # library can handle multiple tc capabilities in an entry. 4.4BSD has this # capability. Older versions of GNU termcap, through 1.3, do not. # -# For details on these formats, see terminfo(5) in the ncurses distribution, +# For details on these formats, see terminfo(7) in the ncurses distribution, # and termcap(5) in the 4.4BSD Unix Programmer's Manual. Be aware that 4.4BSD # curses has been declared obsolete by the caretakers of the 4.4BSD sources # as of June 1995; they are encouraging everyone to migrate to ncurses. diff --git a/usr/src/data/zoneinfo/README b/usr/src/data/zoneinfo/README index adcc2258f7..b43f23531d 100644 --- a/usr/src/data/zoneinfo/README +++ b/usr/src/data/zoneinfo/README @@ -1,7 +1,7 @@ Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. The /usr/share/lib/zoneinfo/src directory contains zoneinfo timezone source -files. These source files have been compiled using zic(1M) to create +files. These source files have been compiled using zic(8) to create the zoneinfo data files in /usr/share/lib/zoneinfo. The zic command can be used with the zoneinfo source files to create additional data files. @@ -13,7 +13,7 @@ the zoneinfo files is based on tzdata2010k.tar.gz. The /usr/share/lib/zoneinfo/GMT[+-]* timezones listed below have been removed from the release. Replace usage of the /usr/share/lib/zoneinfo/GMT[+-]* files with the equivalent quoted timezone -(see environ(5)). Note the signs of the offsets of the equivalent quoted +(see environ(7)). Note the signs of the offsets of the equivalent quoted timezone are reversed from the signs of the /usr/share/lib/zoneinfo/GMT[+-]* files. @@ -63,5 +63,5 @@ offset from standard time, and could return incorrect values. This affects 64-bit versions of interfaces such as ascftime(3C), cftime(3C), ctime(3C), getdate(3C), ftime(3C), mktime(3C), and localtime(3C). -For more information see zic(1M), zdump(1M), environ(5), TIMEZONE(4), +For more information see zic(8), zdump(8), environ(7), TIMEZONE(5), ctime(3C), and mktime(3C) man pages. diff --git a/usr/src/grub/grub-0.97/stage2/tparm.c b/usr/src/grub/grub-0.97/stage2/tparm.c index 6e35002a42..7c6e26544f 100644 --- a/usr/src/grub/grub-0.97/stage2/tparm.c +++ b/usr/src/grub/grub-0.97/stage2/tparm.c @@ -71,7 +71,7 @@ typedef char grub_bool; * tparm(string, ...) * * Substitute the given parameters into the given string by the following - * rules (taken from terminfo(5)): + * rules (taken from terminfo(7)): * * Cursor addressing and other strings requiring parame- * ters in the terminal are described by a parameterized string diff --git a/usr/src/grub/menu.lst b/usr/src/grub/menu.lst index e72a53e76d..b5500f6ada 100644 --- a/usr/src/grub/menu.lst +++ b/usr/src/grub/menu.lst @@ -46,8 +46,8 @@ timeout 10 # module$ /platform/i86pc/$ISADIR/boot_archive # -# To override Solaris boot args (see kernel(1M)), console device and -# properties set via eeprom(1M) edit the "kernel" line to: +# To override Solaris boot args (see kernel(8)), console device and +# properties set via eeprom(8) edit the "kernel" line to: # # kernel /platform/i86pc/kernel/unix <boot-args> -B prop1=val1,prop2=val2,... # diff --git a/usr/src/head/arpa/inet.h b/usr/src/head/arpa/inet.h index 5b72bee523..03a8e9c321 100644 --- a/usr/src/head/arpa/inet.h +++ b/usr/src/head/arpa/inet.h @@ -54,7 +54,7 @@ extern "C" { /* * External definitions for - * functions in inet(3N) + * functions in inet(3C) */ #if !defined(_XPG4_2) || defined(__EXTENSIONS__) extern int inet_net_pton(int, const char *, void *, size_t); diff --git a/usr/src/head/dlfcn.h b/usr/src/head/dlfcn.h index f150e90bc3..bc61ba064e 100644 --- a/usr/src/head/dlfcn.h +++ b/usr/src/head/dlfcn.h @@ -125,7 +125,7 @@ extern Dl_amd64_unwindinfo *dlamd64getunwind(void *, Dl_amd64_unwindinfo *); #endif /* !defined(_XOPEN_SOURCE) || defined(__EXTENSIONS__) */ /* - * Valid values for handle argument to dlsym(3x). + * Valid values for handle argument to dlsym(3C). */ #define RTLD_NEXT (void *)-1 /* look in `next' dependency */ #define RTLD_DEFAULT (void *)-2 /* look up symbol from scope */ diff --git a/usr/src/head/libzonecfg.h b/usr/src/head/libzonecfg.h index 7db0d126c7..2ca7060101 100644 --- a/usr/src/head/libzonecfg.h +++ b/usr/src/head/libzonecfg.h @@ -137,7 +137,7 @@ extern "C" { #define ZONE_INDEX_GID 3 /* sys */ #define ZONE_INDEX_MODE 0644 -/* The maximum length of the VERSION string in the pkginfo(4) file. */ +/* The maximum length of the VERSION string in the pkginfo(5) file. */ #define ZONE_PKG_VERSMAX 256 /* diff --git a/usr/src/head/listen.h b/usr/src/head/listen.h index baac41c0ec..59231ec060 100644 --- a/usr/src/head/listen.h +++ b/usr/src/head/listen.h @@ -114,7 +114,7 @@ struct call_list { * * the variables should be accessed via library routines. * - * see nlsgetcall(3X) and nlsprovider(3X). + * see nlsgetcall(3NSL) and nlsprovider(3NSL). */ #define NLSADDR "NLSADDR" diff --git a/usr/src/head/nss_common.h b/usr/src/head/nss_common.h index 3d2d775e5e..fb6f68adbc 100644 --- a/usr/src/head/nss_common.h +++ b/usr/src/head/nss_common.h @@ -46,7 +46,7 @@ extern "C" { * The name-service switch * ----------------------- * - * From nsswitch.conf(4): + * From nsswitch.conf(5): * * The operating system uses a number of "databases" of information * about hosts, users (passwd/shadow), groups and so forth. Data for @@ -203,7 +203,7 @@ extern "C" { * Backend routines return the following status codes to the switch engine: * * SUCCESS, UNAVAIL, NOTFOUND, TRYAGAIN (these are the same codes that may - * be specified in the config information; see nsswitch.conf(4)) + * be specified in the config information; see nsswitch.conf(5)) * * The remaining conditions/errors are internally generated and if * necessary are translated, as to one of the above external errors, diff --git a/usr/src/head/rpcsvc/ypclnt.h b/usr/src/head/rpcsvc/ypclnt.h index 6506f76ae6..9bbe3e94fb 100644 --- a/usr/src/head/rpcsvc/ypclnt.h +++ b/usr/src/head/rpcsvc/ypclnt.h @@ -45,7 +45,7 @@ extern "C" { * ypclnt.h * This defines the symbols used in the c language * interface to the yp client functions. A description of this interface - * can be read in ypclnt(3N). + * can be read in ypclnt(3NSL). */ /* diff --git a/usr/src/head/tzfile.h b/usr/src/head/tzfile.h index f2fec4304d..9b23f2c5dd 100644 --- a/usr/src/head/tzfile.h +++ b/usr/src/head/tzfile.h @@ -29,8 +29,6 @@ #ifndef _TZFILE_H #define _TZFILE_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * A part of this file comes from public domain source, so * clarified as of June 5, 1996 by Arthur David Olson @@ -45,7 +43,7 @@ * future releases. */ -/* For further information, see ctime(3C) and zic(1M) man pages. */ +/* For further information, see ctime(3C) and zic(8) man pages. */ /* * This file is in the public domain, so clarified as of diff --git a/usr/src/lib/auditd_plugins/binfile/binfile.c b/usr/src/lib/auditd_plugins/binfile/binfile.c index 1d1a5db642..2582d6c16b 100644 --- a/usr/src/lib/auditd_plugins/binfile/binfile.c +++ b/usr/src/lib/auditd_plugins/binfile/binfile.c @@ -333,7 +333,7 @@ loadauditlist(char *dirstr, char *minfreestr) } if (rc == -2) { (void) pthread_mutex_lock(&log_mutex); - DPRINT((dbfp, "loadauditlist: close / open audit.log(4)\n")); + DPRINT((dbfp, "loadauditlist: close / open audit.log(5)\n")); if (open_log(listhead) == 0) { openNewFile = 1; /* try again later */ } else { @@ -934,7 +934,7 @@ auditd_plugin(const char *input, size_t in_len, uint64_t sequence, char **error) /* * It may be called multiple times as auditd handles SIGHUP and SIGUSR1 - * corresponding to the audit(1M) flags -s and -n + * corresponding to the audit(8) flags -s and -n * * kvlist is NULL only if auditd caught a SIGUSR1 (audit -n), so after the first * time open is called; the reason is -s if kvlist != NULL and -n otherwise. diff --git a/usr/src/lib/auditd_plugins/remote/audit_remote.c b/usr/src/lib/auditd_plugins/remote/audit_remote.c index 9224022daa..6cc8eb15a2 100644 --- a/usr/src/lib/auditd_plugins/remote/audit_remote.c +++ b/usr/src/lib/auditd_plugins/remote/audit_remote.c @@ -97,7 +97,7 @@ FILE *dfile; /* debug file */ /* * set_transq_count_max() - sets the transq_count_max value based on kernel * audit queue high water mark. This is backup solution for a case, when the - * the default qsize zero value is (intentionally) set in the audit_remote(5) + * the default qsize zero value is (intentionally) set in the audit_remote(7) * plugin configuration. */ static auditd_rc_t @@ -696,7 +696,7 @@ auditd_plugin(const char *input, size_t in_len, uint64_t sequence, char **error) /* * auditd_plugin_open() may be called multiple times; on initial open or * `audit -s`, then kvlist != NULL; on `audit -n`, then kvlist == NULL. - * For more information see audit(1M). + * For more information see audit(8). * * Note, that space on stack allocated for any error message returned along * with AUDITD_RETRY is subsequently freed by auditd. @@ -803,7 +803,7 @@ auditd_plugin_open(const kva_t *kvlist, char **ret_list, char **error) /* * auditd_plugin_close() performs shutdown operations. The return values are - * used by auditd to output warnings via the audit_warn(1M) script and the + * used by auditd to output warnings via the audit_warn(8) script and the * string returned via "error_text", is passed to audit_warn. * * Note, that space on stack allocated for any error message returned along diff --git a/usr/src/lib/auditd_plugins/remote/audit_remote.h b/usr/src/lib/auditd_plugins/remote/audit_remote.h index 69e27c98a0..49c9737bf3 100644 --- a/usr/src/lib/auditd_plugins/remote/audit_remote.h +++ b/usr/src/lib/auditd_plugins/remote/audit_remote.h @@ -75,7 +75,7 @@ struct hostlist_s { hostlist_t *next_host; struct hostent *host; in_port_t port; /* TCP port number */ - gss_OID mech; /* GSS mechanism - see mech(4) */ + gss_OID mech; /* GSS mechanism - see mech(5) */ }; /* transq_t - single, already sent token in the transmit queue. */ diff --git a/usr/src/lib/brand/ipkg/zone/SUNWblank.xml b/usr/src/lib/brand/ipkg/zone/SUNWblank.xml index 759f22a150..50e3886d86 100644 --- a/usr/src/lib/brand/ipkg/zone/SUNWblank.xml +++ b/usr/src/lib/brand/ipkg/zone/SUNWblank.xml @@ -23,7 +23,7 @@ CDDL HEADER END - DO NOT EDIT THIS FILE. Use zonecfg(1M) instead. + DO NOT EDIT THIS FILE. Use zonecfg(8) instead. --> <!DOCTYPE zone PUBLIC "-//Sun Microsystems Inc//DTD Zones//EN" "file:///usr/share/lib/xml/dtd/zonecfg.dtd.1"> diff --git a/usr/src/lib/brand/ipkg/zone/SUNWdefault.xml b/usr/src/lib/brand/ipkg/zone/SUNWdefault.xml index 8c1079256b..bc4bfc7b79 100644 --- a/usr/src/lib/brand/ipkg/zone/SUNWdefault.xml +++ b/usr/src/lib/brand/ipkg/zone/SUNWdefault.xml @@ -23,7 +23,7 @@ CDDL HEADER END - DO NOT EDIT THIS FILE. Use zonecfg(1M) instead. + DO NOT EDIT THIS FILE. Use zonecfg(8) instead. --> <!DOCTYPE zone PUBLIC "-//Sun Microsystems Inc//DTD Zones//EN" "file:///usr/share/lib/xml/dtd/zonecfg.dtd.1"> diff --git a/usr/src/lib/brand/shared/zone/common.ksh b/usr/src/lib/brand/shared/zone/common.ksh index 3857a806cf..b2c2e052ef 100644 --- a/usr/src/lib/brand/shared/zone/common.ksh +++ b/usr/src/lib/brand/shared/zone/common.ksh @@ -367,7 +367,7 @@ get_archiver() # # Unpack flar into current directory (which should be zoneroot). The flash -# archive is standard input. See flash_archive(4) man page. +# archive is standard input. See flash_archive(5) man page. # # We can't use "flar split" since it will only unpack into a directory called # "archive". We need to unpack in place in order to properly handle nested @@ -439,7 +439,7 @@ install_flar() # # Otherwise skip past this section; read lines until detecting - # section_end. According to flash_archive(4) we can have + # section_end. According to flash_archive(5) we can have # an arbitrary number of sections but the archive section # must be last. # diff --git a/usr/src/lib/brand/sn1/zone/SUNWsn1.xml b/usr/src/lib/brand/sn1/zone/SUNWsn1.xml index 92b2a92bb8..8d49bcf0bb 100644 --- a/usr/src/lib/brand/sn1/zone/SUNWsn1.xml +++ b/usr/src/lib/brand/sn1/zone/SUNWsn1.xml @@ -23,7 +23,7 @@ CDDL HEADER END - DO NOT EDIT THIS FILE. Use zonecfg(1M) instead. + DO NOT EDIT THIS FILE. Use zonecfg(8) instead. --> <!DOCTYPE zone PUBLIC "-//Sun Microsystems Inc//DTD Zones//EN" "file:///usr/share/lib/xml/dtd/zonecfg.dtd.1"> diff --git a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c index e854260a30..7ebd4f30f2 100644 --- a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c +++ b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c @@ -561,7 +561,7 @@ typedef struct s10_ct_param { } s10_ct_param_t; /* - * We have to emulate process contract ioctls for init(1M) because the + * We have to emulate process contract ioctls for init(8) because the * ioctl parameter structure changed between S10 and Nevada. This is * a relatively simple process of filling Nevada structure fields, * shuffling values, and initiating a native system call. @@ -1838,7 +1838,7 @@ brand_init(int argc, char *argv[], char *envp[]) /* * Cache the pid of the zone's init process and determine if - * we're init(1m) for the zone. Remember: we might be init + * we're init(8) for the zone. Remember: we might be init * now, but as soon as we fork(2) we won't be. */ (void) get_initpid_info(); diff --git a/usr/src/lib/brand/solaris10/zone/SUNWsolaris10.xml b/usr/src/lib/brand/solaris10/zone/SUNWsolaris10.xml index 3b5bffb6f1..a13aa1c8f2 100644 --- a/usr/src/lib/brand/solaris10/zone/SUNWsolaris10.xml +++ b/usr/src/lib/brand/solaris10/zone/SUNWsolaris10.xml @@ -23,7 +23,7 @@ CDDL HEADER END - DO NOT EDIT THIS FILE. Use zonecfg(1M) instead. + DO NOT EDIT THIS FILE. Use zonecfg(8) instead. --> <!DOCTYPE zone PUBLIC "-//Sun Microsystems Inc//DTD Zones//EN" "file:///usr/share/lib/xml/dtd/zonecfg.dtd.1"> diff --git a/usr/src/lib/brand/solaris10/zone/image_install.ksh b/usr/src/lib/brand/solaris10/zone/image_install.ksh index 86b9345d27..349d16ce1d 100644 --- a/usr/src/lib/brand/solaris10/zone/image_install.ksh +++ b/usr/src/lib/brand/solaris10/zone/image_install.ksh @@ -59,7 +59,7 @@ $(gettext "you must specify an installation source using '-a', '-d' or '-r'.\n%s cfgchoice_missing=\ $(gettext "you must specify -u (sys-unconfig) or -p (preserve identity).\n%s") -mount_failed=$(gettext "ERROR: zonecfg(1M) 'fs' mount failed") +mount_failed=$(gettext "ERROR: zonecfg(8) 'fs' mount failed") not_flar=$(gettext "Input is not a flash archive") bad_flar=$(gettext "Flash archive is a corrupt") diff --git a/usr/src/lib/brand/solaris10/zone/s10_boot.ksh b/usr/src/lib/brand/solaris10/zone/s10_boot.ksh index 9f3cc08740..b167540087 100644 --- a/usr/src/lib/brand/solaris10/zone/s10_boot.ksh +++ b/usr/src/lib/brand/solaris10/zone/s10_boot.ksh @@ -273,7 +273,7 @@ safe_copy /lib/svc/share/net_include.sh $filename # # PSARC 2009/306 removed the ND_SET/ND_GET ioctl's for modifying -# IP/TCP/UDP/SCTP/ICMP tunables. If S10 ndd(1M) is used within an +# IP/TCP/UDP/SCTP/ICMP tunables. If S10 ndd(8) is used within an # S10 container, the kernel will return EINVAL. So we need this. # replace_with_native /usr/sbin/ndd 0555 root:bin @@ -302,7 +302,7 @@ replace_with_native /usr/lib/fs/autofs/automount 0555 root:bin replace_with_native /usr/lib/autofs/automountd 0555 root:bin # -# The class-specific dispadmin(1M) and priocntl(1) binaries must be native +# The class-specific dispadmin(8) and priocntl(1) binaries must be native # wrappers, and we must have all of the ones the native zone does. This # allows new scheduling classes to appear without causing dispadmin and # priocntl to be unhappy. diff --git a/usr/src/lib/cfgadm_plugins/fp/common/cfga_fp.c b/usr/src/lib/cfgadm_plugins/fp/common/cfga_fp.c index 4bd9c5e2a2..14a72525ea 100644 --- a/usr/src/lib/cfgadm_plugins/fp/common/cfga_fp.c +++ b/usr/src/lib/cfgadm_plugins/fp/common/cfga_fp.c @@ -27,7 +27,7 @@ /* * This file contains the entry points to the plug-in as defined in the - * config_admin(3X) man page. + * config_admin(3CFGADM) man page. */ /* diff --git a/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c b/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c index 17cd3c0b17..f44b6084aa 100644 --- a/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c +++ b/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c @@ -36,8 +36,8 @@ static char *HDR = "# fabric_WWN_map\n" "#\n" "# The physical ap_id list of configured fabric devices.\n" -"# Do NOT edit this file by hand -- refer to the cfgadm_fp(1M)\n" -"# man page and use cfgadm(1m) instead.\n" +"# Do NOT edit this file by hand -- refer to the cfgadm_fp(8)\n" +"# man page and use cfgadm(8) instead.\n" "#\n"; /* diff --git a/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c b/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c index 79bb9a8b7c..bc510135a0 100644 --- a/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c +++ b/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c @@ -28,7 +28,7 @@ /* * cfga_ib.c: - * All cfgadm entry points that are defined in the config_admin(3X) + * All cfgadm entry points that are defined in the config_admin(3CFGADM) * needed for InfiniBand support are described here. These cfgadm * interfaces issue ioctl(s) to the IB nexus driver. Attachment points * supported are - IOC, VPPA, Port, HCA_SVC and Pseudo dynamic ap_ids, @@ -531,7 +531,7 @@ ib_verify_valid_apid(const char *ap_id) * ib_verify_params * Input: * ap_id - The attachment point of an IB fabric - * options - command options passed by the cfgadm(1M) + * options - command options passed by the cfgadm(8) * errstring - This contains error msg if command fails * Output: * NONE @@ -843,11 +843,11 @@ ib_do_control_ioctl(char *ap_id, uint_t sub_cmd1, uint_t sub_cmd2, * Input: * state_change_cmd - Argument to the cfgadm -c command * ap_id - The attachment point of an IB fabric - * options - State Change command options passed by the cfgadm(1M) + * options - State Change command options passed by the cfgadm(8) * confp - Whether this command requires confirmation? * msgp - cfgadm error message for this plugin * errstring - This contains error msg if command fails - * flags - Cfgadm(1m) flags + * flags - cfgadm(8) flags * Output: * NONE * Returns: @@ -1031,11 +1031,11 @@ cfga_change_state(cfga_cmd_t state_change_cmd, const char *ap_id, * func - The private function (passed w/ -x option) * ap_id - The attachment point of an IB fabric * options - Private function command options passed - * by the cfgadm(1M) + * by the cfgadm(8) * confp - Whether this command requires confirmation? * msgp - cfgadm error message for this plugin * errstring - This contains error msg if command fails - * flags - Cfgadm(1m) flags + * flags - cfgadm(8) flags * Output: * NONE * Returns: @@ -1514,10 +1514,10 @@ cfga_private_func(const char *func, const char *ap_id, const char *options, * cfga_test * Input: * ap_id - The attachment point of an IB fabric - * options - Test command options passed by the cfgadm(1M) + * options - Test command options passed by the cfgadm(8) * msgp - cfgadm error message for this plugin * errstring - This contains error msg if command fails - * flags - Cfgadm(1m) flags + * flags - cfgadm(8) flags * Output: * NONE * Returns: @@ -1624,10 +1624,10 @@ ib_fill_static_apids(char *ap_id, cfga_list_data_t *clp) * ap_id - The attachment point of an IB fabric * ap_id_list - The returned "list" information array * nlistp - Number of elements in the "list" information array - * options - List command options passed by the cfgadm(1M) + * options - List command options passed by the cfgadm(8) * listopts - "-s" specific options * errstring - This contains error msg if command fails - * flags - Cfgadm(1m) flags + * flags - cfgadm(8) flags * Output: * NONE * Returns: @@ -2027,9 +2027,9 @@ cfga_msg(struct cfga_msg *msgp, const char *str) * Function: * cfga_help * Input: - * msgp - Help message passed on to cfgadm(1M) - * options - Help message options passed on to cfgadm(1M) - * flags - Cfgadm(1m) flags + * msgp - Help message passed on to cfgadm(8) + * options - Help message options passed on to cfgadm(8) + * flags - cfgadm(8) flags * Output: * NONE * Returns: diff --git a/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c b/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c index dd74b7d210..27cd493960 100644 --- a/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c +++ b/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c @@ -35,7 +35,7 @@ /* * This file contains the entry points to the plug-in as defined in the - * config_admin(3X) man page. + * config_admin(3CFGADM) man page. */ /* diff --git a/usr/src/lib/cfgadm_plugins/sbd/common/ap_sbd.c b/usr/src/lib/cfgadm_plugins/sbd/common/ap_sbd.c index 7c3b34b1f0..b1444a980a 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/common/ap_sbd.c +++ b/usr/src/lib/cfgadm_plugins/sbd/common/ap_sbd.c @@ -374,7 +374,7 @@ apd_alloc(const char *ap_id, cfga_flags_t flags, char **errstring, } /* - * The type field is defined to be parsable by cfgadm(1M): It + * The type field is defined to be parsable by cfgadm(8): It * must not contain white space characters. This function * converts white space to underscore. */ diff --git a/usr/src/lib/cfgadm_plugins/scsi/common/cfga_scsi.c b/usr/src/lib/cfgadm_plugins/scsi/common/cfga_scsi.c index c11f48165f..14d83936c8 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/common/cfga_scsi.c +++ b/usr/src/lib/cfgadm_plugins/scsi/common/cfga_scsi.c @@ -27,7 +27,7 @@ /* * This file contains the entry points to the plug-in as defined in the - * config_admin(3X) man page. + * config_admin(3CFGADM) man page. */ /* diff --git a/usr/src/lib/cfgadm_plugins/shp/common/shp.c b/usr/src/lib/cfgadm_plugins/shp/common/shp.c index 587e042fab..b1ee7d1bf7 100644 --- a/usr/src/lib/cfgadm_plugins/shp/common/shp.c +++ b/usr/src/lib/cfgadm_plugins/shp/common/shp.c @@ -69,7 +69,7 @@ extern int class_pci_items; #define MSG_HOTPLUG_DISABLED \ "Error: hotplug service is probably not running, " \ "please use 'svcadm enable hotplug' to enable the service. " \ - "See cfgadm_shp(1M) for more details." + "See cfgadm_shp(8) for more details." #define DEVICES_DIR "/devices" #define SLASH "/" diff --git a/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c b/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c index 12e144af82..47976fb058 100644 --- a/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c +++ b/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c @@ -41,7 +41,7 @@ static char *usb_get_devicepath(const char *); /* * This file contains the entry points to the plugin as defined in the - * config_admin(3X) man page. + * config_admin(3CFGADM) man page. */ /* 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 a637542c62..3c1c189c8d 100644 --- a/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c +++ b/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c @@ -113,9 +113,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: @@ -127,7 +127,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 8094587fdf..c8dcdb9cd4 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 85dc937932..8d74b8aeb8 100644 --- a/usr/src/lib/fm/topo/modules/common/ses/ses.c +++ b/usr/src/lib/fm/topo/modules/common/ses/ses.c @@ -3806,7 +3806,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 || diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/mech/name.c b/usr/src/lib/gss_mechs/mech_dh/backend/mech/name.c index 6ccb78fe51..788240729a 100644 --- a/usr/src/lib/gss_mechs/mech_dh/backend/mech/name.c +++ b/usr/src/lib/gss_mechs/mech_dh/backend/mech/name.c @@ -27,8 +27,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "dh_gssapi.h" #include <pwd.h> #include <string.h> @@ -260,7 +258,7 @@ do_username_nametype(OM_uint32 *minor, char *uname, gss_name_t *output) } /* * If node is null, assume local host. If domain is - * null assume local domain. See host2netname(3N) + * null assume local domain. See host2netname(3NSL) */ if (!host2netname(netname, node, domain)) { *minor = DH_NETNAME_FAILURE; @@ -281,7 +279,7 @@ do_username_nametype(OM_uint32 *minor, char *uname, gss_name_t *output) return (GSS_S_FAILURE); } - /* If domain is null assume local domain. See user2netname(3N) */ + /* If domain is null assume local domain. See user2netname(3NSL) */ if (!user2netname(netname, pwd.pw_uid, domain)) { *minor = DH_NETNAME_FAILURE; free(user); diff --git a/usr/src/lib/gss_mechs/mech_krb5/krb5/ccache/cc_file.c b/usr/src/lib/gss_mechs/mech_krb5/krb5/ccache/cc_file.c index 634227b8dd..4eab406379 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/krb5/ccache/cc_file.c +++ b/usr/src/lib/gss_mechs/mech_krb5/krb5/ccache/cc_file.c @@ -1622,7 +1622,7 @@ krb5_fcc_initialize(krb5_context context, krb5_ccache id, krb5_principal princ) /* * SUN14resync - * This is not needed and can cause problems with ktkt_warnd(1M) + * This is not needed and can cause problems with ktkt_warnd(8) * because it does tricks with getuid and if we enable this fchmod * we get EPERM [file_owner] failures on fchmod. */ diff --git a/usr/src/lib/gss_mechs/mech_krb5/krb5/keytab/kt_solaris.c b/usr/src/lib/gss_mechs/mech_krb5/krb5/keytab/kt_solaris.c index ea6e8e2d86..0338434fe0 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/krb5/keytab/kt_solaris.c +++ b/usr/src/lib/gss_mechs/mech_krb5/krb5/keytab/kt_solaris.c @@ -128,7 +128,7 @@ cleanup: * * Note: this function is used for adding service principals to the * local /etc/krb5/krb5.keytab (unless KRB5_KTNAME has been set to something - * different, see krb5envvar(5)) file when the client belongs to an AD domain. + * different, see krb5envvar(7)) file when the client belongs to an AD domain. * The keytab file is populated differently for an AD domain as the various * service principals share the same key material, unlike MIT based * implementations. diff --git a/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/getuid.c b/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/getuid.c index 783a2945ef..73738fff33 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/getuid.c +++ b/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/getuid.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <unistd.h> #include <dlfcn.h> @@ -34,8 +32,8 @@ #define KRB5_UID "app_krb5_user_uid" /* - * mech_krb5 makes various calls to getuid(). When employed by gssd(1M) and - * ktkt_warnd(1M), app_krb5_user_uid() is used to select a given user's + * mech_krb5 makes various calls to getuid(). When employed by gssd(8) and + * ktkt_warnd(8), app_krb5_user_uid() is used to select a given user's * credential cache, rather than the id of the process. */ uid_t @@ -49,7 +47,7 @@ krb5_getuid() * Specifically look for app_krb5_user_uid() in the application, * and don't fall into an exhaustive search through all of the * process dependencies. This interface is suplied from - * gssd(1M) and ktkt_warnd(1M). + * gssd(8) and ktkt_warnd(8). */ if (((handle = dlopen(0, (RTLD_LAZY | RTLD_FIRST))) == NULL) || ((gptr = (uid_t (*)())dlsym(handle, KRB5_UID)) == NULL)) { diff --git a/usr/src/lib/gss_mechs/mech_krb5/krb5/os/locate_kdc.c b/usr/src/lib/gss_mechs/mech_krb5/krb5/os/locate_kdc.c index 38bb3c1363..f8c6e0b6f6 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/krb5/os/locate_kdc.c +++ b/usr/src/lib/gss_mechs/mech_krb5/krb5/os/locate_kdc.c @@ -898,7 +898,7 @@ krb5int_locate_server (krb5_context context, const krb5_data *realm, * Solaris Kerberos: * If kpasswd_server has not been configured and dns_lookup_kdc - * dns_fallback are not configured then admin_server should - * be inferred, per krb5.conf(4). + * be inferred, per krb5.conf(5). */ if (code && svc == locate_service_kpasswd && !maybe_use_dns(context, "dns_lookup_kdc", 0)) { @@ -948,28 +948,28 @@ krb5int_locate_server (krb5_context context, const krb5_data *realm, krb5_set_error_message(context, KRB5_REALM_CANT_RESOLVE, dgettext(TEXT_DOMAIN, - "Cannot find a master KDC entry in krb5.conf(4) or DNS Service Location records for realm '%.*s'"), + "Cannot find a master KDC entry in krb5.conf(5) or DNS Service Location records for realm '%.*s'"), realm->length, realm->data); break; case locate_service_kadmin: krb5_set_error_message(context, KRB5_REALM_CANT_RESOLVE, dgettext(TEXT_DOMAIN, - "Cannot find a kadmin KDC entry in krb5.conf(4) or DNS Service Location records for realm '%.*s'"), + "Cannot find a kadmin KDC entry in krb5.conf(5) or DNS Service Location records for realm '%.*s'"), realm->length, realm->data); break; case locate_service_kpasswd: krb5_set_error_message(context, KRB5_REALM_CANT_RESOLVE, dgettext(TEXT_DOMAIN, - "Cannot find a kpasswd KDC entry in krb5.conf(4) or DNS Service Location records for realm '%.*s'"), + "Cannot find a kpasswd KDC entry in krb5.conf(5) or DNS Service Location records for realm '%.*s'"), realm->length, realm->data); break; default: /* locate_service_kdc: */ krb5_set_error_message(context, KRB5_REALM_CANT_RESOLVE, dgettext(TEXT_DOMAIN, - "Cannot find any KDC entries in krb5.conf(4) or DNS Service Location records for realm '%.*s'"), + "Cannot find any KDC entries in krb5.conf(5) or DNS Service Location records for realm '%.*s'"), realm->length, realm->data); } @@ -1039,7 +1039,7 @@ krb5int_locate_server (krb5_context context, const krb5_data *realm, hostlist_str = hostlist2str(hostlist); krb5_set_error_message(context, KRB5_REALM_CANT_RESOLVE, dgettext(TEXT_DOMAIN, - "Cannot resolve network address for KDCs '%s' specified in krb5.conf(4) for realm %.*s"), + "Cannot resolve network address for KDCs '%s' specified in krb5.conf(5) for realm %.*s"), hostlist_str ? hostlist_str : "unknown", realm->length, realm->data); if (hostlist_str) diff --git a/usr/src/lib/gss_mechs/mech_krb5/mech/store_cred.c b/usr/src/lib/gss_mechs/mech_krb5/mech/store_cred.c index d744d9a7cc..cfabbaca16 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/mech/store_cred.c +++ b/usr/src/lib/gss_mechs/mech_krb5/mech/store_cred.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <k5-int.h> #include <gssapiP_krb5.h> #include <memory.h> @@ -231,7 +229,7 @@ gss_cred_usage_t *cred_usage_stored; if (GSS_ERROR(maj)) goto cleanup; - /* Alert ktkt_warnd(1M) */ + /* Alert ktkt_warnd(8) */ maj = krb5_unparse_name(ctx, cred->princ, &client_name); if (GSS_ERROR(maj)) goto cleanup; @@ -239,7 +237,7 @@ gss_cred_usage_t *cred_usage_stored; if (kwarn_add_warning(client_name, cred->tgt_expire) != 0) { syslog(LOG_AUTH|LOG_NOTICE, "store_cred: kwarn_add_warning" - " failed: ktkt_warnd(1M) down? "); + " failed: ktkt_warnd(8) down? "); } free(client_name); client_name = NULL; diff --git a/usr/src/lib/gss_mechs/mech_krb5/profile/prof_solaris.c b/usr/src/lib/gss_mechs/mech_krb5/profile/prof_solaris.c index 96958c1408..117ccd9c80 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/profile/prof_solaris.c +++ b/usr/src/lib/gss_mechs/mech_krb5/profile/prof_solaris.c @@ -25,7 +25,7 @@ /* * prof_solaris.c: - * Abstracted contract private interfaces for configuring krb5.conf(4). + * Abstracted contract private interfaces for configuring krb5.conf(5). */ #include <ctype.h> diff --git a/usr/src/lib/libbrand/dtd/brand.dtd.1 b/usr/src/lib/libbrand/dtd/brand.dtd.1 index 1f1e13837c..0d2317b254 100644 --- a/usr/src/lib/libbrand/dtd/brand.dtd.1 +++ b/usr/src/lib/libbrand/dtd/brand.dtd.1 @@ -278,13 +278,13 @@ <!-- user_cmd - Path to the binary that will translate a user name to a passwd(4) entry. + Path to the binary that will translate a user name to a passwd(5) entry. The following replacements are performed: %u User login name - It has no attributes. The passwd(4) entry is used to determine $LOGNAME, + It has no attributes. The passwd(5) entry is used to determine $LOGNAME, $HOME, and $SHELL for non-interactive "zlogin -l <user> <cmd>". --> <!ELEMENT user_cmd (#PCDATA) > @@ -624,7 +624,7 @@ <!-- security-flags Specifies the default security flags applied to zones of this brand. This - set can be overridden via security-flags in zonecfg(1m). + set can be overridden via security-flags in zonecfg(8). --> <!ELEMENT security-flags (#PCDATA) > <!ATTLIST security-flags> @@ -636,12 +636,12 @@ zones of this brand with ip-type matched. If a privilege is added to the default set all zones of this brand with ip-type matched on the system will inherit this privilege unless the privilege is - removed via limitpriv in zonecfg(1m). If a privilege is added to + removed via limitpriv in zonecfg(8). If a privilege is added to the prohibited set it can not be added to any zones with ip-type - matched via limitpriv in zonecfg(1m). If a privilege is added to + matched via limitpriv in zonecfg(8). If a privilege is added to the required set then all zones of this brand with ip-type matched on the system will inherit this privilege and it can't be removed via - limitpriv in zonecfg(1m). + limitpriv in zonecfg(8). Its attributes are set The name of the set the privilege should go into. diff --git a/usr/src/lib/libbsm/audit_event.txt b/usr/src/lib/libbsm/audit_event.txt index 2db2fc017e..7ba3bc733d 100644 --- a/usr/src/lib/libbsm/audit_event.txt +++ b/usr/src/lib/libbsm/audit_event.txt @@ -390,16 +390,16 @@ 6157:AUE_mountd_umount:unmount:na 6158:AUE_rshd:rsh access:lo 6159:AUE_su:su:lo -6160:AUE_halt_solaris:halt(1m):ss -6161:AUE_reboot_solaris:reboot(1m):ss +6160:AUE_halt_solaris:halt(8):ss +6161:AUE_reboot_solaris:reboot(8):ss 6162:AUE_rexecd:rexecd:lo 6163:AUE_passwd:passwd:lo 6164:AUE_rexd:rexd:lo 6165:AUE_ftpd:ftp access:lo -6166:AUE_init_solaris:init(1m):ss -6167:AUE_uadmin_solaris:uadmin(1m):no +6166:AUE_init_solaris:init(8):ss +6167:AUE_uadmin_solaris:uadmin(8):no 6168:AUE_shutdown_solaris:shutdown(1b):ss -6169:AUE_poweroff_solaris:poweroff(1m):ss +6169:AUE_poweroff_solaris:poweroff(8):ss 6170:AUE_crontab_mod:crontab-modify:ua 6171:AUE_ftpd_logout:ftp logout:lo 6172:AUE_ssh:login - ssh:lo @@ -460,16 +460,16 @@ 6234:AUE_pool_export:export device from pool:ot 6235:AUE_dladm_create_secobj:create network security object:as,cy 6236:AUE_dladm_delete_secobj:delete network security object:as,cy -6237:AUE_uadmin_shutdown:uadmin(1m) - shutdown:ss -6238:AUE_uadmin_reboot:uadmin(1m) - reboot:ss -6239:AUE_uadmin_dump:uadmin(1m) - dump:ss -6240:AUE_uadmin_freeze:uadmin(1m) - freeze:ss -6241:AUE_uadmin_remount:uadmin(1m) - remount:ss -6242:AUE_uadmin_ftrace:uadmin(1m) - ftrace:ss -6243:AUE_uadmin_swapctl:uadmin(1m) - swapctl:ss -6244:AUE_smbd_session:smbd(1m) session setup:lo -6245:AUE_smbd_logoff:smbd(1m) session logoff:lo -6246:AUE_vscan_quarantine:vscand(1m) quarantine infected file:na +6237:AUE_uadmin_shutdown:uadmin(8) - shutdown:ss +6238:AUE_uadmin_reboot:uadmin(8) - reboot:ss +6239:AUE_uadmin_dump:uadmin(8) - dump:ss +6240:AUE_uadmin_freeze:uadmin(8) - freeze:ss +6241:AUE_uadmin_remount:uadmin(8) - remount:ss +6242:AUE_uadmin_ftrace:uadmin(8) - ftrace:ss +6243:AUE_uadmin_swapctl:uadmin(8) - swapctl:ss +6244:AUE_smbd_session:smbd(8) session setup:lo +6245:AUE_smbd_logoff:smbd(8) session logoff:lo +6246:AUE_vscan_quarantine:vscand(8) quarantine infected file:na 6247:AUE_ndmp_connect:ndmp connect:na 6248:AUE_ndmp_disconnect:ndmp disconnect:na 6249:AUE_ndmp_backup:ndmp backup:na @@ -477,11 +477,11 @@ 6251:AUE_cpu_ondemand:set ondemand CPU freq governor:ss 6252:AUE_cpu_performance:set max CPU freq governor:ss 6253:AUE_cpu_threshold:set CPU freq threshold:ss -6254:AUE_uadmin_thaw:uadmin(1m) - thaw after freeze:ss,na -6255:AUE_uadmin_config:uadmin(1m) - config:ss +6254:AUE_uadmin_thaw:uadmin(8) - thaw after freeze:ss,na +6255:AUE_uadmin_config:uadmin(8) - config:ss # -# SMF(5) svc.configd events (svcadm(1M) related) +# smf(7) svc.configd events (svcadm(8) related) # 6260:AUE_smf_enable:persistently enable service instance:ss 6261:AUE_smf_tmp_enable:temporarily enable service instance:ss @@ -498,11 +498,11 @@ 6272:AUE_smf_tmp_maintenance:set service instance maintenance temporary state:ss 6273:AUE_smf_milestone:set service management facility milestone:ss # -# SMF(5) svc.configd miscellaneous events +# smf(7) svc.configd miscellaneous events # 6275:AUE_smf_read_prop:read restricted access property value:as # -# SMF(5) svc.configd events (svccfg(1M) related) +# smf(7) svc.configd events (svccfg(8) related) # 6280:AUE_smf_create:create service instance object:as 6281:AUE_smf_delete:delete service instance object:as @@ -518,12 +518,12 @@ 6291:AUE_smf_change_prop:change service instance property:as 6292:AUE_smf_delete_prop:delete service instance property:as # -# nwamd(1M) events +# nwamd(8) events # 6300:AUE_nwam_enable:enable nwam profile object:ss 6301:AUE_nwam_disable:disable nwam profile object:ss # -# ilbd(1M) events +# ilbd(8) events # 6310:AUE_ilb_create_healthcheck:create ILB health check:as 6311:AUE_ilb_delete_healthcheck:delete ILB health check:as @@ -538,7 +538,7 @@ 6320:AUE_ilb_create_servergroup:create ILB server group:as 6321:AUE_ilb_delete_servergroup:delete ILB server group:as # -# netcfgd(1M) events +# netcfgd(8) events # 6330:AUE_netcfg_update:create or modify configuration object:ss 6331:AUE_netcfg_remove:remove configuration object from repository:ss @@ -566,7 +566,7 @@ 6418:AUE_tpm_fieldupgrade:update TPM protected capabilities:as 6419:AUE_tpm_resetlockvalue:reset TPM failed authorization attempt lock:as # -# hotplugd(1m) events +# hotplugd(8) events # 6500:AUE_hotplug_state:change hotplug connection state:ss 6501:AUE_hotplug_set:set hotplug bus private options:ss @@ -574,7 +574,7 @@ # # sudo event # -6650:AUE_sudo:sudo(1m):lo,ua,as +6650:AUE_sudo:sudo(8):lo,ua,as # # Trusted Extensions events: diff --git a/usr/src/lib/libbsm/common/adt.xml b/usr/src/lib/libbsm/common/adt.xml index d16c904bc0..9dd74f0de5 100644 --- a/usr/src/lib/libbsm/common/adt.xml +++ b/usr/src/lib/libbsm/common/adt.xml @@ -66,7 +66,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. omitted, the internal name is the same as the external name. - title, these tags are used by auditrecord(1M) build to create + title, these tags are used by auditrecord(8) build to create program, audit_record_attr database from adt events. see Following example demonstrates their semantics: @@ -85,7 +85,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. If the length of string in any of the given elements is longer than defined, the string is silently truncated to the defined length in the - auditrecord(1M) runtime: + auditrecord(8) runtime: element <= max (non-truncated) string length title <= 46 @@ -175,11 +175,11 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. If the type is an array, its length must be given explicitly. - comment Used by auditrecord(1M) build to generate + comment Used by auditrecord(8) build to generate audit_record_attr. Comment is explanation note printed with token type. Colon (':') may not be used in a comment. See example above for other - tags related to auditrecord(1M). + tags related to auditrecord(8). token Define allowed token names. - id is the name of token; this name is used @@ -189,7 +189,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. "TSOL" is defined; it means that this data is to be used only in Trusted Solaris implementations. See also example above for "token" tag relation to - the auditrecord(1M) output. + the auditrecord(8) output. msg_list Define a set of text strings. - id is the name to be used for this group of text @@ -664,7 +664,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_su" header="0" idNo="30" omit="JNI"> <title>su</title> <program>/usr/bin/su</program> - <see>su(1M)</see> + <see>su(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -887,14 +887,14 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. header="0" idNo="39" omit="JNI"> <title>su</title> <program>/usr/bin/su</program> - <see>su(1M)</see> + <see>su(8)</see> </event> <event id="AUE_role_logout" instance_of="AUE_generic_basic" header="0" idNo="40" omit="JNI"> <title>su</title> <program>/usr/bin/su</program> - <see>su(1M)</see> + <see>su(8)</see> </event> <event id="AUE_newgrp_login" header="0" idNo="41" omit="JNI"> @@ -1069,13 +1069,13 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. header="0" idNo="47" omit="JNI"> <title>create wifi security object</title> <program>/usr/sbin/dladm</program> - <see>dladm(1M)</see> + <see>dladm(8)</see> </event> <event id="AUE_dladm_delete_secobj" instance_of="AUE_dladm_generic" header="0" idNo="48" omit="JNI"> <title>delete wifi security object</title> <program>/usr/sbin/dladm</program> - <see>dladm(1M)</see> + <see>dladm(8)</see> </event> <!-- Trusted eXtensions (TX) events --> @@ -1153,7 +1153,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. </entry> </event> - <!-- uadmin(1m) events --> + <!-- uadmin(8) events --> <event id="AUE_uadmin_generic" type="generic" omit="always"> <entry id="subject"> <internal token="subject"/> @@ -1194,34 +1194,34 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <title>uadmin shutdown</title> <program>/sbin/uadmin</program> <program>/usr/sbin/uadmin</program> - <see>uadmin(1M)</see> + <see>uadmin(8)</see> </event> <event id="AUE_uadmin_reboot" instance_of="AUE_uadmin_generic" header="0" idNo="52" omit="JNI"> <title>uadmin reboot</title> <program>/sbin/uadmin</program> <program>/usr/sbin/uadmin</program> - <see>uadmin(1M)</see> + <see>uadmin(8)</see> </event> <event id="AUE_uadmin_dump" instance_of="AUE_uadmin_generic" header="0" idNo="53" omit="JNI"> <title>uadmin dump</title> <program>/sbin/uadmin</program> <program>/usr/sbin/uadmin</program> - <see>uadmin(1M)</see> + <see>uadmin(8)</see> </event> <event id="AUE_uadmin_freeze" instance_of="AUE_uadmin_generic" header="0" idNo="54" omit="JNI"> <title>uadmin freeze</title> <program>/sbin/uadmin</program> <program>/usr/sbin/uadmin</program> - <see>uadmin(1M)</see> + <see>uadmin(8)</see> </event> <event id="AUE_uadmin_remount" header="0" idNo="55" omit="JNI"> <title>uadmin remount</title> <program>/sbin/uadmin</program> <program>/usr/sbin/uadmin</program> - <see>uadmin(1M)</see> + <see>uadmin(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1237,20 +1237,20 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <title>uadmin ftrace</title> <program>/sbin/uadmin</program> <program>/usr/sbin/uadmin</program> - <see>uadmin(1M)</see> + <see>uadmin(8)</see> </event> <event id="AUE_uadmin_swapctl" instance_of="AUE_uadmin_generic_fcn" header="0" idNo="57" omit="JNI"> <title>uadmin swapctl</title> <program>/sbin/uadmin</program> <program>/usr/sbin/uadmin</program> - <see>uadmin(1M)</see> + <see>uadmin(8)</see> </event> <event id="AUE_uadmin_thaw" header="0" idNo="96" omit="JNI"> <title>thaw after freeze</title> <program>/sbin/uadmin</program> <program>/usr/sbin/uadmin</program> - <see>uadmin(1M)</see> + <see>uadmin(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1271,7 +1271,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <title>uadmin config</title> <program>/sbin/uadmin</program> <program>/usr/sbin/uadmin</program> - <see>uadmin(1M)</see> + <see>uadmin(8)</see> </event> <!-- smbd service event; smbd session setup --> @@ -1331,7 +1331,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_vscan_quarantine" header="0" idNo="60" omit="JNI"> <title>VSCAN: quarantine infected file</title> <program>/usr/lib/vscan/vscand</program> - <see>vscand(1M), ICAP RFC 3507 (Extensions)</see> + <see>vscand(8), ICAP RFC 3507 (Extensions)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1357,7 +1357,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. idNo="61" omit="JNI"> <title>NDMP Connect</title> <program>/usr/lib/ndmp/ndmpd</program> - <see>ndmpd(1M)</see> + <see>ndmpd(8)</see> </event> <!-- ndmp service event; ndmp client disconnect --> @@ -1365,14 +1365,14 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. idNo="62" omit="JNI"> <title>NDMP Disconnect</title> <program>/usr/lib/ndmp/ndmpd</program> - <see>ndmpd(1M)</see> + <see>ndmpd(8)</see> </event> <!-- ndmp service event; ndmp backup --> <event id="AUE_ndmp_backup" header="0" idNo="63" omit="JNI"> <title>NDMP Backup</title> <program>/usr/lib/ndmp/ndmpd</program> - <see>ndmpd(1M)</see> + <see>ndmpd(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1402,7 +1402,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_ndmp_restore" header="0" idNo="64" omit="JNI"> <title>NDMP Restore</title> <program>/usr/lib/ndmp/ndmpd</program> - <see>ndmpd(1M)</see> + <see>ndmpd(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1488,110 +1488,110 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_smf_enable" instance_of="AUE_smf_generic" header="0" idNo="65" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_tmp_enable" instance_of="AUE_smf_generic" header="0" idNo="66" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_disable" instance_of="AUE_smf_generic" header="0" idNo="67" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_tmp_disable" instance_of="AUE_smf_generic" header="0" idNo="68" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_restart" instance_of="AUE_smf_generic" header="0" idNo="69" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_refresh" instance_of="AUE_smf_generic" header="0" idNo="70" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_clear" instance_of="AUE_smf_generic" header="0" idNo="71" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_degrade" instance_of="AUE_smf_generic" header="0" idNo="72" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_immediate_degrade" instance_of="AUE_smf_generic" header="0" idNo="73" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_maintenance" instance_of="AUE_smf_generic" header="0" idNo="74" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_immediate_maintenance" instance_of="AUE_smf_generic" header="0" idNo="75" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_immtmp_maintenance" instance_of="AUE_smf_generic" header="0" idNo="76" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_tmp_maintenance" instance_of="AUE_smf_generic" header="0" idNo="77" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_milestone" instance_of="AUE_smf_generic" header="0" idNo="78" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svcadm(1M)</see> + <program>svc.configd(8)</program> + <see>svcadm(8)</see> </event> <event id="AUE_smf_create" instance_of="AUE_smf_generic" header="0" idNo="79" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> </event> <event id="AUE_smf_delete" instance_of="AUE_smf_generic" header="0" idNo="80" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> </event> <event id="AUE_smf_create_pg" instance_of="AUE_smf_generic_pg" header="0" idNo="81" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> </event> <event id="AUE_smf_create_npg" instance_of="AUE_smf_generic_pg" header="0" idNo="82" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> </event> <event id="AUE_smf_delete_pg" instance_of="AUE_smf_generic_pg" header="0" idNo="83" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> </event> <event id="AUE_smf_delete_npg" instance_of="AUE_smf_generic_pg" header="0" idNo="84" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> </event> <event id="AUE_smf_create_snap" header="0" idNo="85" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1617,8 +1617,8 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. </entry> </event> <event id="AUE_smf_delete_snap" header="0" idNo="86" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1644,8 +1644,8 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. </entry> </event> <event id="AUE_smf_attach_snap" header="0" idNo="87" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1682,8 +1682,8 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. </event> <event id="AUE_smf_annotation" header="0" idNo="88" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1705,8 +1705,8 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. </event> <event id="AUE_smf_create_prop" header="0" idNo="89" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1738,8 +1738,8 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. </event> <event id="AUE_smf_change_prop" header="0" idNo="90" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1770,8 +1770,8 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. </entry> </event> <event id="AUE_smf_delete_prop" header="0" idNo="91" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1794,8 +1794,8 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_smf_read_prop" instance_of="AUE_smf_generic" header="0" idNo="92" omit="JNI"> - <program>svc.configd(1M)</program> - <see>svccfg(1M)</see> + <program>svc.configd(8)</program> + <see>svccfg(8)</see> </event> <!-- CPUFreq related events --> @@ -1803,7 +1803,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_cpu_ondemand" header="0" idNo="93" omit="JNI"> <title>set CPU freq to minimal unless load increases</title> <program>/usr/lib/hal/hald-addon-cpufreq</program> - <see>hald(1M)</see> + <see>hald(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1821,7 +1821,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_cpu_performance" header="0" idNo="94" omit="JNI"> <title>set CPU freq to Max</title> <program>/usr/lib/hal/hald-addon-cpufreq</program> - <see>hald(1M)</see> + <see>hald(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1839,7 +1839,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_cpu_threshold" header="0" idNo="95" omit="JNI"> <title>set CPU frequency threshold percentage</title> <program>/usr/lib/hal/hald-addon-cpufreq</program> - <see>hald(1M)</see> + <see>hald(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -1987,12 +1987,12 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <see>tcsd(8)</see> </event> -<!-- hotplug events recorded by hotplugd(1m) --> +<!-- hotplug events recorded by hotplugd(8) --> <event id="AUE_hotplug_state" header="0" idNo="117" omit="JNI"> <title>change hotplug connection state</title> <program>/usr/lib/hotplugd</program> - <see>hotplugd(1M)</see> + <see>hotplugd(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2031,7 +2031,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_hotplug_set" header="0" idNo="118" omit="JNI"> <title>set hotplug bus private options</title> <program>/usr/lib/hotplugd</program> - <see>hotplugd(1M)</see> + <see>hotplugd(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2065,7 +2065,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_ilb_create_healthcheck" header="0" idNo="120" omit="JNI"> <title>Create Integrated Loadbalancer healthcheck object</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2116,7 +2116,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_ilb_delete_healthcheck" header="0" idNo="121" omit="JNI"> <title>Delete Integrated Loadbalancer healthcheck object</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2140,7 +2140,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_ilb_create_rule" header="0" idNo="122" omit="JNI"> <title>Create Integrated Loadbalancer rule</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2271,27 +2271,27 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. header="0" idNo="123"> <title>Delete Integrated Loadbalancer rule</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> </event> <event id="AUE_ilb_disable_rule" instance_of="AUE_generic_ILB_rule" header="0" idNo="124"> <title>Disable Integrated Loadbalancer rule</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> </event> <event id="AUE_ilb_enable_rule" instance_of="AUE_generic_ILB_rule" header="0" idNo="125"> <title>Enable Integrated Loadbalancer rule</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> </event> <event id="AUE_ilb_add_server" header="0" idNo="126" omit="JNI"> <title>Add server to Integrated Loadbalancer</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2343,7 +2343,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_ilb_disable_server" header="0" idNo="127" omit="JNI"> <title>Disable server to Integrated Loadbalancer</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2375,7 +2375,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_ilb_enable_server" header="0" idNo="128" omit="JNI"> <title>Enable server to Integrated Loadbalancer</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2407,7 +2407,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_ilb_remove_server" header="0" idNo="129" omit="JNI"> <title>Remove server from Integrated Loadbalancer</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2444,7 +2444,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_ilb_create_servergroup" header="0" idNo="130" omit="JNI"> <title>Create server group for Integrated Loadbalancer</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2468,7 +2468,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <event id="AUE_ilb_delete_servergroup" header="0" idNo="131" omit="JNI"> <title>Delete server group from Integrated Loadbalancer</title> <program>/usr/sbin/ilbadm</program> - <see>ilbadm(1m)</see> + <see>ilbadm(8)</see> <entry id="subject"> <internal token="subject"/> <external opt="none"/> @@ -2761,7 +2761,7 @@ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. <msg id="ANON_USER">No anonymous</msg> </msg_list> -<!-- msg list for uadmin(1m) fcn argument (next action, see uadmin(2)) --> +<!-- msg list for uadmin(8) fcn argument (next action, see uadmin(2)) --> <msg_list id="uadmin_fcn" header="0" start="3000" public="true"> <msg id="AD_HALT">Halt the processor(s)</msg> <msg id="AD_POWEROFF">Halt the processor(s) and turn off the power</msg> diff --git a/usr/src/lib/libbsm/common/audit_scf.c b/usr/src/lib/libbsm/common/audit_scf.c index fa990fc669..e2946abf28 100644 --- a/usr/src/lib/libbsm/common/audit_scf.c +++ b/usr/src/lib/libbsm/common/audit_scf.c @@ -22,7 +22,7 @@ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. */ -/* auditd smf(5)/libscf(3LIB) interface - set and display audit parameters */ +/* auditd smf(7)/libscf(3LIB) interface - set and display audit parameters */ #include <audit_scf.h> #include <audit_policy.h> @@ -691,7 +691,7 @@ do_getpolicy_scf(uint32_t *policy_mask) bzero(prop_vect, sizeof (prop_vect)); bzero(policy_arr, sizeof (policy_arr)); - /* prepare the smf(5) query */ + /* prepare the smf(7) query */ for (i = 0; i < POLICY_TBL_SZ; i++) { cur_policy_str = policy_table[i].policy_str; diff --git a/usr/src/lib/libbsm/common/audit_scf.h b/usr/src/lib/libbsm/common/audit_scf.h index 09b826e97b..d913dc57d0 100644 --- a/usr/src/lib/libbsm/common/audit_scf.h +++ b/usr/src/lib/libbsm/common/audit_scf.h @@ -30,7 +30,7 @@ extern "C" { #endif /* - * auditd smf(5)/libscf(3LIB) interface - set and display audit parameters + * auditd smf(7)/libscf(3LIB) interface - set and display audit parameters */ #include <audit_plugin.h> @@ -110,7 +110,7 @@ typedef struct scf_qctrl scf_qctrl_t; #define PRESELECTION_NAFLAGS "naflags" #define PRESELECTION_MAXBUF 256 /* max. length of na/flags */ -/* auditd(1M) plugin related well known properties */ +/* auditd(8) plugin related well known properties */ #define PLUGIN_ACTIVE "active" /* plugin state */ #define PLUGIN_PATH "path" /* plugin shared object */ #define PLUGIN_QSIZE "qsize" /* plugin queue size */ diff --git a/usr/src/lib/libc/i386/sys/ptrace.c b/usr/src/lib/libc/i386/sys/ptrace.c index c4ecdd34f4..13865136b5 100644 --- a/usr/src/lib/libc/i386/sys/ptrace.c +++ b/usr/src/lib/libc/i386/sys/ptrace.c @@ -25,11 +25,9 @@ */ /* - * ptrace(2) interface built on top of proc(4). + * ptrace(2) interface built on top of proc(5). */ -#pragma ident "%Z%%M% %I% %E% SMI" - #pragma weak _ptrace = ptrace #include "lint.h" diff --git a/usr/src/lib/libc/port/gen/crypt.c b/usr/src/lib/libc/port/gen/crypt.c index 812062644f..016da3202a 100644 --- a/usr/src/lib/libc/port/gen/crypt.c +++ b/usr/src/lib/libc/port/gen/crypt.c @@ -128,7 +128,7 @@ static char *_unix_crypt_gensalt(char *gsbuffer, size_t gsbufflen, * This function encodes strings in a suitable for for secure storage * as passwords. It generates the password hash given the plaintext and salt. * - * If the first character of salt is "$" then we use crypt.conf(4) to + * If the first character of salt is "$" then we use crypt.conf(5) to * determine which plugin to use and run the crypt_genhash_impl(3c) function * from it. * Otherwise we use the old unix algorithm. @@ -166,7 +166,7 @@ crypt(const char *plaintext, const char *salt) /* * Find the algorithm name from the salt and look it up in - * crypt.conf(4) to find out what shared object to use. + * crypt.conf(5) to find out what shared object to use. * If we can't find it in crypt.conf then getalgbyname would * have returned with found = B_FALSE so we use the unix algorithm. * If alg is NULL but found = B_TRUE then there is a problem with @@ -472,12 +472,12 @@ alg_valid(const char *algname, const struct crypt_policy_s *policy) } /* - * getalgbyname - read crypt.conf(4) looking for algname + * getalgbyname - read crypt.conf(5) looking for algname * * RETURN VALUES * On error NULL and errno is set * On success the alg details including an open handle to the lib - * If crypt.conf(4) is okay but algname doesn't exist in it then + * If crypt.conf(5) is okay but algname doesn't exist in it then * return NULL the caller should then use the default algorithm * as per the policy. */ diff --git a/usr/src/lib/libc/port/gen/getusershell.c b/usr/src/lib/libc/port/gen/getusershell.c index df10f2f6fd..c744828a8a 100644 --- a/usr/src/lib/libc/port/gen/getusershell.c +++ b/usr/src/lib/libc/port/gen/getusershell.c @@ -134,7 +134,7 @@ initshells(void) return ((char **)okshells); /* * The +1 in the malloc() below is needed to handle the final - * fgets() NULL terminator. From fgets(3S): + * fgets() NULL terminator. From fgets(3C): * * char *fgets(char *s, int n, FILE *stream); * diff --git a/usr/src/lib/libc/port/gen/isaexec.c b/usr/src/lib/libc/port/gen/isaexec.c index c3807ead39..5db6ccf29a 100644 --- a/usr/src/lib/libc/port/gen/isaexec.c +++ b/usr/src/lib/libc/port/gen/isaexec.c @@ -57,7 +57,7 @@ isaexec(const char *execname, char *const *argv, char *const *envp) int saved_errno; /* - * Extract the isalist(5) for userland from the kernel. + * Extract the isalist(7) for userland from the kernel. */ isalist = malloc(isalen); do { diff --git a/usr/src/lib/libc/port/gen/localtime.c b/usr/src/lib/libc/port/gen/localtime.c index 65c202821d..a2cb012c46 100644 --- a/usr/src/lib/libc/port/gen/localtime.c +++ b/usr/src/lib/libc/port/gen/localtime.c @@ -79,8 +79,8 @@ * * A zoneinfo timezone is a reference to a file that contains a set of * rules that describe the timezone. In Solaris, the file is in - * /usr/share/lib/zoneinfo. The file is generated by zic(1M), based - * on zoneinfo rules "source" files. This is all described on the zic(1M) + * /usr/share/lib/zoneinfo. The file is generated by zic(8), based + * on zoneinfo rules "source" files. This is all described on the zic(8) * man page. */ @@ -1410,7 +1410,7 @@ posix_daylight(long long *janfirst, int year, posix_daylight_t *pdaylightp) /* * Try to load zoneinfo file into internal transition tables using name - * indicated in TZ, and do validity checks. The format of zic(1M) + * indicated in TZ, and do validity checks. The format of zic(8) * compiled zoneinfo files isdescribed in tzfile.h */ static int diff --git a/usr/src/lib/libc/port/locale/gb18030.c b/usr/src/lib/libc/port/locale/gb18030.c index 3901270a8d..920da0a97e 100644 --- a/usr/src/lib/libc/port/locale/gb18030.c +++ b/usr/src/lib/libc/port/locale/gb18030.c @@ -29,7 +29,7 @@ /* * PRC National Standard GB 18030-2000 encoding of Chinese text. * - * See gb18030(5) for details. + * See gb18030(7) for details. */ #include "lint.h" diff --git a/usr/src/lib/libc/port/regex/regex.c b/usr/src/lib/libc/port/regex/regex.c index 769761daef..6e4c86e17e 100644 --- a/usr/src/lib/libc/port/regex/regex.c +++ b/usr/src/lib/libc/port/regex/regex.c @@ -27,8 +27,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * IMPORTANT NOTE: * @@ -328,7 +326,7 @@ regex(const char *regexp, const char *stringp, ...) * * NOTE: * - * According to manual page regcmp(3G), regex() returns substrings + * According to manual page regcmp(3C), regex() returns substrings * that match subexpressions even when no substring matches the * entire regular expression. */ diff --git a/usr/src/lib/libc/port/stdio/README.design b/usr/src/lib/libc/port/stdio/README.design index 748f7f9913..80305bf22b 100644 --- a/usr/src/lib/libc/port/stdio/README.design +++ b/usr/src/lib/libc/port/stdio/README.design @@ -266,7 +266,7 @@ Extended File and fileno() The 32-bit libc has historically been limited to 255 open streams because of the use of an unsigned char. This problem does not impact the 64-bit libc. To deal with this, libc uses a series of techniques which -are summarized for users in extendedFILE(5). The usage of extendedFILE +are summarized for users in extendedFILE(7). The usage of extendedFILE can also be enabled by passing the special 'F' character to fopen(3C). The '_magic' member in the 32-bit 'struct __FILE_TAG' contains what used diff --git a/usr/src/lib/libc/port/sys/epoll.c b/usr/src/lib/libc/port/sys/epoll.c index 230860d391..d497856083 100644 --- a/usr/src/lib/libc/port/sys/epoll.c +++ b/usr/src/lib/libc/port/sys/epoll.c @@ -68,7 +68,7 @@ /* * The defined behavior for epoll_wait/epoll_pwait when using a timeout less * than 0 is to wait for events until they arrive (or interrupted by a signal). - * While poll(7d) operates in this manner for a timeout of -1, using other + * While poll(4D) operates in this manner for a timeout of -1, using other * negative values results in an immediate timeout, as if it had been set to 0. * For that reason, negative values are clamped to -1. */ diff --git a/usr/src/lib/libc/port/threads/door_calls.c b/usr/src/lib/libc/port/threads/door_calls.c index baa1f573aa..87124a6a37 100644 --- a/usr/src/lib/libc/port/threads/door_calls.c +++ b/usr/src/lib/libc/port/threads/door_calls.c @@ -809,7 +809,7 @@ door_server_create(door_server_func_t *create_func) /* * Thread start function for door_create_server() below. - * Create door server threads with cancellation(5) disabled. + * Create door server threads with cancellation(7) disabled. */ static void * door_create_func(void *arg) diff --git a/usr/src/lib/libc/sparc/sys/ptrace.c b/usr/src/lib/libc/sparc/sys/ptrace.c index 796e0dac5c..0153088f0f 100644 --- a/usr/src/lib/libc/sparc/sys/ptrace.c +++ b/usr/src/lib/libc/sparc/sys/ptrace.c @@ -25,7 +25,7 @@ */ /* - * ptrace(2) interface built on top of proc(4). + * ptrace(2) interface built on top of proc(5). */ diff --git a/usr/src/lib/libc_db/common/thread_db.c b/usr/src/lib/libc_db/common/thread_db.c index 53e1f6b1c7..93b54ef65f 100644 --- a/usr/src/lib/libc_db/common/thread_db.c +++ b/usr/src/lib/libc_db/common/thread_db.c @@ -2134,7 +2134,7 @@ __td_thr_validate(const td_thrhandle_t *th_p) /* * Get a thread's private binding to a given thread specific - * data(TSD) key(see thr_getspecific(3T). If the thread doesn't + * data(TSD) key(see thr_getspecific(3C). If the thread doesn't * have a binding for a particular key, then NULL is returned. */ #pragma weak td_thr_tsd = __td_thr_tsd diff --git a/usr/src/lib/libcryptoutil/README b/usr/src/lib/libcryptoutil/README index 371374e42d..77280391ee 100644 --- a/usr/src/lib/libcryptoutil/README +++ b/usr/src/lib/libcryptoutil/README @@ -105,7 +105,7 @@ Consumers: command line args to mech numbers. They will need to add the "CKM_" prefix before calling pkc11_str2mech() - cryptoadm(1m) for output to user, and for storing in pkcs11.conf + cryptoadm(8) for output to user, and for storing in pkcs11.conf file. Debug code. @@ -114,7 +114,7 @@ Consumers: The "pkcs11.conf" configuration file parsing code and data structures are shared between: - cryptoadm(1m), libpkcs11(3crypto). + cryptoadm(8), libpkcs11(3crypto). 2.3.1 Data Structures: diff --git a/usr/src/lib/libcryptoutil/common/debug.c b/usr/src/lib/libcryptoutil/common/debug.c index 84ac2ec4be..b2537c8ded 100644 --- a/usr/src/lib/libcryptoutil/common/debug.c +++ b/usr/src/lib/libcryptoutil/common/debug.c @@ -68,7 +68,7 @@ cryptodebug(const char *fmt, ...) /* * cryptoerror * - * This is intended to be used both by interactive commands like cryptoadm(1m) + * This is intended to be used both by interactive commands like cryptoadm(8) * digest(1) etc, and by libraries libpkcs11, libelfsign etc. * * A library probably wants most (all?) of its errors going to syslog but diff --git a/usr/src/lib/libdevinfo/devinfo_devlink.c b/usr/src/lib/libdevinfo/devinfo_devlink.c index 8d4d0ed709..138f75eab2 100644 --- a/usr/src/lib/libdevinfo/devinfo_devlink.c +++ b/usr/src/lib/libdevinfo/devinfo_devlink.c @@ -67,7 +67,7 @@ static const char *skip_files[] = { * * This file contains two sets of interfaces which operate on the reverse * links database. One set (which includes di_devlink_open()/_close()) - * allows link generators like devfsadm(1M) and ucblinks(1B) (writers) to + * allows link generators like devfsadm(8) and ucblinks(1B) (writers) to * populate the database with /devices -> /dev mappings. Another set * of interfaces (which includes di_devlink_init()/_fini()) allows * applications (readers) to lookup the database for /dev links corresponding @@ -3731,7 +3731,7 @@ walk_cache_node(di_devlink_handle_t hdp, const char *path, link_desc_t *linkp) * are selected. * If neither flag is specified, all devlinks are selected. * - * re An extended regular expression in regex(5) format which + * re An extended regular expression in regex(7) format which * selects the /dev links to be returned. The regular * expression should use link pathnames relative to * /dev. i.e. without the leading "/dev/" prefix. diff --git a/usr/src/lib/libdevinfo/devinfo_dim.c b/usr/src/lib/libdevinfo/devinfo_dim.c index 141f5a9514..073fc60543 100644 --- a/usr/src/lib/libdevinfo/devinfo_dim.c +++ b/usr/src/lib/libdevinfo/devinfo_dim.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "libdevinfo.h" #include <strings.h> #include <sys/modctl.h> @@ -35,7 +33,7 @@ * information into /devices and /dev paths. It does this using interfaces to * the kernel instance tree so that it can provide translations for devices * which are no longer present. An example consumer of these interfaces is - * iostat(1M) - which shows, in its first iteration, activity since reboot. + * iostat(8) - which shows, in its first iteration, activity since reboot. * With persistant kstats, a device which was busy a long time ago can still * have a decaying presence in iostat output, and that output, when '-n' is * used, should show the public name. diff --git a/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.c b/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.c index a70eb2bbdc..9c669a7047 100644 --- a/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.c +++ b/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.c @@ -438,7 +438,7 @@ dhcp_ipc_init(int *listen_fd) /* * we use SO_REUSEADDR here since in the case where there * really is another daemon running that is using the agent's - * port, bind(3N) will fail. so we can't lose. + * port, bind(3SOCKET) will fail. so we can't lose. */ (void) setsockopt(*listen_fd, SOL_SOCKET, SO_REUSEADDR, &on, @@ -477,7 +477,7 @@ dhcp_ipc_accept(int listen_fd, int *fd, int *is_priv) /* * if we were extremely concerned with portability, we would * set the socket into nonblocking mode before doing the - * accept(3N), since on BSD-based networking stacks, there is + * accept(3SOCKET), since on BSD-based networking stacks, there is * a potential race that can occur if the socket which * connected to us performs a TCP RST before we accept, since * BSD handles this case entirely in the kernel and as a diff --git a/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.h b/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.h index beed5b1ffc..2f1cb8c1ee 100644 --- a/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.h +++ b/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.h @@ -159,7 +159,7 @@ extern int dhcp_ipc_getinfo(dhcp_optnum_t *, DHCP_OPT **, int32_t); /* * private dhcpagent ipc "server side" functions -- these are only for - * use by dhcpagent(1M) and are subject to change. + * use by dhcpagent(8) and are subject to change. */ extern int dhcp_ipc_init(int *); diff --git a/usr/src/lib/libdhcputil/README.inittab b/usr/src/lib/libdhcputil/README.inittab index b6ec2763e6..1f18d08517 100644 --- a/usr/src/lib/libdhcputil/README.inittab +++ b/usr/src/lib/libdhcputil/README.inittab @@ -24,7 +24,6 @@ All rights reserved. Inittab Purpose, Goals, and Functionality Peter Memishian -ident "%Z%%M% %I% %E% SMI" PROBLEM STATEMENT ================= @@ -41,8 +40,8 @@ in core Solaris (in.dhcpd, dhcpinfo, snoop, and dhcpmgr), the situation has spiraled out of control. In addition to the obvious maintenance headache caused by the redundant code, it has also become a burden to our customers, who already have to cope with multiple -places where DHCP option information is stored (dhcptags(4), -dhcptab(4)). +places where DHCP option information is stored (dhcptags(5), +dhcptab(5)). The inittab API is designed to reduce the confusion, both for the customer and the application developer. Its goal is to provide a @@ -61,7 +60,7 @@ new DHCP options, but this should be rare. The inittab file consists of inittab records, each being one line long and describing a particular option. The format is based heavily on -the format for defining symbols in dhcptab(4). Each line has the +the format for defining symbols in dhcptab(5). Each line has the following syntax: option_name category, code, type, granularity, maximum, consumers @@ -69,7 +68,7 @@ following syntax: where: `option_name' is user-interpretable name of the option (for use with - dhcpinfo(1M) for instance). This field should at least be per- + dhcpinfo(1) for instance). This field should at least be per- category unique and ideally should be unique across all categories. Of particular note is that options names in the STANDARD, SITE, and VENDOR spaces should not overlap, or the behavior is undefined. @@ -132,7 +131,7 @@ for all DHCP option consumers, with the following exceptions and notes: programs, even if they are listed as a `consumer' of the given option. An example of this is that the DHCP server never requests any fields with the VENDOR category. (VENDOR information - for the DHCP server comes from dhcptab(4) instead). + for the DHCP server comes from dhcptab(5) instead). o In general, changing provided information in a released inittab file is ill-advised. Adding new entries should be the extent @@ -145,9 +144,9 @@ for all DHCP option consumers, with the following exceptions and notes: absolutely necessary, since it nullifies some of the advantages of having an inittab. - o Where a symbol is defined both in the inittab and in dhcptab(4), + o Where a symbol is defined both in the inittab and in dhcptab(5), inittab is authoritative. EXTEND symbol definitions in - dhcptab(4) will be deprecated in a future release of Solaris. + dhcptab(5) will be deprecated in a future release of Solaris. C-LEVEL API =========== diff --git a/usr/src/lib/libdiskmgt/common/entry.c b/usr/src/lib/libdiskmgt/common/entry.c index 425255ae45..1680d20652 100644 --- a/usr/src/lib/libdiskmgt/common/entry.c +++ b/usr/src/lib/libdiskmgt/common/entry.c @@ -1065,12 +1065,12 @@ dm_get_usage_string(char *what, char *how, char **usage_string) if (strcmp(what, DM_USE_MOUNT) == 0) { if (strcmp(how, "swap") == 0) { *usage_string = dgettext(TEXT_DOMAIN, - "%s is currently used by swap. Please see swap(1M)." + "%s is currently used by swap. Please see swap(8)." "\n"); } else { *usage_string = dgettext(TEXT_DOMAIN, "%s is currently mounted on %s." - " Please see umount(1M).\n"); + " Please see umount(8).\n"); } } else if (strcmp(what, DM_USE_VFSTAB) == 0) { *usage_string = dgettext(TEXT_DOMAIN, @@ -1084,28 +1084,28 @@ dm_get_usage_string(char *what, char *how, char **usage_string) "%s is part of VxVM volume %s.\n"); } else if (strcmp(what, DM_USE_LU) == 0) { *usage_string = dgettext(TEXT_DOMAIN, - "%s is in use for live upgrade %s. Please see ludelete(1M)." + "%s is in use for live upgrade %s. Please see ludelete(8)." "\n"); } else if (strcmp(what, DM_USE_DUMP) == 0) { *usage_string = dgettext(TEXT_DOMAIN, - "%s is in use by %s. Please see dumpadm(1M)." + "%s is in use by %s. Please see dumpadm(8)." "\n"); } else if (strcmp(what, DM_USE_EXPORTED_ZPOOL) == 0) { *usage_string = dgettext(TEXT_DOMAIN, "%s is part of exported or potentially active ZFS pool %s. " - "Please see zpool(1M).\n"); + "Please see zpool(8).\n"); } else if (strcmp(what, DM_USE_ACTIVE_ZPOOL) == 0) { *usage_string = dgettext(TEXT_DOMAIN, - "%s is part of active ZFS pool %s. Please see zpool(1M)." + "%s is part of active ZFS pool %s. Please see zpool(8)." "\n"); } else if (strcmp(what, DM_USE_SPARE_ZPOOL) == 0) { *usage_string = dgettext(TEXT_DOMAIN, "%s is reserved as a hot spare for ZFS pool %s. Please " - "see zpool(1M).\n"); + "see zpool(8).\n"); } else if (strcmp(what, DM_USE_L2CACHE_ZPOOL) == 0) { *usage_string = dgettext(TEXT_DOMAIN, "%s is in use as a cache device for ZFS pool %s. " - "Please see zpool(1M).\n"); + "Please see zpool(8).\n"); } } void diff --git a/usr/src/lib/libdladm/common/libdladm.c b/usr/src/lib/libdladm/common/libdladm.c index eb099376a4..5d51590058 100644 --- a/usr/src/lib/libdladm/common/libdladm.c +++ b/usr/src/lib/libdladm/common/libdladm.c @@ -115,7 +115,7 @@ dladm_open(dladm_handle_t *handle) return (dladm_errno2status(errno)); /* - * Don't open DLMGMT_DOOR now. dlmgmtd(1M) is not able to + * Don't open DLMGMT_DOOR now. dlmgmtd(8) is not able to * open the door when the dladm handle is opened because the * door hasn't been created yet at that time. Thus, we must * open it on-demand in dladm_door_fd(). Move the open() diff --git a/usr/src/lib/libdladm/common/libdlaggr.c b/usr/src/lib/libdladm/common/libdlaggr.c index d54920d432..8ceff4e287 100644 --- a/usr/src/lib/libdladm/common/libdlaggr.c +++ b/usr/src/lib/libdladm/common/libdlaggr.c @@ -45,7 +45,7 @@ /* * Link Aggregation Administration Library. * - * This library is used by administration tools such as dladm(1M) to + * This library is used by administration tools such as dladm(8) to * configure link aggregations. */ diff --git a/usr/src/lib/libdladm/common/libdlbridge.c b/usr/src/lib/libdladm/common/libdlbridge.c index bbf8fe762e..aaf2fede13 100644 --- a/usr/src/lib/libdladm/common/libdlbridge.c +++ b/usr/src/lib/libdladm/common/libdlbridge.c @@ -47,7 +47,7 @@ /* * Bridge Administration Library. * - * This library is used by administration tools such as dladm(1M) to configure + * This library is used by administration tools such as dladm(8) to configure * bridges, and by the bridge daemon to retrieve configuration information. */ diff --git a/usr/src/lib/libdladm/common/libdliptun.c b/usr/src/lib/libdladm/common/libdliptun.c index 21c4f5dbd1..8e4855fff5 100644 --- a/usr/src/lib/libdladm/common/libdliptun.c +++ b/usr/src/lib/libdladm/common/libdliptun.c @@ -44,7 +44,7 @@ /* * IP Tunneling Administration Library. - * This library is used by dladm(1M) and to configure IP tunnel links. + * This library is used by dladm(8) and to configure IP tunnel links. */ #define IPTUN_CONF_TYPE "type" diff --git a/usr/src/lib/libdladm/common/libdllink.c b/usr/src/lib/libdladm/common/libdllink.c index 58bec0ad30..78c22e7b43 100644 --- a/usr/src/lib/libdladm/common/libdllink.c +++ b/usr/src/lib/libdladm/common/libdllink.c @@ -239,7 +239,7 @@ dladm_walk_macaddr(dladm_handle_t handle, datalink_id_t linkid, void *arg, } /* - * These routines are used by administration tools such as dladm(1M) to + * These routines are used by administration tools such as dladm(8) to * iterate through the list of MAC interfaces */ diff --git a/usr/src/lib/libdladm/common/libdlvlan.c b/usr/src/lib/libdladm/common/libdlvlan.c index 943728dc03..3ed060e38e 100644 --- a/usr/src/lib/libdladm/common/libdlvlan.c +++ b/usr/src/lib/libdladm/common/libdlvlan.c @@ -30,7 +30,7 @@ /* * VLAN Administration Library. * - * This library is used by administration tools such as dladm(1M) to + * This library is used by administration tools such as dladm(8) to * configure VLANs. */ diff --git a/usr/src/lib/libdladm/common/linkprop.c b/usr/src/lib/libdladm/common/linkprop.c index d575bfd21c..5cfa61166b 100644 --- a/usr/src/lib/libdladm/common/linkprop.c +++ b/usr/src/lib/libdladm/common/linkprop.c @@ -3221,7 +3221,7 @@ i_dladm_add_ap_module(const char *module, struct dlautopush *dlap) /* * Currently, both '.' and ' '(space) can be used as the delimiters between * autopush modules. The former is used in dladm set-linkprop, and the - * latter is used in the autopush(1M) file. + * latter is used in the autopush(8) file. */ /* ARGSUSED */ static dladm_status_t diff --git a/usr/src/lib/libdlpi/common/libdlpi.c b/usr/src/lib/libdlpi/common/libdlpi.c index 44045d0224..7b09c4bf85 100644 --- a/usr/src/lib/libdlpi/common/libdlpi.c +++ b/usr/src/lib/libdlpi/common/libdlpi.c @@ -177,8 +177,8 @@ dlpi_open(const char *linkname, dlpi_handle_t *dhp, uint_t flags) /* * Special case: DLPI_SERIAL flag is set to indicate a synchronous - * serial line interface (see syncinit(1M), syncstat(1M), - * syncloop(1M)), which is not a DLPI link. + * serial line interface (see syncinit(8), syncstat(8), + * syncloop(8)), which is not a DLPI link. */ if (dip->dli_oflags & DLPI_SERIAL) { if ((retval = i_dlpi_style2_open(dip)) != DLPI_SUCCESS) { @@ -1233,7 +1233,7 @@ i_dlpi_attach(dlpi_impl_t *dip) * if this request fails, as this indicates the underlying DLPI device does * not support link aggregation (pre-GLDV3 device drivers), and thus will * see the expected behavior without failing with DL_SYSERR/EBUSY when issuing - * DLPI primitives like DL_BIND_REQ. For further info see dlpi(7p). + * DLPI primitives like DL_BIND_REQ. For further info see dlpi(4P). */ static void i_dlpi_passive(dlpi_impl_t *dip) diff --git a/usr/src/lib/libdlpi/common/libdlpi_impl.h b/usr/src/lib/libdlpi/common/libdlpi_impl.h index 70708ff5af..24b02e1376 100644 --- a/usr/src/lib/libdlpi/common/libdlpi_impl.h +++ b/usr/src/lib/libdlpi/common/libdlpi_impl.h @@ -58,7 +58,7 @@ extern "C" { /* * Publicly available DLPI notification types. This list may change if - * new DLPI notification types are made public. See dlpi(7P). + * new DLPI notification types are made public. See dlpi(4P). * */ #define DLPI_NOTIFICATION_TYPES (DL_NOTE_LINK_DOWN | DL_NOTE_LINK_UP | \ diff --git a/usr/src/lib/libdscp/svc/dscp.ppp.options b/usr/src/lib/libdscp/svc/dscp.ppp.options index d46df31de3..22b2cb226e 100644 --- a/usr/src/lib/libdscp/svc/dscp.ppp.options +++ b/usr/src/lib/libdscp/svc/dscp.ppp.options @@ -23,11 +23,9 @@ # # dscp.ppp.options # -#ident "%Z%%M% %I% %E% SMI" -# # -# These are options for running pppd(1M) to provide a DSCP +# These are options for running pppd(8) to provide a DSCP # link between a service processor and a domain in OPL. All # options are explicitly set here so that site customizations # of the global options files will not affect DSCP. diff --git a/usr/src/lib/libdtrace/common/dlink_audit.c b/usr/src/lib/libdtrace/common/dlink_audit.c index 57ca8d7fb7..b196e97ac3 100644 --- a/usr/src/lib/libdtrace/common/dlink_audit.c +++ b/usr/src/lib/libdtrace/common/dlink_audit.c @@ -22,7 +22,7 @@ * of helper providers. The default disposition for a helper provider -- USDT * and ustack helpers -- is to load itself from it's containing object's .init * section. In cases where startup time is deemed critical, USDT authors can - * use the -xlazyload option to dtrace(1M) to disable automatic loading (it's + * use the -xlazyload option to dtrace(8) to disable automatic loading (it's * difficult to make the case for the utility of this feature for anything * other than libc which, indeed, was the sole motivation). If a binary has * been compiled with automatic loading disabled, this audit library may be diff --git a/usr/src/lib/libdtrace/common/dlink_common.c b/usr/src/lib/libdtrace/common/dlink_common.c index c47ec273ab..976abca82a 100644 --- a/usr/src/lib/libdtrace/common/dlink_common.c +++ b/usr/src/lib/libdtrace/common/dlink_common.c @@ -30,7 +30,7 @@ /* * Common functions for helper provider loading both compiled into the - * executable via drti.o and dtrace(1M) -G, and the libdaudit.so library. + * executable via drti.o and dtrace(8) -G, and the libdaudit.so library. */ #include <errno.h> diff --git a/usr/src/lib/libdtrace/common/dlink_init.c b/usr/src/lib/libdtrace/common/dlink_init.c index 7c00a49c21..b6bfd550cc 100644 --- a/usr/src/lib/libdtrace/common/dlink_init.c +++ b/usr/src/lib/libdtrace/common/dlink_init.c @@ -30,7 +30,7 @@ /* * This is the basis for drti.o which dt_link.c links into the object file - * generated by dtrace(1M) -G by default (note that -xlazyload disables this). + * generated by dtrace(8) -G by default (note that -xlazyload disables this). */ #include <dlfcn.h> diff --git a/usr/src/lib/libdtrace/common/dt_buf.c b/usr/src/lib/libdtrace/common/dt_buf.c index 324e778213..d34d359025 100644 --- a/usr/src/lib/libdtrace/common/dt_buf.c +++ b/usr/src/lib/libdtrace/common/dt_buf.c @@ -24,14 +24,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * DTrace Memory Buffer Routines * * The routines in this file are used to create an automatically resizing * memory buffer that can be written to like a file. Memory buffers are - * used to construct DOF to ioctl() to dtrace(7D), and provide semantics that + * used to construct DOF to ioctl() to dtrace(4D), and provide semantics that * simplify caller code. Specifically, any allocation errors result in an * error code being set inside the buffer which is maintained persistently and * propagates to another buffer if the buffer in error is concatenated. These diff --git a/usr/src/lib/libdtrace/common/dt_dof.c b/usr/src/lib/libdtrace/common/dt_dof.c index c1f5dc827e..2c5173491d 100644 --- a/usr/src/lib/libdtrace/common/dt_dof.c +++ b/usr/src/lib/libdtrace/common/dt_dof.c @@ -496,7 +496,7 @@ dof_add_provider(dt_dof_t *ddo, const dt_provider_t *pvp) if (pvp->pv_flags & DT_PROVIDER_IMPL) { /* - * ignore providers that are exported by dtrace(7D) + * ignore providers that are exported by dtrace(4D) */ return (0); } diff --git a/usr/src/lib/libdtrace/common/dt_grammar.y b/usr/src/lib/libdtrace/common/dt_grammar.y index a7e7de7bc1..a61e8434c2 100644 --- a/usr/src/lib/libdtrace/common/dt_grammar.y +++ b/usr/src/lib/libdtrace/common/dt_grammar.y @@ -312,7 +312,7 @@ probe_definition: * it. This can only occur if the next token is EOF or * an ambiguous predicate was slurped up as a comment. * We cannot perform this check if input() is a string - * because dtrace(1M) [-fmnP] also use the compiler and + * because dtrace(8) [-fmnP] also use the compiler and * things like dtrace -n BEGIN have to be accepted. */ if (yypcb->pcb_fileptr != NULL) { diff --git a/usr/src/lib/libdtrace/common/dt_impl.h b/usr/src/lib/libdtrace/common/dt_impl.h index 2681709483..6a854c5919 100644 --- a/usr/src/lib/libdtrace/common/dt_impl.h +++ b/usr/src/lib/libdtrace/common/dt_impl.h @@ -125,7 +125,7 @@ typedef struct dt_module { uint_t dm_asrsv; /* actual reserved size of dm_asmap */ uint_t dm_aslen; /* number of entries in dm_asmap */ uint_t dm_flags; /* module flags (see below) */ - int dm_modid; /* modinfo(1M) module identifier */ + int dm_modid; /* modinfo(8) module identifier */ GElf_Addr dm_text_va; /* virtual address of text section */ GElf_Xword dm_text_size; /* size in bytes of text section */ GElf_Addr dm_data_va; /* virtual address of data section */ diff --git a/usr/src/lib/libdtrace/common/dt_open.c b/usr/src/lib/libdtrace/common/dt_open.c index 3e3bf9768a..973ea3cfa9 100644 --- a/usr/src/lib/libdtrace/common/dt_open.c +++ b/usr/src/lib/libdtrace/common/dt_open.c @@ -640,7 +640,7 @@ inline long NULL = 0; \n\ * Default DTrace configuration to use when opening libdtrace DTRACE_O_NODEV. * If DTRACE_O_NODEV is not set, we load the configuration from the kernel. * The use of CTF_MODEL_NATIVE is more subtle than it might appear: we are - * relying on the fact that when running dtrace(1M), isaexec will invoke the + * relying on the fact that when running dtrace(8), isaexec will invoke the * binary with the same bitness as the kernel, which is what we want by default * when generating our DIF. The user can override the choice using oflags. */ diff --git a/usr/src/lib/libdtrace/common/dt_parser.c b/usr/src/lib/libdtrace/common/dt_parser.c index e652f337d9..176d9b7d48 100644 --- a/usr/src/lib/libdtrace/common/dt_parser.c +++ b/usr/src/lib/libdtrace/common/dt_parser.c @@ -2584,7 +2584,7 @@ dt_node_provider(char *name, dt_node_t *probes) /* * Check to see if the provider is already defined or visible through - * dtrace(7D). If so, set dn_provred to treat it as a re-declaration. + * dtrace(4D). If so, set dn_provred to treat it as a re-declaration. * If not, create a new provider and set its interface-only flag. This * flag may be cleared later by calls made to dt_probe_declare(). */ @@ -4438,7 +4438,7 @@ dt_cook_provider(dt_node_t *dnp, uint_t idflags) /* * If we're declaring a provider for the first time and it is unknown - * to dtrace(7D), insert the probe definitions into the provider's hash. + * to dtrace(4D), insert the probe definitions into the provider's hash. * If we're redeclaring a known provider, verify the interface matches. */ for (pnp = dnp->dn_probes; pnp != NULL; pnp = pnp->dn_list) { diff --git a/usr/src/lib/libdtrace/common/dt_proc.c b/usr/src/lib/libdtrace/common/dt_proc.c index 03fe05f21f..80823aae60 100644 --- a/usr/src/lib/libdtrace/common/dt_proc.c +++ b/usr/src/lib/libdtrace/common/dt_proc.c @@ -34,7 +34,7 @@ * This file provides a set of routines that permit libdtrace and its clients * to create and grab process handles using libproc, and to share these handles * between library mechanisms that need libproc access, such as ustack(), and - * client mechanisms that need libproc access, such as dtrace(1M) -c and -p. + * client mechanisms that need libproc access, such as dtrace(8) -c and -p. * The library provides several mechanisms in the libproc control layer: * * Reference Counting: The library code and client code can independently grab diff --git a/usr/src/lib/libdtrace/common/dt_provider.c b/usr/src/lib/libdtrace/common/dt_provider.c index ef4b4470d5..aefa7590e9 100644 --- a/usr/src/lib/libdtrace/common/dt_provider.c +++ b/usr/src/lib/libdtrace/common/dt_provider.c @@ -226,7 +226,7 @@ dt_probe_key(const dtrace_probedesc_t *pdp, char *s) } /* - * If a probe was discovered from the kernel, ask dtrace(7D) for a description + * If a probe was discovered from the kernel, ask dtrace(4D) for a description * of each of its arguments, including native and translated types. */ static dt_probe_t * @@ -365,7 +365,7 @@ dt_probe_discover(dt_provider_t *pvp, const dtrace_probedesc_t *pdp) /* * Lookup a probe declaration based on a known provider and full or partially * specified module, function, and name. If the probe is not known to us yet, - * ask dtrace(7D) to match the description and then cache any useful results. + * ask dtrace(4D) to match the description and then cache any useful results. */ dt_probe_t * dt_probe_lookup(dt_provider_t *pvp, const char *s) @@ -392,7 +392,7 @@ dt_probe_lookup(dt_provider_t *pvp, const char *s) /* * If the probe isn't known, use the probe description computed above - * to ask dtrace(7D) to find the first matching probe. + * to ask dtrace(4D) to find the first matching probe. */ if (dt_ioctl(dtp, DTRACEIOC_PROBEMATCH, &pd) == 0) return (dt_probe_discover(pvp, &pd)); @@ -769,7 +769,7 @@ dt_probe_info(dtrace_hdl_t *dtp, } /* - * If we matched a probe exported by dtrace(7D), then discover + * If we matched a probe exported by dtrace(4D), then discover * the real attributes. Otherwise grab the static declaration. */ if (pd.dtpd_id != DTRACE_IDNONE) diff --git a/usr/src/lib/libdtrace/common/dt_subr.c b/usr/src/lib/libdtrace/common/dt_subr.c index 25e206eb4c..e93617ef59 100644 --- a/usr/src/lib/libdtrace/common/dt_subr.c +++ b/usr/src/lib/libdtrace/common/dt_subr.c @@ -736,7 +736,7 @@ dt_difo_free(dtrace_hdl_t *dtp, dtrace_difo_t *dp) } /* - * dt_gmatch() is similar to gmatch(3GEN) and dtrace(7D) globbing, but also + * dt_gmatch() is similar to gmatch(3GEN) and dtrace(4D) globbing, but also * implements the behavior that an empty pattern matches any string. */ int diff --git a/usr/src/lib/libdtrace/common/dtrace.h b/usr/src/lib/libdtrace/common/dtrace.h index 293ab944af..7d86cdc7f2 100644 --- a/usr/src/lib/libdtrace/common/dtrace.h +++ b/usr/src/lib/libdtrace/common/dtrace.h @@ -48,7 +48,7 @@ extern "C" { * Solaris system and DTrace subsystem and are subject to change at any time * without notice. Applications and drivers using these interfaces will fail * to run on future releases. These interfaces should not be used for any - * purpose except those expressly outlined in dtrace(7D) and libdtrace(3LIB). + * purpose except those expressly outlined in dtrace(4D) and libdtrace(3LIB). * Please refer to the "Solaris Dynamic Tracing Guide" for more information. */ @@ -61,7 +61,7 @@ typedef struct dtrace_prog dtrace_prog_t; typedef struct dtrace_vector dtrace_vector_t; typedef struct dtrace_aggdata dtrace_aggdata_t; -#define DTRACE_O_NODEV 0x01 /* do not open dtrace(7D) device */ +#define DTRACE_O_NODEV 0x01 /* do not open dtrace(4D) device */ #define DTRACE_O_NOSYS 0x02 /* do not load /system/object modules */ #define DTRACE_O_LP64 0x04 /* force D compiler to be LP64 */ #define DTRACE_O_ILP32 0x08 /* force D compiler to be ILP32 */ @@ -529,7 +529,7 @@ extern struct dt_node *dt_compile_sugar(dtrace_hdl_t *, * * Library clients can use these functions to iterate over the set of available * probe definitions and inquire as to their attributes. The probe iteration - * interfaces report probes that are declared as well as those from dtrace(7D). + * interfaces report probes that are declared as well as those from dtrace(4D). */ typedef struct dtrace_probeinfo { dtrace_attribute_t dtp_attr; /* name attributes */ @@ -549,7 +549,7 @@ extern int dtrace_probe_info(dtrace_hdl_t *, /* * DTrace Vector Interface * - * The DTrace library normally speaks directly to dtrace(7D). However, + * The DTrace library normally speaks directly to dtrace(4D). However, * this communication may be vectored elsewhere. Consumers who wish to * perform a vectored open must fill in the vector, and use the dtrace_vopen() * entry point to obtain a library handle. diff --git a/usr/src/lib/libdtrace/common/procfs.d.in b/usr/src/lib/libdtrace/common/procfs.d.in index 9381e1ecf0..968435e76f 100644 --- a/usr/src/lib/libdtrace/common/procfs.d.in +++ b/usr/src/lib/libdtrace/common/procfs.d.in @@ -32,7 +32,7 @@ #pragma D depends_on module procfs /* - * The following miscellaneous constants are used by the proc(4) translators + * The following miscellaneous constants are used by the proc(5) translators * defined below. These are assigned the latest values from the system .h's. */ inline char SSLEEP = @SSLEEP@; @@ -207,7 +207,7 @@ inline int POLL_HUP = @POLL_HUP@; #pragma D binding "1.0" POLL_HUP /* - * Translate from the kernel's proc_t structure to a proc(4) psinfo_t struct. + * Translate from the kernel's proc_t structure to a proc(5) psinfo_t struct. * We do not provide support for pr_size, pr_rssize, pr_pctcpu, and pr_pctmem. * We also do not fill in pr_lwp (the lwpsinfo_t for the representative LWP) * because we do not have the ability to select and stop any representative. @@ -252,7 +252,7 @@ translator psinfo_t < proc_t *T > { }; /* - * Translate from the kernel's kthread_t structure to a proc(4) psinfo_t + * Translate from the kernel's kthread_t structure to a proc(5) psinfo_t * struct. Lacking a facility to define one translator only in terms of * another, we explicitly define each member by using the proc_t-to-psinfo_t * translator, above; any members added to that translator should also be @@ -287,7 +287,7 @@ translator psinfo_t < kthread_t *T > { }; /* - * Translate from the kernel's kthread_t structure to a proc(4) lwpsinfo_t. + * Translate from the kernel's kthread_t structure to a proc(5) lwpsinfo_t. * We do not provide support for pr_nice, pr_oldpri, pr_cpu, or pr_pctcpu. * Also, for the moment, pr_start and pr_time are not supported, but these * could be supported by DTrace in the future using subroutines. diff --git a/usr/src/lib/libdtrace_jni/java/docs/html/fast.html b/usr/src/lib/libdtrace_jni/java/docs/html/fast.html index 23898130c0..e9114c7451 100644 --- a/usr/src/lib/libdtrace_jni/java/docs/html/fast.html +++ b/usr/src/lib/libdtrace_jni/java/docs/html/fast.html @@ -49,7 +49,7 @@ Guide</h1> To demonstrate how to use the Java DTrace API, let's write a simple Java program that runs a D script, in this case <tt>hello.d</tt> (prints "hello, world" and exits). You will need root permission to use the -Java DTrace API (just as you do to use the <tt>dtrace(1M)</tt> command). +Java DTrace API (just as you do to use the <tt>dtrace(8)</tt> command). You may want to eliminate this inconvenience by adding the following line to <tt>/etc/user_attr</tt>: <br> diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregate.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregate.java index fb595333dc..2c83a281cb 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregate.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregate.java @@ -237,7 +237,7 @@ public final class Aggregate implements Serializable * </code></pre> * Use {@code getOrderedRecords()} instead of {@code getRecords()} * when you want to list records as they would be ordered by {@code - * dtrace(1M)}. + * dtrace(8)}. * * @return a newly created list of this aggregate's records * in the order used by the native DTrace library diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AggregationRecord.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AggregationRecord.java index 35fa877fbf..c6ca540bd6 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AggregationRecord.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AggregationRecord.java @@ -22,8 +22,6 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * ident "%Z%%M% %I% %E% SMI" */ package org.opensolaris.os.dtrace; @@ -174,7 +172,7 @@ public final class AggregationRecord implements Record, Serializable { * Option#aggsortkey aggsortkey}, {@link Option#aggsortkeypos * aggsortkeypos}, {@link Option#aggsortpos aggsortpos}, and {@link * Option#aggsortrev aggsortrev} DTrace options and matches the way - * that the records would be ordered by {@code dtrace(1M)}. + * that the records would be ordered by {@code dtrace(8)}. * * @return non-negative ordinal from zero (first) to n-1 (last) * within the {@code Aggregate} containing this record diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Consumer.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Consumer.java index b732fa454d..22d3f4fb04 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Consumer.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Consumer.java @@ -782,7 +782,7 @@ public interface Consumer { * Gets the version of the native DTrace library. * * @return version string generated by the native DTrace library - * (same as the output of {@code dtrace(1M)} with the {@code -V} + * (same as the output of {@code dtrace(8)} with the {@code -V} * option) */ public String getVersion(); diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/InterfaceAttributes.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/InterfaceAttributes.java index 80f14e5ba6..4735658e45 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/InterfaceAttributes.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/InterfaceAttributes.java @@ -31,7 +31,7 @@ import java.beans.*; /** * Triplet of attributes consisting of two stability levels and a * dependency class. Attributes may vary independently. They use - * labels described in the {@code attributes(5)} man page to help set + * labels described in the {@code attributes(7)} man page to help set * expectations for what kinds of changes might occur in different kinds * of future releases. The D compiler includes features to dynamically * compute the stability levels of D programs you create. For more @@ -227,7 +227,7 @@ public final class InterfaceAttributes implements Serializable { UNKNOWN("Unknown"), /** * The interface is specific to the CPU model of the current - * system. You can use the {@code psrinfo(1M)} utility's {@code + * system. You can use the {@code psrinfo(8)} utility's {@code * -v} option to display the current CPU model and * implementation names. Interfaces with CPU model dependencies * might not be available on other CPU implementations, even if diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Option.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Option.java index 67f896cff9..c30e7088c7 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Option.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Option.java @@ -520,7 +520,7 @@ public final class Option implements Serializable { * Only output explicitly traced data (no option value). Makes no * difference to generated {@link ProbeData}, but user apps may use * the {@code quiet} flag as a rendering hint similar to the {@code - * -q} {@code dtrace(1M)} command option. Runtime option. + * -q} {@code dtrace(8)} command option. Runtime option. */ public static final String quiet = "quiet"; /** Speculation buffer size (size). Runtime option. */ diff --git a/usr/src/lib/libelfsign/README b/usr/src/lib/libelfsign/README index 059b4c7869..3e00452dc8 100644 --- a/usr/src/lib/libelfsign/README +++ b/usr/src/lib/libelfsign/README @@ -23,8 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - Note that this library does not have a spec file. @@ -34,5 +32,5 @@ here are ever elevated to a public taxonomy then a spec file needs to be introduced. A 64 bit version of this library does not exist. -That isn't an issue since kcfd(1m) and elfsign(1) are 32 bit +That isn't an issue since kcfd(8) and elfsign(1) are 32 bit applications and are the only consumers. diff --git a/usr/src/lib/libeti/form/common/regcmp.c b/usr/src/lib/libeti/form/common/regcmp.c index 147ac0faec..d9802a6c9d 100644 --- a/usr/src/lib/libeti/form/common/regcmp.c +++ b/usr/src/lib/libeti/form/common/regcmp.c @@ -36,7 +36,7 @@ #include <stdlib.h> #include "utility.h" -/* this code was taken from REGCMP(3X) */ +/* this code was taken from regcmp(3C) */ #define SSIZE 16 #define TGRP 48 diff --git a/usr/src/lib/libeti/form/common/regex.c b/usr/src/lib/libeti/form/common/regex.c index 3993c286a7..f077f465f7 100644 --- a/usr/src/lib/libeti/form/common/regex.c +++ b/usr/src/lib/libeti/form/common/regex.c @@ -38,7 +38,7 @@ #include "utility.h" /* - * this code was taken from REGCMP(3X) + * this code was taken from regcmp(3C) */ /*VARARGS*/ /*ARGSUSED*/ diff --git a/usr/src/lib/libeti/form/common/ty_regexp.c b/usr/src/lib/libeti/form/common/ty_regexp.c index baad199f2d..5d7b012b7b 100644 --- a/usr/src/lib/libeti/form/common/ty_regexp.c +++ b/usr/src/lib/libeti/form/common/ty_regexp.c @@ -28,8 +28,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ - /*LINTLIBRARY*/ #include <sys/types.h> @@ -42,7 +40,7 @@ * usage: * set_field_type(f, TYPE_REGEXP, expression); * - * char * expression; regular expression REGCMP(3X) + * char * expression; regular expression regcmp(3C) */ extern char *libform_regcmp(char *, char *); extern char *libform_regex(char *, char *, char *); diff --git a/usr/src/lib/libexacct/demo/README b/usr/src/lib/libexacct/demo/README index 04f259301d..974a7b8797 100644 --- a/usr/src/lib/libexacct/demo/README +++ b/usr/src/lib/libexacct/demo/README @@ -23,8 +23,6 @@ Copyright 2002 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. -#ident "%Z%%M% %I% %E% SMI" - 1. Introduction This directory contains source code for the "exdump" utility that uses @@ -64,7 +62,7 @@ execute the default "make all" target. 4. References Exacct files: /var/adm/exacct/proc, /var/adm/exacct/task -Man pages: acctadm(1M), libexacct(3LIB) +Man pages: acctadm(8), libexacct(3LIB) Documentation: "System Administration Guide: Resource Management and Network Services" "System Administration Guide: IP Services" diff --git a/usr/src/lib/libfakekernel/common/sys/mutex.h b/usr/src/lib/libfakekernel/common/sys/mutex.h index 0301cc24f5..1eb400fad7 100644 --- a/usr/src/lib/libfakekernel/common/sys/mutex.h +++ b/usr/src/lib/libfakekernel/common/sys/mutex.h @@ -49,7 +49,7 @@ extern "C" { * either MUTEX_ADAPTIVE or MUTEX_SPIN depending on the iblock cookie. * * Mutex statistics can be gathered on the fly, without rebooting or - * recompiling the kernel, via the lockstat driver (lockstat(7D)). + * recompiling the kernel, via the lockstat driver (lockstat(4D)). */ typedef enum { MUTEX_ADAPTIVE = 0, /* spin if owner is running, otherwise block */ diff --git a/usr/src/lib/libgen/common/p2open.c b/usr/src/lib/libgen/common/p2open.c index f7c70d0e55..3f0a778ec1 100644 --- a/usr/src/lib/libgen/common/p2open.c +++ b/usr/src/lib/libgen/common/p2open.c @@ -27,10 +27,8 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* - * Similar to popen(3S) but with pipe to cmd's stdin and from stdout. + * Similar to popen(3C) but with pipe to cmd's stdin and from stdout. */ #include <sys/types.h> diff --git a/usr/src/lib/libhotplug/common/libhotplug_impl.h b/usr/src/lib/libhotplug/common/libhotplug_impl.h index e75170bcb2..a9e7a9c241 100644 --- a/usr/src/lib/libhotplug/common/libhotplug_impl.h +++ b/usr/src/lib/libhotplug/common/libhotplug_impl.h @@ -64,7 +64,7 @@ struct hp_node { #define HP_INFO_TIME "hp_info.last_change" /* - * Definitions for the door interface to hotplugd(1m). + * Definitions for the door interface to hotplugd(8). */ #define HOTPLUGD_PID "/var/run/hotplugd.pid" #define HOTPLUGD_DOOR "/var/run/hotplugd_door" diff --git a/usr/src/lib/libipadm/common/ipadm_addr.c b/usr/src/lib/libipadm/common/ipadm_addr.c index 6bdfc487d3..46bb609bdb 100644 --- a/usr/src/lib/libipadm/common/ipadm_addr.c +++ b/usr/src/lib/libipadm/common/ipadm_addr.c @@ -1052,7 +1052,7 @@ i_ipadm_set_zone(ipadm_handle_t iph, const void *arg, /* * To modify the zone assignment such that it persists across - * reboots, zonecfg(1M) must be used. + * reboots, zonecfg(8) must be used. */ if (flags & IPADM_OPT_PERSIST) { return (IPADM_NOTSUP); diff --git a/usr/src/lib/libipadm/common/ipadm_if.c b/usr/src/lib/libipadm/common/ipadm_if.c index 73508c0d34..7699937c4a 100644 --- a/usr/src/lib/libipadm/common/ipadm_if.c +++ b/usr/src/lib/libipadm/common/ipadm_if.c @@ -1910,11 +1910,11 @@ ipadm_disable_if(ipadm_handle_t iph, const char *ifname, uint32_t flags) } /* - * FIXME Remove this when ifconfig(1M) is updated to use IPMP support + * FIXME Remove this when ifconfig(8) is updated to use IPMP support * in libipadm. */ /* - * This workaround is required by ifconfig(1M) whenever an + * This workaround is required by ifconfig(8) whenever an * interface is moved into an IPMP group to update the daemon's * in-memory mapping of `aobjname' to 'lifnum'. * diff --git a/usr/src/lib/libipadm/common/libipadm.c b/usr/src/lib/libipadm/common/libipadm.c index 972c45630b..e4ea402a59 100644 --- a/usr/src/lib/libipadm/common/libipadm.c +++ b/usr/src/lib/libipadm/common/libipadm.c @@ -1006,7 +1006,7 @@ i_ipadm_call_ipmgmtd(ipadm_handle_t iph, void *garg, size_t garg_size, /* * ipadm_is_nil_hostname() : Determine if the `hostname' is nil: i.e., * NULL, empty, or a single space (e.g., as returned by - * domainname(1M)/sysinfo). + * domainname(8)/sysinfo). * * input: const char *: the hostname to inspect; * output: boolean_t: B_TRUE if `hostname' is not NULL satisfies the diff --git a/usr/src/lib/libipmp/common/ipmp_mpathd.c b/usr/src/lib/libipmp/common/ipmp_mpathd.c index 80a7e579a1..ffda238c52 100644 --- a/usr/src/lib/libipmp/common/ipmp_mpathd.c +++ b/usr/src/lib/libipmp/common/ipmp_mpathd.c @@ -25,7 +25,7 @@ */ /* - * Low-level interfaces for communicating with in.mpathd(1M). + * Low-level interfaces for communicating with in.mpathd(8). * * These routines are not intended for use outside of libipmp. */ diff --git a/usr/src/lib/libipsecutil/common/algs.c b/usr/src/lib/libipsecutil/common/algs.c index 2018b7f079..752f0f614b 100644 --- a/usr/src/lib/libipsecutil/common/algs.c +++ b/usr/src/lib/libipsecutil/common/algs.c @@ -35,11 +35,11 @@ #include <errno.h> static char *preamble = -"# /etc/inet/ipsecalgs output from ipsecalgs(1m)\n" +"# /etc/inet/ipsecalgs output from ipsecalgs(8)\n" "#\n" "# DO NOT EDIT OR PARSE THIS FILE!\n" "#\n" -"# Use the ipsecalgs(1m) command to change the contents of this file.\n" +"# Use the ipsecalgs(8) command to change the contents of this file.\n" "# The algorithm descriptions contained in this file are synchronised to the\n" "# kernel with ipsecalgs -s, the kernel validates the entries at this point." "\n\n" diff --git a/usr/src/lib/libipsecutil/common/ipsec_util.c b/usr/src/lib/libipsecutil/common/ipsec_util.c index e27a47e63b..a369ee90a5 100644 --- a/usr/src/lib/libipsecutil/common/ipsec_util.c +++ b/usr/src/lib/libipsecutil/common/ipsec_util.c @@ -56,7 +56,7 @@ /* * This file contains support functions that are shared by the ipsec - * utilities and daemons including ipseckey(1m), ikeadm(1m) and in.iked(1m). + * utilities and daemons including ipseckey(8), ikeadm(8) and in.iked(8). */ @@ -370,7 +370,7 @@ dump_sockaddr(struct sockaddr *sa, uint8_t prefixlen, boolean_t addr_only, * value, this will also be part of the dumped key. The last "saltbits" of the * key string, reading left to right will be the salt value. To make it easier * to see which bits make up the key, the salt value is enclosed in []'s. - * This function can also be called when ipseckey(1m) -s is run, this "saves" + * This function can also be called when ipseckey(8) -s is run, this "saves" * the SAs, including the key to a file. When this is the case, the []'s are * not printed. * @@ -850,12 +850,12 @@ do_interactive(FILE *infile, char *configfile, char *promptstring, /* * There were errors. Putting the service in maintenance mode. - * When svc.startd(1M) allows services to degrade themselves, + * When svc.startd(8) allows services to degrade themselves, * this should be revisited. * * If this function was called from a program running as a - * smf_method(5), print a warning message. Don't spew out the - * errors as these will end up in the smf(5) log file which is + * smf_method(7), print a warning message. Don't spew out the + * errors as these will end up in the smf(7) log file which is * publically readable, the errors may contain sensitive * information. */ @@ -867,7 +867,7 @@ do_interactive(FILE *infile, char *configfile, char *promptstring, "errors.\n" "Manually check the configuration with:\n" "ipseckey -c %s\n" - "Use svcadm(1M) to clear maintenance " + "Use svcadm(8) to clear maintenance " "condition when errors are resolved.\n"), lines_parsed - lines_added, configfile); } else { @@ -3381,24 +3381,24 @@ rparseidtype(uint16_t type) /* * This is a general purpose exit function, calling functions can specify an - * error type. If the command calling this function was started by smf(5) the + * error type. If the command calling this function was started by smf(7) the * error type could be used as a hint to the restarter. In the future this * function could be used to do something more intelligent with a process that * encounters an error. If exit() is called with an error code other than those - * defined by smf(5), the program will just get restarted. Unless restarting + * defined by smf(7), the program will just get restarted. Unless restarting * is likely to resolve the error condition, its probably sensible to just * log the error and keep running. * * The SERVICE_* exit_types mean nothing if the command was run from the * command line, just exit(). There are two special cases: * - * SERVICE_DEGRADE - Not implemented in smf(5), one day it could hint that + * SERVICE_DEGRADE - Not implemented in smf(7), one day it could hint that * the service is not running as well is it could. For * now, don't do anything, just record the error. * DEBUG_FATAL - Something happened, if the command was being run in debug * mode, exit() as you really want to know something happened, * otherwise just keep running. This is ignored when running - * under smf(5). + * under smf(7). * * The function will handle an optional variable args error message, this * will be written to the error stream, typically a log file or stderr. @@ -3437,7 +3437,7 @@ ipsecutil_exit(exit_type_t type, char *fmri, FILE *fp, const char *fmt, ...) break; } } else { - /* Command being run as a smf(5) method. */ + /* Command being run as a smf(7) method. */ switch (type) { case SERVICE_EXIT_OK: exit_status = SMF_EXIT_OK; diff --git a/usr/src/lib/libipsecutil/common/ipsec_util.h b/usr/src/lib/libipsecutil/common/ipsec_util.h index 7f779bb95f..bd0a4bb65a 100644 --- a/usr/src/lib/libipsecutil/common/ipsec_util.h +++ b/usr/src/lib/libipsecutil/common/ipsec_util.h @@ -65,7 +65,7 @@ extern "C" { * Input buffer size limits maximum line length for both file parsing and * interactive mode. 4K chars should be enough even for broad commands and * all possible key lenghts of today's symmetric ciphers entered via - * ipseckey(1M) which has the most bifurcated grammar from all IPsec commands. + * ipseckey(8) which has the most bifurcated grammar from all IPsec commands. */ #define IBUF_SIZE 4096 @@ -128,7 +128,7 @@ typedef struct keywdtab { * when a program needs to exit because of an error. These exit_types * are used in macros, defined later in this file, which call ipsecutil_exit(). * What happens when ipsecutil_exit() may differ if the command was started - * on the command line or via smf(5), See ipsecutil_exit() source for details. + * on the command line or via smf(7), See ipsecutil_exit() source for details. * * Note: The calling function should decide what "debug mode" is before calling * ipsecutil_exit() with DEBUG_FATAL. @@ -138,10 +138,10 @@ typedef enum exit_type { SERVICE_DEGRADE, /* A hint that service should be degraded. */ SERVICE_BADPERM, /* A Permission error occured. */ SERVICE_BADCONF, /* Misconfiguration. */ - SERVICE_MAINTAIN, /* smf(5) to put service in maintenance mode. */ - SERVICE_DISABLE, /* Tell smf(5) to disable me. */ + SERVICE_MAINTAIN, /* smf(7) to put service in maintenance mode. */ + SERVICE_DISABLE, /* Tell smf(7) to disable me. */ SERVICE_FATAL, /* Whatever happened is not fixable. */ - SERVICE_RESTART, /* Tell smf(5) to restart the service. */ + SERVICE_RESTART, /* Tell smf(7) to restart the service. */ DEBUG_FATAL /* Exit in debug mode. */ } exit_type_t; diff --git a/usr/src/lib/libmapid/common/mapid.c b/usr/src/lib/libmapid/common/mapid.c index 42eceb21b4..3af9649802 100644 --- a/usr/src/lib/libmapid/common/mapid.c +++ b/usr/src/lib/libmapid/common/mapid.c @@ -747,7 +747,7 @@ get_dns_txt_domain(cb_t *argp) if (stat(_PATH_RESCONF, &st) < 0 && errno == ENOENT) { /* * If /etc/resolv.conf is not there, then we'll - * get the domain from domainname(1M). No real + * get the domain from domainname(8). No real * reason to query DNS or fire a thread since we * have no nameserver addresses. */ @@ -1011,7 +1011,7 @@ get_dns_domain(void) case ENOENT: /* * The resolver defaults to obtaining the - * domain off of the NIS domainname(1M) if + * domain off of the NIS domainname(8) if * /etc/resolv.conf does not exist, so we * move forward. */ diff --git a/usr/src/lib/libnisdb/db_dictionary.cc b/usr/src/lib/libnisdb/db_dictionary.cc index 2eef6d3b6e..85ff29ccf4 100644 --- a/usr/src/lib/libnisdb/db_dictionary.cc +++ b/usr/src/lib/libnisdb/db_dictionary.cc @@ -699,7 +699,7 @@ db_dictionary::change_table_name(db_table_desc *clone, char *tok, char *repl) while (clone) { /* * Special case for a tok="". This is used for the - * nisrestore(1M), when restoring a replica in another + * nisrestore(8), when restoring a replica in another * domain. This routine is used to change the datafile * names in the data.dict (see bugid #4031273). This will not * effect massage_dict(), since it never generates an empty diff --git a/usr/src/lib/libnisdb/ldap_parse.h b/usr/src/lib/libnisdb/ldap_parse.h index 10bf13afc1..f0f987bb90 100644 --- a/usr/src/lib/libnisdb/ldap_parse.h +++ b/usr/src/lib/libnisdb/ldap_parse.h @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #ifndef _LDAP_PARSE_H #define _LDAP_PARSE_H @@ -301,7 +299,7 @@ typedef struct __nis_mapping_item_struct { * __nis_mapping_item_t's are shortened to just the item name. * * (1) String value consisting of the string "{crypt}" followed by the - * value of the 'passwd' column. The NIS+LDAPmapping(4) representation + * value of the 'passwd' column. The NIS+LDAPmapping(5) representation * is * ("{crypt}%s", passwd) * and the element.print contains diff --git a/usr/src/lib/libnisdb/nis_parse_ldap_yp_util.c b/usr/src/lib/libnisdb/nis_parse_ldap_yp_util.c index 206007aa4a..927ae57de4 100644 --- a/usr/src/lib/libnisdb/nis_parse_ldap_yp_util.c +++ b/usr/src/lib/libnisdb/nis_parse_ldap_yp_util.c @@ -1196,7 +1196,7 @@ getfullmapname(char **mapname, const char *domainname) * existing fqdn table mapping structure results. That would be the * case when a full qualified domain specific attribute was present. * - * Note that per NISLDAPmapping(4) such an attribute MUST be listed + * Note that per NISLDAPmapping(5) such an attribute MUST be listed * in the mapping file BEFORE its non-fqdn counterpart. * * RETURNS: 0 normal exit, 1 if an existing structure found, -1 for all diff --git a/usr/src/lib/libnsl/nss/getipnodeby.c b/usr/src/lib/libnsl/nss/getipnodeby.c index a4e4515273..be485d1cb3 100644 --- a/usr/src/lib/libnsl/nss/getipnodeby.c +++ b/usr/src/lib/libnsl/nss/getipnodeby.c @@ -570,7 +570,7 @@ getipnodebyaddr(const void *src, size_t len, int type, int *error_num) /* * Step 2: AF_INET, v4 lookup. Since we're going to search the * ipnodes (v6) path first, we need to treat this as a v4mapped - * address. nscd(1m) caches v4 from ipnodes as mapped v6's. The + * address. nscd(8) caches v4 from ipnodes as mapped v6's. The * switch backend knows to lookup v4's (not v4mapped) from the * name services. */ diff --git a/usr/src/lib/libnsl/rpc/auth_des.c b/usr/src/lib/libnsl/rpc/auth_des.c index 4bb4b929c8..dfa6777c96 100644 --- a/usr/src/lib/libnsl/rpc/auth_des.c +++ b/usr/src/lib/libnsl/rpc/auth_des.c @@ -32,8 +32,6 @@ * California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * auth_des.c, client-side implementation of DES authentication * @@ -185,7 +183,7 @@ authdes_pk_seccreate(const char *servername, netobj *pkey, uint_t window, if (ckey == NULL) { if (key_gendes(&auth->ah_key) < 0) { syslog(LOG_ERR, - "authdes_seccreate: keyserv(1m) is unable to generate session key"); + "authdes_seccreate: keyserv(8) is unable to generate session key"); goto failed; } } else @@ -423,7 +421,7 @@ authdes_refresh(AUTH *auth, void *dummy) pkey.n_len = (uint_t)strlen((char *)ad->ad_pkey) + 1; if (key_encryptsession_pk(ad->ad_servername, &pkey, &ad->ad_xkey) < 0) { syslog(LOG_INFO, - "authdes_refresh: keyserv(1m) is unable to encrypt session key"); + "authdes_refresh: keyserv(8) is unable to encrypt session key"); return (FALSE); } cred->adc_fullname.key = ad->ad_xkey; diff --git a/usr/src/lib/libnwam/README b/usr/src/lib/libnwam/README index 01cdc74b75..7ed4db9285 100644 --- a/usr/src/lib/libnwam/README +++ b/usr/src/lib/libnwam/README @@ -533,4 +533,4 @@ ATTRIBUTES SEE ALSO - nwamd(1M), nwamcfg(1M), nwamadm(1M) + nwamd(8), nwamcfg(8), nwamadm(8) diff --git a/usr/src/lib/libnwam/common/libnwam_loc.c b/usr/src/lib/libnwam/common/libnwam_loc.c index 23adbba00b..59a67da0ad 100644 --- a/usr/src/lib/libnwam/common/libnwam_loc.c +++ b/usr/src/lib/libnwam/common/libnwam_loc.c @@ -84,7 +84,7 @@ struct nwam_prop_table_entry loc_prop_table_entries[] = { {NWAM_LOC_PROP_NAMESERVICES_CONFIG_FILE, NWAM_VALUE_TYPE_STRING, B_FALSE, 0, 1, nwam_valid_file, "specifies path to configuration file for name services switch " - "for this location - see nsswitch.conf(4)", + "for this location - see nsswitch.conf(5)", NWAM_TYPE_ANY, NWAM_CLASS_ANY}, {NWAM_LOC_PROP_DNS_NAMESERVICE_CONFIGSRC, NWAM_VALUE_TYPE_UINT64, B_FALSE, 0, NWAM_MAX_NUM_VALUES, valid_configsrc, @@ -123,7 +123,7 @@ struct nwam_prop_table_entry loc_prop_table_entries[] = { NWAM_TYPE_ANY, NWAM_CLASS_ANY}, {NWAM_LOC_PROP_DEFAULT_DOMAIN, NWAM_VALUE_TYPE_STRING, B_FALSE, 0, 1, nwam_valid_domain, - "specifies the domainname(1M) to be set for this location", + "specifies the domainname(8) to be set for this location", NWAM_TYPE_ANY, NWAM_CLASS_ANY}, {NWAM_LOC_PROP_NFSV4_DOMAIN, NWAM_VALUE_TYPE_STRING, B_FALSE, 0, 1, nwam_valid_domain, @@ -131,7 +131,7 @@ struct nwam_prop_table_entry loc_prop_table_entries[] = { NWAM_TYPE_ANY, NWAM_CLASS_ANY}, {NWAM_LOC_PROP_IPFILTER_CONFIG_FILE, NWAM_VALUE_TYPE_STRING, B_FALSE, 0, 1, nwam_valid_file, - "specifies an absolute path to an ipf.conf(4) file for this " + "specifies an absolute path to an ipf.conf(5) file for this " "location", NWAM_TYPE_ANY, NWAM_CLASS_ANY}, {NWAM_LOC_PROP_IPFILTER_V6_CONFIG_FILE, NWAM_VALUE_TYPE_STRING, @@ -141,23 +141,23 @@ struct nwam_prop_table_entry loc_prop_table_entries[] = { NWAM_TYPE_ANY, NWAM_CLASS_ANY}, {NWAM_LOC_PROP_IPNAT_CONFIG_FILE, NWAM_VALUE_TYPE_STRING, B_FALSE, 0, 1, nwam_valid_file, - "specifies an absolute path to an ipnat.conf(4) file for this " + "specifies an absolute path to an ipnat.conf(5) file for this " "location", NWAM_TYPE_ANY, NWAM_CLASS_ANY}, {NWAM_LOC_PROP_IPPOOL_CONFIG_FILE, NWAM_VALUE_TYPE_STRING, B_FALSE, 0, 1, nwam_valid_file, - "specifies an absolute path to an ippool.conf(4) file for this " + "specifies an absolute path to an ippool.conf(5) file for this " "location", NWAM_TYPE_ANY, NWAM_CLASS_ANY}, {NWAM_LOC_PROP_IKE_CONFIG_FILE, NWAM_VALUE_TYPE_STRING, B_FALSE, 0, 1, nwam_valid_file, "specifies an absolute path to an ike config file " - "(see ike.config(4))", + "(see ike.config(5))", NWAM_TYPE_ANY, NWAM_CLASS_ANY}, {NWAM_LOC_PROP_IPSECPOLICY_CONFIG_FILE, NWAM_VALUE_TYPE_STRING, B_FALSE, 0, 1, nwam_valid_file, "specifies an absolute path to an IPsec policy configuration file " - "(see ipsecconf(1M)", + "(see ipsecconf(8)", NWAM_TYPE_ANY, NWAM_CLASS_ANY}, }; diff --git a/usr/src/lib/libpam/pam.conf b/usr/src/lib/libpam/pam.conf index 4f4ec81be2..e50ae416c8 100644 --- a/usr/src/lib/libpam/pam.conf +++ b/usr/src/lib/libpam/pam.conf @@ -131,5 +131,5 @@ other password requisite pam_authtok_check.so.1 other password required pam_authtok_store.so.1 # # Support for Kerberos V5 authentication and example configurations can -# be found in the pam_krb5(5) man page under the "EXAMPLES" section. +# be found in the pam_krb5(7) man page under the "EXAMPLES" section. # diff --git a/usr/src/lib/libpcsc/common/winscard.h b/usr/src/lib/libpcsc/common/winscard.h index bec4960040..f144f13da9 100644 --- a/usr/src/lib/libpcsc/common/winscard.h +++ b/usr/src/lib/libpcsc/common/winscard.h @@ -26,7 +26,7 @@ * https://docs.microsoft.com/en-us/windows/win32/api/winscard/ * * New consumers should not use this library and instead should leverage - * ccid(7D) instead. + * ccid(4D) instead. */ #include <stdint.h> diff --git a/usr/src/lib/libpkg/common/isdir.c b/usr/src/lib/libpkg/common/isdir.c index 4589b0a56b..1e5b1e94bb 100644 --- a/usr/src/lib/libpkg/common/isdir.c +++ b/usr/src/lib/libpkg/common/isdir.c @@ -353,7 +353,7 @@ _InitRemoteFstypes(void) } /* - * Read the remote file system type database; from fstypes(4): + * Read the remote file system type database; from fstypes(5): * * fstypes resides in directory /etc/dfs and lists distributed file * system utilities packages installed on the system. For each installed diff --git a/usr/src/lib/libproc/common/Pcontrol.c b/usr/src/lib/libproc/common/Pcontrol.c index dfc2a404af..90ce97c191 100644 --- a/usr/src/lib/libproc/common/Pcontrol.c +++ b/usr/src/lib/libproc/common/Pcontrol.c @@ -401,7 +401,7 @@ dupfd(int fd, int dfd) /* * Make fd be greater than 255 (the 32-bit stdio limit), * or at least make it greater than 2 so that the - * program will work when spawned by init(1m). + * program will work when spawned by init(8). * Also, if dfd is non-zero, dup the fd to be dfd. */ if ((mfd = minfd) == 0) diff --git a/usr/src/lib/libproc/common/Pcore.c b/usr/src/lib/libproc/common/Pcore.c index ab7b75f807..b83153cb93 100644 --- a/usr/src/lib/libproc/common/Pcore.c +++ b/usr/src/lib/libproc/common/Pcore.c @@ -2171,7 +2171,7 @@ core_exec_open(const char *path, void *efp) /* * Attempt to load any section headers found in the core file. If present, * this will refer to non-loadable data added to the core file by the kernel - * based on coreadm(1M) settings, including CTF data and the symbol table. + * based on coreadm(8) settings, including CTF data and the symbol table. */ static void core_load_shdrs(struct ps_prochandle *P, elf_file_t *efp) diff --git a/usr/src/lib/libresolv2/install.xml b/usr/src/lib/libresolv2/install.xml index a01a2b83cf..e2f7bd8bf2 100644 --- a/usr/src/lib/libresolv2/install.xml +++ b/usr/src/lib/libresolv2/install.xml @@ -111,21 +111,21 @@ <prop_pattern name='nameserver' type='net_address' required='true'> <description> <loctext xml:lang='C'> - The value used to construct the "nameserver" directive in resolv.conf(4). + The value used to construct the "nameserver" directive in resolv.conf(5). </loctext> </description> <cardinality min='1' max='3'/> </prop_pattern> <prop_pattern name='domain' type='astring' required='false'> <description> <loctext xml:lang='C'> - The value used to construct the "domain" directive in resolv.conf(4). + The value used to construct the "domain" directive in resolv.conf(5). </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> <prop_pattern name='search' type='astring' required='false'> <description> <loctext xml:lang='C'> - The value used to construct the "search" directive in resolv.conf(4). + The value used to construct the "search" directive in resolv.conf(5). </loctext> </description> <cardinality min='1' max='6'/> </prop_pattern> diff --git a/usr/src/lib/librestart/common/librestart.c b/usr/src/lib/librestart/common/librestart.c index cebaf54884..c2009bfb2f 100644 --- a/usr/src/lib/librestart/common/librestart.c +++ b/usr/src/lib/librestart/common/librestart.c @@ -2755,7 +2755,7 @@ out: * * If no method_context is defined, original init context is provided, where * the working directory is '/', and uid/gid are 0/0. But if a method_context - * is defined at any level the smf_method(5) method_context defaults are used. + * is defined at any level the smf_method(7) method_context defaults are used. * * Return an error message structure containing the error message * with context, and the error so the caller can make a decision diff --git a/usr/src/lib/libsec/common/acl_lex.l b/usr/src/lib/libsec/common/acl_lex.l index 0c388f2832..ab61d5bf0e 100644 --- a/usr/src/lib/libsec/common/acl_lex.l +++ b/usr/src/lib/libsec/common/acl_lex.l @@ -397,7 +397,7 @@ INHERIT_STR [fdinFSI-]+ dgettext(TEXT_DOMAIN, "The ',' is not a valid permission field " "separator.\nThe comma is used to separate " - "access control entries.\nSee acl(5) for " + "access control entries.\nSee acl(7) for " "examples of specifying ACL entries.\n")); yylval.val = EACL_PERM_MASK_ERROR; return (ERROR); @@ -630,7 +630,7 @@ INHERIT_STR [fdinFSI-]+ dgettext(TEXT_DOMAIN, "The ',' is not a valid inheritance field " "separator.\nThe comma is used to separate " - "access control entries.\nSee acl(5) for " + "access control entries.\nSee acl(7) for " "examples of specifying ACL entries.\n")); yylval.val = EACL_INVALID_ACCESS_TYPE; return (ERROR); diff --git a/usr/src/lib/libsecdb/auth_attr.txt b/usr/src/lib/libsecdb/auth_attr.txt index a1a99aee82..b083187445 100644 --- a/usr/src/lib/libsecdb/auth_attr.txt +++ b/usr/src/lib/libsecdb/auth_attr.txt @@ -25,7 +25,7 @@ # # /etc/security/auth_attr # -# authorizations. see auth_attr(4) +# authorizations. see auth_attr(5) # solaris.:::All Solaris Authorizations::help=AllSolAuthsHeader.html solaris.grant:::Grant All Solaris Authorizations::help=PriAdmin.html diff --git a/usr/src/lib/libsecdb/common/i.rbac b/usr/src/lib/libsecdb/common/i.rbac index 0ed2cc1cde..a7c1ffa46b 100644 --- a/usr/src/lib/libsecdb/common/i.rbac +++ b/usr/src/lib/libsecdb/common/i.rbac @@ -107,15 +107,15 @@ dbmerge() { # $sed_cmd -e '/^# \/etc\/security\/exec_attr/d' -e '/^#$/d' \ -e '/^# execution attributes for profiles./d' \ - -e '/^# See exec_attr(4)/d' \ + -e '/^# See exec_attr([45])/d' \ -e '/^# \/etc\/user_attr/d' \ - -e '/^# user attributes. see user_attr(4)/d' \ + -e '/^# user attributes. see user_attr([45])/d' \ -e '/^# \/etc\/security\/prof_attr/d' \ - -e '/^# profiles attributes. see prof_attr(4)/d' \ - -e '/^# See prof_attr(4)/d' \ + -e '/^# profiles attributes. see prof_attr([45])/d' \ + -e '/^# See prof_attr([45])/d' \ -e '/^# \/etc\/security\/auth_attr/d' \ - -e '/^# authorizations. see auth_attr(4)/d' \ - -e '/^# authorization attributes. see auth_attr(4)/d' \ + -e '/^# authorizations. see auth_attr([45])/d' \ + -e '/^# authorization attributes. see auth_attr([45])/d' \ $4.old > $4.$$ $mv_cmd $4.$$ $4.old # diff --git a/usr/src/lib/libsecdb/exec_attr.txt b/usr/src/lib/libsecdb/exec_attr.txt index f63bfc3961..dc86dc9342 100644 --- a/usr/src/lib/libsecdb/exec_attr.txt +++ b/usr/src/lib/libsecdb/exec_attr.txt @@ -23,7 +23,7 @@ # # /etc/security/exec_attr # -# execution attributes for profiles. see exec_attr(4) +# execution attributes for profiles. see exec_attr(5) # # All:suser:cmd:::*: diff --git a/usr/src/lib/libsecdb/help/auths/NetworkAutoconfRead.html b/usr/src/lib/libsecdb/help/auths/NetworkAutoconfRead.html index c734350c34..86a8f1644a 100644 --- a/usr/src/lib/libsecdb/help/auths/NetworkAutoconfRead.html +++ b/usr/src/lib/libsecdb/help/auths/NetworkAutoconfRead.html @@ -32,6 +32,6 @@ meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" <body> When View Network Auto-Magic Config is in the Authorizations Included column, it grants permission to view the configuration repository used -by the nwamd(1M) daemon to manage network configuration. +by the nwamd(8) daemon to manage network configuration. </body> </html> diff --git a/usr/src/lib/libsecdb/help/auths/NetworkAutoconfSelect.html b/usr/src/lib/libsecdb/help/auths/NetworkAutoconfSelect.html index 966530c655..2f0889c9d7 100644 --- a/usr/src/lib/libsecdb/help/auths/NetworkAutoconfSelect.html +++ b/usr/src/lib/libsecdb/help/auths/NetworkAutoconfSelect.html @@ -31,7 +31,7 @@ meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" </head> <body> When Enable/Disable Network Auto-Magic Config is in the Authorizations Included -column, it grants permission to enable and disable profiles by nwamd(1M) via -the nwam-manager GUI or the nwamadm(1M) command. +column, it grants permission to enable and disable profiles by nwamd(8) via +the nwam-manager GUI or the nwamadm(8) command. </body> </html> diff --git a/usr/src/lib/libsecdb/help/auths/NetworkAutoconfWlan.html b/usr/src/lib/libsecdb/help/auths/NetworkAutoconfWlan.html index ee9827885d..0d9cbcac72 100644 --- a/usr/src/lib/libsecdb/help/auths/NetworkAutoconfWlan.html +++ b/usr/src/lib/libsecdb/help/auths/NetworkAutoconfWlan.html @@ -32,7 +32,7 @@ meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" <body> When Create Network Auto-Magic Config for Known WLANs is in the Authorizations Included column, it grants permission to create or modify Known WLAN data in -the configuration repository used by the nwamd(1M) daemon to manage network +the configuration repository used by the nwamd(8) daemon to manage network configuration. </body> </html> diff --git a/usr/src/lib/libsecdb/help/auths/NetworkAutoconfWrite.html b/usr/src/lib/libsecdb/help/auths/NetworkAutoconfWrite.html index ae9b0fbde5..77b137f68f 100644 --- a/usr/src/lib/libsecdb/help/auths/NetworkAutoconfWrite.html +++ b/usr/src/lib/libsecdb/help/auths/NetworkAutoconfWrite.html @@ -32,6 +32,6 @@ meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" <body> When Create Network Auto-Magic Config is in the Authorizations Included column, it grants permission to create or modify data in the configuration -repository used by the nwamd(1M) daemon to manage network configuration. +repository used by the nwamd(8) daemon to manage network configuration. </body> </html> diff --git a/usr/src/lib/libsecdb/help/auths/NetworkILBconf.html b/usr/src/lib/libsecdb/help/auths/NetworkILBconf.html index b0a175258d..e711fce969 100644 --- a/usr/src/lib/libsecdb/help/auths/NetworkILBconf.html +++ b/usr/src/lib/libsecdb/help/auths/NetworkILBconf.html @@ -32,10 +32,10 @@ meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" <body> When Network ILB Configuration is in the Authorizations Included column, it grants permission to administrate the add, -create and destroy subcommands of ilbadm(1M) +create and destroy subcommands of ilbadm(8) <p> Note, to retrieve configuration and state information about ILB by -using ilbadm(1M) doesn't require Network ILB Configuration +using ilbadm(8) doesn't require Network ILB Configuration authorization. </body> </html> diff --git a/usr/src/lib/libsecdb/help/auths/NetworkILBenable.html b/usr/src/lib/libsecdb/help/auths/NetworkILBenable.html index 3cb93b237e..54720abc45 100644 --- a/usr/src/lib/libsecdb/help/auths/NetworkILBenable.html +++ b/usr/src/lib/libsecdb/help/auths/NetworkILBenable.html @@ -32,10 +32,10 @@ meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" <body> When Network ILB Enable Configuration is in the Authorizations Included column, it grants permission to administrate the enable -and disable subcommands of ilbadm(1M). +and disable subcommands of ilbadm(8). <p> Note, to retrieve configuration and state information about ILB by -using ilbadm(1M) doesn't require Network ILB Configuration +using ilbadm(8) doesn't require Network ILB Configuration authorization. </body> </html> diff --git a/usr/src/lib/libsecdb/help/auths/NetworkVRRP.html b/usr/src/lib/libsecdb/help/auths/NetworkVRRP.html index e641c0c9d8..3b3871418c 100644 --- a/usr/src/lib/libsecdb/help/auths/NetworkVRRP.html +++ b/usr/src/lib/libsecdb/help/auths/NetworkVRRP.html @@ -32,10 +32,10 @@ meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" <body> When Administer VRRP is in the Authorizations Included column, it grants authorization to administrate the VRRP service, which is provided by the -vrrpd(1M) daemon. In particularly, the user is allowed to create, delete, -modify, disable, re-enable VRRP routers using the vrrpadm(1M) command. +vrrpd(8) daemon. In particularly, the user is allowed to create, delete, +modify, disable, re-enable VRRP routers using the vrrpadm(8) command. <p> Note, querying configuration and state information of a VRRP router using -vrrpadm(1M) doesn't require the Administer VRRP authorization. +vrrpadm(8) doesn't require the Administer VRRP authorization. </body> </html> diff --git a/usr/src/lib/libsecdb/help/auths/WifiConfig.html b/usr/src/lib/libsecdb/help/auths/WifiConfig.html index 966df7274b..9182d4231d 100644 --- a/usr/src/lib/libsecdb/help/auths/WifiConfig.html +++ b/usr/src/lib/libsecdb/help/auths/WifiConfig.html @@ -24,9 +24,6 @@ CDDL HEADER END --> -<!-- SCCS keyword -#pragma ident "%Z%%M% %I% %E% SMI" ---> <HEAD> <!-- @@ -37,7 +34,7 @@ META NAME="GENERATOR" CONTENT="Mozilla/4.02 [en] (X11; U; SunOS 5.6 sun4u) [Nets --> </HEAD> <BODY> -When Wifi Config is in the Authorizations Included column, it grants permission to manage all the parameters of the wifi interface apart from wep key using wificonfig(1m) command. +When Wifi Config is in the Authorizations Included column, it grants permission to manage all the parameters of the wifi interface apart from wep key using wificonfig(8) command. <p> If Wifi Config is grayed, then you are not entitled to Add or Remove this authorization. <BR> diff --git a/usr/src/lib/libsecdb/help/auths/WifiWep.html b/usr/src/lib/libsecdb/help/auths/WifiWep.html index 7e18d440d3..5ef9e419ea 100644 --- a/usr/src/lib/libsecdb/help/auths/WifiWep.html +++ b/usr/src/lib/libsecdb/help/auths/WifiWep.html @@ -24,9 +24,6 @@ CDDL HEADER END --> -<!-- SCCS keyword -#pragma ident "%Z%%M% %I% %E% SMI" ---> <HEAD> <!-- @@ -37,7 +34,7 @@ META NAME="GENERATOR" CONTENT="Mozilla/4.02 [en] (X11; U; SunOS 5.6 sun4u) [Nets --> </HEAD> <BODY> -When Wifi Wep is in the Authorizations Included column, it grants permission to configurate the wep key of the wifi interface using the wificonfig(1m) command. +When Wifi Wep is in the Authorizations Included column, it grants permission to configurate the wep key of the wifi interface using the wificonfig(8) command. <p> If Wifi Wep is grayed, then you are not entitled to Add or Remove this authorization. <BR> diff --git a/usr/src/lib/libsecdb/help/profiles/RtConsUser.html b/usr/src/lib/libsecdb/help/profiles/RtConsUser.html index 7e7b956193..5a042d6e56 100644 --- a/usr/src/lib/libsecdb/help/profiles/RtConsUser.html +++ b/usr/src/lib/libsecdb/help/profiles/RtConsUser.html @@ -28,14 +28,12 @@ </HEAD> <BODY> -<!-- ident "%Z%%M% %I% %E% SMI" --> - When Console User is in the Rights Included column, it grants the right for a user or role to do operations often associated with ownership of a Solaris workstation or laptop. <p> -These Rights are typically granted automatically through policy.conf(4) +These Rights are typically granted automatically through policy.conf(5) to the user logged in on the workstation console. It can be, but is generally not directly assigned to a user or role. <p> diff --git a/usr/src/lib/libsecdb/help/profiles/RtNetAutoconfAdmin.html b/usr/src/lib/libsecdb/help/profiles/RtNetAutoconfAdmin.html index 5825f2d74d..cbdbabbcdb 100644 --- a/usr/src/lib/libsecdb/help/profiles/RtNetAutoconfAdmin.html +++ b/usr/src/lib/libsecdb/help/profiles/RtNetAutoconfAdmin.html @@ -28,9 +28,9 @@ <body> When Network Autoconf Admin is in the Rights Included column, it grants the right to create and edit the data in the configuration repository (using the -nwamcfg(1M) command or the nwam-manager GUI) and to apply the changes made to -the configuration repository to the system by nwamd(1M) daemon (using the -nwamadm(1M) command or the nwam-manager GUI). +nwamcfg(8) command or the nwam-manager GUI) and to apply the changes made to +the configuration repository to the system by nwamd(8) daemon (using the +nwamadm(8) command or the nwam-manager GUI). <p> If Network Autoconf Admin is grayed, then you are not entitled to Add or Remove this right. diff --git a/usr/src/lib/libsecdb/help/profiles/RtNetAutoconfUser.html b/usr/src/lib/libsecdb/help/profiles/RtNetAutoconfUser.html index d8ad5cd1b3..25d9c5d594 100644 --- a/usr/src/lib/libsecdb/help/profiles/RtNetAutoconfUser.html +++ b/usr/src/lib/libsecdb/help/profiles/RtNetAutoconfUser.html @@ -28,7 +28,7 @@ <body> When Network Autoconf User is in the Rights Included column, it grants the right to enable and disable different profiles and select WiFi networks using -the nwamadm(1M) command or the nwam-manager GUI. +the nwamadm(8) command or the nwam-manager GUI. <p> If Network Autoconf User is grayed, then you are not entitled to Add or Remove this right. diff --git a/usr/src/lib/libsecdb/help/profiles/RtNetILB.html b/usr/src/lib/libsecdb/help/profiles/RtNetILB.html index 95a7f99bef..f1c22e0f10 100644 --- a/usr/src/lib/libsecdb/help/profiles/RtNetILB.html +++ b/usr/src/lib/libsecdb/help/profiles/RtNetILB.html @@ -27,7 +27,7 @@ </head> <body> When Network ILB is in the Rights Included column, it grants the -right to manage the configuration of ILB feature by using ilbadm(1M) +right to manage the configuration of ILB feature by using ilbadm(8) command. <p> If Network ILB is grayed, then you are not entitled to Add or diff --git a/usr/src/lib/libsecdb/help/profiles/RtNetVRRP.html b/usr/src/lib/libsecdb/help/profiles/RtNetVRRP.html index 18c94e178e..45da90dd79 100644 --- a/usr/src/lib/libsecdb/help/profiles/RtNetVRRP.html +++ b/usr/src/lib/libsecdb/help/profiles/RtNetVRRP.html @@ -27,7 +27,7 @@ </head> <body> When Network VRRP is in the Rights Included column, it grants the -right to administer the VRRP routers using the vrrpadm(1M) command. +right to administer the VRRP routers using the vrrpadm(8) command. <p> If Network VRRP is grayed, then you are not entitled to Add or Remove this right. diff --git a/usr/src/lib/libsecdb/policy.conf b/usr/src/lib/libsecdb/policy.conf index 60fea9f5f3..8009a24c8b 100644 --- a/usr/src/lib/libsecdb/policy.conf +++ b/usr/src/lib/libsecdb/policy.conf @@ -24,7 +24,7 @@ # # /etc/security/policy.conf # -# security policy configuration for user attributes. see policy.conf(4) +# security policy configuration for user attributes. see policy.conf(5) # AUTHS_GRANTED=solaris.device.cdrw @@ -46,7 +46,7 @@ CRYPT_ALGORITHMS_ALLOW=1,2a,md5,5,6 # The illumos default is a SHA512 based algorithm. To revert to # the policy present in former Solaris releases set CRYPT_DEFAULT=__unix__, -# which is not listed in crypt.conf(4) since it is internal to libc. +# which is not listed in crypt.conf(5) since it is internal to libc. # CRYPT_DEFAULT=6 # @@ -73,8 +73,8 @@ CRYPT_DEFAULT=6 #PRIV_LIMIT=all # # LOCK_AFTER_RETRIES specifies the default account locking policy for local -# user accounts (passwd(4)/shadow(4)). The default may be overridden by -# a user's user_attr(4) "lock_after_retries" value. +# user accounts (passwd(5)/shadow(5)). The default may be overridden by +# a user's user_attr(5) "lock_after_retries" value. # YES enables local account locking, NO disables local account locking. # The default value is NO. # diff --git a/usr/src/lib/libsecdb/prof_attr.txt b/usr/src/lib/libsecdb/prof_attr.txt index ec638b1732..b186fde8a9 100644 --- a/usr/src/lib/libsecdb/prof_attr.txt +++ b/usr/src/lib/libsecdb/prof_attr.txt @@ -24,7 +24,7 @@ # # /etc/security/prof_attr # -# profiles attributes. see prof_attr(4) +# profiles attributes. see prof_attr(5) # All:::Execute any command as the user or role:help=RtAll.html Audit Configuration:::Configure Solaris Audit:auths=solaris.smf.value.audit;help=RtAuditCfg.html diff --git a/usr/src/lib/libsecdb/user_attr.txt b/usr/src/lib/libsecdb/user_attr.txt index aa31d7373b..576028804e 100644 --- a/usr/src/lib/libsecdb/user_attr.txt +++ b/usr/src/lib/libsecdb/user_attr.txt @@ -22,7 +22,7 @@ # # /etc/user_attr # -# user attributes. see user_attr(4) +# user attributes. see user_attr(5) # # root::::auths=solaris.*,solaris.grant;profiles=All;audit_flags=lo\:no;lock_after_retries=no;min_label=admin_low;clearance=admin_high diff --git a/usr/src/lib/libshare/common/libsharecore.c b/usr/src/lib/libshare/common/libsharecore.c index 042bb00726..c15291d19d 100644 --- a/usr/src/lib/libshare/common/libsharecore.c +++ b/usr/src/lib/libshare/common/libsharecore.c @@ -58,7 +58,7 @@ #define DFSTAB_NOTICE_LINES 5 static char *notice[DFSTAB_NOTICE_LINES] = { "# Do not modify this file directly.\n", - "# Use the sharemgr(1m) command for all share management\n", + "# Use the sharemgr(8) command for all share management\n", "# This file is reconstructed and only maintained for backward\n", "# compatibility. Configuration lines could be lost.\n", "#\n" diff --git a/usr/src/lib/libsldap/common/ns_sldap.h b/usr/src/lib/libsldap/common/ns_sldap.h index fbee323739..0507910a48 100644 --- a/usr/src/lib/libsldap/common/ns_sldap.h +++ b/usr/src/lib/libsldap/common/ns_sldap.h @@ -582,7 +582,7 @@ typedef struct ns_standalone_conf { * and naming context. During all further operations on behalf * of the application requested a standalone schema libsldap will use * the information obtained by __ns_ldap_initStandalone() instead of - * door_call(3C)ing ldap_cachemgr(1M). + * door_call(3C)ing ldap_cachemgr(8). * * conf * A structure describing where and in which way to obtain all the diff --git a/usr/src/lib/libsldap/common/ns_standalone.c b/usr/src/lib/libsldap/common/ns_standalone.c index 3d998d16ae..119c148b41 100644 --- a/usr/src/lib/libsldap/common/ns_standalone.c +++ b/usr/src/lib/libsldap/common/ns_standalone.c @@ -1367,7 +1367,7 @@ __ns_ldap_getRootDSE(const char *server_addr, * Fallback to anonymous, non-SSL mode for backward * compatibility reasons. This mode should only be used when * this function (__ns_ldap_getRootDSE) is called from - * ldap_cachemgr(1M). + * ldap_cachemgr(8). */ syslog(LOG_WARNING, gettext("libsldap: Falling back to anonymous, non-SSL" @@ -1965,7 +1965,7 @@ __ns_ldap_initAuth(const char *auth_mech, * and naming context. During all further operations on behalf * of the application requested a standalone schema libsldap will use * the information obtained by __ns_ldap_initStandalone() instead of - * door_call(3C)ing ldap_cachemgr(1M). + * door_call(3C)ing ldap_cachemgr(8). * * INPUT: * sa_conf - a structure describing where and in which way to obtain all diff --git a/usr/src/lib/libsldap/common/ns_writes.c b/usr/src/lib/libsldap/common/ns_writes.c index 0774eb7524..85a9ea8938 100644 --- a/usr/src/lib/libsldap/common/ns_writes.c +++ b/usr/src/lib/libsldap/common/ns_writes.c @@ -1262,7 +1262,7 @@ __ns_ldap_is_shadow_update_enabled(void) * to modify. When the Native LDAP client is configured with 'shadow update * enabled', Shadowshadow(4) entries can only be modified by privileged users. * Such users use the NS_LDAP_UPDATE_SHADOW flag to indicate the call is - * for such a shadow(4) update, which would be forwarded to ldap_cachemgr + * for such a shadow(5) update, which would be forwarded to ldap_cachemgr * for performing the LDAP modify operation. ldap_cachemgr would call * this function again and use the special service NS_ADMIN_SHADOW_UPDATE * to identify itself, so that admin credential would be obtained and diff --git a/usr/src/lib/libslp/clib/slp_auth.c b/usr/src/lib/libslp/clib/slp_auth.c index 923fd5dd45..6b8167f3ab 100644 --- a/usr/src/lib/libslp/clib/slp_auth.c +++ b/usr/src/lib/libslp/clib/slp_auth.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This file contains all authentication-related functionality for * SLP. Two interfaces are exported: @@ -41,7 +39,7 @@ * sun.net.slp.authBackend; the value of this property should contain * either the name of a shared object which implements the necessary * interfaces, or a full or relative path to such an object. This value - * will be passed to dlopen(3X) to resolve the symbols. + * will be passed to dlopen(3C) to resolve the symbols. * * The shared object must implement the following AMI interfaces: * diff --git a/usr/src/lib/libslp/etc/slp.conf.example b/usr/src/lib/libslp/etc/slp.conf.example index 53660e3eb4..4fc951b483 100644 --- a/usr/src/lib/libslp/etc/slp.conf.example +++ b/usr/src/lib/libslp/etc/slp.conf.example @@ -22,15 +22,14 @@ # Copyright 1999 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # Example configuration file for SLP. This file lists and explains # each property you can set for SLP. No properties are acutally set, # so uncomment and edit any properties you wish to change. The -# file /etc/inet/slp.conf must exist in order for slpd(1m) to start, +# file /etc/inet/slp.conf must exist in order for slpd(8) to start, # so copy this file to /etc/inet/slp.conf to enable SLP. See -# slp.conf(4), slpd(1m), or RFC 2614 for more information. +# slp.conf(5), slpd(8), or RFC 2614 for more information. # # Specifies if slpd should act as a DA. Default is false. diff --git a/usr/src/lib/libstmf/common/store.c b/usr/src/lib/libstmf/common/store.c index 0d3cfcba53..cc593eb4ce 100644 --- a/usr/src/lib/libstmf/common/store.c +++ b/usr/src/lib/libstmf/common/store.c @@ -40,7 +40,7 @@ /* * This file's functions are responsible for all store and retrieve operations - * against the STMF smf(5) database. The following shows the currently defined + * against the STMF smf(7) database. The following shows the currently defined * schema for the STMF database: * * Description of property groups for service: svc:/system/stmf diff --git a/usr/src/lib/libsysevent/libevchannel.c b/usr/src/lib/libsysevent/libevchannel.c index b86a7d3e13..979671f17c 100644 --- a/usr/src/lib/libsysevent/libevchannel.c +++ b/usr/src/lib/libsysevent/libevchannel.c @@ -149,7 +149,7 @@ sysevent_evc_bind(const char *channel, evchan_t **scpp, uint32_t flags) /* * Enable sysevent driver. Fallback if the device link doesn't exist; * this situation can arise if a channel is bound early in system - * startup, prior to devfsadm(1M) being invoked. + * startup, prior to devfsadm(8) being invoked. */ EV_FD(scp) = open(DEVSYSEVENT, O_RDWR); if (EV_FD(scp) == -1) { diff --git a/usr/src/lib/libsysevent/libsysevent.c b/usr/src/lib/libsysevent/libsysevent.c index 9aa2178301..8bca21c6fe 100644 --- a/usr/src/lib/libsysevent/libsysevent.c +++ b/usr/src/lib/libsysevent/libsysevent.c @@ -736,7 +736,7 @@ se_print(FILE *fp, sysevent_t *ev) * registration notifications and each subscriber creates a door for event * delivery. * - * Most of these routines are used by syseventd(1M), the sysevent publisher + * Most of these routines are used by syseventd(8), the sysevent publisher * for the syseventd channel. Processes wishing to receive sysevent * notifications from syseventd may use a set of public * APIs designed to subscribe to syseventd sysevents. The subscription @@ -2553,7 +2553,7 @@ sysevent_unbind_publisher(sysevent_handle_t *shp) } /* - * Evolving APIs to subscribe to syseventd(1M) system events. + * Evolving APIs to subscribe to syseventd(8) system events. */ static sysevent_handle_t * @@ -2648,7 +2648,7 @@ sysevent_unbind_handle(sysevent_handle_t *shp) /* * sysevent_subscribe_event - Subscribe to system event notification from - * syseventd(1M) for the class and subclasses specified. + * syseventd(8) for the class and subclasses specified. */ int sysevent_subscribe_event(sysevent_handle_t *shp, const char *event_class, diff --git a/usr/src/lib/libxcurses/src/libc/xcurses/tparm.c b/usr/src/lib/libxcurses/src/libc/xcurses/tparm.c index 5504d6fa5d..1b5f82b530 100644 --- a/usr/src/lib/libxcurses/src/libc/xcurses/tparm.c +++ b/usr/src/lib/libxcurses/src/libc/xcurses/tparm.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * tparm.c * @@ -42,8 +40,8 @@ static char rcsID[] = "$Header: /rd/src/libc/xcurses/rcs/tparm.c 1.2 1995/08/31 #endif /*l - * Substitute the given parameters into the given string by the - * following rules (taken from terminfo(5)): + * Substitute the given parameters into the given string by the + * following rules (taken from terminfo(7)): * * Cursor addressing and other strings requiring parameters * in the terminal are described by a parameterized string @@ -54,14 +52,14 @@ static char rcsID[] = "$Header: /rd/src/libc/xcurses/rcs/tparm.c 1.2 1995/08/31 * screen visible to the user, not to any unseen memory.) If * the terminal has memory relative cursor addressing, that can * be indicated by - * + * * The parameter mechanism uses a stack and special % * codes to manipulate it. Typically a sequence will push one * of the parameters onto the stack and then print it in some * format. Often more complex operations are necessary. - * + * * The % encodings have the following meanings: - * + * * %% outputs `%' * %d print pop() like %d in printf() * %2d print pop() like %2d in printf() @@ -70,25 +68,25 @@ static char rcsID[] = "$Header: /rd/src/libc/xcurses/rcs/tparm.c 1.2 1995/08/31 * %03d print pop() like %03d in printf() * %c print pop() like %c in printf() * %s print pop() like %s in printf() - * + * * %p[1-9] push ith parm * %P[a-z] set variable [a-z] to pop() * %g[a-z] get variable [a-z] and push it * %'c' push char constant c * %{nn} push integer constant nn - * + * * %+ %- %* %/ %m * arithmetic (%m is mod): push(pop() op pop()) * %& %| %^ bit operations: push(pop() op pop()) * %= %> %< logical operations: push(pop() op pop()) * %! %~ unary operations push(op pop()) * %i add 1 to first two parms (for ANSI terminals) - * + * * %? expr %t thenpart %e elsepart %; * if-then-else, %e elsepart is optional. * else-if's are possible ala Algol 68: * %? c1 %t b1 %e c2 %t b2 %e c3 %t b3 %e c4 %t b4 %e b5 %; - * + * * For those of the above operators which are binary and not commutative, * the stack works in the usual way, with * %gx %gy %m @@ -136,7 +134,7 @@ long p1, p2, p3, p4, p5, p6, p7, p8, p9; char *bufptr = buffer; #ifdef STDARG_VERSION - /* We've had too many problems porting this particular module + /* We've had too many problems porting this particular module * to different compilers and machines, in particular RISC, * that we can't make clever assumptions about how variable * arguments might be handled. The best solution is the @@ -186,7 +184,7 @@ long p1, p2, p3, p4, p5, p6, p7, p8, p9; break; case '0': len = -(*++string - '0'); - if ((len == (char)-2 || len == (char)-3) + if ((len == (char)-2 || len == (char)-3) && *++string == 'd') bufptr += sprintf( bufptr, "%0*ld", len, npop() @@ -321,7 +319,7 @@ long p1, p2, p3, p4, p5, p6, p7, p8, p9; if (x) { /* do nothing; keep executing */ } else { - /* scan forward for %e or %; at + /* scan forward for %e or %; at * level zero */ string++; level = 0; diff --git a/usr/src/lib/libxcurses2/src/libc/xcurses/tparm.c b/usr/src/lib/libxcurses2/src/libc/xcurses/tparm.c index bba9f916ad..6173a81d92 100644 --- a/usr/src/lib/libxcurses2/src/libc/xcurses/tparm.c +++ b/usr/src/lib/libxcurses2/src/libc/xcurses/tparm.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* LINTLIBRARY */ /* @@ -48,7 +46,7 @@ static char rcsID[] = /* * Substitute the given parameters into the given string by the - * following rules (taken from terminfo(5)): + * following rules (taken from terminfo(7)): * * Cursor addressing and other strings requiring parameters * in the terminal are described by a parameterized string diff --git a/usr/src/lib/libzfs/Makefile.com b/usr/src/lib/libzfs/Makefile.com index eba6f3d1f7..628cae354f 100644 --- a/usr/src/lib/libzfs/Makefile.com +++ b/usr/src/lib/libzfs/Makefile.com @@ -58,7 +58,7 @@ OBJECTS= $(OBJS_COMMON) $(OBJS_SHARED) include ../../Makefile.lib -# libzfs must be installed in the root filesystem for mount(1M) +# libzfs must be installed in the root filesystem for mount(8) include ../../Makefile.rootfs LIBS= $(DYNLIB) diff --git a/usr/src/lib/libzfs/common/libzfs.h b/usr/src/lib/libzfs/common/libzfs.h index 3df583f332..0516845d24 100644 --- a/usr/src/lib/libzfs/common/libzfs.h +++ b/usr/src/lib/libzfs/common/libzfs.h @@ -88,8 +88,8 @@ typedef enum zfs_error { EZFS_ZONED, /* used improperly in local zone */ EZFS_MOUNTFAILED, /* failed to mount dataset */ EZFS_UMOUNTFAILED, /* failed to unmount dataset */ - EZFS_UNSHARENFSFAILED, /* unshare(1M) failed */ - EZFS_SHARENFSFAILED, /* share(1M) failed */ + EZFS_UNSHARENFSFAILED, /* unshare(8) failed */ + EZFS_SHARENFSFAILED, /* share(8) failed */ EZFS_PERM, /* permission denied */ EZFS_NOSPC, /* out of space */ EZFS_FAULT, /* bad address */ diff --git a/usr/src/lib/libzfs/common/libzfs_pool.c b/usr/src/lib/libzfs/common/libzfs_pool.c index b06053737c..98a4617e08 100644 --- a/usr/src/lib/libzfs/common/libzfs_pool.c +++ b/usr/src/lib/libzfs/common/libzfs_pool.c @@ -4710,7 +4710,7 @@ zpool_label_disk(libzfs_handle_t *hdl, zpool_handle_t *zhp, const char *name, efi_free(vtoc); zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "try using fdisk(1M) and then provide a specific slice")); + "try using fdisk(8) and then provide a specific slice")); return (zfs_error(hdl, EZFS_LABELFAILED, errbuf)); } diff --git a/usr/src/lib/libzfs/common/libzfs_util.c b/usr/src/lib/libzfs/common/libzfs_util.c index c21159c310..8b5ea59c0e 100644 --- a/usr/src/lib/libzfs/common/libzfs_util.c +++ b/usr/src/lib/libzfs/common/libzfs_util.c @@ -139,9 +139,9 @@ libzfs_error_description(libzfs_handle_t *hdl) case EZFS_UMOUNTFAILED: return (dgettext(TEXT_DOMAIN, "umount failed")); case EZFS_UNSHARENFSFAILED: - return (dgettext(TEXT_DOMAIN, "unshare(1M) failed")); + return (dgettext(TEXT_DOMAIN, "unshare(8) failed")); case EZFS_SHARENFSFAILED: - return (dgettext(TEXT_DOMAIN, "share(1M) failed")); + return (dgettext(TEXT_DOMAIN, "share(8) failed")); case EZFS_UNSHARESMBFAILED: return (dgettext(TEXT_DOMAIN, "smb remove share failed")); case EZFS_SHARESMBFAILED: diff --git a/usr/src/lib/libzfs_core/Makefile.com b/usr/src/lib/libzfs_core/Makefile.com index 5693e9ab0f..47dec8b0ae 100644 --- a/usr/src/lib/libzfs_core/Makefile.com +++ b/usr/src/lib/libzfs_core/Makefile.com @@ -35,7 +35,7 @@ OBJECTS= $(OBJS_COMMON) $(OBJS_SHARED) include ../../Makefile.lib -# libzfs_core must be installed in the root filesystem for mount(1M) +# libzfs_core must be installed in the root filesystem for mount(8) include ../../Makefile.rootfs LIBS= $(DYNLIB) diff --git a/usr/src/lib/libzonecfg/common/libzonecfg.c b/usr/src/lib/libzonecfg/common/libzonecfg.c index 2149c546a1..c1500aa184 100644 --- a/usr/src/lib/libzonecfg/common/libzonecfg.c +++ b/usr/src/lib/libzonecfg/common/libzonecfg.c @@ -1327,7 +1327,7 @@ zonecfg_save(zone_dochandle_t handle) return (Z_MISC_FS); addcomment(handle, "\n DO NOT EDIT THIS " - "FILE. Use zonecfg(1M) instead.\n"); + "FILE. Use zonecfg(8) instead.\n"); /* * Update user_attr first so that it will be older @@ -1412,7 +1412,7 @@ zonecfg_detach_save(zone_dochandle_t handle, uint_t flags) return (err); addcomment(handle, "\n DO NOT EDIT THIS FILE. " - "Use zonecfg(1M) and zoneadm(1M) attach.\n"); + "Use zonecfg(8) and zoneadm(8) attach.\n"); cvp.error = zonecfg_error_func; cvp.warning = zonecfg_error_func; @@ -5136,7 +5136,7 @@ zonecfg_endadminent(zone_dochandle_t handle) } /* - * The privileges available on the system and described in privileges(5) + * The privileges available on the system and described in privileges(7) * fall into four categories with respect to non-global zones: * * Default set of privileges considered safe for all non-global @@ -5154,7 +5154,7 @@ zonecfg_endadminent(zone_dochandle_t handle) * non-global zone. * * Set of privileges required in order to get a zone booted and - * init(1M) started. These cannot be removed from the zone's + * init(8) started. These cannot be removed from the zone's * privilege set. * * All other privileges are optional and are potentially useful for diff --git a/usr/src/lib/libzutil/Makefile.com b/usr/src/lib/libzutil/Makefile.com index f51c13aef2..62ebe5ea4a 100644 --- a/usr/src/lib/libzutil/Makefile.com +++ b/usr/src/lib/libzutil/Makefile.com @@ -23,7 +23,7 @@ OBJECTS= \ include ../../Makefile.lib -# libzutil must be installed in the root filesystem for mount(1M) +# libzutil must be installed in the root filesystem for mount(8) include ../../Makefile.rootfs LIBS= $(DYNLIB) diff --git a/usr/src/lib/nsswitch/ad/common/getgrent.c b/usr/src/lib/nsswitch/ad/common/getgrent.c index 84481bb09f..78d984a606 100644 --- a/usr/src/lib/nsswitch/ad/common/getgrent.c +++ b/usr/src/lib/nsswitch/ad/common/getgrent.c @@ -96,7 +96,7 @@ getbynam(ad_backend_ptr be, void *a) return ((nss_status_t)NSS_NOTFOUND); } - /* Create group(4) style string */ + /* Create group(5) style string */ if (update_buffer(be, argp, name, dname, gid) < 0) return ((nss_status_t)NSS_NOTFOUND); @@ -137,12 +137,12 @@ getbygid(ad_backend_ptr be, void *a) /* * NULL winname implies a local SID or unresolvable SID both of - * which cannot be used to generated group(4) entry + * which cannot be used to generated group(5) entry */ if (winname == NULL) goto out; - /* Create group(4) style string */ + /* Create group(5) style string */ if (update_buffer(be, argp, winname, windomain, argp->key.gid) < 0) goto out; diff --git a/usr/src/lib/nsswitch/ad/common/getpwnam.c b/usr/src/lib/nsswitch/ad/common/getpwnam.c index ff2140b59b..babde81322 100644 --- a/usr/src/lib/nsswitch/ad/common/getpwnam.c +++ b/usr/src/lib/nsswitch/ad/common/getpwnam.c @@ -366,7 +366,7 @@ getbyname(ad_backend_ptr be, void *a) return ((nss_status_t)NSS_NOTFOUND); } - /* Create passwd(4) style string */ + /* Create passwd(5) style string */ if (update_buffer(be, argp, name, dname, be->uid, gid, "", "", "") < 0) return ((nss_status_t)NSS_NOTFOUND); @@ -418,7 +418,7 @@ getbyuid(ad_backend_ptr be, void *a) /* * NULL winname implies a local SID or unresolvable SID both of - * which cannot be used to generated passwd(4) entry + * which cannot be used to generated passwd(5) entry */ if (winname == NULL) goto out; @@ -453,7 +453,7 @@ getbyuid(ad_backend_ptr be, void *a) goto out; } - /* Create passwd(4) style string */ + /* Create passwd(5) style string */ if (update_buffer(be, argp, winname, windomain, argp->key.uid, gid, "", "", "") < 0) goto out; diff --git a/usr/src/lib/nsswitch/ad/common/getspent.c b/usr/src/lib/nsswitch/ad/common/getspent.c index a66d8b122b..ca58a484ae 100644 --- a/usr/src/lib/nsswitch/ad/common/getspent.c +++ b/usr/src/lib/nsswitch/ad/common/getspent.c @@ -105,7 +105,7 @@ getbynam(ad_backend_ptr be, void *a) return ((nss_status_t)NSS_NOTFOUND); } - /* Create shadow(4) style string */ + /* Create shadow(5) style string */ if (update_buffer(be, argp, name, dname) < 0) return ((nss_status_t)NSS_NOTFOUND); diff --git a/usr/src/lib/nsswitch/files/common/getpwnam.c b/usr/src/lib/nsswitch/files/common/getpwnam.c index 570eec84ad..b50eb616cf 100644 --- a/usr/src/lib/nsswitch/files/common/getpwnam.c +++ b/usr/src/lib/nsswitch/files/common/getpwnam.c @@ -180,7 +180,7 @@ validate_passwd_ids(char *line, int *linelenp, int buflen, int extra_chars) int linelen = *linelenp, newlinelen; /* - * +name entries in passwd(4) do not override uid and gid + * +name entries in passwd(5) do not override uid and gid * values. Therefore no need to validate the ids in these * entries. */ diff --git a/usr/src/lib/pam_modules/authtok_check/authtok_check.c b/usr/src/lib/pam_modules/authtok_check/authtok_check.c index 2334b9c9cd..ad45f66b7e 100644 --- a/usr/src/lib/pam_modules/authtok_check/authtok_check.c +++ b/usr/src/lib/pam_modules/authtok_check/authtok_check.c @@ -332,7 +332,7 @@ get_passwd_defaults(pam_handle_t *pamh, char *user, struct pwdefaults *p) syslog(LOG_ERR, "%s: pam_authtok_check: The configured " "minimum password length (PASSLENGTH=%d) is larger than " "the number of significant characters the current " - "encryption algorithm uses (%d). See policy.conf(4) for " + "encryption algorithm uses (%d). See policy.conf(5) for " "alternative password encryption algorithms.", progname); /* this won't lead to failure */ } diff --git a/usr/src/lib/pam_modules/krb5/krb5_setcred.c b/usr/src/lib/pam_modules/krb5/krb5_setcred.c index 743cda3297..5f43c0babc 100644 --- a/usr/src/lib/pam_modules/krb5/krb5_setcred.c +++ b/usr/src/lib/pam_modules/krb5/krb5_setcred.c @@ -568,13 +568,13 @@ error: if (kwarn_del_warning(client_name) != 0) { __pam_log(LOG_AUTH | LOG_NOTICE, "PAM-KRB5 (setcred): kwarn_del_warning" - " failed: ktkt_warnd(1M) down?"); + " failed: ktkt_warnd(8) down?"); } if (kwarn_add_warning(client_name, endtime) != 0) { __pam_log(LOG_AUTH | LOG_NOTICE, "PAM-KRB5 (setcred): kwarn_add_warning" - " failed: ktkt_warnd(1M) down?"); + " failed: ktkt_warnd(8) down?"); } } diff --git a/usr/src/lib/pam_modules/krb5_migrate/krb5_migrate_authenticate.c b/usr/src/lib/pam_modules/krb5_migrate/krb5_migrate_authenticate.c index b437359bfe..f8e19deefa 100644 --- a/usr/src/lib/pam_modules/krb5_migrate/krb5_migrate_authenticate.c +++ b/usr/src/lib/pam_modules/krb5_migrate/krb5_migrate_authenticate.c @@ -331,7 +331,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, /* * Since this is a new krb5 principal, do a pam_set_data() - * for possible use by the acct_mgmt routine of pam_krb5(5) + * for possible use by the acct_mgmt routine of pam_krb5(7) */ if (pam_get_data(pamh, KRB5_AUTOMIGRATE_DATA, (const void **)&olduserdata) == PAM_SUCCESS) { diff --git a/usr/src/lib/pam_modules/unix_cred/unix_cred.c b/usr/src/lib/pam_modules/unix_cred/unix_cred.c index fcaeecb320..036d2fc3f0 100644 --- a/usr/src/lib/pam_modules/unix_cred/unix_cred.c +++ b/usr/src/lib/pam_modules/unix_cred/unix_cred.c @@ -524,7 +524,7 @@ adt_done: default: /* * Resource control assignment failed. Unlike - * newtask(1m), we treat this as an error. + * newtask(1), we treat this as an error. */ if (error < 0) { /* diff --git a/usr/src/lib/passwdutil/files_attr.c b/usr/src/lib/passwdutil/files_attr.c index 8a250b90df..c1021b361c 100644 --- a/usr/src/lib/passwdutil/files_attr.c +++ b/usr/src/lib/passwdutil/files_attr.c @@ -1135,7 +1135,7 @@ files_putpwnam(char *name, char *oldpw, pwu_repository_t *rep, void *buf) /* * NOTE: This is all covered under the repository lock held for updating - * passwd(4) and shadow(4). + * passwd(5) and shadow(5). */ int files_update_history(char *name, struct spwd *spwd) diff --git a/usr/src/lib/passwdutil/ldap_attr.c b/usr/src/lib/passwdutil/ldap_attr.c index 4c43eb7adb..42489c8473 100644 --- a/usr/src/lib/passwdutil/ldap_attr.c +++ b/usr/src/lib/passwdutil/ldap_attr.c @@ -181,7 +181,7 @@ free_ldapbuf(ldapbuf_t *p) * * If the Shadow Update functionality is enabled, then we check to * see if the caller has 0 as the euid or has all zone privs. If so, - * the caller would be able to modify shadow(4) data stored on the + * the caller would be able to modify shadow(5) data stored on the * LDAP server. Otherwise, when LDAP Shadow Update is not enabled, * we can't determine whether the user is "privileged" in the LDAP * sense. The operation should be attempted and will succeed if the diff --git a/usr/src/lib/pkcs11/libpkcs11/common/pkcs11Conf.c b/usr/src/lib/pkcs11/libpkcs11/common/pkcs11Conf.c index dd66f6b808..d33f8808a8 100644 --- a/usr/src/lib/pkcs11/libpkcs11/common/pkcs11Conf.c +++ b/usr/src/lib/pkcs11/libpkcs11/common/pkcs11Conf.c @@ -64,7 +64,7 @@ metaslot_config_t metaslot_config; void (*Tmp_GetThreshold)(void *) = NULL; cipher_mechs_threshold_t meta_mechs_threshold[MAX_NUM_THRESHOLD]; -static const char *conf_err = "See cryptoadm(1M). Skipping this plug-in."; +static const char *conf_err = "See cryptoadm(8). Skipping this plug-in."; /* * Set up metaslot for the framework using either user configuration @@ -95,7 +95,7 @@ setup_metaslot(uentry_t *metaslot_entry) { */ cryptoerror(LOG_ERR, "libpkcs11: Policy invalid or corrupted " - "for metaslot. Use cryptoadm(1M) to fix " + "for metaslot. Use cryptoadm(8) to fix " "this. Disabling metaslot functionality.\n"); metaslot_enabled = B_FALSE; return (rv); @@ -532,7 +532,7 @@ pkcs11_slot_mapping(uentrylist_t *pplist, CK_VOID_PTR pInitArgs) */ cryptoerror(LOG_ERR, "libpkcs11: Policy invalid or corrupted " - "for %s. Use cryptoadm(1M) to fix " + "for %s. Use cryptoadm(8) to fix " "this. Skipping this plug-in.", fullpath); (void) prov_funcs->C_Finalize(NULL); diff --git a/usr/src/lib/print/libpapi-dynamic/common/nss.c b/usr/src/lib/print/libpapi-dynamic/common/nss.c index 5ab245e936..ed665e8567 100644 --- a/usr/src/lib/print/libpapi-dynamic/common/nss.c +++ b/usr/src/lib/print/libpapi-dynamic/common/nss.c @@ -170,7 +170,7 @@ fill_printer_uri_supported(papi_attribute_t ***list) return; } - /* do we have a printers.conf(4) "bsdaddr" to convert */ + /* do we have a printers.conf(5) "bsdaddr" to convert */ papiAttributeListGetString(*list, NULL, "bsdaddr", &string); if (string != NULL) { /* parse it, convert it, add it */ char *uri = bsdaddr_to_uri(*list, string); @@ -184,7 +184,7 @@ fill_printer_uri_supported(papi_attribute_t ***list) } } - /* do we have a printers.conf(4) "rm" (and "rp") to convert */ + /* do we have a printers.conf(5) "rm" (and "rp") to convert */ papiAttributeListGetString(*list, NULL, "rm", &string); if (string != NULL) { char *rp = NULL; diff --git a/usr/src/lib/print/libprint/common/nss_write.c b/usr/src/lib/print/libprint/common/nss_write.c index 0eb6ef7e35..3225598092 100644 --- a/usr/src/lib/print/libprint/common/nss_write.c +++ b/usr/src/lib/print/libprint/common/nss_write.c @@ -141,7 +141,7 @@ _file_put_printer(const char *file, const ns_printer_t *printer) (void) fprintf(ofp, "#\n#\tIf you hand edit this file, comments and structure may change.\n" "#\tThe preferred method of modifying this file is through the use of\n" - "#\tlpset(1M)\n#\n"); + "#\tlpset(8)\n#\n"); /* * Handle the special case of lpset -x all diff --git a/usr/src/lib/smbsrv/libmlsvc/common/smb_autohome.c b/usr/src/lib/smbsrv/libmlsvc/common/smb_autohome.c index c9e634f515..114db29cbb 100644 --- a/usr/src/lib/smbsrv/libmlsvc/common/smb_autohome.c +++ b/usr/src/lib/smbsrv/libmlsvc/common/smb_autohome.c @@ -64,7 +64,7 @@ static void smb_autohome_parse_options(smb_share_t *); static int smb_autohome_add_private(const char *, uid_t, gid_t); /* - * Add an autohome share. See smb_autohome(4) for details. + * Add an autohome share. See smb_autohome(5) for details. * * If share directory contains backslash path separators, they will * be converted to forward slash to support NT/DOS path style for diff --git a/usr/src/pkg/README.pkg b/usr/src/pkg/README.pkg index 6edf5f8465..3822dc9c66 100644 --- a/usr/src/pkg/README.pkg +++ b/usr/src/pkg/README.pkg @@ -29,7 +29,7 @@ Introduction This README describes some basics about creating, modifying, and building packages in ON. All package creation in ON is done using tools available to our customers. If terminology in this document -is confusing, you may wish to review the pkg(5) manpage. +is confusing, you may wish to review the pkg(7) manpage. Packaging Overview ------------------ @@ -150,7 +150,7 @@ available from /opt/onbld/bin or usr/src/tools/scripts/ to setup and upgrade your system. A manpage is available in /opt/onbld/man or usr/src/tools/scripts/onu.1. -Alternatively, you can manually start a pkg.depot(1M) server to +Alternatively, you can manually start a pkg.depot(8) server to serve the generated repository to multiple test machines. Start up a depot on your build machine. @@ -263,7 +263,7 @@ in our manifests. Zones and Packages ------------------ -pkg(5) uses variants to implement zones. If a package is marked +pkg(7) uses variants to implement zones. If a package is marked with both global and non-global zone variants, the package contents will be installed in both global and non-global by default. set name=variant.opensolaris.zone value=global value=nonglobal @@ -289,7 +289,7 @@ add a comment describing why the dependency is required. Moving Content Between Packages and Removing Content ---------------------------------------------------- -pkg(5) tracks when content is removed from packages, and automatically +pkg(7) tracks when content is removed from packages, and automatically removes it. If you need to move content between packages, there are two primary diff --git a/usr/src/prototypes/prototype.man1 b/usr/src/prototypes/prototype.man1 index f1551578b4..ae83f6bfec 100644 --- a/usr/src/prototypes/prototype.man1 +++ b/usr/src/prototypes/prototype.man1 @@ -25,8 +25,8 @@ .\" Each of the following lines should use the Fl and Ar options to .\" indicate the set of supported options and flags. There should be one .\" option and argument per line. If there are independent ways of -.\" invoking the command or independent sub-commands ala zfs(1M) or -.\" dladm(1M), there should be a fresh '.Nm' to indicate that and the +.\" invoking the command or independent sub-commands ala zfs(8) or +.\" dladm(8), there should be a fresh '.Nm' to indicate that and the .\" sub-command should use .Cm. .Sh DESCRIPTION .\" Describe the purpose of the utility, what it does and how it @@ -77,7 +77,7 @@ Description of what oper2 is. .\" .Ev NLSPATH . .\" .Sh CODE SET INDEPENDENCE .\" If there are issues around the code set, indicate so here. See -.\" attributes(5). +.\" attributes(7). .Sh INTERFACE STABILITY .\" When documenting the stability of commands it's useful to .\" distinguish between the stability of the options and the command's diff --git a/usr/src/prototypes/prototype.man3x b/usr/src/prototypes/prototype.man3x index c707abe2d5..52f808ecc8 100644 --- a/usr/src/prototypes/prototype.man3x +++ b/usr/src/prototypes/prototype.man3x @@ -59,13 +59,13 @@ A Reason why ERRNO1 could occur. A Reason why ERRNO2 could occur. .El .Sh INTERFACE STABILITY -.\" Indicate the stability per attributes(5). One of: +.\" Indicate the stability per attributes(7). One of: .\" .Sy Committed .\" .Sy Uncommitted .\" .Sy Volatile .\" .Sy Private .Sh MT-LEVEL -.\" Indicate the MT-Level per attributes(5). If there are exceptions, +.\" Indicate the MT-Level per attributes(7). If there are exceptions, .\" start with the level and go from there. .\" .Sy Safe .\" .Sy Unsafe diff --git a/usr/src/psm/stand/boot/sparc/common/boot_plat.c b/usr/src/psm/stand/boot/sparc/common/boot_plat.c index a06c734b4e..e44831c9c3 100644 --- a/usr/src/psm/stand/boot/sparc/common/boot_plat.c +++ b/usr/src/psm/stand/boot/sparc/common/boot_plat.c @@ -288,7 +288,7 @@ openfile(char *filename) * Get the boot arguments from the PROM and split it into filename and * options components. * - * As per IEEE1275 and boot(1M), the boot arguments will have the syntax + * As per IEEE1275 and boot(8), the boot arguments will have the syntax * "[filename] [-options]". If filename is specified, it is copied into the * first buffer. (Otherwise, the buffer is left alone.) The rest of the string * is copied into the second buffer. diff --git a/usr/src/psm/stand/boot/sparc/common/bootflags.c b/usr/src/psm/stand/boot/sparc/common/bootflags.c index d30e3a1cb3..b167e95bef 100644 --- a/usr/src/psm/stand/boot/sparc/common/bootflags.c +++ b/usr/src/psm/stand/boot/sparc/common/bootflags.c @@ -174,7 +174,7 @@ done: *np++ = '-'; /* - * boot(1M) says to pass these on. + * boot(8) says to pass these on. */ if (boothowto & RB_ASKNAME) *np++ = 'a'; diff --git a/usr/src/test/crypto-tests/doc/README b/usr/src/test/crypto-tests/doc/README index 0c848ac735..3bc99b40f2 100644 --- a/usr/src/test/crypto-tests/doc/README +++ b/usr/src/test/crypto-tests/doc/README @@ -45,7 +45,7 @@ depends on it. 2. Running the KCF/PKCS Unit Test Suite The pre-requisites for running the KCF/PKCS Unit Test Suite are: - - A non-root user with the ability to sudo(1M) to root without a + - A non-root user with the ability to sudo(8) to root without a password or the root user must run the test. Once the pre-requisites are satisfied, simply run the cryptotest script: diff --git a/usr/src/test/libmlrpc-tests/doc/README b/usr/src/test/libmlrpc-tests/doc/README index 43412a4747..c24c97b5ff 100644 --- a/usr/src/test/libmlrpc-tests/doc/README +++ b/usr/src/test/libmlrpc-tests/doc/README @@ -45,7 +45,7 @@ depends on it. 2. Running this Unit Test Suite The pre-requisites for running the this Unit Test Suite are: - - A non-root user with the ability to sudo(1M) to root without a + - A non-root user with the ability to sudo(8) to root without a password or the root user must run the test. (The samlogon test requires a user with 'solaris.smf.read.smb' authorization, such as root.) diff --git a/usr/src/test/os-tests/doc/README b/usr/src/test/os-tests/doc/README index 7e8f5236e8..9a5b881e8a 100644 --- a/usr/src/test/os-tests/doc/README +++ b/usr/src/test/os-tests/doc/README @@ -44,7 +44,7 @@ depends on it. 2. Running the OS Unit Test Suite The pre-requisites for running the OS Unit Test Suite are: - - A non-root user with the ability to sudo(1M) to root without a + - A non-root user with the ability to sudo(8) to root without a password or the root user must run the test. Once the pre-requisites are satisfied, simply run the ostest script: diff --git a/usr/src/test/test-runner/man/run.1 b/usr/src/test/test-runner/man/run.1 index 31cd412452..9ba7ea813c 100644 --- a/usr/src/test/test-runner/man/run.1 +++ b/usr/src/test/test-runner/man/run.1 @@ -80,7 +80,7 @@ executed, and the remaining tests are marked "SKIPPED." Any test that exceeds its \fItimeout\fR is terminated, and marked "KILLED." By default, tests are executed with the credentials of the \fBrun\fR script. -Executing tests with other credentials is done via \fBsudo\fR(1m), which must +Executing tests with other credentials is done via \fBsudo\fR(8), which must be configured to allow execution without prompting for a password. Environment variables from the calling shell are available to individual tests. During test execution, the working directory is changed to \fIoutputdir\fR. @@ -367,4 +367,4 @@ An error occurred. .SH SEE ALSO .sp .LP -\fBsudo\fR(1m) +\fBsudo\fR(8) diff --git a/usr/src/test/zfs-tests/doc/README b/usr/src/test/zfs-tests/doc/README index d7af3457f7..064fa3bbe0 100644 --- a/usr/src/test/zfs-tests/doc/README +++ b/usr/src/test/zfs-tests/doc/README @@ -52,7 +52,7 @@ The pre-requisites for running the ZFS Test Suite are: - Use the '-a' option to the zfstest script and all unused disks on the system are eligible. With '-a' specified, $DISKS is ignored. - A non-root user with the full set of basic privileges and the ability - to sudo(1M) to root without a password to run the test. + to sudo(8) to root without a password to run the test. - Specify any pools you wish to preserve as a space delimited list in the $KEEP variable. The root pool is added automatically. diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh index 54a7ee8456..de535300d0 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh @@ -39,7 +39,7 @@ # STRATEGY: # 1. Create filesystems with copies set as 2,3 respectively; # 2. Copy specified size data into each filesystem; -# 3. Verify that the space is charged as expected with zfs list, ls -s, df(1m), +# 3. Verify that the space is charged as expected with zfs list, ls -s, df(8), # du(1) commands; # @@ -87,7 +87,7 @@ for val in 1 2 3; do check_used $used $val done -log_note "Verify df(1M) can corectly display the space charged." +log_note "Verify df(8) can corectly display the space charged." for val in 1 2 3; do used=`df -F zfs -h /$TESTPOOL/fs_$val/$FILE | grep $TESTPOOL/fs_$val \ | awk '{print $3}'` diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_001_pos.ksh index 68e714a89f..5c4d9b0db0 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_001_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_001_pos.ksh @@ -34,7 +34,7 @@ # # DESCRIPTION: -# Ensure that the clri(1M) utility fails on a ZFS file system. +# Ensure that the clri(8) utility fails on a ZFS file system. # # STRATEGY: # 1. Populate a ZFS directory with a number of files. @@ -51,7 +51,7 @@ function cleanup log_onexit cleanup -log_assert "Ensure that the clri(1M) utility fails on a ZFS file system." +log_assert "Ensure that the clri(8) utility fails on a ZFS file system." populate_dir $NUM_FILES @@ -59,4 +59,4 @@ inode=`ls -i $TESTDIR/$TESTFILE.0 | awk '{print $1}'` log_mustnot clri /dev/rdsk/$DISK $inode log_mustnot clri -F zfs /dev/rdsk/$DISK $inode -log_pass "clri(1M) returned an error as expected." +log_pass "clri(8) returned an error as expected." diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_002_pos.ksh index 81c7ab1bad..7ff89d9968 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_002_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_002_pos.ksh @@ -34,11 +34,11 @@ # # DESCRIPTION: -# Ensure that the labelit(1M) utility fails on a ZFS file system. +# Ensure that the labelit(8) utility fails on a ZFS file system. # # STRATEGY: # 1. Populate a ZFS file system with some files. -# 2. Run labelit(1M) against the device. +# 2. Run labelit(8) against the device. # 3. Ensure it fails. # @@ -55,7 +55,7 @@ function cleanup log_onexit cleanup -log_assert "Ensure that the labelit(1M) utility fails on a ZFS file system." +log_assert "Ensure that the labelit(8) utility fails on a ZFS file system." populate_dir $NUM_FILES @@ -63,4 +63,4 @@ log_must zfs unmount $TESTDIR log_mustnot labelit /dev/rdsk/${DISK}s0 mfiles ${DISK}s0 -log_pass "labelit(1M) returned an error as expected." +log_pass "labelit(8) returned an error as expected." diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_003_pos.ksh index 3678d76332..82bc6a1df4 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_003_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_003_pos.ksh @@ -34,7 +34,7 @@ # # DESCRIPTION: -# Ensure that the fsdb(1M) utility fails on a ZFS file system. +# Ensure that the fsdb(8) utility fails on a ZFS file system. # # STRATEGY: # 1. Populate a ZFS directory with a number of files. @@ -51,7 +51,7 @@ function cleanup log_onexit cleanup -log_assert "Ensure that the fsdb(1M) utility fails on a ZFS file system." +log_assert "Ensure that the fsdb(8) utility fails on a ZFS file system." populate_dir $NUM_FILES inode_num=`ls -li $TESTDIR/$TESTFILE.0 | awk '{print $1}'` @@ -60,4 +60,4 @@ inode_num=`ls -li $TESTDIR/$TESTFILE.0 | awk '{print $1}'` log_mustnot echo ":inode $inode_num" | fsdb /dev/rdsk/${DISK}s0 -log_pass "fsdb(1M) returned an error as expected." +log_pass "fsdb(8) returned an error as expected." diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_004_pos.ksh index 74241a1e57..31d4908394 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_004_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_004_pos.ksh @@ -34,7 +34,7 @@ # # DESCRIPTION: -# Ensure that the quotaon(1M) utility fails on a ZFS file system. +# Ensure that the quotaon(8) utility fails on a ZFS file system. # # STRATEGY: # 1. Enable a quota on a ZFS file system. @@ -51,10 +51,10 @@ function cleanup log_onexit cleanup -log_assert "Ensure that the quotaon(1M) utility fails on a ZFS file system." +log_assert "Ensure that the quotaon(8) utility fails on a ZFS file system." log_must zfs set quota=1099511627776 $TESTPOOL/$TESTFS log_must touch $TESTDIR/quotas log_mustnot quotaon /dev/dsk/${DISK}s0 -log_pass "quotaon(1M) returned an error as expected." +log_pass "quotaon(8) returned an error as expected." diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_005_pos.ksh index 775105a904..7971a8c7e3 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_005_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_005_pos.ksh @@ -34,11 +34,11 @@ # # DESCRIPTION: -# Ensure that the ff(1M) utility fails on a ZFS file system. +# Ensure that the ff(8) utility fails on a ZFS file system. # # STRATEGY: # 1. Populate a ZFS file system with some files. -# 2. Run ff(1M) against the device. +# 2. Run ff(8) against the device. # 3. Ensure it fails. # @@ -51,10 +51,10 @@ function cleanup log_onexit cleanup -log_assert "Ensure that the ff(1M) utility fails on a ZFS file system." +log_assert "Ensure that the ff(8) utility fails on a ZFS file system." populate_dir $NUM_FILES log_mustnot ff -F zfs /dev/rdsk/${DISK}s0 -log_pass "ff(1M) returned an error as expected." +log_pass "ff(8) returned an error as expected." diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_006_pos.ksh index 9c610f74c3..e3a50ec185 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_006_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_006_pos.ksh @@ -34,11 +34,11 @@ # # DESCRIPTION: -# Ensure that the fsirand(1M) utility fails on a ZFS file system. +# Ensure that the fsirand(8) utility fails on a ZFS file system. # # STRATEGY: # 1. Populate a ZFS file system with some files. -# 2. Run fsirand(1M) against the device. +# 2. Run fsirand(8) against the device. # 3. Ensure it fails. # @@ -55,7 +55,7 @@ function cleanup log_onexit cleanup -log_assert "Ensure that the fsirand(1M) utility fails on a ZFS file system." +log_assert "Ensure that the fsirand(8) utility fails on a ZFS file system." populate_dir $NUM_FILES @@ -63,4 +63,4 @@ log_must zfs unmount $TESTDIR log_mustnot fsirand /dev/rdsk/${DISK}s0 -log_pass "fsirand(1M) returned an error as expected." +log_pass "fsirand(8) returned an error as expected." diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_007_pos.ksh index ecb37900c7..2ed6ef2170 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_007_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_007_pos.ksh @@ -34,11 +34,11 @@ # # DESCRIPTION: -# Ensure that the fstyp(1M) utility succeeds on a ZFS file system. +# Ensure that the fstyp(8) utility succeeds on a ZFS file system. # # STRATEGY: # 1. Populate a ZFS file system with some files. -# 2. Run fstyp(1M) against the device. +# 2. Run fstyp(8) against the device. # 3. Ensure it fails. # @@ -55,7 +55,7 @@ function cleanup log_onexit cleanup -log_assert "Ensure that the fstyp(1M) utility succeeds on a ZFS file system." +log_assert "Ensure that the fstyp(8) utility succeeds on a ZFS file system." populate_dir $NUM_FILES @@ -67,4 +67,4 @@ else log_must fstyp /dev/rdsk/${DISK}s0 fi -log_pass "fstyp(1M) returned successfully." +log_pass "fstyp(8) returned successfully." diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_008_pos.ksh index c736265110..0f86150e42 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_008_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_008_pos.ksh @@ -34,11 +34,11 @@ # # DESCRIPTION: -# Ensure that the ncheck(1M) utility fails on a ZFS file system. +# Ensure that the ncheck(8) utility fails on a ZFS file system. # # STRATEGY: # 1. Populate a ZFS file system with some files. -# 2. Run ncheck(1M) against the device. +# 2. Run ncheck(8) against the device. # 3. Ensure it fails. # @@ -55,7 +55,7 @@ function cleanup log_onexit cleanup -log_assert "Ensure that the ncheck(1M) utility fails on a ZFS file system." +log_assert "Ensure that the ncheck(8) utility fails on a ZFS file system." populate_dir $NUM_FILES @@ -63,4 +63,4 @@ log_must zfs unmount $TESTDIR log_mustnot ncheck /dev/rdsk/${DISK}s0 -log_pass "ncheck(1M) returned an error as expected." +log_pass "ncheck(8) returned an error as expected." diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_009_pos.ksh index b7dc013ab5..916e29eaca 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_009_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_009_pos.ksh @@ -34,11 +34,11 @@ # # DESCRIPTION: -# Ensure that the tunefs(1M) utility fails on a ZFS file system. +# Ensure that the tunefs(8) utility fails on a ZFS file system. # # STRATEGY: # 1. Populate a ZFS file system with some files. -# 2. Run tunefs(1M) against the device. +# 2. Run tunefs(8) against the device. # 3. Ensure it fails. # @@ -51,10 +51,10 @@ function cleanup log_onexit cleanup -log_assert "Ensure that the tunefs(1M) utility fails on a ZFS file system." +log_assert "Ensure that the tunefs(8) utility fails on a ZFS file system." populate_dir $NUM_FILES log_mustnot tunefs -m 80 /dev/dsk/${DISK}s0 -log_pass "tunefs(1M) returned an error as expected." +log_pass "tunefs(8) returned an error as expected." diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_007_neg.ksh index 6b3feeafc0..6d88f710fa 100644 --- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_007_neg.ksh +++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_007_neg.ksh @@ -35,7 +35,7 @@ # Creating and writing xattrs on files in snapshot directories fails. Also, # we shouldn't be able to list the xattrs of files in snapshots who didn't have # xattrs when the snapshot was created (the xattr namespace wouldn't have been -# created yet, and snapshots are read-only) See fsattr(5) for more details. +# created yet, and snapshots are read-only) See fsattr(7) for more details. # # STRATEGY: # 1. Create a file and add an xattr to it. diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh index 2fc112ad1b..a8e7778d7e 100644 --- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh +++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh @@ -37,7 +37,7 @@ verify_runnable "global" default_zvol_setup $DISK $VOLSIZE echo "y" | newfs -v /dev/zvol/rdsk/$TESTPOOL/$TESTVOL >/dev/null 2>&1 -(( $? != 0 )) && log_fail "Unable to newfs(1M) $TESTPOOL/$TESTVOL" +(( $? != 0 )) && log_fail "Unable to newfs(8) $TESTPOOL/$TESTVOL" log_must mkdir $TESTDIR log_must mount /dev/zvol/dsk/$TESTPOOL/$TESTVOL $TESTDIR diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh index dfb5d2b996..1e528171cc 100644 --- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh @@ -68,7 +68,7 @@ NUM_WRITES=40 log_must zfs set volsize=128m $TESTPOOL/$TESTVOL echo "y" | newfs -v /dev/zvol/rdsk/$TESTPOOL/$TESTVOL >/dev/null 2>&1 -(( $? != 0 )) && log_fail "Unable to newfs(1M) $TESTPOOL/$TESTVOL" +(( $? != 0 )) && log_fail "Unable to newfs(8) $TESTPOOL/$TESTVOL" log_must mkdir $TESTDIR log_must mount /dev/zvol/dsk/$TESTPOOL/$TESTVOL $TESTDIR diff --git a/usr/src/test/zfs-tests/tests/longevity/slop_space_test.ksh b/usr/src/test/zfs-tests/tests/longevity/slop_space_test.ksh index ac61f961ab..f76a893a57 100644 --- a/usr/src/test/zfs-tests/tests/longevity/slop_space_test.ksh +++ b/usr/src/test/zfs-tests/tests/longevity/slop_space_test.ksh @@ -169,7 +169,7 @@ do # properties in one zfs command and reducing # the overhead caused by the number of times # we wait for a txg to sync (e.g. equal to the - # number of times we execute zfs(1m)) + # number of times we execute zfs(8)) # PROPERTIES="" for j in {1..100} diff --git a/usr/src/tools/cscope-fast/display.c b/usr/src/tools/cscope-fast/display.c index fafad24d23..ddfa859f03 100644 --- a/usr/src/tools/cscope-fast/display.c +++ b/usr/src/tools/cscope-fast/display.c @@ -446,7 +446,7 @@ search(void) pattern); } else if (rc == REGCMPERROR) { (void) sprintf(lastmsg, - "Error in this regcmp(3X) regular expression: %s", + "Error in this regcmp(3C) regular expression: %s", pattern); } else { (void) sprintf(lastmsg, "Could not find the %s: %s", diff --git a/usr/src/tools/cscope-fast/help.c b/usr/src/tools/cscope-fast/help.c index e1b71fc21a..65dd8d6961 100644 --- a/usr/src/tools/cscope-fast/help.c +++ b/usr/src/tools/cscope-fast/help.c @@ -28,8 +28,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * cscope - interactive C symbol cross-reference * @@ -55,7 +53,7 @@ help(void) *tp++ = "type the pattern to search for, and then " "press the RETURN key. For the first 5\n"; *tp++ = "and last 2 input fields, the pattern can be " - "a regcmp(3X) regular expression.\n"; + "a regcmp(3C) regular expression.\n"; *tp++ = "If the search is successful, you can edit " "the file containing a displayed line\n"; *tp++ = "by pointing with the mouse and clicking " @@ -68,7 +66,7 @@ help(void) *tp++ = "pattern to search for, and then press the " "RETURN key. For the first 4 and\n"; *tp++ = "last 2 input fields, the pattern can be a " - "regcmp(3X) regular expression.\n"; + "regcmp(3C) regular expression.\n"; *tp++ = "If the search is successful, you can use " "these command characters:\n\n"; *tp++ = "1-9\tEdit the file containing the displayed " diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh index a33472de8f..77446ffce3 100644 --- a/usr/src/tools/env/illumos.sh +++ b/usr/src/tools/env/illumos.sh @@ -213,7 +213,7 @@ export MAILTO="${MAILTO:-$STAFFER}" # MAILFROM. #export MAILFROM="user@example.com" -# The project (see project(4)) under which to run this build. If not +# The project (see project(5)) under which to run this build. If not # specified, the build is simply run in a new task in the current project. export BUILD_PROJECT='' diff --git a/usr/src/tools/ndrgen/ndrgen.1onbld b/usr/src/tools/ndrgen/ndrgen.1onbld index 7989b4559c..17923679be 100644 --- a/usr/src/tools/ndrgen/ndrgen.1onbld +++ b/usr/src/tools/ndrgen/ndrgen.1onbld @@ -467,7 +467,7 @@ An error occurred. .RE .SH ATTRIBUTES -See the \fBattributes\fR(5) man page for descriptions of the following attributes: +See the \fBattributes\fR(7) man page for descriptions of the following attributes: .sp .sp @@ -482,7 +482,7 @@ Availability SUNWbtool .SH SEE ALSO .LP -\fBcpp\fR(1), \fBrpcgen\fR(1), \fBcc\fR(1B), \fBattributes\fR(5) +\fBcpp\fR(1), \fBrpcgen\fR(1), \fBcc\fR(1B), \fBattributes\fR(7) .SH BUGS .LP Some \fBcpp\fR(1) macros used by \fBndrgen\fR are not understood by \fB/usr/bin/cpp\fR or \fB/usr/sfw/bin/cpp\fR. Simple NDL files generally do not pose a problem. If problems occur, for example, when using unions, use \fB/usr/libexec/cpp\fR or \fBcw\fR. diff --git a/usr/src/tools/scripts/its.reg b/usr/src/tools/scripts/its.reg index 1f40e67fe6..cf03804cf2 100644 --- a/usr/src/tools/scripts/its.reg +++ b/usr/src/tools/scripts/its.reg @@ -65,7 +65,7 @@ # # REGEX (required) # -# A regexp(5) to tokenize a valid, unique key. See NOTES below. +# A regexp(7) to tokenize a valid, unique key. See NOTES below. # # CONTACT # @@ -78,7 +78,7 @@ # NOTES # # REGEX should use parenthesization via \(\) to provide one or more -# tokens to be substituted in *_URLs. See regexp(5) for syntax. +# tokens to be substituted in *_URLs. See regexp(7) for syntax. # # A REGEX for a particular system is required to match any unique keys # that are valid for that system. For the common case, where such a key diff --git a/usr/src/tools/scripts/onu.1onbld b/usr/src/tools/scripts/onu.1onbld index 385d5bd6bd..987db80e65 100644 --- a/usr/src/tools/scripts/onu.1onbld +++ b/usr/src/tools/scripts/onu.1onbld @@ -34,7 +34,7 @@ is a replacement for .I bfu used to update a system with the latest set of IPS packages for the ON -(OS/Net) consolidation of Solaris, using beadm(1M) to create a new Boot +(OS/Net) consolidation of Solaris, using beadm(8) to create a new Boot Environment (BE) and pkg(1) to update the image. .SH OPTIONS .LP @@ -103,7 +103,7 @@ differently from bfu. First, as noted above, onu creates a new BE, rather than updating an existing BE in-place. Second, onu will not install packages that are older than what is already installed in the source BE. Third, conflicts in system configuration files are automatically resolved according -to the files' "preserve" attribute, as described in pkg(5). +to the files' "preserve" attribute, as described in pkg(7). .LP If the .B -d diff --git a/usr/src/tools/scripts/validate_pkg.py b/usr/src/tools/scripts/validate_pkg.py index b2d9bfca80..18a2c0cc77 100644 --- a/usr/src/tools/scripts/validate_pkg.py +++ b/usr/src/tools/scripts/validate_pkg.py @@ -577,7 +577,7 @@ class ManifestTree(DirectoryTree): """ def addmanifest(self, root, mfile, arch, modechecks, exceptions): - """Treats the specified input file as a pkg(5) package + """Treats the specified input file as a pkg(7) package manifest, and extends the ManifestTree dictionary with entries for the actions therein. """ @@ -607,9 +607,9 @@ class ManifestTree(DirectoryTree): # # The dir action is currently fully specified, in that it # lists owner, group, and mode attributes. If that - # changes in pkg(5) code, we'll need to revisit either this + # changes in pkg(7) code, we'll need to revisit either this # code or the ActionInfo() constructor. It's possible - # that the pkg(5) system could be extended to provide a + # that the pkg(7) system could be extended to provide a # mechanism for specifying directory permissions outside # of the individual manifests that deliver files into # those directories. Doing so at time of manifest @@ -644,7 +644,7 @@ class ManifestTree(DirectoryTree): var = None # - # The name of this method changed in pkg(5) build 150, we need to + # The name of this method changed in pkg(7) build 150, we need to # work with both sets. # if hasattr(action, 'get_variants'): @@ -665,7 +665,7 @@ class ManifestTree(DirectoryTree): print("") def adddir(self, mdir, arch, modechecks, exceptions): - """Walks the specified directory looking for pkg(5) manifests. + """Walks the specified directory looking for pkg(7) manifests. """ for mfile in os.listdir(mdir): if (mfile.endswith(".mog") and diff --git a/usr/src/tools/scripts/webrev.sh b/usr/src/tools/scripts/webrev.sh index 104ce0512c..a28e90eb02 100644 --- a/usr/src/tools/scripts/webrev.sh +++ b/usr/src/tools/scripts/webrev.sh @@ -3288,7 +3288,7 @@ print "<table>" # syntax characters) in the email address. # # Otherwise, use the current userid in the form "John Doe (jdoe)", but -# to maintain compatibility with passwd(4), we must support '&' substitutions. +# to maintain compatibility with passwd(5), we must support '&' substitutions. # preparer= if [[ "$SCM_MODE" == git ]]; then diff --git a/usr/src/tools/scripts/xref.sh b/usr/src/tools/scripts/xref.sh index d69a364fda..d765cbe988 100644 --- a/usr/src/tools/scripts/xref.sh +++ b/usr/src/tools/scripts/xref.sh @@ -147,7 +147,7 @@ dirs=$@ # # Get the canonical path to the workspace. This allows xref to work -# even in the presence of lofs(7FS). +# even in the presence of lofs(4FS). # cd $CODEMGR_WS CODEMGR_WS=`/bin/pwd` @@ -202,7 +202,7 @@ for dir in $dirs; do # # NOTE: we cannot use $PWD because it will mislead in the presence - # of lofs(7FS). + # of lofs(4FS). # cd $dir || fail "cannot change to directory $dir" pwd=`/bin/pwd` diff --git a/usr/src/uts/common/Makefile.files b/usr/src/uts/common/Makefile.files index 12dfb48062..0662cb5308 100644 --- a/usr/src/uts/common/Makefile.files +++ b/usr/src/uts/common/Makefile.files @@ -2287,13 +2287,13 @@ BNX_OBJS += \ bnx_lm_send.o # -# mlxcx(7D) +# mlxcx(4D) # MLXCX_OBJS += mlxcx.o mlxcx_dma.o mlxcx_cmd.o mlxcx_intr.o mlxcx_gld.o \ mlxcx_ring.o mlxcx_sensor.o # -# ena(7D) +# ena(4D) # ENA_OBJS += ena.o ena_admin.o ena_dma.o ena_gld.o ena_hw.o ena_intr.o \ ena_stats.o ena_tx.o ena_rx.o diff --git a/usr/src/uts/common/c2/audit_start.c b/usr/src/uts/common/c2/audit_start.c index 49713c6f77..ef0c74a049 100644 --- a/usr/src/uts/common/c2/audit_start.c +++ b/usr/src/uts/common/c2/audit_start.c @@ -90,7 +90,7 @@ audit_init_module() /* * setup environment for asynchronous auditing. We can't use * audit_async_start() here since it assumes the audit system - * has been started via auditd(1m). auditd sets the variable, + * has been started via auditd(8). auditd sets the variable, * auk_auditstate, to indicate audit record generation should * commence. Here we want to always generate an audit record. */ diff --git a/usr/src/uts/common/conf/param.c b/usr/src/uts/common/conf/param.c index 2e41a370aa..9a7a08d380 100644 --- a/usr/src/uts/common/conf/param.c +++ b/usr/src/uts/common/conf/param.c @@ -703,7 +703,7 @@ param_check(void) #if defined(__x86) if (physmem != original_physmem) { cmn_err(CE_NOTE, "physmem cannot be modified to 0x%lx" - " via /etc/system. Please use eeprom(1M) instead.", + " via /etc/system. Please use eeprom(8) instead.", physmem); physmem = original_physmem; } diff --git a/usr/src/uts/common/contract/process.c b/usr/src/uts/common/contract/process.c index 2a78fbb630..3f25547b50 100644 --- a/usr/src/uts/common/contract/process.c +++ b/usr/src/uts/common/contract/process.c @@ -68,7 +68,7 @@ * special casing itself. * * A composite outcome of these two concepts is that we can now create - * a tree of process contracts, rooted at init(1M), which represent + * a tree of process contracts, rooted at init(8), which represent * services and subservices that are reliably observed and can be * restarted when fatal errors occur. The service management framework * (SMF) realizes this structure. @@ -787,7 +787,7 @@ contract_process_init(void) &contract_process_ops, contract_process_default); /* - * Create a template for use with init(1M) and other + * Create a template for use with init(8) and other * kernel-started processes. */ sys_process_tmpl = kmem_alloc(sizeof (ctmpl_process_t), KM_SLEEP); diff --git a/usr/src/uts/common/cpr/cpr_misc.c b/usr/src/uts/common/cpr/cpr_misc.c index ee7cd5ddf4..0510c15e81 100644 --- a/usr/src/uts/common/cpr/cpr_misc.c +++ b/usr/src/uts/common/cpr/cpr_misc.c @@ -201,7 +201,7 @@ cpr_get_config(void) cprconfig_loaded = 1; else { cpr_err(CE_CONT, "invalid config file \"%s\", " - "rerun pmconfig(1M)\n", config_path); + "rerun pmconfig(8)\n", config_path); err = EINVAL; } @@ -255,7 +255,7 @@ cpr_verify_statefile_path(void) "cpr statefile device %s.\n"; static const char path_chg_fmt[] = "Device path for statefile " "has changed from %s to %s.\t%s\n"; - static const char rerun[] = "Please rerun pmconfig(1m)."; + static const char rerun[] = "Please rerun pmconfig(8)."; struct vfs *vfsp = NULL, *vfsp_save = rootvfs; ufsvfs_t *ufsvfsp = (ufsvfs_t *)rootvfs->vfs_data; ufsvfs_t *ufsvfsp_save = ufsvfsp; @@ -406,7 +406,7 @@ cpr_verify_statefile_path(void) if (ufsvfsp_save->vfs_devvp->v_rdev != vp->v_rdev) { cpr_err(CE_CONT, "Filesystem containing " "statefile no longer mounted on device %s. " - "See power.conf(4).", cf->cf_devfs); + "See power.conf(5).", cf->cf_devfs); VN_RELE(vp); return (ENXIO); } diff --git a/usr/src/uts/common/cpr/cpr_mod.c b/usr/src/uts/common/cpr/cpr_mod.c index 623ed0dba0..9bf72dcbcf 100644 --- a/usr/src/uts/common/cpr/cpr_mod.c +++ b/usr/src/uts/common/cpr/cpr_mod.c @@ -131,7 +131,7 @@ cpr(int fcn, void *mdep) static const char noswapstr[] = "reusable statefile requires " "that no swap area be configured.\n"; static const char blockstr[] = "reusable statefile must be " - "a block device. See power.conf(4) and pmconfig(1M).\n"; + "a block device. See power.conf(5) and pmconfig(8).\n"; static const char normalfmt[] = "cannot run normal " "checkpoint/resume when in reusable statefile mode. " "use uadmin A_FREEZE AD_REUSEFINI (uadmin %d %d) " diff --git a/usr/src/uts/common/crypto/api/kcf_random.c b/usr/src/uts/common/crypto/api/kcf_random.c index 64f9e4e68d..b99a834503 100644 --- a/usr/src/uts/common/crypto/api/kcf_random.c +++ b/usr/src/uts/common/crypto/api/kcf_random.c @@ -934,7 +934,7 @@ rnd_handler(void *arg) if (!rng_prov_found && rng_ok_to_log) { cmn_err(CE_WARN, "No randomness provider enabled for " - "/dev/random. Use cryptoadm(1M) to enable a provider."); + "/dev/random. Use cryptoadm(8) to enable a provider."); rng_ok_to_log = B_FALSE; } diff --git a/usr/src/uts/common/crypto/core/kcf_cryptoadm.c b/usr/src/uts/common/crypto/core/kcf_cryptoadm.c index 19fc558088..b7da72060b 100644 --- a/usr/src/uts/common/crypto/core/kcf_cryptoadm.c +++ b/usr/src/uts/common/crypto/core/kcf_cryptoadm.c @@ -1122,7 +1122,7 @@ add_soft_config(char *name, uint_t count, crypto_mech_name_t *array) * This is because the default entries for Software providers * are more up-to-date than possibly stale entries in kcf.conf. * If an entry is to be deleted, the proper way to do it is - * to add it to the disablelist (with cryptoadm(1M)), + * to add it to the disablelist (with cryptoadm(8)), * instead of removing it from the supportedlist. */ if (entry->ce_mechs == NULL) { /* add new mechanisms */ diff --git a/usr/src/uts/common/crypto/core/kcf_prov_tabs.c b/usr/src/uts/common/crypto/core/kcf_prov_tabs.c index 1f69e2dd18..6c5a1ca4bf 100644 --- a/usr/src/uts/common/crypto/core/kcf_prov_tabs.c +++ b/usr/src/uts/common/crypto/core/kcf_prov_tabs.c @@ -62,7 +62,7 @@ * which triggers the removal of the prov_tab entry. * It also calls kcf_remove_mech_provider(). * - * prov_tab entries are not updated from kcf.conf or by cryptoadm(1M). + * prov_tab entries are not updated from kcf.conf or by cryptoadm(8). */ static kcf_provider_desc_t **prov_tab = NULL; kmutex_t prov_tab_mutex; /* ensure exclusive access to the table */ @@ -662,7 +662,7 @@ out: /* * Returns an array of hardware provider descriptors. This routine - * used by cryptoadm(1M). A REFHOLD is done on each descriptor before + * used by cryptoadm(8). A REFHOLD is done on each descriptor before * the array is returned. The entire table can be freed by calling * kcf_free_provider_tab(). * diff --git a/usr/src/uts/common/disp/disp.c b/usr/src/uts/common/disp/disp.c index 2b9662d931..ca49d8610a 100644 --- a/usr/src/uts/common/disp/disp.c +++ b/usr/src/uts/common/disp/disp.c @@ -142,7 +142,7 @@ int rechoose_interval = RECHOOSE_INTERVAL; hrtime_t nosteal_nsec = NOSTEAL_UNINITIALIZED; extern void cmp_set_nosteal_interval(void); -id_t defaultcid; /* system "default" class; see dispadmin(1M) */ +id_t defaultcid; /* system "default" class; see dispadmin(8) */ disp_lock_t transition_lock; /* lock on transitioning threads */ disp_lock_t stop_lock; /* lock on stopped threads */ @@ -290,7 +290,7 @@ dispinit(void) /* * Get the default class ID; this may be later modified via - * dispadmin(1M). This will load the class (normally TS) and that will + * dispadmin(8). This will load the class (normally TS) and that will * call disp_add(), which is why we had to drop cpu_lock first. */ if (getcid(defaultclass, &defaultcid) != 0) { diff --git a/usr/src/uts/common/disp/fx_dptbl.c b/usr/src/uts/common/disp/fx_dptbl.c index d0d5ad8096..cf7c3f5561 100644 --- a/usr/src/uts/common/disp/fx_dptbl.c +++ b/usr/src/uts/common/disp/fx_dptbl.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/proc.h> #include <sys/priocntl.h> #include <sys/class.h> @@ -37,7 +35,7 @@ /* * The purpose of this file is to allow a user to make their own * fx_dptbl. The contents of this file should be included in the - * fx_dptbl(4) man page with proper instructions for making + * fx_dptbl(5) man page with proper instructions for making * and replacing the FX_DPTBL in usr/kernel/sched. * It is recommended that the system calls be used to change the time * quantums instead of re-building the module. diff --git a/usr/src/uts/common/disp/rt_dptbl.c b/usr/src/uts/common/disp/rt_dptbl.c index 768b499ef2..1012b5aef2 100644 --- a/usr/src/uts/common/disp/rt_dptbl.c +++ b/usr/src/uts/common/disp/rt_dptbl.c @@ -28,8 +28,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989, 1990 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/proc.h> #include <sys/priocntl.h> #include <sys/class.h> @@ -41,7 +39,7 @@ /* * The purpose of this file is to allow a user to make their own * rt_dptbl. The contents of this file should be included in the - * rt_dptbl(4) man page with proper instructions for making + * rt_dptbl(5) man page with proper instructions for making * and replacing the RT_DPTBL.kmod in modules/sched. This was the * only way to provide functionality equivalent to the mkboot/cunix * method in SVr4 without having the utilities mkboot/cunix in diff --git a/usr/src/uts/common/disp/ts_dptbl.c b/usr/src/uts/common/disp/ts_dptbl.c index 4399a9bad1..09c7b7615d 100644 --- a/usr/src/uts/common/disp/ts_dptbl.c +++ b/usr/src/uts/common/disp/ts_dptbl.c @@ -28,8 +28,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989, 1990 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/proc.h> #include <sys/priocntl.h> #include <sys/class.h> @@ -41,7 +39,7 @@ /* * The purpose of this file is to allow a user to make their own * ts_dptbl. The contents of this file should be included in the - * ts_dptbl(4) man page with proper instructions for making + * ts_dptbl(5) man page with proper instructions for making * and replacing the TS_DPTBL.kmod in modules/sched. This was the * only way to provide functionality equivalent to the mkboot/cunix * method in SVr4 without having the utilities mkboot/cunix in diff --git a/usr/src/uts/common/dtrace/dcpc.c b/usr/src/uts/common/dtrace/dcpc.c index 9da817537c..9e2b42e457 100644 --- a/usr/src/uts/common/dtrace/dcpc.c +++ b/usr/src/uts/common/dtrace/dcpc.c @@ -75,7 +75,7 @@ * A consumer will fail to enable probes when resources are currently in use. * * The cpc provider contends for shared hardware resources along with other - * consumers of the kernel CPU performance counter subsystem (e.g. cpustat(1M)). + * consumers of the kernel CPU performance counter subsystem (e.g. cpustat(8)). * Only one such consumer can use the performance counters at any one time and * counters are made available on a first-come, first-served basis. As with * cpustat, the cpc provider has priority over per-LWP libcpc usage (e.g. diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c index 0fd20b7f45..f3a78f5f69 100644 --- a/usr/src/uts/common/dtrace/dtrace.c +++ b/usr/src/uts/common/dtrace/dtrace.c @@ -151,7 +151,7 @@ hrtime_t dtrace_unregister_defunct_reap = (hrtime_t)60 * NANOSEC; /* * DTrace External Variables * - * As dtrace(7D) is a kernel module, any DTrace variables are obviously + * As dtrace(4D) is a kernel module, any DTrace variables are obviously * available to DTrace consumers via the backtick (`) syntax. One of these, * dtrace_zero, is made deliberately so: it is provided as a source of * well-known, zero-filled memory. While this variable is not documented, diff --git a/usr/src/uts/common/fs/mntfs/mntvnops.c b/usr/src/uts/common/fs/mntfs/mntvnops.c index 7374820f95..6bb3b514fb 100644 --- a/usr/src/uts/common/fs/mntfs/mntvnops.c +++ b/usr/src/uts/common/fs/mntfs/mntvnops.c @@ -54,7 +54,7 @@ extern void vfs_mnttab_readop(void); * mntfs provides two methods of reading the in-kernel mnttab, i.e. the state of * the mounted resources: the read-only file /etc/mnttab, and a collection of * ioctl() commands. Most of these interfaces are public and are described in - * mnttab(4). Three private ioctl() commands, MNTIOC_GETMNTENT, + * mnttab(5). Three private ioctl() commands, MNTIOC_GETMNTENT, * MNTIOC_GETEXTMNTENT and MNTIOC_GETMNTANY, provide for the getmntent(3C) * family of functions, allowing them to support white space in mount names. * @@ -1039,7 +1039,7 @@ mntgetattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, /* * The mntnode already has at least one snapshot from * which to take the size; the user will understand from - * mnttab(4) that the current size of the in-kernel + * mnttab(5) that the current size of the in-kernel * mnttab is irrelevant. */ size = rsnapp->mnts_nmnts ? rsnapp->mnts_text_size : @@ -1186,7 +1186,7 @@ mntinactive(vnode_t *vp, cred_t *cr, caller_context_t *ct) * has a special meaning for /etc/mnttab: it forces mntfs to refresh the * snapshot at the next ioctl(). * - * mnttab(4) explains that "the snapshot...is taken any time a read(2) is + * mnttab(5) explains that "the snapshot...is taken any time a read(2) is * performed at offset 0". We therefore ignore the read snapshot here. */ /* ARGSUSED */ diff --git a/usr/src/uts/common/fs/nfs/nfs4_idmap.c b/usr/src/uts/common/fs/nfs/nfs4_idmap.c index c0e2492d56..0eb449b5ef 100644 --- a/usr/src/uts/common/fs/nfs/nfs4_idmap.c +++ b/usr/src/uts/common/fs/nfs/nfs4_idmap.c @@ -31,11 +31,11 @@ * mapping code is executing on the client or server. Thus, the following * rules represents the latest incantation of the id mapping policies. * - * 1) For the case in which the nfsmapid(1m) daemon has _never_ been + * 1) For the case in which the nfsmapid(8) daemon has _never_ been * started, the policy is to _always_ work with stringified uid's * and gid's * - * 2) For the case in which the nfsmapid(1m) daemon _was_ started but + * 2) For the case in which the nfsmapid(8) daemon _was_ started but * has either died or become unresponsive, the mapping policies are * as follows: * @@ -72,7 +72,7 @@ * `-------------------------------'---------------------------------' * * 3) Lastly, in order to leverage better cache utilization whenever - * communication with nfsmapid(1m) is currently hindered, cache + * communication with nfsmapid(8) is currently hindered, cache * entry eviction is throttled whenever nfsidmap_daemon_dh == NULL. * * @@ -80,28 +80,28 @@ * ==================================================== * * GETATTR - Server-side GETATTR *id to attr string conversion policies - * for unresponsive/dead nfsmapid(1m) daemon + * for unresponsive/dead nfsmapid(8) daemon * * a) If the *id is *ID_NOBODY, the string "nobody" is returned * - * b) If the *id is not *ID_NOBODY _and_ the nfsmapid(1m) daemon + * b) If the *id is not *ID_NOBODY _and_ the nfsmapid(8) daemon * _is_ operational, the daemon is contacted to convert the * [u/g]id into a string of type "[user/group]@domain" * - * c) If the nfsmapid(1m) daemon has died or has become unresponsive, + * c) If the nfsmapid(8) daemon has died or has become unresponsive, * the server returns status == NFS4_OK for the GETATTR operation, * and returns a strigified [u/g]id to let the client map it into * the appropriate value. * * SETATTR - Server-side SETATTR attr string to *id conversion policies - * for unresponsive/dead nfsmapid(1m) daemon + * for unresponsive/dead nfsmapid(8) daemon * * a) If the otw string is a stringified uid (ie. does _not_ contain * an '@' sign and is of the form "12345") then the literal uid is * decoded and it is used to perform the mapping. * * b) If, on the other hand, the otw string _is_ of the form - * "[user/group]@domain" and problems arise contacting nfsmapid(1m), + * "[user/group]@domain" and problems arise contacting nfsmapid(8), * the SETATTR operation _must_ fail w/NFS4ERR_DELAY, as the server * cannot default to *ID_NOBODY, which would allow a file to be * given away by setting it's owner or owner_group to "nobody". @@ -329,7 +329,7 @@ nfs_idmap_str_uid(utf8string *u8s, uid_t *uid, bool_t isserver) } /* - * Start-off with upcalls disabled, and once nfsmapid(1m) is up and + * Start-off with upcalls disabled, and once nfsmapid(8) is up and * running, we'll leverage it's first flush to let the kernel know * when it's up and available to perform mappings. Also, on client * only, be smarter about when to issue upcalls by checking the @@ -399,7 +399,7 @@ retry: /* * string came in as stringified id. Don't cache ! * - * nfsmapid(1m) semantics have changed in order to + * nfsmapid(8) semantics have changed in order to * support diskless clients. Thus, for stringified * id's that have passwd/group entries, we'll go * ahead and map them, returning no error. @@ -538,7 +538,7 @@ nfs_idmap_uid_str(uid_t uid, utf8string *u8s, bool_t isserver) } /* - * Start-off with upcalls disabled, and once nfsmapid(1m) is + * Start-off with upcalls disabled, and once nfsmapid(8) is * up and running, we'll leverage it's first flush to let the * kernel know when it's up and available to perform mappings. * We fall back to answering with stringified uid's. @@ -708,7 +708,7 @@ nfs_idmap_str_gid(utf8string *u8s, gid_t *gid, bool_t isserver) } /* - * Start-off with upcalls disabled, and once nfsmapid(1m) is up and + * Start-off with upcalls disabled, and once nfsmapid(8) is up and * running, we'll leverage it's first flush to let the kernel know * when it's up and available to perform mappings. Also, on client * only, be smarter about when to issue upcalls by checking the @@ -779,7 +779,7 @@ retry: /* * string came in as stringified id. Don't cache ! * - * nfsmapid(1m) semantics have changed in order to + * nfsmapid(8) semantics have changed in order to * support diskless clients. Thus, for stringified * id's that have passwd/group entries, we'll go * ahead and map them, returning no error. @@ -918,7 +918,7 @@ nfs_idmap_gid_str(gid_t gid, utf8string *u8s, bool_t isserver) } /* - * Start-off with upcalls disabled, and once nfsmapid(1m) is + * Start-off with upcalls disabled, and once nfsmapid(8) is * up and running, we'll leverage it's first flush to let the * kernel know when it's up and available to perform mappings. * We fall back to answering with stringified gid's. @@ -1119,7 +1119,7 @@ nfs_idmap_args(struct nfsidmap_args *idmp) nfs_idmap_cache_flush(&nig->s2g_ci); /* - * nfsmapid(1m) up and running; enable upcalls + * nfsmapid(8) up and running; enable upcalls * State: * 0 Just flush caches * 1 Re-establish door knob @@ -1309,7 +1309,7 @@ nfs_idmap_cache_s2i_lkup(idmap_cache_info_t *cip, utf8string *u8s, * Check entry for staleness first, as user's id * may have changed and may need to be remapped. * Note that we don't evict entries from the cache - * if we're having trouble contacting nfsmapid(1m) + * if we're having trouble contacting nfsmapid(8) */ if (TIMEOUT(p->id_time) && (*cip->nfsidmap_daemon_dh) != NULL) { nfs_idmap_cache_rment(p); @@ -1405,7 +1405,7 @@ nfs_idmap_cache_s2i_insert(idmap_cache_info_t *cip, uid_t id, utf8string *u8s, * Check entry for staleness first, as user's id * may have changed and may need to be remapped. * Note that we don't evict entries from the cache - * if we're having trouble contacting nfsmapid(1m) + * if we're having trouble contacting nfsmapid(8) */ if (TIMEOUT(p->id_time) && (*cip->nfsidmap_daemon_dh) != NULL) { nfs_idmap_cache_rment(p); @@ -1486,7 +1486,7 @@ nfs_idmap_cache_i2s_lkup(idmap_cache_info_t *cip, uid_t id, uint_t *hashno, * Check entry for staleness first, as user's id * may have changed and may need to be remapped. * Note that we don't evict entries from the cache - * if we're having trouble contacting nfsmapid(1m) + * if we're having trouble contacting nfsmapid(8) */ if (TIMEOUT(p->id_time) && (*cip->nfsidmap_daemon_dh) != NULL) { nfs_idmap_cache_rment(p); @@ -1570,7 +1570,7 @@ nfs_idmap_cache_i2s_insert(idmap_cache_info_t *cip, uid_t id, utf8string *u8s, * Check entry for staleness first, as user's id * may have changed and may need to be remapped. * Note that we don't evict entries from the cache - * if we're having trouble contacting nfsmapid(1m) + * if we're having trouble contacting nfsmapid(8) */ if (TIMEOUT(p->id_time) && (*cip->nfsidmap_daemon_dh) != NULL) { nfs_idmap_cache_rment(p); diff --git a/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c b/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c index a9ee217a8b..13e5320752 100644 --- a/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c +++ b/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c @@ -2093,7 +2093,7 @@ rfs4_fattr4_owner(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, * occur. Please refer to nfs4_idmap.c for details. * * Any other errors, such as the mapping not being found by - * nfsmapid(1m), and interrupted clnt_call, etc, will result + * nfsmapid(8), and interrupted clnt_call, etc, will result * in NFS4ERR_BADOWNER. * * XXX need to return consistent errors, perhaps all @@ -2206,7 +2206,7 @@ rfs4_fattr4_owner_group(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, * cannot occur. Please refer to nfs4_idmap.c for details. * * Any other errors, such as the mapping not being found by - * nfsmapid(1m), and interrupted clnt_call, etc, will result + * nfsmapid(8), and interrupted clnt_call, etc, will result * in NFS4ERR_BADOWNER. * * XXX need to return consistent errors, perhaps all diff --git a/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c b/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c index 83c84b7892..d0950dd6f0 100644 --- a/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c +++ b/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c @@ -1906,7 +1906,7 @@ nfs4_trigger_domount(vnode_t *stubvp, domount_args_t *dma, vfs_t **vfsp, uap->flags = MS_SYSSPACE | MS_DATA; /* fstype-independent mount options not covered elsewhere */ - /* copy parent's mount(1M) "-m" flag */ + /* copy parent's mount(8) "-m" flag */ if (stubvfsp->vfs_flag & VFS_NOMNTTAB) uap->flags |= MS_NOMNTTAB; diff --git a/usr/src/uts/common/fs/nfs/nfs_auth.c b/usr/src/uts/common/fs/nfs/nfs_auth.c index e132346545..3ee8bb07f6 100644 --- a/usr/src/uts/common/fs/nfs/nfs_auth.c +++ b/usr/src/uts/common/fs/nfs/nfs_auth.c @@ -219,7 +219,7 @@ nfsauth_zone_init(nfs_globals_t *ng) nag = kmem_zalloc(sizeof (*nag), KM_SLEEP); /* - * mountd can be restarted by smf(5). We need to make sure + * mountd can be restarted by smf(7). We need to make sure * the updated door handle will safely make it to mountd_dh. */ mutex_init(&nag->mountd_lock, NULL, MUTEX_DEFAULT, NULL); @@ -462,7 +462,7 @@ retry: if (dh == NULL) { /* * The rendezvous point has not been established yet! - * This could mean that either mountd(1m) has not yet + * This could mean that either mountd(8) has not yet * been started or that _this_ routine nuked the door * handle after receiving an EINTR for a REVOKED door. * @@ -523,8 +523,8 @@ retry: /* * The server barfed and revoked * the (existing) door on us; we - * want to wait to give smf(5) a - * chance to restart mountd(1m) + * want to wait to give smf(7) a + * chance to restart mountd(8) * and establish a new door handle. */ mutex_enter(&nag->mountd_lock); diff --git a/usr/src/uts/common/fs/nfs/nfs_cmd.c b/usr/src/uts/common/fs/nfs/nfs_cmd.c index 40775bb231..b9d23ba0d6 100644 --- a/usr/src/uts/common/fs/nfs/nfs_cmd.c +++ b/usr/src/uts/common/fs/nfs/nfs_cmd.c @@ -138,7 +138,7 @@ retry: if (dh == NULL) { /* * The rendezvous point has not been established yet ! - * This could mean that either mountd(1m) has not yet + * This could mean that either mountd(8) has not yet * been started or that _this_ routine nuked the door * handle after receiving an EINTR for a REVOKED door. * @@ -176,8 +176,8 @@ retry: /* * The server barfed and revoked * the (existing) door on us; we - * want to wait to give smf(5) a - * chance to restart mountd(1m) + * want to wait to give smf(7) a + * chance to restart mountd(8) * and establish a new door handle. */ mutex_enter(&ncg->nfscmd_lock); diff --git a/usr/src/uts/common/fs/nfs/nfs_stats.c b/usr/src/uts/common/fs/nfs/nfs_stats.c index 97f820d756..13466a4f33 100644 --- a/usr/src/uts/common/fs/nfs/nfs_stats.c +++ b/usr/src/uts/common/fs/nfs/nfs_stats.c @@ -34,7 +34,7 @@ /* * Key to retrieve per-zone data corresponding to NFS kstats consumed by - * nfsstat(1m). + * nfsstat(8). */ zone_key_t nfsstat_zone_key; diff --git a/usr/src/uts/common/fs/pcfs/pc_node.c b/usr/src/uts/common/fs/pcfs/pc_node.c index 84a29f4430..bf01336c6f 100644 --- a/usr/src/uts/common/fs/pcfs/pc_node.c +++ b/usr/src/uts/common/fs/pcfs/pc_node.c @@ -667,7 +667,7 @@ pc_mark_irrecov(struct pcfs *fsp) "an irrecoverable error was encountered.\n" "File damage is possible. To prevent further\n" "damage, this pcfs instance will now be frozen.\n" - "Use umount(1M) to release the instance.\n"); + "Use umount(8) to release the instance.\n"); (void) pc_unlockfs(fsp); } } diff --git a/usr/src/uts/common/fs/pcfs/pc_vfsops.c b/usr/src/uts/common/fs/pcfs/pc_vfsops.c index 7b2205e1d7..60041a3d71 100644 --- a/usr/src/uts/common/fs/pcfs/pc_vfsops.c +++ b/usr/src/uts/common/fs/pcfs/pc_vfsops.c @@ -589,7 +589,7 @@ pcfs_parse_mntopts(struct pcfs *fsp) /* * The "secsize=..." mount option is a workaround for the lack of - * lofi(7d) support for DKIOCGMEDIAINFO. If PCFS wants to parse the + * lofi(4D) support for DKIOCGMEDIAINFO. If PCFS wants to parse the * partition table of a disk image and it has been partitioned with * sector sizes other than 512 bytes, we'd fail on loopback'ed disk * images. @@ -1988,7 +1988,7 @@ parseBPB(struct pcfs *fsp, uchar_t *bpb, int *valid) mediasize = (len_t)totsec * (len_t)secsize; /* * This is not an error because not all devices support the - * dkio(7i) mediasize queries, and/or not all devices are + * dkio(4I) mediasize queries, and/or not all devices are * partitioned. If we have not been able to figure out the * size of the underlaying medium, we have to trust the BPB. */ @@ -2286,7 +2286,7 @@ recheck: * * Test whether the device is: * - a floppy device from a known controller type via DKIOCINFO - * - a real floppy using the fd(7d) driver and capable of fdio(7I) ioctls + * - a real floppy using the fd(4D) driver and capable of fdio(4I) ioctls * - a USB floppy drive (identified by drive geometry) * * Detecting a floppy will make PCFS metadata updates on such media synchronous, @@ -2381,7 +2381,7 @@ pcfs_device_getinfo(struct pcfs *fsp) arg.mi.dki_media_type == DK_JAZ); /* - * if this device understands fdio(7I) requests it's + * if this device understands fdio(4I) requests it's * obviously a floppy drive. */ if (!isfloppy && @@ -2390,7 +2390,7 @@ pcfs_device_getinfo(struct pcfs *fsp) /* * some devices we like to treat as floppies, but they don't - * understand fdio(7I) requests. + * understand fdio(4I) requests. */ if (!isfloppy && !ldi_ioctl(lh, DKIOCINFO, argp, FKIOCTL, cr, NULL) && diff --git a/usr/src/uts/common/fs/portfs/port.c b/usr/src/uts/common/fs/portfs/port.c index 91d998b4b5..dd32c82434 100644 --- a/usr/src/uts/common/fs/portfs/port.c +++ b/usr/src/uts/common/fs/portfs/port.c @@ -156,7 +156,7 @@ * interested on. * The internal pollwakeup() function is used by all the file * systems --which are supporting the VOP_POLL() interface- to notify - * the upper layer (poll(2), devpoll(7d) and now event ports) about + * the upper layer (poll(2), devpoll(4D) and now event ports) about * the event triggered (see valid events in poll(2)). * The pollwakeup() function forwards the event to the layer registered * to receive the current event. diff --git a/usr/src/uts/common/fs/portfs/port_fd.c b/usr/src/uts/common/fs/portfs/port_fd.c index a1a1d6fb68..511c15e979 100644 --- a/usr/src/uts/common/fs/portfs/port_fd.c +++ b/usr/src/uts/common/fs/portfs/port_fd.c @@ -230,7 +230,7 @@ port_associate_fd(port_t *pp, int source, uintptr_t object, int events, * Allocate a polldat_t structure per fd * The use of the polldat_t structure to cache file descriptors * is required to be able to share the pollwakeup() function - * with poll(2) and devpoll(7d). + * with poll(2) and devpoll(4D). */ pfd = kmem_zalloc(sizeof (portfd_t), KM_SLEEP); pdp = PFTOD(pfd); diff --git a/usr/src/uts/common/fs/proc/prvnops.c b/usr/src/uts/common/fs/proc/prvnops.c index 90fb0a1736..fe196288fb 100644 --- a/usr/src/uts/common/fs/proc/prvnops.c +++ b/usr/src/uts/common/fs/proc/prvnops.c @@ -6038,7 +6038,7 @@ prseek(vnode_t *vp, offset_t ooff, offset_t *noffp, caller_context_t *ct) /* * We use the p_execdir member of proc_t to expand the %d token in core file * paths (the directory path for the executable that dumped core; see - * coreadm(1M) for details). We'd like gcore(1) to be able to expand %d in + * coreadm(8) for details). We'd like gcore(1) to be able to expand %d in * the same way as core dumping from the kernel, but there's no convenient * and comprehensible way to export the path name for p_execdir. To solve * this, we try to find the actual path to the executable that was used. In diff --git a/usr/src/uts/common/fs/sockfs/nl7c.c b/usr/src/uts/common/fs/sockfs/nl7c.c index c76dada8d7..a71572cbd4 100644 --- a/usr/src/uts/common/fs/sockfs/nl7c.c +++ b/usr/src/uts/common/fs/sockfs/nl7c.c @@ -598,7 +598,7 @@ done: /* * Open and read each line from "/etc/nca/ncalogd.conf" and parse for - * the tokens and token text (i.e. key and value ncalogd.conf(4)): + * the tokens and token text (i.e. key and value ncalogd.conf(5)): * * status=enabled * diff --git a/usr/src/uts/common/fs/sockfs/nl7clogd.c b/usr/src/uts/common/fs/sockfs/nl7clogd.c index 1580a08c6c..4dd40abf2d 100644 --- a/usr/src/uts/common/fs/sockfs/nl7clogd.c +++ b/usr/src/uts/common/fs/sockfs/nl7clogd.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/sysmacros.h> #include <sys/callb.h> #include <sys/fcntl.h> @@ -53,7 +51,7 @@ static void logit_flush(void *); * NL7C reuses the NCA logging scheme, the directory "/var/nca" contains * the symlink "current" to 1 of up to 16 NCA BLF logging files, by default * a single logging file "log", optionally paths of up to 16 log files can - * be specified via ncalogd.conf(4), note that these log files need not be + * be specified via ncalogd.conf(5), note that these log files need not be * in the "/var/nca" directory. * * NL7C reuses the NCA logging APIs defined in <inet/nca/ncalogd.h>, at diff --git a/usr/src/uts/common/fs/sockfs/sockcommon_sops.c b/usr/src/uts/common/fs/sockfs/sockcommon_sops.c index 0e02bbbabb..4c8784e974 100644 --- a/usr/src/uts/common/fs/sockfs/sockcommon_sops.c +++ b/usr/src/uts/common/fs/sockfs/sockcommon_sops.c @@ -174,7 +174,7 @@ so_bind(struct sonode *so, struct sockaddr *name, socklen_t namelen, /* * Force a zero sa_family to match so_family. * - * Some programs like inetd(1M) don't set the + * Some programs like inetd(8) don't set the * family field. Other programs leave * sin_family set to garbage - SunOS 4.X does * not check the family field on a bind. diff --git a/usr/src/uts/common/fs/sockfs/sockfilter.c b/usr/src/uts/common/fs/sockfs/sockfilter.c index a2ac9a3fbb..1fa4efe59f 100644 --- a/usr/src/uts/common/fs/sockfs/sockfilter.c +++ b/usr/src/uts/common/fs/sockfs/sockfilter.c @@ -41,7 +41,7 @@ * * Socket filter entry (sof_entry_t): * - * There exists one entry for each configured filter (done via soconfig(1M)), + * There exists one entry for each configured filter (done via soconfig(8)), * and they are all in sof_entry_list. In addition to the global list, each * sockparams entry maintains a list of filters that is interested in that * particular socket type. So the filter entry may be referenced by multiple diff --git a/usr/src/uts/common/fs/sockfs/sockfilter_impl.h b/usr/src/uts/common/fs/sockfs/sockfilter_impl.h index 7f7aece1f1..e9a09bad88 100644 --- a/usr/src/uts/common/fs/sockfs/sockfilter_impl.h +++ b/usr/src/uts/common/fs/sockfs/sockfilter_impl.h @@ -78,7 +78,7 @@ struct sof_entry_kstat { /* * Socket filter entry - one for each configured filter (added and - * removed by soconfig(1M)). + * removed by soconfig(8)). * * sofe_flags, sofe_refcnt and sofe_mod are protected by sofe_lock, and all * other fields are write once. @@ -104,7 +104,7 @@ struct sof_entry { /* Filter entry flags */ #define SOFEF_AUTO 0x1 /* automatic filter */ #define SOFEF_PROG 0x2 /* programmatic filter */ -#define SOFEF_CONDEMED 0x4 /* removed by soconfig(1M) */ +#define SOFEF_CONDEMED 0x4 /* removed by soconfig(8) */ /* * Socket filter instance - one for each socket using a sof_entry_t diff --git a/usr/src/uts/common/fs/sockfs/sockparams.c b/usr/src/uts/common/fs/sockfs/sockparams.c index 1015decaac..86cbced50c 100644 --- a/usr/src/uts/common/fs/sockfs/sockparams.c +++ b/usr/src/uts/common/fs/sockfs/sockparams.c @@ -64,7 +64,7 @@ static int sockparams_sdev_init(struct sockparams *, char *, int); static void sockparams_sdev_fini(struct sockparams *); /* - * Global sockparams list (populated via soconfig(1M)). + * Global sockparams list (populated via soconfig(8)). */ static list_t sphead; diff --git a/usr/src/uts/common/fs/sockfs/socktpi.c b/usr/src/uts/common/fs/sockfs/socktpi.c index b8d83105e8..0e9883498b 100644 --- a/usr/src/uts/common/fs/sockfs/socktpi.c +++ b/usr/src/uts/common/fs/sockfs/socktpi.c @@ -865,7 +865,7 @@ sotpi_bindlisten(struct sonode *so, struct sockaddr *name, /* * Force a zero sa_family to match so_family. * - * Some programs like inetd(1M) don't set the + * Some programs like inetd(8) don't set the * family field. Other programs leave * sin_family set to garbage - SunOS 4.X does * not check the family field on a bind. @@ -6518,7 +6518,7 @@ socktpi_init(void) { /* * Create sonode caches. We create a special one for AF_UNIX so - * that we can track them for netstat(1m). + * that we can track them for netstat(8). */ socktpi_cache = kmem_cache_create("socktpi_cache", sizeof (struct sotpi_sonode), 0, socktpi_constructor, diff --git a/usr/src/uts/common/fs/ufs/lufs_log.c b/usr/src/uts/common/fs/ufs/lufs_log.c index 2ec3f7907c..052c53d507 100644 --- a/usr/src/uts/common/fs/ufs/lufs_log.c +++ b/usr/src/uts/common/fs/ufs/lufs_log.c @@ -1591,7 +1591,7 @@ ldl_seterror(ml_unit_t *ul, char *why) cmn_err(CE_WARN, "%s", why); cmn_err(CE_WARN, "ufs log for %s changed state to Error", ul->un_ufsvfs->vfs_fs->fs_fsmnt); - cmn_err(CE_WARN, "Please umount(1M) %s and run fsck(1M)", + cmn_err(CE_WARN, "Please umount(8) %s and run fsck(8)", ul->un_ufsvfs->vfs_fs->fs_fsmnt); /* diff --git a/usr/src/uts/common/fs/ufs/ufs_alloc.c b/usr/src/uts/common/fs/ufs/ufs_alloc.c index ee7d99143e..3b052f75c0 100644 --- a/usr/src/uts/common/fs/ufs/ufs_alloc.c +++ b/usr/src/uts/common/fs/ufs/ufs_alloc.c @@ -381,7 +381,7 @@ loop: rw_exit(&ip->i_contents); VN_RELE(ITOV(ip)); cmn_err(CE_WARN, - "%s: unexpected allocated inode %d, run fsck(1M)%s", + "%s: unexpected allocated inode %d, run fsck(8)%s", fs->fs_fsmnt, (int)ino, (TRANS_ISTRANS(ufsvfsp) ? " -o f" : "")); goto loop; @@ -406,7 +406,7 @@ loop: if (ip->i_size) { cmn_err(CE_WARN, - "%s: free inode %d had size 0x%llx, run fsck(1M)%s", + "%s: free inode %d had size 0x%llx, run fsck(8)%s", fs->fs_fsmnt, (int)ino, ip->i_size, (TRANS_ISTRANS(ufsvfsp) ? " -o f" : "")); } diff --git a/usr/src/uts/common/fs/ufs/ufs_inode.c b/usr/src/uts/common/fs/ufs/ufs_inode.c index ea42eed6e4..35b66b203c 100644 --- a/usr/src/uts/common/fs/ufs/ufs_inode.c +++ b/usr/src/uts/common/fs/ufs/ufs_inode.c @@ -612,7 +612,7 @@ again: vp->v_vfsp = &EIO_vfs; VN_RELE(vp); cmn_err(CE_NOTE, - "%s: unexpected free inode %d, run fsck(1M)%s", + "%s: unexpected free inode %d, run fsck(8)%s", fs->fs_fsmnt, (int)ino, (TRANS_ISTRANS(ufsvfsp) ? " -o f" : "")); return (EIO); diff --git a/usr/src/uts/common/fs/ufs/ufs_vfsops.c b/usr/src/uts/common/fs/ufs/ufs_vfsops.c index afd43e7e63..390319bfef 100644 --- a/usr/src/uts/common/fs/ufs/ufs_vfsops.c +++ b/usr/src/uts/common/fs/ufs/ufs_vfsops.c @@ -983,7 +983,7 @@ mountfs(struct vfs *vfsp, enum whymountroot why, struct vnode *devvp, */ if (!(vfsp->vfs_flag & VFS_RDONLY)) { cmn_err(CE_WARN, "Error accessing ufs " - "log for %s; Please run fsck(1M)", path); + "log for %s; Please run fsck(8)", path); goto out; } } diff --git a/usr/src/uts/common/fs/xattr.c b/usr/src/uts/common/fs/xattr.c index 2326a42747..ffa68a362e 100644 --- a/usr/src/uts/common/fs/xattr.c +++ b/usr/src/uts/common/fs/xattr.c @@ -28,7 +28,7 @@ * * The Solaris VFS layer presents extended file attributes using a special * "XATTR" directory under files or directories that have extended file - * attributes. See fsattr(5) for background. + * attributes. See fsattr(7) for background. * * This design avoids the need for a separate set of VFS or vnode functions * for operating on XATTR objects. File system implementations that support diff --git a/usr/src/uts/common/fs/zfs/dsl_scan.c b/usr/src/uts/common/fs/zfs/dsl_scan.c index fa7b9fb2fc..f6e8db4100 100644 --- a/usr/src/uts/common/fs/zfs/dsl_scan.c +++ b/usr/src/uts/common/fs/zfs/dsl_scan.c @@ -3856,7 +3856,7 @@ dsl_scan_scrub_cb(dsl_pool_t *dp, /* * Keep track of how much data we've examined so that - * zpool(1M) status can make useful progress reports. + * zpool(8) status can make useful progress reports. */ scn->scn_phys.scn_examined += DVA_GET_ASIZE(dva); spa->spa_scan_pass_exam += DVA_GET_ASIZE(dva); diff --git a/usr/src/uts/common/fs/zfs/lua/README.zfs b/usr/src/uts/common/fs/zfs/lua/README.zfs index 0e22de7a4a..bd0804f99e 100644 --- a/usr/src/uts/common/fs/zfs/lua/README.zfs +++ b/usr/src/uts/common/fs/zfs/lua/README.zfs @@ -26,7 +26,7 @@ maintenance policy, the modifications that have been made to it, and how it should (and should not) be used. For a description of the Lua language and features exposed by ZFS channel -programs, please refer to the zfs-program(1m) man page instead. +programs, please refer to the zfs-program(8) man page instead. Maintenance policy diff --git a/usr/src/uts/common/fs/zfs/metaslab.c b/usr/src/uts/common/fs/zfs/metaslab.c index c46ee1bc20..68733f47c1 100644 --- a/usr/src/uts/common/fs/zfs/metaslab.c +++ b/usr/src/uts/common/fs/zfs/metaslab.c @@ -5593,7 +5593,7 @@ metaslab_claim_concrete(vdev_t *vd, uint64_t offset, uint64_t size, range_tree_remove(msp->ms_allocatable, offset, size); range_tree_clear(msp->ms_trim, offset, size); - if (spa_writeable(spa)) { /* don't dirty if we're zdb(1M) */ + if (spa_writeable(spa)) { /* don't dirty if we're zdb(8) */ metaslab_class_t *mc = msp->ms_group->mg_class; multilist_sublist_t *mls = multilist_sublist_lock_obj(mc->mc_metaslab_txg_list, msp); @@ -5640,7 +5640,7 @@ metaslab_claim_impl(vdev_t *vd, uint64_t offset, uint64_t size, uint64_t txg) metaslab_claim_cb_arg_t arg; /* - * Only zdb(1M) can claim on indirect vdevs. This is used + * Only zdb(8) can claim on indirect vdevs. This is used * to detect leaks of mapped space (that are not accounted * for in the obsolete counts, spacemap, or bpobj). */ diff --git a/usr/src/uts/common/fs/zfs/spa_history.c b/usr/src/uts/common/fs/zfs/spa_history.c index 897d3c6e9a..44a4ec7ddc 100644 --- a/usr/src/uts/common/fs/zfs/spa_history.c +++ b/usr/src/uts/common/fs/zfs/spa_history.c @@ -334,7 +334,7 @@ spa_history_log_sync(void *arg, dmu_tx_t *tx) * posted as a result of the ZPOOL_HIST_CMD key being present * it would result in only one sysevent being posted with the * full command line arguments, requiring the consumer to know - * how to parse and understand zfs(1M) command invocations. + * how to parse and understand zfs(8) command invocations. */ spa_history_log_notify(spa, nvl); } else if (nvlist_exists(nvl, ZPOOL_HIST_IOCTL)) { diff --git a/usr/src/uts/common/fs/zfs/spa_misc.c b/usr/src/uts/common/fs/zfs/spa_misc.c index 27697d5267..cb59eef824 100644 --- a/usr/src/uts/common/fs/zfs/spa_misc.c +++ b/usr/src/uts/common/fs/zfs/spa_misc.c @@ -1384,7 +1384,7 @@ spa_vdev_state_exit(spa_t *spa, vdev_t *vd, int error) /* * If anything changed, wait for it to sync. This ensures that, - * from the system administrator's perspective, zpool(1M) commands + * from the system administrator's perspective, zpool(8) commands * are synchronous. This is important for things like zpool offline: * when the command completes, you expect no further I/O from ZFS. */ diff --git a/usr/src/uts/common/fs/zfs/sys/dmu.h b/usr/src/uts/common/fs/zfs/sys/dmu.h index d38914dd1d..be834895c8 100644 --- a/usr/src/uts/common/fs/zfs/sys/dmu.h +++ b/usr/src/uts/common/fs/zfs/sys/dmu.h @@ -963,7 +963,7 @@ void dmu_objset_fast_stat(objset_t *os, dmu_objset_stats_t *stat); /* * Add entries to the nvlist for all the objset's properties. See - * zfs_prop_table[] and zfs(1m) for details on the properties. + * zfs_prop_table[] and zfs(8) for details on the properties. */ void dmu_objset_stats(objset_t *os, struct nvlist *nv); @@ -974,7 +974,7 @@ void dmu_objset_stats(objset_t *os, struct nvlist *nv); * availbytes is the amount of space available to this objset, taking * into account quotas & reservations, assuming that no other objsets * use the space first. These values correspond to the 'referenced' and - * 'available' properties, described in the zfs(1m) manpage. + * 'available' properties, described in the zfs(8) manpage. * * usedobjs and availobjs are the number of objects currently allocated, * and available. diff --git a/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h b/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h index 60d4d6805f..5058d48e74 100644 --- a/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h +++ b/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h @@ -455,7 +455,7 @@ typedef struct zfs_cmd { uint64_t zc_history_len; uint64_t zc_history_offset; uint64_t zc_obj; - uint64_t zc_iflags; /* internal to zfs(7fs) */ + uint64_t zc_iflags; /* internal to zfs(4FS) */ zfs_share_t zc_share; dmu_objset_stats_t zc_objset_stats; dmu_replay_record_t zc_begin_record; diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c index 99ad0cd27d..8e155979e6 100644 --- a/usr/src/uts/common/fs/zfs/vdev.c +++ b/usr/src/uts/common/fs/zfs/vdev.c @@ -203,7 +203,7 @@ vdev_getops(const char *type) /* * Derive the enumerated alloction bias from string input. - * String origin is either the per-vdev zap or zpool(1M). + * String origin is either the per-vdev zap or zpool(8). */ static vdev_alloc_bias_t vdev_derive_alloc_bias(const char *bias) diff --git a/usr/src/uts/common/fs/zfs/zcp.c b/usr/src/uts/common/fs/zfs/zcp.c index 61ce60a233..ba915ff4f1 100644 --- a/usr/src/uts/common/fs/zfs/zcp.c +++ b/usr/src/uts/common/fs/zfs/zcp.c @@ -22,7 +22,7 @@ * * The ZCP interface allows various ZFS commands and operations ZFS * administrative operations (e.g. creating and destroying snapshots, typically - * performed via an ioctl to /dev/zfs by the zfs(1M) command and + * performed via an ioctl to /dev/zfs by the zfs(8) command and * libzfs/libzfs_core) to be run * programmatically as a Lua script. A ZCP * script is run as a dsl_sync_task and fully executed during one transaction * group sync. This ensures that no other changes can be written concurrently @@ -86,7 +86,7 @@ * longjumps out of the script execution with luaL_error() and returns with the * error. * - * See zfs-program(1M) for more information on high level usage. + * See zfs-program(8) for more information on high level usage. */ #include "lua.h" diff --git a/usr/src/uts/common/fs/zfs/zfs_vfsops.c b/usr/src/uts/common/fs/zfs/zfs_vfsops.c index 39ee51855a..e7e00e58f6 100644 --- a/usr/src/uts/common/fs/zfs/zfs_vfsops.c +++ b/usr/src/uts/common/fs/zfs/zfs_vfsops.c @@ -175,7 +175,7 @@ zfs_sync(vfs_t *vfsp, short flag, cred_t *cr) } else { /* * Sync all ZFS filesystems. This is what happens when you - * run sync(1M). Unlike other filesystems, ZFS honors the + * run sync(8). Unlike other filesystems, ZFS honors the * request by waiting for all pools to commit all dirty data. */ spa_sync_allpools(); diff --git a/usr/src/uts/common/fs/zfs/zio.c b/usr/src/uts/common/fs/zfs/zio.c index 0fa1445217..f8a98f73f3 100644 --- a/usr/src/uts/common/fs/zfs/zio.c +++ b/usr/src/uts/common/fs/zfs/zio.c @@ -1116,7 +1116,7 @@ zio_claim(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp, ASSERT3U(spa->spa_uberblock.ub_rootbp.blk_birth, <, spa_min_claim_txg(spa)); ASSERT(txg == spa_min_claim_txg(spa) || txg == 0); - ASSERT(!BP_GET_DEDUP(bp) || !spa_writeable(spa)); /* zdb(1M) */ + ASSERT(!BP_GET_DEDUP(bp) || !spa_writeable(spa)); /* zdb(8) */ zio = zio_create(pio, spa, txg, bp, NULL, BP_GET_PSIZE(bp), BP_GET_PSIZE(bp), done, private, ZIO_TYPE_CLAIM, ZIO_PRIORITY_NOW, diff --git a/usr/src/uts/common/fs/zfs/zvol.c b/usr/src/uts/common/fs/zfs/zvol.c index 9cc082fe87..1de192f87f 100644 --- a/usr/src/uts/common/fs/zfs/zvol.c +++ b/usr/src/uts/common/fs/zfs/zvol.c @@ -1610,7 +1610,7 @@ zvol_log_truncate(zvol_state_t *zv, dmu_tx_t *tx, uint64_t off, uint64_t len, } /* - * Dirtbag ioctls to support mkfs(1M) for UFS filesystems. See dkio(7I). + * Dirtbag ioctls to support mkfs(8) for UFS filesystems. See dkio(4I). * Also a dirtbag dkio ioctl for unmap/free-block functionality. */ /*ARGSUSED*/ diff --git a/usr/src/uts/common/inet/ip.h b/usr/src/uts/common/inet/ip.h index 93ae80f303..9858fd65ec 100644 --- a/usr/src/uts/common/inet/ip.h +++ b/usr/src/uts/common/inet/ip.h @@ -177,7 +177,7 @@ typedef struct ipoptp_s #define IPOPTP_ERROR 0x00000001 #endif /* _KERNEL */ -/* Controls forwarding of IP packets, set via ipadm(1M)/ndd(1M) */ +/* Controls forwarding of IP packets, set via ipadm(8)/ndd(8) */ #define IP_FORWARD_NEVER 0 #define IP_FORWARD_ALWAYS 1 diff --git a/usr/src/uts/common/inet/ip/ip_if.c b/usr/src/uts/common/inet/ip/ip_if.c index f4642c720d..cc67299a1b 100644 --- a/usr/src/uts/common/inet/ip/ip_if.c +++ b/usr/src/uts/common/inet/ip/ip_if.c @@ -8570,8 +8570,8 @@ ip_sioctl_plink_ipmp(ill_t *ill, int ioccmd) * Do I_PLINK/I_LINK or I_PUNLINK/I_UNLINK with consistency checks and also * atomically set/clear the muxids. Also complete the ioctl by acking or * naking it. Note that the code is structured such that the link type, - * whether it's persistent or not, is treated equally. ifconfig(1M) and - * its clones use the persistent link, while pppd(1M) and perhaps many + * whether it's persistent or not, is treated equally. ifconfig(8) and + * its clones use the persistent link, while pppd(8) and perhaps many * other daemons may use non-persistent link. When combined with some * ill_t states, linking and unlinking lower streams may be used as * indicators of dynamic re-plumbing events [see PSARC/1999/348]. diff --git a/usr/src/uts/common/inet/ip/sadb.c b/usr/src/uts/common/inet/ip/sadb.c index dbdd97e6ce..9ba7773656 100644 --- a/usr/src/uts/common/inet/ip/sadb.c +++ b/usr/src/uts/common/inet/ip/sadb.c @@ -3239,7 +3239,7 @@ sadb_common_add(queue_t *pfkey_q, mblk_t *mp, sadb_msg_t *samsg, /* * An error here indicates that alg is the wrong type * (IE: not authentication) or its not in the alg tables - * created by ipsecalgs(1m), or Kcf does not like the + * created by ipsecalgs(8), or Kcf does not like the * parameters passed in with this algorithm, which is * probably a coding error! */ @@ -6862,8 +6862,8 @@ ipsec_tun_pol(ipsec_selector_t *sel, ipsec_policy_t **ppp, return (ENOENT); } /* - * Else, this is a tunnel policy configured with ifconfig(1m) - * or "negotiate transport" with ipsecconf(1m). We have an + * Else, this is a tunnel policy configured with ifconfig(8) + * or "negotiate transport" with ipsecconf(8). We have an * itp with policy set based on any match, so don't bother * changing fields in "sel". */ diff --git a/usr/src/uts/common/inet/ip/spd.c b/usr/src/uts/common/inet/ip/spd.c index 85f06f3d02..0bcecd8a3a 100644 --- a/usr/src/uts/common/inet/ip/spd.c +++ b/usr/src/uts/common/inet/ip/spd.c @@ -4913,7 +4913,7 @@ ipsec_alg_fix_min_max(ipsec_alginfo_t *alg, ipsec_algtype_t alg_type, } /* - * Sanity check parameters provided by ipsecalgs(1m). Assume that + * Sanity check parameters provided by ipsecalgs(8). Assume that * the algoritm is marked as valid, there is a check at the top * of this function. If any of the checks below fail, the algorithm * entry is invalid. diff --git a/usr/src/uts/common/inet/ip_ndp.h b/usr/src/uts/common/inet/ip_ndp.h index 38ab51e2ff..c1a156067e 100644 --- a/usr/src/uts/common/inet/ip_ndp.h +++ b/usr/src/uts/common/inet/ip_ndp.h @@ -161,7 +161,7 @@ typedef struct ndp_g_s { /* * NCE_F_NONUD is used to disable IPv6 Neighbor Unreachability Detection or - * IPv4 aging and maps to the ATF_PERM flag for arp(1m) + * IPv4 aging and maps to the ATF_PERM flag for arp(8) */ #define NCE_F_NONUD 0x10 @@ -181,7 +181,7 @@ typedef struct ndp_g_s { * NCE_F_AUTHORITY is set for any address that we have authoritatitve * information for. This includes locally configured addresses as well * as statically configured arp entries that are set up using the "permanent" - * option described in arp(1m). The NCE_F_AUTHORITY asserts that we would + * option described in arp(8). The NCE_F_AUTHORITY asserts that we would * reject any updates for that nce's (host, link-layer-address) information */ #define NCE_F_AUTHORITY 0x800 diff --git a/usr/src/uts/common/inet/ipd/ipd.c b/usr/src/uts/common/inet/ipd/ipd.c index d1c5dfdb9b..104603d840 100644 --- a/usr/src/uts/common/inet/ipd/ipd.c +++ b/usr/src/uts/common/inet/ipd/ipd.c @@ -71,7 +71,7 @@ * * ipd has two different entry points, one is administrative, the other is the * data path. The administrative path is accessed by a userland component called - * ipdadm(1M). It communicates to the kernel component via ioctls to /dev/ipd. + * ipdadm(8). It communicates to the kernel component via ioctls to /dev/ipd. * If the administrative path enables a specific zone, then the data path will * become active for that zone. Any packet that leaves that zone's IP stack or * is going to enter it, comes through the callback specified in the hook_t(9S) diff --git a/usr/src/uts/common/inet/iptun.h b/usr/src/uts/common/inet/iptun.h index 1cd74d87cc..7745c8b3d7 100644 --- a/usr/src/uts/common/inet/iptun.h +++ b/usr/src/uts/common/inet/iptun.h @@ -82,7 +82,7 @@ typedef struct iptun_kparams { #define IPTUN_KPARAM_RADDR 0x00000004 /* itk_raddr is set */ #define IPTUN_KPARAM_SECINFO 0x00000008 /* itk_secinfo is set */ #define IPTUN_KPARAM_IMPLICIT 0x00000010 /* implicitly created IP tunnel */ -#define IPTUN_KPARAM_IPSECPOL 0x00000020 /* ipsecconf(1M) policy present */ +#define IPTUN_KPARAM_IPSECPOL 0x00000020 /* ipsecconf(8) policy present */ #ifdef __cplusplus } diff --git a/usr/src/uts/common/inet/iptun/iptun.c b/usr/src/uts/common/inet/iptun/iptun.c index ca46539f89..e67e6bd26e 100644 --- a/usr/src/uts/common/inet/iptun/iptun.c +++ b/usr/src/uts/common/inet/iptun/iptun.c @@ -1115,12 +1115,12 @@ iptun_setparams(iptun_t *iptun, const iptun_kparams_t *ik) if (ik->iptun_kparam_flags & IPTUN_KPARAM_SECINFO) { /* - * Set IPsec policy originating from the ifconfig(1M) command + * Set IPsec policy originating from the ifconfig(8) command * line. This is traditionally called "simple" policy because * the ipsec_req_t (iptun_kparam_secinfo) can only describe a * simple policy of "do ESP on everything" and/or "do AH on * everything" (as opposed to the rich policy that can be - * defined with ipsecconf(1M)). + * defined with ipsecconf(8)). */ if (iptun->iptun_typeinfo->iti_type == IPTUN_TYPE_6TO4) { /* diff --git a/usr/src/uts/common/inet/sadb.h b/usr/src/uts/common/inet/sadb.h index 30b935495f..ddb3b3902f 100644 --- a/usr/src/uts/common/inet/sadb.h +++ b/usr/src/uts/common/inet/sadb.h @@ -73,12 +73,12 @@ typedef struct ipsa_cm_mech_s { * initialize the Block Cipher, is made up of a Counter and a Salt. * The Counter is fixed at 64 bits and is incremented for each packet. * The Salt value can be any whole byte value upto 64 bits. This is - * algorithm mode specific and can be configured with ipsecalgs(1m). + * algorithm mode specific and can be configured with ipsecalgs(8). * * We only support whole byte salt lengths, this is because the salt is - * stored in an array of uint8_t's. This is enforced by ipsecalgs(1m) + * stored in an array of uint8_t's. This is enforced by ipsecalgs(8) * which configures the salt length as a number of bytes. Checks are - * made to ensure the salt length defined in ipsecalgs(1m) fits in + * made to ensure the salt length defined in ipsecalgs(8) fits in * the ipsec_nonce_t. * * The Salt value remains constant for the life of the SA, the Salt is diff --git a/usr/src/uts/common/inet/tcp/tcp_bind.c b/usr/src/uts/common/inet/tcp/tcp_bind.c index bf16fb6007..86242fc944 100644 --- a/usr/src/uts/common/inet/tcp/tcp_bind.c +++ b/usr/src/uts/common/inet/tcp/tcp_bind.c @@ -279,7 +279,7 @@ retry: * Return the next anonymous port in the privileged port range for * bind checking. It starts at IPPORT_RESERVED - 1 and goes * downwards. This is the same behavior as documented in the userland - * library call rresvport(3N). + * library call rresvport(3SOCKET). * * TS note: skip multilevel ports. */ diff --git a/usr/src/uts/common/inet/tcp/tcp_misc.c b/usr/src/uts/common/inet/tcp/tcp_misc.c index 0896dd7611..423d3003cf 100644 --- a/usr/src/uts/common/inet/tcp/tcp_misc.c +++ b/usr/src/uts/common/inet/tcp/tcp_misc.c @@ -44,7 +44,7 @@ static boolean_t tcp_do_reclaim = B_TRUE; * TCP_IOC_ABORT_CONN is a non-transparent ioctl command used for aborting * TCP connections. To invoke this ioctl, a tcp_ioc_abort_conn_t structure * (defined in tcp.h) needs to be filled in and passed into the kernel - * via an I_STR ioctl command (see streamio(7I)). The tcp_ioc_abort_conn_t + * via an I_STR ioctl command (see streamio(4I)). The tcp_ioc_abort_conn_t * structure contains the four-tuple of a TCP connection and a range of TCP * states (specified by ac_start and ac_end). The use of wildcard addresses * and ports is allowed. Connections with a matching four tuple and a state diff --git a/usr/src/uts/common/io/audio/impl/audio_sun.c b/usr/src/uts/common/io/audio/impl/audio_sun.c index cee3f6ace4..698eae3801 100644 --- a/usr/src/uts/common/io/audio/impl/audio_sun.c +++ b/usr/src/uts/common/io/audio/impl/audio_sun.c @@ -23,7 +23,7 @@ */ /* - * Sun audio(7I) and mixer(7I) personality. + * Sun audio(4I) and mixer(4I) personality. * * There are some "undocumented" details of how legacy Sun audio * interfaces work. The following "rules" were derived from reading the @@ -251,7 +251,7 @@ devaudio_proc_alloc(audio_client_t *c) info = &proc->p_info; /* - * audio(7I) says: Upon the initial open() of the audio + * audio(4I) says: Upon the initial open() of the audio * device, the driver resets the data format of the device to * the default state of 8-bit, 8Khz, mono u-Law data. */ diff --git a/usr/src/uts/common/io/bge/bge.conf b/usr/src/uts/common/io/bge/bge.conf index edabf29ab1..8387dcbeb8 100644 --- a/usr/src/uts/common/io/bge/bge.conf +++ b/usr/src/uts/common/io/bge/bge.conf @@ -27,7 +27,7 @@ # Broadcom 579x Gigabit Ethernet devices # # All the properties below can be set globally (i.e. for all instances -# of BGE), or on a per-instance basis. See driver.conf(4) for details +# of BGE), or on a per-instance basis. See driver.conf(5) for details # of the syntax of global and per-instance properties. # # Properties specified in this file take effect when the driver is first @@ -35,7 +35,7 @@ # therefore not take effect until the next reboot, but will be permanent # thereafter. # -# Some of the driver's parameters can also be changed using ndd(1m). +# Some of the driver's parameters can also be changed using ndd(8). # Changes made with ndd apply only to a specific instance (e.g. bge1). # They take effect immediately, but are lost if the driver is unloaded. # @@ -106,7 +106,7 @@ # adv_pause_cap = 0; # # All of these parameters can can also be queried and modified at run-time -# by use of the ndd(1m) command. +# by use of the ndd(8) command. # ######################################################################### # diff --git a/usr/src/uts/common/io/bnx/bnx.conf b/usr/src/uts/common/io/bnx/bnx.conf index cb19ea560a..9c960cbcf6 100644 --- a/usr/src/uts/common/io/bnx/bnx.conf +++ b/usr/src/uts/common/io/bnx/bnx.conf @@ -14,6 +14,6 @@ # # -# Driver.conf file for NetExtreme II 1 GbE parts. See bnx(7D) for valid +# Driver.conf file for NetExtreme II 1 GbE parts. See bnx(4D) for valid # options. # diff --git a/usr/src/uts/common/io/cmlb.c b/usr/src/uts/common/io/cmlb.c index 7d88643ada..dce6c74a43 100644 --- a/usr/src/uts/common/io/cmlb.c +++ b/usr/src/uts/common/io/cmlb.c @@ -1689,7 +1689,7 @@ cmlb_validate_geometry(struct cmlb_lun *cl, boolean_t forcerevalid, int flags, cmlb_log(CMLB_DEVINFO(cl), CMLB_LABEL(cl), CE_NOTE, "!Disk (%s%d) is limited to 2 TB " "due to VTOC label. To use the full " - "capacity of the disk, use format(1M) to " + "capacity of the disk, use format(8) to " "relabel the disk with EFI/GPT label.\n", CMLB_LABEL(cl), ddi_get_instance(CMLB_DEVINFO(cl))); diff --git a/usr/src/uts/common/io/devinfo.c b/usr/src/uts/common/io/devinfo.c index 68ccd8eea4..d9e1e81a2d 100644 --- a/usr/src/uts/common/io/devinfo.c +++ b/usr/src/uts/common/io/devinfo.c @@ -1987,7 +1987,7 @@ property: * Make copy of global property list if this devinfo refers * global properties different from what's on the devnames * array. It can happen if there has been a forced - * driver.conf update. See mod_drv(1M). + * driver.conf update. See update_drv(8). */ ASSERT(me->drv_major != -1); if (node->devi_global_prop_list != diff --git a/usr/src/uts/common/io/e1000api/e1000_hw.h b/usr/src/uts/common/io/e1000api/e1000_hw.h index 9d440c3e71..644cc1ef17 100644 --- a/usr/src/uts/common/io/e1000api/e1000_hw.h +++ b/usr/src/uts/common/io/e1000api/e1000_hw.h @@ -290,8 +290,8 @@ enum e1000_mac_type { e1000_pch_lnp, e1000_pch_rpl, /* - * After this point all MACs are used by the igb(7D) driver as opposed - * to e1000g(7D). If a new MAC is specific to e1000g series of devices, + * After this point all MACs are used by the igb(4D) driver as opposed + * to e1000g(4D). If a new MAC is specific to e1000g series of devices, * then it should be added above this. */ e1000_82575, diff --git a/usr/src/uts/common/io/ecpp.conf b/usr/src/uts/common/io/ecpp.conf index 910929263b..527dd186ad 100644 --- a/usr/src/uts/common/io/ecpp.conf +++ b/usr/src/uts/common/io/ecpp.conf @@ -23,7 +23,6 @@ # Use is subject to license terms. # # -#ident "%Z%%M% %I% %E% SMI" # When fast-centronics is set to "true", handshaking between the # driver and the peripheral is conducted by hardware. For some @@ -45,7 +44,7 @@ fast-1284-compatible="true"; # Some Centronics devices require the Init signal to be toggled upon # power-up. The application should do this directly with ioctl(2) interface -# as specified in ecpp(7d). As an alternative to using the API, the driver +# as specified in ecpp(4D). As an alternative to using the API, the driver # may be configured to toggle the nInit signal upon every time the device # is opened. If centronics-init-seq is set to "true" the Init signal # will be toggled when the device is opened. The default is "false". diff --git a/usr/src/uts/common/io/ena/ena.conf b/usr/src/uts/common/io/ena/ena.conf index 64ee011d7c..5df2c7e805 100644 --- a/usr/src/uts/common/io/ena/ena.conf +++ b/usr/src/uts/common/io/ena/ena.conf @@ -15,7 +15,7 @@ # # -# Driver .conf file for AWS Elastic Network Adapter. See ena(7D) for +# Driver .conf file for AWS Elastic Network Adapter. See ena(4D) for # valid options. # diff --git a/usr/src/uts/common/io/i40e/i40e.conf b/usr/src/uts/common/io/i40e/i40e.conf index b4c3459931..0f039f21f0 100644 --- a/usr/src/uts/common/io/i40e/i40e.conf +++ b/usr/src/uts/common/io/i40e/i40e.conf @@ -15,5 +15,5 @@ # # Driver.conf file for Intel XL710 PCIe NIC Driver (i40e) -# See i40e(7D) for valid options. +# See i40e(4D) for valid options. # diff --git a/usr/src/uts/common/io/ib/adapters/hermon/hermon_stats.c b/usr/src/uts/common/io/ib/adapters/hermon/hermon_stats.c index b479f461e0..fde0ca6f2d 100644 --- a/usr/src/uts/common/io/ib/adapters/hermon/hermon_stats.c +++ b/usr/src/uts/common/io/ib/adapters/hermon/hermon_stats.c @@ -30,7 +30,7 @@ * * Implements all the routines necessary for setting up, querying, and * (later) tearing down all the kstats necessary for implementing to - * the interfaces necessary to provide busstat(1M) access. + * the interfaces necessary to provide busstat(8) access. */ #include <sys/types.h> diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c index 244cf9b4fc..aa9e0889ae 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c @@ -30,7 +30,7 @@ * * Implements all the routines necessary for setting up, querying, and * (later) tearing down all the kstats necessary for implementing to - * the interfaces necessary to provide busstat(1M) access. + * the interfaces necessary to provide busstat(8) access. */ #include <sys/types.h> diff --git a/usr/src/uts/common/io/ib/clients/ibd/ibd.c b/usr/src/uts/common/io/ib/clients/ibd/ibd.c index 75e25457f2..8232642502 100644 --- a/usr/src/uts/common/io/ib/clients/ibd/ibd.c +++ b/usr/src/uts/common/io/ib/clients/ibd/ibd.c @@ -109,14 +109,14 @@ * objects that can be plumbed and they alone participate in I/O and not the * port driver. * - * There are some info ioctls supported in ibd which are used by dladm(1M) to + * There are some info ioctls supported in ibd which are used by dladm(8) to * display useful information. The info entry point for ibd is * ibd_get_partition_info(). * * 2. Late HCA initialization feature. * ------------------------------------ * As mentioned in section 1, the user creates the partition objects via - * dladm(1M). It is possible that: + * dladm(8). It is possible that: * a) The physical port itself is down and the SM cannot be reached. * b) The PKEY specified by the used has not been created in the SM yet. * c) An IPoIB broadcast group for the specified PKEY is not present. diff --git a/usr/src/uts/common/io/ib/ibtl/ibtl_ibnex.c b/usr/src/uts/common/io/ib/ibtl/ibtl_ibnex.c index 6b14dc4e8b..3a7847fd99 100644 --- a/usr/src/uts/common/io/ib/ibtl/ibtl_ibnex.c +++ b/usr/src/uts/common/io/ib/ibtl/ibtl_ibnex.c @@ -56,7 +56,7 @@ ibtl_ibnex_callback_t ibtl_ibnex_callback_routine = NULL; * IBTL_IBNEX_UNCFG_CLNTS_FLAG - Build a NVLIST containing * clients' devpaths and their * AP_IDs. (-x unconfig_clients) - * callback - Callback function to get ap_id from ib(7d) + * callback - Callback function to get ap_id from ib(4D) * Output: * buffer - The information is returned in this buffer * bufsiz - The size of the information buffer @@ -519,7 +519,7 @@ ibt_reprobe_dev(dev_info_t *dip) * else IBT_NO_HCAS_AVAILABLE. * * For IOC/Pseudo devices check if the given pdip is that of - * the ib(7d) nexus or that of the eoib(7d) nexus. If yes + * the ib(4D) nexus or that of the eoib(4D) nexus. If yes * return IBT_SUCCESS, else IBT_NO_HCAS_AVAILABLE. */ ibt_status_t diff --git a/usr/src/uts/common/io/lofi.c b/usr/src/uts/common/io/lofi.c index ed3ee88e53..e775ecce0d 100644 --- a/usr/src/uts/common/io/lofi.c +++ b/usr/src/uts/common/io/lofi.c @@ -126,7 +126,7 @@ * * Encryption: * Each lofi device can have its own symmetric key and cipher. - * They are passed to us by lofiadm(1m) in the correct format for use + * They are passed to us by lofiadm(8) in the correct format for use * with the misc/kcf crypto_* routines. * * Each block has its own IV, that is calculated in lofi_blk_mech(), based @@ -2275,7 +2275,7 @@ fake_disk_geometry(struct lofi_state *lsp) { u_offset_t dsize = lsp->ls_vp_size - lsp->ls_crypto_offset; - /* dk_geom - see dkio(7I) */ + /* dk_geom - see dkio(4I) */ /* * dkg_ncyl _could_ be set to one here (one big cylinder with gobs * of sectors), but that breaks programs like fdisk which want to @@ -2305,7 +2305,7 @@ fake_disk_geometry(struct lofi_state *lsp) } /* - * build vtoc - see dkio(7I) + * build vtoc - see dkio(4I) * * Fakes one big partition based on the size of the file. This is needed * because we allow newfs'ing the traditional lofi device and newfs will @@ -2345,7 +2345,7 @@ fake_disk_vtoc(struct lofi_state *lsp, struct vtoc *vt) } /* - * build dk_cinfo - see dkio(7I) + * build dk_cinfo - see dkio(4I) */ static void fake_disk_info(dev_t dev, struct dk_cinfo *ci) diff --git a/usr/src/uts/common/io/log.c b/usr/src/uts/common/io/log.c index 91ee5b2879..87ae96806c 100644 --- a/usr/src/uts/common/io/log.c +++ b/usr/src/uts/common/io/log.c @@ -25,7 +25,7 @@ /* - * Streams log driver. See log(7D). + * Streams log driver. See log(4D). */ #include <sys/types.h> diff --git a/usr/src/uts/common/io/mac/mac_flow.c b/usr/src/uts/common/io/mac/mac_flow.c index 62612122d6..d83de9503e 100644 --- a/usr/src/uts/common/io/mac/mac_flow.c +++ b/usr/src/uts/common/io/mac/mac_flow.c @@ -1204,7 +1204,7 @@ mac_link_flow_init(mac_client_handle_t mch, flow_entry_t *sub_flow) /* * mac_link_flow_add() - * Used by flowadm(1m) or kernel mac clients for creating flows. + * Used by flowadm(8) or kernel mac clients for creating flows. */ int mac_link_flow_add(datalink_id_t linkid, char *flow_name, @@ -1344,7 +1344,7 @@ mac_link_flow_clean(mac_client_handle_t mch, flow_entry_t *sub_flow) /* * Delete the SRSs associated with this subflow. If this is being - * driven by flowadm(1M) then the subflow will be deleted by + * driven by flowadm(8) then the subflow will be deleted by * dls_rem_flow. However if this is a result of the interface being * unplumbed then the subflow itself won't be deleted. */ @@ -1370,7 +1370,7 @@ mac_link_flow_clean(mac_client_handle_t mch, flow_entry_t *sub_flow) /* * mac_link_flow_remove() - * Used by flowadm(1m) or kernel mac clients for removing flows. + * Used by flowadm(8) or kernel mac clients for removing flows. */ int mac_link_flow_remove(char *flow_name) diff --git a/usr/src/uts/common/io/mac/mac_sched.c b/usr/src/uts/common/io/mac/mac_sched.c index 9290530810..fe00be8b14 100644 --- a/usr/src/uts/common/io/mac/mac_sched.c +++ b/usr/src/uts/common/io/mac/mac_sched.c @@ -44,7 +44,7 @@ * * This driver. It interfaces with device drivers and provides abstractions * that the rest of the system consumes. All data links -- things managed - * with dladm(1M), are accessed through MAC. + * with dladm(8), are accessed through MAC. * * GLDv3 DEVICE DRIVER * @@ -65,7 +65,7 @@ * which is used for all unicast traffic addressed to the address of a MAC * device. For example, when a VNIC is created, a default flow is created * for the VNIC's MAC address. In addition, flows are created for broadcast - * groups and a user may create a flow with flowadm(1M). + * groups and a user may create a flow with flowadm(8). * * CLASSIFICATION * @@ -77,7 +77,7 @@ * destination MAC address. * * The system also will do classification based on layer three and layer - * four properties. This is used to support things like flowadm(1M), which + * four properties. This is used to support things like flowadm(8), which * allows setting QoS and other properties on a per-flow basis. * * RING @@ -230,8 +230,8 @@ * capabilities and rules in place and then to supplement that with hardware * resources when available. In general, simple layer two classification is * sufficient and nothing else is used, unless a specific flow is created with - * tools such as flowadm(1M) or bandwidth limits are set on a device with - * dladm(1M). + * tools such as flowadm(8) or bandwidth limits are set on a device with + * dladm(8). * * RINGS AND GROUPS * @@ -292,7 +292,7 @@ * * MAC makes the determination as to which of these modes a given soft ring set * obtains based on parameters such as whether or not it's the primary mac - * client, whether it's on a 10 GbE or faster device, user controlled dladm(1M) + * client, whether it's on a 10 GbE or faster device, user controlled dladm(8) * properties, and the nature of the hardware and the resources that it has. * * When there is no fanout, MAC does not create any soft rings for a device and diff --git a/usr/src/uts/common/io/mac/plugins/mac_ether.c b/usr/src/uts/common/io/mac/plugins/mac_ether.c index 9b230b36cd..6e1ec4953a 100644 --- a/usr/src/uts/common/io/mac/plugins/mac_ether.c +++ b/usr/src/uts/common/io/mac/plugins/mac_ether.c @@ -62,7 +62,7 @@ static mac_stat_info_t ether_stats[] = { { ETHER_STAT_TOOSHORT_ERRORS, "runt_errors", KSTAT_DATA_UINT32, 0 }, { ETHER_STAT_JABBER_ERRORS, "jabber_errors", KSTAT_DATA_UINT32, 0 }, - /* Statistics described in the ieee802.3(5) man page */ + /* Statistics described in the ieee802.3(7) man page */ { ETHER_STAT_XCVR_ADDR, "xcvr_addr", KSTAT_DATA_UINT32, 0 }, { ETHER_STAT_XCVR_ID, "xcvr_id", KSTAT_DATA_UINT32, 0 }, { ETHER_STAT_XCVR_INUSE, "xcvr_inuse", KSTAT_DATA_UINT32, 0 }, diff --git a/usr/src/uts/common/io/mac/plugins/mac_wifi.c b/usr/src/uts/common/io/mac/plugins/mac_wifi.c index 1bd338c8b9..d8087cab91 100644 --- a/usr/src/uts/common/io/mac/plugins/mac_wifi.c +++ b/usr/src/uts/common/io/mac/plugins/mac_wifi.c @@ -44,7 +44,7 @@ static uint8_t wifi_ietfmagic[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; static uint8_t wifi_ieeemagic[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; static mac_stat_info_t wifi_stats[] = { - /* statistics described in ieee802.11(5) */ + /* statistics described in ieee802.11(7) */ { WIFI_STAT_TX_FRAGS, "tx_frags", KSTAT_DATA_UINT32, 0 }, { WIFI_STAT_MCAST_TX, "mcast_tx", KSTAT_DATA_UINT32, 0 }, { WIFI_STAT_TX_FAILED, "tx_failed", KSTAT_DATA_UINT32, 0 }, diff --git a/usr/src/uts/common/io/mlxcx/mlxcx.conf b/usr/src/uts/common/io/mlxcx/mlxcx.conf index 321820a47b..3c3d1bcb87 100644 --- a/usr/src/uts/common/io/mlxcx/mlxcx.conf +++ b/usr/src/uts/common/io/mlxcx/mlxcx.conf @@ -17,7 +17,7 @@ # # Driver.conf file for Mellanox Connect-X 4/5/6. -# See mlxcx(7D) for valid options. +# See mlxcx(4D) for valid options. # # diff --git a/usr/src/uts/common/io/mlxcx/mlxcx.h b/usr/src/uts/common/io/mlxcx/mlxcx.h index 68da65765f..a85a432bbe 100644 --- a/usr/src/uts/common/io/mlxcx/mlxcx.h +++ b/usr/src/uts/common/io/mlxcx/mlxcx.h @@ -25,7 +25,7 @@ #define _MLXCX_H /* - * mlxcx(7D) defintions + * mlxcx(4D) defintions */ #include <sys/ddi.h> diff --git a/usr/src/uts/common/io/net80211/net80211.c b/usr/src/uts/common/io/net80211/net80211.c index 7b8d614190..74b1b7ada8 100644 --- a/usr/src/uts/common/io/net80211/net80211.c +++ b/usr/src/uts/common/io/net80211/net80211.c @@ -670,7 +670,7 @@ ieee80211_notify_node_leave(ieee80211com_t *ic, ieee80211_node_t *in) /* - * Get 802.11 kstats defined in ieee802.11(5) + * Get 802.11 kstats defined in ieee802.11(7) * * Return 0 on success */ diff --git a/usr/src/uts/common/io/ntxn/ntxn.conf b/usr/src/uts/common/io/ntxn/ntxn.conf index a0f152297c..6adb37666d 100644 --- a/usr/src/uts/common/io/ntxn/ntxn.conf +++ b/usr/src/uts/common/io/ntxn/ntxn.conf @@ -28,7 +28,7 @@ # Driver.conf file for Netxen 10-Gigabit Ethernet devices # # All the properties below can be set globally (i.e. for all instances -# of ntxn), or on a per-instance basis. See driver.conf(4) for details +# of ntxn), or on a per-instance basis. See driver.conf(5) for details # of the syntax of global and per-instance properties. # # Properties specified in this file take effect when the driver is first @@ -36,7 +36,7 @@ # therefore not take effect until the next reboot, but will be permanent # thereafter. # -# Some of the driver's parameters can also be changed using ndd(1m). +# Some of the driver's parameters can also be changed using ndd(8). # Changes made with ndd apply only to a specific instance (e.g. ntxn0). # They take effect immediately, but are lost if the driver is unloaded. # diff --git a/usr/src/uts/common/io/nulldriver.c b/usr/src/uts/common/io/nulldriver.c index 04e8d86b22..d5050cf51a 100644 --- a/usr/src/uts/common/io/nulldriver.c +++ b/usr/src/uts/common/io/nulldriver.c @@ -45,7 +45,7 @@ * device access, a nexus driver can still internally use the transport * services. * - * A scsi(4) example of this type of use is SCSA enumeration services + * A scsi(5) example of this type of use is SCSA enumeration services * issuing a scsi REPORT_LUN command to a lun-0 'probe' node bound to * nulldriver in order to discover all luns supported by a target. */ diff --git a/usr/src/uts/common/io/nvme/nvme.c b/usr/src/uts/common/io/nvme/nvme.c index ae631771b7..6cdd8275e4 100644 --- a/usr/src/uts/common/io/nvme/nvme.c +++ b/usr/src/uts/common/io/nvme/nvme.c @@ -108,7 +108,7 @@ * For each NVMe device the driver exposes one minor node for the controller and * one minor node for each namespace. The only operations supported by those * minor nodes are open(9E), close(9E), and ioctl(9E). This serves as the - * interface for the nvmeadm(1M) utility. + * interface for the nvmeadm(8) utility. * * * Blkdev Interface: diff --git a/usr/src/uts/common/io/power.c b/usr/src/uts/common/io/power.c index aed53f5334..2e29f55416 100644 --- a/usr/src/uts/common/io/power.c +++ b/usr/src/uts/common/io/power.c @@ -41,7 +41,7 @@ * an application that has opened the device is going away, a new * minor clone is created for each open(9E) request. There are * allocations for creating minor clones between 1 and 255. The ioctl - * interface is defined by pbio(7I) and approved as part of + * interface is defined by pbio(4I) and approved as part of * PSARC/1999/393 case. */ diff --git a/usr/src/uts/common/io/ptem.c b/usr/src/uts/common/io/ptem.c index 6497465b61..afe14a2ad9 100644 --- a/usr/src/uts/common/io/ptem.c +++ b/usr/src/uts/common/io/ptem.c @@ -756,7 +756,7 @@ out: /* * TCSBRK meaningful if data part of message is 0 - * cf. termio(7). + * cf. termio(4I). */ if (!(*(int *)mp->b_cont->b_rptr)) (void) putnextctl(q, M_BREAK); diff --git a/usr/src/uts/common/io/ramdisk.c b/usr/src/uts/common/io/ramdisk.c index a7a568b77c..5fbd5e62b2 100644 --- a/usr/src/uts/common/io/ramdisk.c +++ b/usr/src/uts/common/io/ramdisk.c @@ -29,7 +29,7 @@ * * There are two types of ramdisk: 'real' OBP-created ramdisks, and 'pseudo' * ramdisks created at runtime with no corresponding OBP device node. The - * ramdisk(7D) driver is capable of dealing with both, and with the creation + * ramdisk(4D) driver is capable of dealing with both, and with the creation * and deletion of 'pseudo' ramdisks. * * Every ramdisk has a single 'state' structure which maintains data for @@ -44,7 +44,7 @@ * assigned to the ramdisk. All 'pseudo' ramdisks share a common devinfo * structure. * - * A single character device node is used by ramdiskadm(1M) to communicate + * A single character device node is used by ramdiskadm(8) to communicate * with the ramdisk driver, with minor number 0: * * /dev/ramdiskctl -> /devices/pseudo/ramdisk@0:ctl @@ -495,7 +495,7 @@ rd_map_window(rd_devstate_t *rsp, off_t offset) static void rd_fake_disk_geometry(rd_devstate_t *rsp) { - /* dk_geom - see dkio(7I) */ + /* dk_geom - see dkio(4I) */ /* * dkg_ncyl _could_ be set to one here (one big cylinder with gobs * of sectors), but that breaks programs like fdisk which want to @@ -529,7 +529,7 @@ rd_fake_disk_geometry(rd_devstate_t *rsp) rsp->rd_dkg.dkg_write_reinstruct = 0; rsp->rd_dkg.dkg_read_reinstruct = 0; - /* vtoc - see dkio(7I) */ + /* vtoc - see dkio(4I) */ bzero(&rsp->rd_vtoc, sizeof (struct vtoc)); rsp->rd_vtoc.v_sanity = VTOC_SANE; rsp->rd_vtoc.v_version = V_VERSION; @@ -548,7 +548,7 @@ rd_fake_disk_geometry(rd_devstate_t *rsp) rsp->rd_vtoc.v_part[0].p_size = rsp->rd_dkg.dkg_pcyl * rsp->rd_dkg.dkg_nsect * rsp->rd_dkg.dkg_nhead; - /* dk_cinfo - see dkio(7I) */ + /* dk_cinfo - see dkio(4I) */ bzero(&rsp->rd_ci, sizeof (struct dk_cinfo)); (void) strcpy(rsp->rd_ci.dki_cname, RD_DRIVER_NAME); rsp->rd_ci.dki_ctype = DKC_MD; diff --git a/usr/src/uts/common/io/sata/impl/sata.c b/usr/src/uts/common/io/sata/impl/sata.c index 8ee71ce192..9228b470ec 100644 --- a/usr/src/uts/common/io/sata/impl/sata.c +++ b/usr/src/uts/common/io/sata/impl/sata.c @@ -2221,7 +2221,7 @@ sata_scsi_tgt_free(dev_info_t *hba_dip, dev_info_t *tgt_dip, /* * If devid was previously created but not freed up from - * sd(7D) driver (i.e during detach(9F)) then do it here. + * sd(4D) driver (i.e during detach(9F)) then do it here. */ if ((sdinfo->satadrv_type == SATA_DTYPE_ATADISK) && (ddi_getprop(DDI_DEV_T_ANY, hba_dip, DDI_PROP_DONTPASS, @@ -11588,7 +11588,7 @@ sata_reprobe_pmult(sata_hba_inst_t *sata_hba_inst, sata_device_t *sata_device, * after which the port multiplier is not correct initialized and * recognized. In that case the new device will be marked as unknown * and will not be automatically probed in this routine. Instead - * system administrator could manually restart it via cfgadm(1M). + * system administrator could manually restart it via cfgadm(8). */ if (sata_device->satadev_type != SATA_DTYPE_PMULT) { cportinfo->cport_dev_type = SATA_DTYPE_UNKNOWN; diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c index cf1fa01c68..d62e3b2924 100644 --- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c +++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c @@ -97,7 +97,7 @@ static int vhci_bus_config_debug = 0; /* * Bidirectional map of 'target-port' to port id <pid> for support of - * iostat(1M) '-Xx' and '-Yx' output. + * iostat(8) '-Xx' and '-Yx' output. */ static kmutex_t vhci_targetmap_mutex; static uint_t vhci_targetmap_pid = 1; @@ -4966,14 +4966,14 @@ vhci_kstat_create_pathinfo(mdi_pathinfo_t *pip) * * We maintain a bidirectional 'target-port' to <pid> map, * called targetmap. All pathinfo nodes with the same - * 'target-port' map to the same <pid>. The iostat(1M) code, + * 'target-port' map to the same <pid>. The iostat(8) code, * when parsing a path oriented kstat name, uses the <pid> as * a SCSI_VHCI_GET_TARGET_LONGNAME ioctl argument in order * to get the 'target-port'. For KSTAT_FLAG_PERSISTENT kstats, * this ioctl needs to translate a <pid> to a 'target-port' * even after all pathinfo nodes associated with the * 'target-port' have been destroyed. This is needed to support - * consistent first-iteration activity-since-boot iostat(1M) + * consistent first-iteration activity-since-boot iostat(8) * output. Because of this requirement, the mapping can't be * based on pathinfo information in a devinfo snapshot. */ @@ -5003,7 +5003,7 @@ vhci_kstat_create_pathinfo(mdi_pathinfo_t *pip) * For this type of mapping we don't want the * <id> -> 'target-port' mapping to be made. This * will cause the SCSI_VHCI_GET_TARGET_LONGNAME ioctl - * to fail, and the iostat(1M) long '-n' output will + * to fail, and the iostat(8) long '-n' output will * still use the <pid>. We do this because we just * made up the 'target-port' using the guid, and we * don't want to expose that fact in iostat output. @@ -8346,7 +8346,7 @@ vhci_uscsi_send_sense(struct scsi_pkt *pkt, mp_uscsi_cmd_t *mp_uscmdp) rqpkt->pkt_private = mp_uscmdp; /* - * NOTE: This code path is related to MPAPI uscsi(7I), so path + * NOTE: This code path is related to MPAPI uscsi(4I), so path * selection is not based on path_instance. */ if (scsi_pkt_allocated_correctly(rqpkt)) @@ -8577,7 +8577,7 @@ vhci_uscsi_iostart(struct buf *bp) (void *)bp, bp->b_bcount, (void *)mp_uscmdp->pip, stat_size)); /* - * NOTE: This code path is related to MPAPI uscsi(7I), so path + * NOTE: This code path is related to MPAPI uscsi(4I), so path * selection is not based on path_instance. */ if (scsi_pkt_allocated_correctly(pkt)) diff --git a/usr/src/uts/common/io/scsi/impl/scsi_hba.c b/usr/src/uts/common/io/scsi/impl/scsi_hba.c index 50bf21b2f3..0ae0978796 100644 --- a/usr/src/uts/common/io/scsi/impl/scsi_hba.c +++ b/usr/src/uts/common/io/scsi/impl/scsi_hba.c @@ -3229,7 +3229,7 @@ scsi_hba_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, (bus_state == BUS_QUIESCED)) rv = EALREADY; else if (tran->tran_quiesce == NULL) - rv = ENOTSUP; /* man ioctl(7I) says ENOTTY */ + rv = ENOTSUP; /* man ioctl(2) says ENOTTY */ else if (tran->tran_quiesce(self) != 0) rv = EIO; else if (ndi_set_bus_state(self, BUS_QUIESCED) != NDI_SUCCESS) @@ -3241,7 +3241,7 @@ scsi_hba_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, (bus_state == BUS_ACTIVE)) rv = EALREADY; else if (tran->tran_unquiesce == NULL) - rv = ENOTSUP; /* man ioctl(7I) says ENOTTY */ + rv = ENOTSUP; /* man ioctl(2) says ENOTTY */ else if (tran->tran_unquiesce(self) != 0) rv = EIO; else if (ndi_set_bus_state(self, BUS_ACTIVE) != NDI_SUCCESS) @@ -3250,7 +3250,7 @@ scsi_hba_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, case DEVCTL_BUS_RESET: if (tran->tran_bus_reset == NULL) - rv = ENOTSUP; /* man ioctl(7I) says ENOTTY */ + rv = ENOTSUP; /* man ioctl(2) says ENOTTY */ else if (tran->tran_bus_reset(self, RESET_BUS) != 1) rv = EIO; break; @@ -3261,7 +3261,7 @@ scsi_hba_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, break; /* reset all worked */ } if (tran->tran_bus_reset == NULL) { - rv = ENOTSUP; /* man ioctl(7I) says ENOTTY */ + rv = ENOTSUP; /* man ioctl(2) says ENOTTY */ break; } if (tran->tran_bus_reset(self, RESET_BUS) != 1) @@ -3917,7 +3917,7 @@ scsi_hba_ident_nodename_compatible_get(struct scsi_inquiry *inq, csp = compatp; p = (char *)(compatp + NCOMPAT); - /* ( 0) driver (optional, not documented in scsi(4)) */ + /* ( 0) driver (optional, not documented in scsi(5)) */ if (compat0) { *csp++ = p; (void) snprintf(p, tlen, "%s", compat0); @@ -4006,7 +4006,7 @@ scsi_hba_ident_nodename_compatible_get(struct scsi_inquiry *inq, tlen -= len; } - /* (8.5) scsa,DD.bB (not documented in scsi(4)) */ + /* (8.5) scsa,DD.bB (not documented in scsi(5)) */ if (binding_set) { *csp++ = p; (void) snprintf(p, tlen, "scsa,%02x.b%s", @@ -7819,7 +7819,7 @@ scsi_hba_bus_config_spi(dev_info_t *self, uint_t flags, * Static driver.conf file enumeration: * * Force reprobe for BUS_CONFIG_ONE or when manually - * reconfiguring via devfsadm(1m) to emulate deferred attach. + * reconfiguring via devfsadm(8) to emulate deferred attach. * Reprobe only discovers driver.conf enumerated nodes, more * dynamic implementations probably require their own * bus_config. diff --git a/usr/src/uts/common/io/scsi/impl/scsi_subr.c b/usr/src/uts/common/io/scsi/impl/scsi_subr.c index 4b08bed848..1fd97aeeb3 100644 --- a/usr/src/uts/common/io/scsi/impl/scsi_subr.c +++ b/usr/src/uts/common/io/scsi/impl/scsi_subr.c @@ -2502,7 +2502,7 @@ scsi_uscsi_pktinit(struct uscsi_cmd *uscmd, struct scsi_pkt *pkt) (uscmd->uscsi_path_instance != 0)) { /* * Check to make sure the scsi_pkt was allocated correctly - * before transferring uscsi(7i) path_instance to scsi_pkt(9S). + * before transferring uscsi(4I) path_instance to scsi_pkt(9S). */ if (scsi_pkt_allocated_correctly(pkt)) { /* set pkt_path_instance and flag. */ @@ -2547,7 +2547,7 @@ scsi_uscsi_pktfini(struct scsi_pkt *pkt, struct uscsi_cmd *uscmd) { /* * Check to make sure the scsi_pkt was allocated correctly before - * transferring scsi_pkt(9S) path_instance to uscsi(7i). + * transferring scsi_pkt(9S) path_instance to uscsi(4I). */ if (!scsi_pkt_allocated_correctly(pkt)) { uscmd->uscsi_path_instance = 0; diff --git a/usr/src/uts/common/io/scsi/targets/sd.c b/usr/src/uts/common/io/scsi/targets/sd.c index 20ec0d6ece..4bf5a8e9f3 100644 --- a/usr/src/uts/common/io/scsi/targets/sd.c +++ b/usr/src/uts/common/io/scsi/targets/sd.c @@ -14260,7 +14260,7 @@ sd_initpkt_for_uscsi(struct buf *bp, struct scsi_pkt **pktpp) SD_FILL_SCSI1_LUN(un, pktp); /* - * Set up the optional USCSI flags. See the uscsi (7I) man page + * Set up the optional USCSI flags. See the uscsi(4I) man page * for listing of the supported flags. */ @@ -30967,7 +30967,7 @@ sd_faultinjection(struct scsi_pkt *pktp) * 4. Building default VTOC label * * As section 3 says, sd checks if some kinds of devices have VTOC label. - * If those devices have no valid VTOC label, sd(7d) will attempt to + * If those devices have no valid VTOC label, sd(4D) will attempt to * create default VTOC for them. Currently sd creates default VTOC label * for all devices on x86 platform (VTOC_16), but only for removable * media devices on SPARC (VTOC_8). @@ -31000,7 +31000,7 @@ sd_faultinjection(struct scsi_pkt *pktp) * * 6. Automatic mount & unmount * - * Sd(7d) driver provides DKIOCREMOVABLE ioctl. This ioctl is used to query + * sd(4D) driver provides DKIOCREMOVABLE ioctl. This ioctl is used to query * if a device is removable media device. It return 1 for removable media * devices, and 0 for others. * @@ -31010,9 +31010,9 @@ sd_faultinjection(struct scsi_pkt *pktp) * * 7. fdisk partition management * - * Fdisk is traditional partition method on x86 platform. Sd(7d) driver + * Fdisk is traditional partition method on x86 platform. sd(4D) driver * just supports fdisk partitions on x86 platform. On sparc platform, sd - * doesn't support fdisk partitions at all. Note: pcfs(7fs) can recognize + * doesn't support fdisk partitions at all. Note: pcfs(4FS) can recognize * fdisk partitions on both x86 and SPARC platform. * * ----------------------------------------------------------- @@ -31026,7 +31026,7 @@ sd_faultinjection(struct scsi_pkt *pktp) * * 8. MBOOT/MBR * - * Although sd(7d) doesn't support fdisk on SPARC platform, it does support + * Although sd(4D) doesn't support fdisk on SPARC platform, it does support * read/write mboot for removable media devices on sparc platform. * * ----------------------------------------------------------- diff --git a/usr/src/uts/common/io/scsi/targets/sgen.c b/usr/src/uts/common/io/scsi/targets/sgen.c index 1d6316caf3..2a954f116d 100644 --- a/usr/src/uts/common/io/scsi/targets/sgen.c +++ b/usr/src/uts/common/io/scsi/targets/sgen.c @@ -34,7 +34,7 @@ * sgen - SCSI generic device driver * * The sgen driver provides user programs access to SCSI devices that - * are not supported by other drivers by providing the USCSI(7I) interface. + * are not supported by other drivers by providing the uscsi(4I) interface. */ #include <sys/modctl.h> @@ -1128,7 +1128,7 @@ sgen_close(dev_t dev, int flag, int otyp, cred_t *cred_p) /* * sgen_ioctl() - * sgen supports the USCSI(7I) ioctl interface. + * sgen supports the uscsi(4I) ioctl interface. */ /*ARGSUSED4*/ static int @@ -1195,7 +1195,7 @@ sgen_ioctl(dev_t dev, /* * sgen_uscsi_cmd() - * Setup, configuration and teardown for a uscsi(7I) command + * Setup, configuration and teardown for a uscsi(4I) command */ /*ARGSUSED*/ static int diff --git a/usr/src/uts/common/io/scsi/targets/sgen.conf b/usr/src/uts/common/io/scsi/targets/sgen.conf index e18c06928c..38b0161862 100644 --- a/usr/src/uts/common/io/scsi/targets/sgen.conf +++ b/usr/src/uts/common/io/scsi/targets/sgen.conf @@ -28,7 +28,7 @@ # # WARNING: enabling this driver may impact the security and data integrity of -# devices on your system. Please refer to sgen(7d) for details. +# devices on your system. Please refer to sgen(4D) for details. # # There are two ways of configuring sgen: by establishing an association # between a compatible alias for a device and the sgen driver via @@ -39,7 +39,7 @@ # preferred method to control driver binding, it avoids issues associated # with multiple driver.conf files associating more than one driver with a # device. The compatible property forms for SCSI target devices used in the -# add_drv command are described in scsi(4). +# add_drv command are described in scsi(5). # # USAGE EXAMPLE (add_drv) # @@ -85,7 +85,7 @@ # Vendor and Product IDs returned by the device in response to the SCSI INQUIRY # command. This is accomplished by specifying pairs of Vendor ID and Product ID # strings in the inquiry-config-list property, below. "*" may be substituted -# for the vendor ID as a wildcard. See sgen(7D) for details and extended usage +# for the vendor ID as a wildcard. See sgen(4D) for details and extended usage # examples. # # USAGE EXAMPLE (sgen.conf) diff --git a/usr/src/uts/common/io/scsi/targets/st.c b/usr/src/uts/common/io/scsi/targets/st.c index 3fef558d3a..cdba7764cc 100644 --- a/usr/src/uts/common/io/scsi/targets/st.c +++ b/usr/src/uts/common/io/scsi/targets/st.c @@ -1031,7 +1031,7 @@ st_attach(dev_info_t *devi, ddi_attach_cmd_t cmd) " I/O\n" " For more information, read about " " tape-driver-buffering " - "property in the st(7d) man page\n"); + "property in the st(4D) man page\n"); } } diff --git a/usr/src/uts/common/io/sfxge/sfxge_ioc.h b/usr/src/uts/common/io/sfxge/sfxge_ioc.h index 0ad86a160b..64e9e37b7f 100644 --- a/usr/src/uts/common/io/sfxge/sfxge_ioc.h +++ b/usr/src/uts/common/io/sfxge/sfxge_ioc.h @@ -78,7 +78,7 @@ typedef struct sfxge_nvram_ioc_s { uint16_t sni_version[4]; /* get/set_ver */ /* * Streams STRMSGSZ limit (default 64kb) - * See write(2) and I_STR in streamio(7i) + * See write(2) and I_STR in streamio(4I) */ uint8_t sni_data[32*1024]; /* read/write */ } sfxge_nvram_ioc_t; diff --git a/usr/src/uts/common/io/sfxge/sfxge_pci.c b/usr/src/uts/common/io/sfxge/sfxge_pci.c index 720b47f7aa..e88f68c370 100644 --- a/usr/src/uts/common/io/sfxge/sfxge_pci.c +++ b/usr/src/uts/common/io/sfxge/sfxge_pci.c @@ -111,7 +111,7 @@ sfxge_pci_init(sfxge_t *sp) * resources. Each element contains a 5-tuple of 32bit values, * where the first 32bit value contains the bus/dev/fn slot * information. - * See pci(4) and the definition of "struct pci_phys_spec" in sys/pci.h + * See pci(5) and the definition of "struct pci_phys_spec" in sys/pci.h */ if (ddi_prop_lookup_int_array(DDI_DEV_T_ANY, sp->s_dip, DDI_PROP_DONTPASS, "reg", (int **)&pci_regs, &pci_nregs) != diff --git a/usr/src/uts/common/io/smbios.c b/usr/src/uts/common/io/smbios.c index 92d28cc4fa..8a4bfd12fe 100644 --- a/usr/src/uts/common/io/smbios.c +++ b/usr/src/uts/common/io/smbios.c @@ -26,7 +26,7 @@ /* - * smbios(7D) driver + * smbios(4D) driver * * This pseudo-driver makes available a snapshot of the system's SMBIOS image * that can be accessed using libsmbios. Clients may access a snapshot using diff --git a/usr/src/uts/common/io/softmac/softmac_main.c b/usr/src/uts/common/io/softmac/softmac_main.c index e19df40e0c..294afecb58 100644 --- a/usr/src/uts/common/io/softmac/softmac_main.c +++ b/usr/src/uts/common/io/softmac/softmac_main.c @@ -563,7 +563,7 @@ softmac_update_info(softmac_t *softmac, datalink_id_t *linkidp) cmn_err(CE_WARN, "%s device might not be available " "for use.", softmac->smac_devname); - cmn_err(CE_WARN, "See dladm(1M) for more information."); + cmn_err(CE_WARN, "See dladm(8) for more information."); } return (err); diff --git a/usr/src/uts/common/io/strplumb.c b/usr/src/uts/common/io/strplumb.c index d57bc150f5..5ecd2cdc39 100644 --- a/usr/src/uts/common/io/strplumb.c +++ b/usr/src/uts/common/io/strplumb.c @@ -348,12 +348,12 @@ strplumb_dev(ldi_ident_t li) * permanently linked under UDP. One stream consists of the * ARP-[ifname] combination, while the other consists of IP-[ifname]. * - * We pin underneath UDP here to match what is done in ifconfig(1m); + * We pin underneath UDP here to match what is done in ifconfig(8); * otherwise, ifconfig will be unable to unplumb the stream (the major * number and mux id must both match for a successful I_PUNLINK). * * There are subtleties in the plumbing which make it essential to - * follow the logic used in ifconfig(1m) very closely. + * follow the logic used in ifconfig(8) very closely. */ /* diff --git a/usr/src/uts/common/io/tem_safe.c b/usr/src/uts/common/io/tem_safe.c index 7b8730aa08..41f93c42be 100644 --- a/usr/src/uts/common/io/tem_safe.c +++ b/usr/src/uts/common/io/tem_safe.c @@ -32,7 +32,7 @@ /* * Polled I/O safe ANSI terminal emulator module; * Supporting TERM types 'sun' and 'sun-color, parsing - * ANSI x3.64 escape sequences, and the like. (See wscons(7d) + * ANSI x3.64 escape sequences, and the like. (See wscons(4D) * for more information). * * IMPORTANT: diff --git a/usr/src/uts/common/io/ufm.c b/usr/src/uts/common/io/ufm.c index d124485e65..2fe7cdd793 100644 --- a/usr/src/uts/common/io/ufm.c +++ b/usr/src/uts/common/io/ufm.c @@ -15,7 +15,7 @@ */ /* - * The ufm(7D) pseudo driver provides an ioctl interface for DDI UFM + * The ufm(4D) pseudo driver provides an ioctl interface for DDI UFM * information. See ddi_ufm.h. */ #include <sys/ddi.h> diff --git a/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/usbser_keyspan.c b/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/usbser_keyspan.c index b6143e4a6b..7a9d491638 100644 --- a/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/usbser_keyspan.c +++ b/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/usbser_keyspan.c @@ -595,7 +595,7 @@ keyspan_download_firmware(keyspan_pre_state_t *kbp) if (!record) { USB_DPRINTF_L1(DPRINT_ATTACH, kbp->kb_lh, "No firmware available for Keyspan usa49wlc" - " usb-to-serial adapter. Refer to usbsksp(7D)" + " usb-to-serial adapter. Refer to usbsksp(4D)" " for details."); return (USB_FAILURE); diff --git a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c index 1ce34ed9a4..9a3eea35ee 100644 --- a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c +++ b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c @@ -27,7 +27,7 @@ */ /* - * USB video class driver (usbvc(7D)) + * USB video class driver (usbvc(4D)) * * 1. Overview * ------------ diff --git a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c index 74c76afc8c..04269888f8 100644 --- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c +++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c @@ -1153,7 +1153,7 @@ ehci_init_workaround(ehci_state_t *ehcip) USB_DPRINTF_L1(PRINT_MASK_ATTA, ehcip->ehci_log_hdl, "If you are interested in enabling USB2.x"); USB_DPRINTF_L1(PRINT_MASK_ATTA, ehcip->ehci_log_hdl, - "support please, refer to the ehci(7D) man page."); + "support please, refer to the ehci(4D) man page."); USB_DPRINTF_L1(PRINT_MASK_ATTA, ehcip->ehci_log_hdl, "Please also refer to www.sun.com/io for"); USB_DPRINTF_L1(PRINT_MASK_ATTA, ehcip->ehci_log_hdl, diff --git a/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.conf b/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.conf index af772d8a9f..7bc92a9b91 100644 --- a/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.conf +++ b/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.conf @@ -111,7 +111,7 @@ # By setting "remvalue" to "true", the information provided # by the device is ignored. Consequently a USB hard disk # is treated as a removable media disk and will not show in -# format(1M) disk list. +# format(8) disk list. # # modesensevalue - "false" if the device cannot handle mode sense # requests. This is the only legal value for this diff --git a/usr/src/uts/common/io/zcons.c b/usr/src/uts/common/io/zcons.c index 8430e3e8cb..b264cd8e61 100644 --- a/usr/src/uts/common/io/zcons.c +++ b/usr/src/uts/common/io/zcons.c @@ -70,7 +70,7 @@ * slave while the associated non-global zone ran, thus ensuring that the * slave's STREAMS anchor would never be popped from within the non-global zone * (because zoneadmd runs in the global zone). However, this file descriptor - * was removed to make zone console management more robust. sad(7D) is now + * was removed to make zone console management more robust. sad(4D) is now * used to automatically set up the slave's STREAMS modules when the zone * console is freshly opened within the associated non-global zone. However, * when a process within the non-global zone freshly opens the zone console, the @@ -533,9 +533,9 @@ zc_slave_open(zc_state_t *zcs, } /* - * Set up sad(7D) so that the necessary STREAMS modules will be in + * Set up sad(4D) so that the necessary STREAMS modules will be in * place. A wrinkle is that 'ptem' must be anchored - * in place (see streamio(7i)) because we always want the console to + * in place (see streamio(4I)) because we always want the console to * have terminal semantics. */ minor = ddi_get_instance(zcs->zc_devinfo) << 1 | ZC_SLAVE_MINOR; diff --git a/usr/src/uts/common/net/if.h b/usr/src/uts/common/net/if.h index b184fcdda9..924fd390c7 100644 --- a/usr/src/uts/common/net/if.h +++ b/usr/src/uts/common/net/if.h @@ -147,7 +147,7 @@ struct ifnet { #define IFF_IPV4 0x0001000000 /* IPv4 interface */ #define IFF_IPV6 0x0002000000 /* IPv6 interface */ #define IFF_NOACCEPT 0x0004000000 /* no-accept mode VRRP ill */ -#define IFF_NOFAILOVER 0x0008000000 /* in.mpathd(1M) test address */ +#define IFF_NOFAILOVER 0x0008000000 /* in.mpathd(8) test address */ #define IFF_FAILED 0x0010000000 /* Interface has failed */ #define IFF_STANDBY 0x0020000000 /* Interface is a hot-spare */ diff --git a/usr/src/uts/common/net/pfpolicy.h b/usr/src/uts/common/net/pfpolicy.h index 0e456cf8f3..7da8256aed 100644 --- a/usr/src/uts/common/net/pfpolicy.h +++ b/usr/src/uts/common/net/pfpolicy.h @@ -326,8 +326,8 @@ struct spd_attribute }; /* - * These flags are used by the kernel algorithm structures and by ipsecalgs(1m). - * ALG_FLAG_KERNELCHECKED is used by ipsecalgs(1m) to tag ipsecalgent_t as + * These flags are used by the kernel algorithm structures and by ipsecalgs(8). + * ALG_FLAG_KERNELCHECKED is used by ipsecalgs(8) to tag ipsecalgent_t as * kernel verified. ALG_FLAG_VALID is only meaningful if set by the kernel. */ #define ALG_FLAG_VALID 0x01 diff --git a/usr/src/uts/common/nfs/auth.h b/usr/src/uts/common/nfs/auth.h index 5293e3fdd1..c33ac714d3 100644 --- a/usr/src/uts/common/nfs/auth.h +++ b/usr/src/uts/common/nfs/auth.h @@ -177,7 +177,7 @@ typedef struct nfsauth_res nfsauth_res_t; /* * For future extensibility, we version the data structures so - * future incantations of mountd(1m) will know how to XDR decode + * future incantations of mountd(8) will know how to XDR decode * the arguments. */ enum vtypes { diff --git a/usr/src/uts/common/nfs/nfs.h b/usr/src/uts/common/nfs/nfs.h index 6f76fc93ea..2bb312e661 100644 --- a/usr/src/uts/common/nfs/nfs.h +++ b/usr/src/uts/common/nfs/nfs.h @@ -1031,7 +1031,7 @@ extern void (*nfs_srv_quiesce_func)(void); extern int (*nfs_srv_dss_func)(char *, size_t); /* - * Per-zone stats as consumed by nfsstat(1m) + * Per-zone stats as consumed by nfsstat(8) */ struct nfs_version_stats { kstat_named_t *aclreqcnt_ptr; /* nfs_acl:0:aclreqcnt_v? */ diff --git a/usr/src/uts/common/os/cap_util.c b/usr/src/uts/common/os/cap_util.c index 86475315e1..7647302cfe 100644 --- a/usr/src/uts/common/os/cap_util.c +++ b/usr/src/uts/common/os/cap_util.c @@ -693,7 +693,7 @@ cu_cpc_program(cpu_t *cp, int *err) * * Context is marked with KCPC_CTX_INVALID_STOPPED when context is * unprogrammed and may be marked with KCPC_CTX_INVALID when - * kcpc_invalidate_all() is called by cpustat(1M) and dtrace CPC to + * kcpc_invalidate_all() is called by cpustat(8) and dtrace CPC to * invalidate all CPC contexts before they take over all the counters. * * This isn't necessary since these flags are only used for thread bound diff --git a/usr/src/uts/common/os/clock_process.c b/usr/src/uts/common/os/clock_process.c index 555cfd01d9..a3c1641c9c 100644 --- a/usr/src/uts/common/os/clock_process.c +++ b/usr/src/uts/common/os/clock_process.c @@ -18,7 +18,7 @@ * clock. This clock is weakly defined by POSIX as "The identifier of the * CPU-time clock associated with the process making a clock() or timer*() * function call". We interpret that as including LMS_USER, LMS_SYSTEM, and - * LMS_TRAP microstates. This is similar to what we do in proc(4) for the + * LMS_TRAP microstates. This is similar to what we do in proc(5) for the * lwpstatus_t and the prstatus_t. * * At this time, we only provide the ability to read the current time (e.g. diff --git a/usr/src/uts/common/os/ddi.c b/usr/src/uts/common/os/ddi.c index a37d91e92a..c348ee474c 100644 --- a/usr/src/uts/common/os/ddi.c +++ b/usr/src/uts/common/os/ddi.c @@ -1136,8 +1136,8 @@ qunbufcall(queue_t *q, bufcall_id_t id) * Associate the stream with an instance of the bottom driver. This * function is called by APIs that establish or modify the hardware * association (ppa) of an open stream. Two examples of such - * post-open(9E) APIs are the dlpi(7p) DL_ATTACH_REQ message, and the - * ndd(1M) "instance=" ioctl(2). This interface may be called from a + * post-open(9E) APIs are the dlpi(4P) DL_ATTACH_REQ message, and the + * ndd(8) "instance=" ioctl(2). This interface may be called from a * stream driver's wput procedure and from within syncq perimeters, * so it can't block. * diff --git a/usr/src/uts/common/os/ddi_hp_impl.c b/usr/src/uts/common/os/ddi_hp_impl.c index 38e575dbfd..8f0890fc2b 100644 --- a/usr/src/uts/common/os/ddi_hp_impl.c +++ b/usr/src/uts/common/os/ddi_hp_impl.c @@ -92,8 +92,8 @@ * - Through the nexus driver interface, ndi_hp_state_change_req. PCIe * nexus drivers that pass a hotplug interrupt through to pciehpc will kick * off state changes in this way. - * - Through coordinated removal, ddihp_modctl. Both cfgadm(1M) and - * hotplug(1M) pass state change requests through hotplugd, which uses + * - Through coordinated removal, ddihp_modctl. Both cfgadm(8) and + * hotplug(8) pass state change requests through hotplugd, which uses * modctl to request state changes to the DDI hotplug framework. That * interface is ultimately implemented by ddihp_modctl. * @@ -131,7 +131,7 @@ * of some key components are below. * * +------------+ - * | cfgadm(1M) | + * | cfgadm(8) | * +------------+ * | * +-------------------+ @@ -139,7 +139,7 @@ * +-------------------+ * | * +-------------+ +------------+ - * | hotplug(1M) |----------| libhotplug | + * | hotplug(8) |----------| libhotplug | * +-------------+ +------------+ * | * +----------+ @@ -193,14 +193,14 @@ * * KEY HOTPLUG SOFTWARE COMPONENTS * - * CFGADM(1M) + * cfgadm(8) * * cfgadm is the canonical tool for hotplug operations. It can be used to * list connections on the system and change their state in a coordinated * fashion. For more information, see its manual page. * * - * HOTPLUG(1M) + * hotplug(8) * * hotplug is a command line tool for managing hotplug connections for * connectors. For more information, see its manual page. diff --git a/usr/src/uts/common/os/ddi_ufm.c b/usr/src/uts/common/os/ddi_ufm.c index 7e863bdac2..a9da32cc4c 100644 --- a/usr/src/uts/common/os/ddi_ufm.c +++ b/usr/src/uts/common/os/ddi_ufm.c @@ -30,7 +30,7 @@ * drivers that participate in the DDI UFM subsystem on a per-instance basis * via ddi_ufm_handle_t structures (see ddi_ufm_impl.h). This is known as the * UFM handle. The UFM handle contains a pointer to the driver's UFM ops, - * which the ufm(7D) pseudo driver uses to invoke the UFM entry points in + * which the ufm(4D) pseudo driver uses to invoke the UFM entry points in * response to DDI UFM ioctls. Additionally, the DDI UFM subsystem uses the * handle to maintain cached UFM image and slot data. * diff --git a/usr/src/uts/common/os/ddifm.c b/usr/src/uts/common/os/ddifm.c index 533fa15aed..dc39ba49ab 100644 --- a/usr/src/uts/common/os/ddifm.c +++ b/usr/src/uts/common/os/ddifm.c @@ -56,7 +56,7 @@ * * Error reports resulting from hardware component specific and common IO * fault and driver defects must be accompanied by an Eversholt fault - * tree (.eft) by the Solaris fault manager (fmd(1M)) for + * tree (.eft) by the Solaris fault manager (fmd(8)) for * diagnosis. * * DDI_FM_ERRCB_CAPABLE @@ -466,7 +466,7 @@ out: if (ereport && (nva == NULL)) /* * Generate an error report for consumption by the Solaris Fault Manager, - * fmd(1M). Valid ereport classes are defined in /usr/include/sys/fm/io. + * fmd(8). Valid ereport classes are defined in /usr/include/sys/fm/io. * * The ENA should be set if this error is a result of an error status * returned from ddi_dma_err_check() or ddi_acc_err_check(). Otherwise, diff --git a/usr/src/uts/common/os/devid_cache.c b/usr/src/uts/common/os/devid_cache.c index 3e1a06a844..2a780eebe2 100644 --- a/usr/src/uts/common/os/devid_cache.c +++ b/usr/src/uts/common/os/devid_cache.c @@ -47,7 +47,7 @@ * involves walking the entire device tree attaching all possible disk * instances, to search for the device referenced by a devid. Obviously, * full device discovery is something to be avoided where possible. - * Note that simply invoking devfsadm(1M) is equivalent to running full + * Note that simply invoking devfsadm(8) is equivalent to running full * discovery at the devid cache level. * * Reasons why a disk may not be accessible: @@ -61,7 +61,7 @@ * When discovery may succeed: * Discovery will result in success when a device has been moved * to a different address. Note that it's recommended that - * devfsadm(1M) be invoked (no arguments required) whenever a system's + * devfsadm(8) be invoked (no arguments required) whenever a system's * h/w configuration has been updated. Alternatively, a * reconfiguration boot can be used to accomplish the same result. * @@ -69,7 +69,7 @@ * failure for a device which was powered off. Assuming the cache has an * entry for such a device, simply powering it on should permit the system * to access it. If problems persist after powering it on, invoke - * devfsadm(1M). + * devfsadm(8). * * Discovery prior to mounting root is only of interest when booting * from a filesystem which accesses devices by device id, which of diff --git a/usr/src/uts/common/os/errorq.c b/usr/src/uts/common/os/errorq.c index 8b41e7e8c1..cd71b9be08 100644 --- a/usr/src/uts/common/os/errorq.c +++ b/usr/src/uts/common/os/errorq.c @@ -946,7 +946,7 @@ errorq_cancel(errorq_t *eqp, errorq_elem_t *eqep) /* * Write elements on the dump list of each nvlist errorq to the dump device. - * Upon reboot, fmd(1M) will extract and replay them for diagnosis. + * Upon reboot, fmd(8) will extract and replay them for diagnosis. */ void errorq_dump(void) diff --git a/usr/src/uts/common/os/exit.c b/usr/src/uts/common/os/exit.c index 317251f12d..5a9355ae9f 100644 --- a/usr/src/uts/common/os/exit.c +++ b/usr/src/uts/common/os/exit.c @@ -170,11 +170,11 @@ restart_init(int what, int why) * zone) know that init has failed and will be restarted. */ zcmn_err(p->p_zone->zone_id, CE_WARN, - "init(1M) %s: restarting automatically", + "init(8) %s: restarting automatically", exit_reason(reason_buf, sizeof (reason_buf), what, why)); if (!INGLOBALZONE(p)) { - cmn_err(CE_WARN, "init(1M) for zone %s (pid %d) %s: " + cmn_err(CE_WARN, "init(8) for zone %s (pid %d) %s: " "restarting automatically", p->p_zone->zone_name, p->p_pid, reason_buf); } @@ -189,7 +189,7 @@ restart_init(int what, int why) /* * Grab p_lock and begin clearing miscellaneous global process - * state that needs to be reset before we exec the new init(1M). + * state that needs to be reset before we exec the new init(8). */ mutex_enter(&p->p_lock); @@ -287,7 +287,7 @@ restart_init(int what, int why) (void) freectty(B_TRUE); /* - * Now exec() the new init(1M) on top of the current process. If we + * Now exec() the new init(8) on top of the current process. If we * succeed, the caller will treat this like a successful system call. * If we fail, we issue messages and the caller will proceed with exit. */ @@ -297,11 +297,11 @@ restart_init(int what, int why) return (0); zcmn_err(p->p_zone->zone_id, CE_WARN, - "failed to restart init(1M) (err=%d): system reboot required", err); + "failed to restart init(8) (err=%d): system reboot required", err); if (!INGLOBALZONE(p)) { - cmn_err(CE_WARN, "failed to restart init(1M) for zone %s " - "(pid %d, err=%d): zoneadm(1M) boot required", + cmn_err(CE_WARN, "failed to restart init(8) for zone %s " + "(pid %d, err=%d): zoneadm(8) boot required", p->p_zone->zone_name, p->p_pid, err); } diff --git a/usr/src/uts/common/os/fm.c b/usr/src/uts/common/os/fm.c index 842f611ec0..6b0c27aaef 100644 --- a/usr/src/uts/common/os/fm.c +++ b/usr/src/uts/common/os/fm.c @@ -363,7 +363,7 @@ fm_nvprint(nvlist_t *nvl) /* * Wrapper for panic() that first produces an FMA-style message for admins. - * Normally such messages are generated by fmd(1M)'s syslog-msgs agent: this + * Normally such messages are generated by fmd(8)'s syslog-msgs agent: this * is the one exception to that rule and the only error that gets messaged. * This function is intended for use by subsystems that have detected a fatal * error and enqueued appropriate ereports and wish to then force a panic. diff --git a/usr/src/uts/common/os/kmem.c b/usr/src/uts/common/os/kmem.c index e01be96775..14c587d804 100644 --- a/usr/src/uts/common/os/kmem.c +++ b/usr/src/uts/common/os/kmem.c @@ -2250,7 +2250,7 @@ kmem_dumppr(char **pp, char *e, const char *format, ...) } /* - * Called when dumpadm(1M) configures dump parameters. + * Called when dumpadm(8) configures dump parameters. */ void kmem_dump_init(size_t size) diff --git a/usr/src/uts/common/os/ksensor.c b/usr/src/uts/common/os/ksensor.c index 491fbcc7cd..7dd4a22c8a 100644 --- a/usr/src/uts/common/os/ksensor.c +++ b/usr/src/uts/common/os/ksensor.c @@ -67,8 +67,8 @@ * * The implementation of (1) is all in this file. The implementation of (2) is * in uts/common/io/ksensor/ksensor_drv.c. The implementation of (3) is found in - * all of the different leaf devices. Examples of (3) include pchtemp(7D) and - * igb(7D). + * all of the different leaf devices. Examples of (3) include pchtemp(4D) and + * igb(4D). * * We separate numbers one and two into two different components for a few * reasons. The most important thing is that drivers that provide sensors should diff --git a/usr/src/uts/common/os/logsubr.c b/usr/src/uts/common/os/logsubr.c index f597c4a922..b5f41d93f9 100644 --- a/usr/src/uts/common/os/logsubr.c +++ b/usr/src/uts/common/os/logsubr.c @@ -198,7 +198,7 @@ log_init(void) /* * Create a backlog queue to consume console messages during periods - * when there is no console reader (e.g. before syslogd(1M) starts). + * when there is no console reader (e.g. before syslogd(8) starts). */ log_backlogq = log_consq = log_makeq(0, LOG_HIWAT, NULL); @@ -681,7 +681,7 @@ log_sendmsg(mblk_t *mp, zoneid_t zoneid) if (lp->log_q == log_consq) { console_printf(log_overflow_msg, lp->log_minor, - " -- is syslogd(1M) running?"); + " -- is syslogd(8) running?"); } else { printf(log_overflow_msg, lp->log_minor, ""); diff --git a/usr/src/uts/common/os/ndifm.c b/usr/src/uts/common/os/ndifm.c index 16613a9203..54640971fd 100644 --- a/usr/src/uts/common/os/ndifm.c +++ b/usr/src/uts/common/os/ndifm.c @@ -669,7 +669,7 @@ ndi_fm_dma_err_set(ddi_dma_handle_t handle, ddi_fm_error_t *dfe) /* * Call parent busop fm initialization routine. * - * Called during driver attach(1M) + * Called during driver attach(9E) */ int i_ndi_busop_fm_init(dev_info_t *dip, int tcap, ddi_iblock_cookie_t *ibc) @@ -696,7 +696,7 @@ i_ndi_busop_fm_init(dev_info_t *dip, int tcap, ddi_iblock_cookie_t *ibc) /* * Call parent busop fm clean-up routine. * - * Called during driver detach(1M) + * Called during driver detach(9E) */ void i_ndi_busop_fm_fini(dev_info_t *dip) diff --git a/usr/src/uts/common/os/priv_defs b/usr/src/uts/common/os/priv_defs index bc1787c9ca..186aafc460 100644 --- a/usr/src/uts/common/os/priv_defs +++ b/usr/src/uts/common/os/priv_defs @@ -213,7 +213,7 @@ privilege PRIV_NET_BINDMLP Allow a process to bind to a port that is configured as a multi-level port(MLP) for the process's zone. This privilege applies to both shared address and zone-specific address MLPs. - See tnzonecfg(4) from the Trusted Extensions manual pages for + See tnzonecfg(5) from the Trusted Extensions manual pages for information on configuring MLP ports. This privilege is interpreted only if the system is configured with Trusted Extensions. @@ -499,7 +499,7 @@ privilege PRIV_SYS_TRANS_LABEL privilege PRIV_VIRT_MANAGE Allows a process to manage virtualized environments such as - xVM(5). + xVM(7). privilege PRIV_WIN_COLORMAP @@ -605,7 +605,7 @@ privilege PRIV_WIN_UPGRADE_SL privilege PRIV_XVM_CONTROL - Allows a process access to the xVM(5) control devices for + Allows a process access to the xVM(7) control devices for managing guest domains and the hypervisor. This privilege is used only if booted into xVM on x86 platforms. diff --git a/usr/src/uts/common/os/rctl.c b/usr/src/uts/common/os/rctl.c index 09b80323d5..f365bb4594 100644 --- a/usr/src/uts/common/os/rctl.c +++ b/usr/src/uts/common/os/rctl.c @@ -148,7 +148,7 @@ * The locking subsequence of interest is: p_lock, rctl_dict_lock, * rctl_lists_lock, entity->rcs_lock. * - * The projects(4) database and project entity resource controls + * The project(5) database and project entity resource controls * A special case is made for RCENTITY_PROJECT values set through the * setproject(3PROJECT) interface. setproject() makes use of a private * interface, setprojrctl(), which passes through an array of resource control @@ -169,7 +169,7 @@ * * rctl->rc_values - a linked list of rctl_val_t. These are the active * resource values associated with this rctl, and may have been set by - * setrctl() - via prctl(1M), or by setprojrctl() - via + * setrctl() - via prctl(1), or by setprojrctl() - via * setproject(3PROJECT). * * rctl->rc_projdb - a linked list of rctl_val_t. These reflect the diff --git a/usr/src/uts/common/os/streamio.c b/usr/src/uts/common/os/streamio.c index 11a4033db1..c137a498d1 100644 --- a/usr/src/uts/common/os/streamio.c +++ b/usr/src/uts/common/os/streamio.c @@ -3627,7 +3627,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, /* * The I_STR facility provides a trap door for malicious - * code to send down bogus streamio(7I) ioctl commands to + * code to send down bogus streamio(4I) ioctl commands to * unsuspecting STREAMS modules and drivers which expect to * only get these messages from the stream head. * Explicitly prohibit any streamio ioctls which can be diff --git a/usr/src/uts/common/os/sunpm.c b/usr/src/uts/common/os/sunpm.c index 3ce7cc530d..bb7d643c22 100644 --- a/usr/src/uts/common/os/sunpm.c +++ b/usr/src/uts/common/os/sunpm.c @@ -61,8 +61,8 @@ * tells what each component's power state values are, and provides human * readable strings (currently unused) for each component name and power state. * Devices which export pm-components(9P) are automatically power managed - * whenever autopm is enabled (via PM_START_PM ioctl issued by pmconfig(1M) - * after parsing power.conf(4)). The exception to this rule is that power + * whenever autopm is enabled (via PM_START_PM ioctl issued by pmconfig(8) + * after parsing power.conf(5)). The exception to this rule is that power * manageable CPU devices may be automatically managed independently of autopm * by either enabling or disabling (via PM_START_CPUPM and PM_STOP_CPUPM * ioctls) cpupm. If the CPU devices are not managed independently, then they @@ -72,13 +72,13 @@ * hardware state. * * Each device component also has a threshold time associated with each power - * transition (see power.conf(4)), and a busy/idle state maintained by the + * transition (see power.conf(5)), and a busy/idle state maintained by the * driver calling pm_idle_component(9F) and pm_busy_component(9F). * Components are created idle. * * The PM framework provides several functions: - * -implement PM policy as described in power.conf(4) - * Policy is set by pmconfig(1M) issuing pm ioctls based on power.conf(4). + * -implement PM policy as described in power.conf(5) + * Policy is set by pmconfig(8) issuing pm ioctls based on power.conf(5). * Policies consist of: * -set threshold values (defaults if none provided by pmconfig) * -set dependencies among devices @@ -122,7 +122,7 @@ * cdrom is always up whenever the console framebuffer is up, so that the user * can insert a cdrom and see a popup as a result. * - * The dependency terminology used in power.conf(4) is not easy to understand, + * The dependency terminology used in power.conf(5) is not easy to understand, * so we've adopted a different terminology in the implementation. We write * of a "keeps up" and a "kept up" device. A relationship can be established * where one device keeps up another. That means that if the keepsup device @@ -384,7 +384,7 @@ int cpr_platform_enable = 0; /* * pm_S3_enabled indicates that we believe the platform can support S3, - * which we get from pmconfig(1M) + * which we get from pmconfig(8) */ int pm_S3_enabled; @@ -7647,7 +7647,7 @@ pm_cfb_setup(const char *stdout_path) */ } else { cmn_err(CE_WARN, "Kernel debugger present: see " - "kmdb(1M) for interaction with power management."); + "kmdb(1) for interaction with power management."); } } #ifdef DEBUG diff --git a/usr/src/uts/common/os/timer.c b/usr/src/uts/common/os/timer.c index 7d061d878b..c78a545360 100644 --- a/usr/src/uts/common/os/timer.c +++ b/usr/src/uts/common/os/timer.c @@ -178,7 +178,7 @@ timer_delete_locked(proc_t *p, timer_t tid, itimer_t *it) /* * timer_grab() and its companion routine, timer_release(), are wrappers - * around timer_lock()/_unlock() which allow the timer_*(3R) routines to + * around timer_lock()/_unlock() which allow the timer_*(3C) routines to * (a) share error handling code and (b) not grab p_lock themselves. Routines * which are called with p_lock held (e.g. timer_lwpbind(), timer_lwpexit()) * must call timer_lock()/_unlock() explictly. @@ -193,7 +193,7 @@ timer_delete_locked(proc_t *p, timer_t tid, itimer_t *it) * (a) The specified timer ID is out of range. * * (b) The specified timer ID does not correspond to a timer ID returned - * from timer_create(3R). + * from timer_create(3C). * * (c) The specified timer ID is currently being removed. * diff --git a/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c b/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c index aa0eb2484e..bf8e6ed3a1 100644 --- a/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c +++ b/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c @@ -949,7 +949,7 @@ rpcsec_gss_init( } /* - * kgss_accept_sec_context()/gssd(1M) can be overly time + * kgss_accept_sec_context()/gssd(8) can be overly time * consuming so let's queue it and return asap. * * taskq func must free arg. diff --git a/usr/src/uts/common/sys/class.h b/usr/src/uts/common/sys/class.h index a132d38419..c795f85eca 100644 --- a/usr/src/uts/common/sys/class.h +++ b/usr/src/uts/common/sys/class.h @@ -130,7 +130,7 @@ extern int loaded_classes; /* number of classes loaded */ extern pri_t minclsyspri; extern id_t syscid; /* system scheduling class ID */ extern id_t sysdccid; /* system duty-cycle scheduling class ID */ -extern id_t defaultcid; /* "default" class id; see dispadmin(1M) */ +extern id_t defaultcid; /* "default" class id; see dispadmin(8) */ extern int alloc_cid(char *, id_t *); extern int scheduler_load(char *, sclass_t *); diff --git a/usr/src/uts/common/sys/csiioctl.h b/usr/src/uts/common/sys/csiioctl.h index 78a1303798..6a6debfadb 100644 --- a/usr/src/uts/common/sys/csiioctl.h +++ b/usr/src/uts/common/sys/csiioctl.h @@ -27,8 +27,6 @@ #ifndef _SYS_CSIIOCTL_H #define _SYS_CSIIOCTL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -37,14 +35,14 @@ extern "C" { * csiioctl.h * * CodeSet Independent codeset width communication between stty(1) and - * ldterm(7M). + * ldterm(4M). * * CSDATA_SET This call takes a pointer to a ldterm_cs_data_t data * structure, and uses it to set the line discipline definition * and also for a possible switch of the internal methods and * data for the current locale's codeset. * - * When this message is reached, the ldterm(7M) will check + * When this message is reached, the ldterm(4M) will check * the validity of the message and if the message contains * a valid data, it will accumulate the data and switch * the internal methods if necessary to support the requested @@ -52,7 +50,7 @@ extern "C" { * * CSDATA_GET This call takes a pointer to a ldterm_cs_data_t structure * and returns in it the codeset data info currently in use by - * the ldterm(7M) module. + * the ldterm(4M) module. */ #define CSI_IOC (('C' | 128) << 8) diff --git a/usr/src/uts/common/sys/dkio.h b/usr/src/uts/common/sys/dkio.h index e66551fc6d..6996837b40 100644 --- a/usr/src/uts/common/sys/dkio.h +++ b/usr/src/uts/common/sys/dkio.h @@ -88,7 +88,7 @@ struct dk_cinfo { #define DKC_PCMCIA_MEM 21 /* PCMCIA memory disk-like type (Obsolete) */ #define DKC_PCMCIA_ATA 22 /* PCMCIA AT Attached type */ #define DKC_VBD 23 /* virtual block device */ -#define DKC_BLKDEV 24 /* generic block device (see blkdev(7d)) */ +#define DKC_BLKDEV 24 /* generic block device (see blkdev(4D)) */ /* * Sun reserves up through 1023 diff --git a/usr/src/uts/common/sys/dklabel.h b/usr/src/uts/common/sys/dklabel.h index 457c1ecadc..25b52c014b 100644 --- a/usr/src/uts/common/sys/dklabel.h +++ b/usr/src/uts/common/sys/dklabel.h @@ -87,7 +87,7 @@ typedef daddr32_t blkaddr32_t; /* * partition headers: section 1 - * Returned in struct dk_allmap by ioctl DKIOC[SG]APART (dkio(7I)) + * Returned in struct dk_allmap by ioctl DKIOC[SG]APART (dkio(4I)) */ struct dk_map { blkaddr_t dkl_cylno; /* starting cylinder */ diff --git a/usr/src/uts/common/sys/dld.h b/usr/src/uts/common/sys/dld.h index cf2780d57a..de7ac46db4 100644 --- a/usr/src/uts/common/sys/dld.h +++ b/usr/src/uts/common/sys/dld.h @@ -48,7 +48,7 @@ extern "C" { #endif /* - * Data-Link Driver Information (text emitted by modinfo(1m)) + * Data-Link Driver Information (text emitted by modinfo(8)) */ #define DLD_INFO "Data-Link Driver" diff --git a/usr/src/uts/common/sys/dlpi.h b/usr/src/uts/common/sys/dlpi.h index 56cd46e668..8b1dc48702 100644 --- a/usr/src/uts/common/sys/dlpi.h +++ b/usr/src/uts/common/sys/dlpi.h @@ -277,7 +277,7 @@ typedef struct dl_ipnetinfo { #define DL_IPV6 0x80000002ul /* IPv6 Tunnel Link */ #define SUNW_DL_VNI 0x80000003ul /* Virtual network interface */ #define DL_WIFI 0x80000004ul /* IEEE 802.11 */ -#define DL_IPNET 0x80000005ul /* ipnet(7D) link */ +#define DL_IPNET 0x80000005ul /* ipnet(4D) link */ #define SUNW_DL_IPMP 0x80000006ul /* IPMP stub interface */ #define DL_6TO4 0x80000007ul /* 6to4 Tunnel Link */ diff --git a/usr/src/uts/common/sys/dls.h b/usr/src/uts/common/sys/dls.h index 50bfb0d86f..cd3749dc21 100644 --- a/usr/src/uts/common/sys/dls.h +++ b/usr/src/uts/common/sys/dls.h @@ -45,7 +45,7 @@ extern "C" { #define DLS_MODULE_NAME "dls" /* - * Data-Link Services Information (text emitted by modinfo(1m)) + * Data-Link Services Information (text emitted by modinfo(8)) */ #define DLS_INFO "Data-Link Services" diff --git a/usr/src/uts/common/sys/dtrace.h b/usr/src/uts/common/sys/dtrace.h index ab6d4c4445..f554fb0e58 100644 --- a/usr/src/uts/common/sys/dtrace.h +++ b/usr/src/uts/common/sys/dtrace.h @@ -43,7 +43,7 @@ extern "C" { * Solaris system and DTrace subsystem and are subject to change at any time * without notice. Applications and drivers using these interfaces will fail * to run on future releases. These interfaces should not be used for any - * purpose except those expressly outlined in dtrace(7D) and libdtrace(3LIB). + * purpose except those expressly outlined in dtrace(4D) and libdtrace(3LIB). * Please refer to the "Solaris Dynamic Tracing Guide" for more information. */ @@ -1188,7 +1188,7 @@ typedef struct dtrace_argdesc { * The D compiler can query the provider attributes (dtrace_pattr_t below) in * order to compute the properties of an input program and report them. */ -typedef uint8_t dtrace_stability_t; /* stability code (see attributes(5)) */ +typedef uint8_t dtrace_stability_t; /* stability code (see attributes(7)) */ typedef uint8_t dtrace_class_t; /* architectural dependency class */ #define DTRACE_STABILITY_INTERNAL 0 /* private to DTrace itself */ diff --git a/usr/src/uts/common/sys/dtrace_impl.h b/usr/src/uts/common/sys/dtrace_impl.h index a55d0d7e1f..fe8666e1dd 100644 --- a/usr/src/uts/common/sys/dtrace_impl.h +++ b/usr/src/uts/common/sys/dtrace_impl.h @@ -43,7 +43,7 @@ extern "C" { * Solaris system and DTrace subsystem and are subject to change at any time * without notice. Applications and drivers using these interfaces will fail * to run on future releases. These interfaces should not be used for any - * purpose except those expressly outlined in dtrace(7D) and libdtrace(3LIB). + * purpose except those expressly outlined in dtrace(4D) and libdtrace(3LIB). * Please refer to the "Solaris Dynamic Tracing Guide" for more information. */ @@ -1201,7 +1201,7 @@ typedef struct dtrace_enabling { * properties in the dtrace.conf file. If there is an anonymous enabling, a * DTrace consumer state and enabling are created on attach. The state may be * subsequently grabbed by the first consumer specifying the "grabanon" - * option. As long as an anonymous DTrace enabling exists, dtrace(7D) will + * option. As long as an anonymous DTrace enabling exists, dtrace(4D) will * refuse to unload. */ typedef struct dtrace_anon { diff --git a/usr/src/uts/common/sys/dumphdr.h b/usr/src/uts/common/sys/dumphdr.h index f418913257..2019f60a5d 100644 --- a/usr/src/uts/common/sys/dumphdr.h +++ b/usr/src/uts/common/sys/dumphdr.h @@ -40,8 +40,8 @@ extern "C" { * are written out: one at the beginning of the dump, and the other at * the very end of the dump device. The terminal header is at a known * location (end of device) so we can always find it. The initial header - * is redundant, but helps savecore(1M) determine whether the dump has been - * overwritten by swap activity. See dumpadm(1M) for dump configuration. + * is redundant, but helps savecore(8) determine whether the dump has been + * overwritten by swap activity. See dumpadm(8) for dump configuration. */ #define DUMP_MAGIC 0xdefec8edU /* dump magic number */ #define DUMP_VERSION 10 /* version of this dumphdr */ diff --git a/usr/src/uts/common/sys/epoll.h b/usr/src/uts/common/sys/epoll.h index 3b38d9f629..480bfdf9ff 100644 --- a/usr/src/uts/common/sys/epoll.h +++ b/usr/src/uts/common/sys/epoll.h @@ -45,7 +45,7 @@ typedef struct epoll_event { #endif /* - * Define the EPOLL* constants in terms of their poll(2)/poll(7) equivalents. + * Define the EPOLL* constants in terms of their poll(2)/poll(4D) equivalents. * Note that the values match the equivalents in Linux to allow for any binary * compatibility layers to not need to translate them. */ diff --git a/usr/src/uts/common/sys/fault.h b/usr/src/uts/common/sys/fault.h index d37e8a0f47..139216b5ff 100644 --- a/usr/src/uts/common/sys/fault.h +++ b/usr/src/uts/common/sys/fault.h @@ -40,7 +40,7 @@ extern "C" { * hardware faults. Setting the appropriate flags in a process's * set of traced faults via /proc causes the process to stop each * time one of the designated faults occurs so that a debugger can - * take action. See proc(4) for details. + * take action. See proc(5) for details. */ /* fault enumeration must begin with 1 */ diff --git a/usr/src/uts/common/sys/feature_tests.h b/usr/src/uts/common/sys/feature_tests.h index 9236a398b8..728060e7ec 100644 --- a/usr/src/uts/common/sys/feature_tests.h +++ b/usr/src/uts/common/sys/feature_tests.h @@ -58,7 +58,7 @@ extern "C" { * compress common standards specified feature test macros for easier reading. * These macros should not be used by the application developer as * unexpected results may occur. Instead, the user should reference - * standards(5) for correct usage of the standards feature test macros. + * standards(7) for correct usage of the standards feature test macros. * * __XOPEN_OR_POSIX Used in cases where a symbol is defined by both * X/Open or POSIX or in the negative, when neither @@ -259,7 +259,7 @@ extern "C" { * * When writing a conforming X/Open application, as per the specification * requirements, the appropriate feature test macros must be defined at - * compile time. These are as follows. For more info, see standards(5). + * compile time. These are as follows. For more info, see standards(7). * * Feature Test Macro Specification * ------------------------------------------------ ------------- diff --git a/usr/src/uts/common/sys/fs/zfs.h b/usr/src/uts/common/sys/fs/zfs.h index 73050319b9..0ed966d22f 100644 --- a/usr/src/uts/common/sys/fs/zfs.h +++ b/usr/src/uts/common/sys/fs/zfs.h @@ -247,7 +247,7 @@ typedef enum { ZPOOL_NUM_PROPS } zpool_prop_t; -/* Small enough to not hog a whole line of printout in zpool(1M). */ +/* Small enough to not hog a whole line of printout in zpool(8). */ #define ZPROP_MAX_COMMENT 32 #define ZPROP_VALUE "value" diff --git a/usr/src/uts/common/sys/fsspriocntl.h b/usr/src/uts/common/sys/fsspriocntl.h index 66931e813b..4f61519a7c 100644 --- a/usr/src/uts/common/sys/fsspriocntl.h +++ b/usr/src/uts/common/sys/fsspriocntl.h @@ -27,8 +27,6 @@ #ifndef _SYS_FSSPRIOCNTL_H #define _SYS_FSSPRIOCNTL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/fss.h> @@ -58,7 +56,7 @@ typedef struct fssinfo { #define FSS_KY_UPRI 2 /* user priority */ /* - * The following is used by the dispadmin(1M) command for scheduler + * The following is used by the dispadmin(8) command for scheduler * administration and is not for general use. */ typedef struct fssadmin { diff --git a/usr/src/uts/common/sys/fxpriocntl.h b/usr/src/uts/common/sys/fxpriocntl.h index feff8a2ad4..8a1c680ee9 100644 --- a/usr/src/uts/common/sys/fxpriocntl.h +++ b/usr/src/uts/common/sys/fxpriocntl.h @@ -27,8 +27,6 @@ #ifndef _SYS_FXPRIOCNTL_H #define _SYS_FXPRIOCNTL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/thread.h> @@ -68,7 +66,7 @@ typedef struct fxinfo { /* - * The following is used by the dispadmin(1M) command for + * The following is used by the dispadmin(8) command for * scheduler administration and is not for general use. */ diff --git a/usr/src/uts/common/sys/iapriocntl.h b/usr/src/uts/common/sys/iapriocntl.h index b6dcd1162b..d35577f9e8 100644 --- a/usr/src/uts/common/sys/iapriocntl.h +++ b/usr/src/uts/common/sys/iapriocntl.h @@ -78,7 +78,7 @@ typedef struct iainfo { #define IA_KY_MODE 3 /* interactive on/off */ /* - * The following is used by the dispadmin(1M) command for + * The following is used by the dispadmin(8) command for * scheduler administration and is not for general use. */ diff --git a/usr/src/uts/common/sys/ib/ibnex/ibnex.h b/usr/src/uts/common/sys/ib/ibnex/ibnex.h index f2928d8f4b..3b12a499fc 100644 --- a/usr/src/uts/common/sys/ib/ibnex/ibnex.h +++ b/usr/src/uts/common/sys/ib/ibnex/ibnex.h @@ -263,7 +263,7 @@ typedef struct ibnex_s { IBNEX_MAX_COMPAT_NAMES * IBNEX_MAX_COMPAT_LEN #define IBNEX_MAX_IBPORT_COMPAT_PROP_SZ \ IBNEX_MAX_IBPORT_COMPAT_NAMES * IBNEX_MAX_COMPAT_LEN -#define IBNEX_DEVFS_ENUMERATE 0x1 /* enumerate via devfs(7fs) */ +#define IBNEX_DEVFS_ENUMERATE 0x1 /* enumerate via devfs(4FS) */ #define IBNEX_CFGADM_ENUMERATE 0x2 /* enumerate via cfgadm */ #define IBNEX_MAX_NODEADDR_SZ 35 diff --git a/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h b/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h index c82b43b5a5..8d74d61c86 100644 --- a/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h +++ b/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h @@ -82,14 +82,14 @@ typedef enum ib_service_type_e { #define IBNEX_NODE_COND_NVL "node_condition" /* - * This flag is passed from cfgadm to ib(7d) to convey that it + * This flag is passed from cfgadm to ib(4D) to convey that it * need not attempt to probe the fabric. * * The value of these flags should be same as flags in enum * ibdm_ibnex_get_ioclist_mtd_t. */ #define IBNEX_DONOT_PROBE_FLAG 1 -#define IBNEX_NORMAL_PROBE 0 /* flag used by ib(7d) only */ +#define IBNEX_NORMAL_PROBE 0 /* flag used by ib(4D) only */ /* * The following are sub-commands to DEVCTL_AP_CONTROL. diff --git a/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h b/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h index 824d692306..4acabc9e86 100644 --- a/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h +++ b/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h @@ -118,7 +118,7 @@ void ibtl_ibnex_unregister_callback(); * alternate_HCA database * IBTL_IBNEX_UNCFG_CLNTS_FLAG - Build client devpaths/ * ap_id database - * callback - Callback function to get ap_id from ib(7d) + * callback - Callback function to get ap_id from ib(4D) * Output: * buffer - The information is returned in this buffer * bufsiz - The size of the information buffer @@ -192,7 +192,7 @@ ibt_status_t ibtl_ibnex_get_hca_verbose_data(ib_guid_t, char **, size_t *); * registered HCAs's dip. If match found return IBT_SUCCESS, * else IBT_NO_HCAS_AVAILABLE. * For IOC/Pseudo devices check if the given pdip is that of - * the ib(7d) nexus. If yes return IBT_SUCCESS, + * the ib(4D) nexus. If yes return IBT_SUCCESS, * else IBT_NO_HCAS_AVAILABLE. */ ibt_status_t ibtl_ibnex_valid_hca_parent(dev_info_t *); diff --git a/usr/src/uts/common/sys/lofi.h b/usr/src/uts/common/sys/lofi.h index f57388a098..f5285149fa 100644 --- a/usr/src/uts/common/sys/lofi.h +++ b/usr/src/uts/common/sys/lofi.h @@ -137,7 +137,7 @@ extern "C" { * torn down. * * Oh, and last but not least: these ioctls are totally private and only - * for use by lofiadm(1M). + * for use by lofiadm(8). * */ diff --git a/usr/src/uts/common/sys/mac.h b/usr/src/uts/common/sys/mac.h index 723128cfc9..da2cff93a7 100644 --- a/usr/src/uts/common/sys/mac.h +++ b/usr/src/uts/common/sys/mac.h @@ -43,7 +43,7 @@ extern "C" { #endif /* - * MAC Information (text emitted by modinfo(1m)) + * MAC Information (text emitted by modinfo(8)) */ #define MAC_INFO "MAC Services" @@ -593,7 +593,7 @@ typedef struct mactype_ops_s { * Note that the ndd ioctls are obsolete, and may be removed in a future * release of Solaris. The ndd ioctls are not typically used in legacy * ethernet drivers. New datalink drivers of all link-types should use - * dladm(1m) interfaces for administering tunables and not have to provide + * dladm(8) interfaces for administering tunables and not have to provide * a mapping. */ typedef struct mac_ndd_mapping_s { diff --git a/usr/src/uts/common/sys/mac_wifi.h b/usr/src/uts/common/sys/mac_wifi.h index 2ff46dbc6c..425c1a6613 100644 --- a/usr/src/uts/common/sys/mac_wifi.h +++ b/usr/src/uts/common/sys/mac_wifi.h @@ -50,7 +50,7 @@ extern "C" { sizeof (struct ieee80211_llc)) enum wifi_stat { - /* statistics described in ieee802.11(5) */ + /* statistics described in ieee802.11(7) */ WIFI_STAT_TX_FRAGS = MACTYPE_STAT_MIN, WIFI_STAT_MCAST_TX, WIFI_STAT_TX_FAILED, diff --git a/usr/src/uts/common/sys/mem.h b/usr/src/uts/common/sys/mem.h index c73a1b6e95..ff265b185c 100644 --- a/usr/src/uts/common/sys/mem.h +++ b/usr/src/uts/common/sys/mem.h @@ -68,7 +68,7 @@ typedef struct mem_vtop32 { #endif /* - * Private ioctls for fmd(1M). These interfaces are Sun Private. Applications + * Private ioctls for fmd(8). These interfaces are Sun Private. Applications * and drivers should not make use of these interfaces: they can change without * notice and programs that consume them will fail to run on future releases. */ @@ -86,7 +86,7 @@ typedef struct mem_vtop32 { #define MEM_SID (('M' << 8) | 0x0B) /* - * Bits returned from MEM_PAGE_GETERRORS ioctl for use by fmd(1M). + * Bits returned from MEM_PAGE_GETERRORS ioctl for use by fmd(8). */ #define MEM_PAGE_ERR_NONE 0x0 #define MEM_PAGE_ERR_MULTI_CE 0x1 diff --git a/usr/src/uts/common/sys/mixer.h b/usr/src/uts/common/sys/mixer.h index 9abcd6121d..e50ad9fc47 100644 --- a/usr/src/uts/common/sys/mixer.h +++ b/usr/src/uts/common/sys/mixer.h @@ -81,7 +81,7 @@ struct am_control { audio_info_t dev_info; /* - * The mixer(7I) manual page shows an example of using the ch_open[] + * The mixer(4I) manual page shows an example of using the ch_open[] * array. Each element that is set to 0 represents a channel which * isn't allocated, and non-zero elements represent a channel that is * alloacted. This size of this array may change, depending on the @@ -111,7 +111,7 @@ struct am_sample_rates { /* * Set this number to the number of sample rates to request. The - * mixer(7I) manual page shows an example of using this structure. + * mixer(4I) manual page shows an example of using this structure. * When AUDIO_MIXER_GET_SAMPLE_RATES returns the number of samples * available is set. This may be more or less than the number requested. * If more that only the requested number of samples is arctually @@ -121,7 +121,7 @@ struct am_sample_rates { /* * Variable size array for the supported sample rates. See the example - * in the mixer(7I) manual page for how to use this array. + * in the mixer(4I) manual page for how to use this array. */ uint_t samp_rates[1]; }; diff --git a/usr/src/uts/common/sys/mutex.h b/usr/src/uts/common/sys/mutex.h index db34243dcc..7f6dc8ae10 100644 --- a/usr/src/uts/common/sys/mutex.h +++ b/usr/src/uts/common/sys/mutex.h @@ -51,7 +51,7 @@ extern "C" { * either MUTEX_ADAPTIVE or MUTEX_SPIN depending on the iblock cookie. * * Mutex statistics can be gathered on the fly, without rebooting or - * recompiling the kernel, via the lockstat driver (lockstat(7D)). + * recompiling the kernel, via the lockstat driver (lockstat(4D)). */ typedef enum { MUTEX_ADAPTIVE = 0, /* spin if owner is running, otherwise block */ diff --git a/usr/src/uts/common/sys/nvme.h b/usr/src/uts/common/sys/nvme.h index 0dc26a8238..787d5d4016 100644 --- a/usr/src/uts/common/sys/nvme.h +++ b/usr/src/uts/common/sys/nvme.h @@ -28,7 +28,7 @@ #endif /* - * Declarations used for communication between nvmeadm(1M) and nvme(7D) + * Declarations used for communication between nvmeadm(8) and nvme(4D) */ #ifdef __cplusplus diff --git a/usr/src/uts/common/sys/priocntl.h b/usr/src/uts/common/sys/priocntl.h index 682c79ed7c..396672a31f 100644 --- a/usr/src/uts/common/sys/priocntl.h +++ b/usr/src/uts/common/sys/priocntl.h @@ -54,7 +54,7 @@ extern long priocntlset(procset_t *, int, ...); #define PC_SETPARMS 2 /* Set scheduling parameters */ #define PC_GETPARMS 3 /* Get scheduling parameters */ #define PC_ADMIN 4 /* Scheduler administration (used by */ - /* dispadmin(1M), not for general use) */ + /* dispadmin(8), not for general use) */ #define PC_GETPRIRANGE 5 /* Get priority range for a class */ /* posix.4 scheduling, not for general use */ #define PC_DONICE 6 /* Set or get nice value */ @@ -152,7 +152,7 @@ typedef struct pcpri { } pcpri_t; /* - * The following is used by the dispadmin(1M) command for + * The following is used by the dispadmin(8) command for * scheduler administration and is not for general use. */ diff --git a/usr/src/uts/common/sys/ramdisk.h b/usr/src/uts/common/sys/ramdisk.h index a750336d37..202fff360f 100644 --- a/usr/src/uts/common/sys/ramdisk.h +++ b/usr/src/uts/common/sys/ramdisk.h @@ -26,8 +26,6 @@ #ifndef _SYS_RAMDISK_H #define _SYS_RAMDISK_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/time.h> #include <sys/vtoc.h> @@ -93,7 +91,7 @@ extern "C" { } /* - * Interface between the ramdisk(7D) driver and ramdiskadm(1M). Use is: + * Interface between the ramdisk(4D) driver and ramdiskadm(8). Use is: * * fd = open("/dev/ramdiskctl", O_RDWR | O_EXCL); * @@ -117,7 +115,7 @@ extern "C" { * by the RD_DELETE_DISK ioctl). * * Note that these ioctls are completely private, and only for the use of - * ramdiskadm(1M). + * ramdiskadm(8). */ #define RD_IOC_BASE (('R' << 16) | ('D' << 8)) diff --git a/usr/src/uts/common/sys/rtpriocntl.h b/usr/src/uts/common/sys/rtpriocntl.h index 6c9d824944..3baa1b62d8 100644 --- a/usr/src/uts/common/sys/rtpriocntl.h +++ b/usr/src/uts/common/sys/rtpriocntl.h @@ -67,7 +67,7 @@ typedef struct rtinfo { #define RT_KY_TQSIG 4 /* real-time time quantum signal */ /* - * The following is used by the dispadmin(1M) command for + * The following is used by the dispadmin(8) command for * scheduler administration and is not for general use. */ diff --git a/usr/src/uts/common/sys/smbios.h b/usr/src/uts/common/sys/smbios.h index 3ce9e2c7a3..257956b047 100644 --- a/usr/src/uts/common/sys/smbios.h +++ b/usr/src/uts/common/sys/smbios.h @@ -2085,7 +2085,7 @@ extern const char *smbios_csn(smbios_hdl_t *); #ifndef _KERNEL /* * The smbios_*_desc() and smbios_*_name() interfaces can be used for utilities - * such as smbios(1M) that wish to decode SMBIOS fields for humans. The _desc + * such as smbios(8) that wish to decode SMBIOS fields for humans. The _desc * functions return the comment string next to the #defines listed above, and * the _name functions return the appropriate #define identifier itself. */ diff --git a/usr/src/uts/common/sys/socketvar.h b/usr/src/uts/common/sys/socketvar.h index 93090dbfa2..479641a11b 100644 --- a/usr/src/uts/common/sys/socketvar.h +++ b/usr/src/uts/common/sys/socketvar.h @@ -596,7 +596,7 @@ extern smod_info_t *smod_lookup_byname(const char *); /* * Used to traverse the list of AF_UNIX sockets to construct the kstat - * for netstat(1m). + * for netstat(8). */ struct socklist { kmutex_t sl_lock; diff --git a/usr/src/uts/common/sys/sysmsg_impl.h b/usr/src/uts/common/sys/sysmsg_impl.h index 9081277478..a573db1320 100644 --- a/usr/src/uts/common/sys/sysmsg_impl.h +++ b/usr/src/uts/common/sys/sysmsg_impl.h @@ -27,8 +27,6 @@ #ifndef _SYS_SYSMSG_IMPL_H #define _SYS_SYSMSG_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -36,7 +34,7 @@ extern "C" { #define SYSMSG "/dev/sysmsg" /* - * consadm(1M) uses these ioctls to interface with /dev/sysmsg. + * consadm(8) uses these ioctls to interface with /dev/sysmsg. */ /* diff --git a/usr/src/uts/common/sys/tspriocntl.h b/usr/src/uts/common/sys/tspriocntl.h index 1c8c35a5d6..6d814631e0 100644 --- a/usr/src/uts/common/sys/tspriocntl.h +++ b/usr/src/uts/common/sys/tspriocntl.h @@ -62,7 +62,7 @@ typedef struct tsinfo { #define TS_KY_UPRI 2 /* user priority */ /* - * The following is used by the dispadmin(1M) command for + * The following is used by the dispadmin(8) command for * scheduler administration and is not for general use. */ diff --git a/usr/src/uts/common/sys/usb/clients/ugen/usb_ugen.h b/usr/src/uts/common/sys/usb/clients/ugen/usb_ugen.h index d1bcc096d1..a63fb02f1a 100644 --- a/usr/src/uts/common/sys/usb/clients/ugen/usb_ugen.h +++ b/usr/src/uts/common/sys/usb/clients/ugen/usb_ugen.h @@ -39,7 +39,7 @@ extern "C" { /* * UGEN provides a mechanism to retrieve USB bus specific information - * through endpoint status minor nodes (See ugen(7D) for more information). + * through endpoint status minor nodes (See ugen(4D) for more information). * Whenever an error occurs on any endpoint, the application can retrieve * the last command status (int). Possible values are give below */ @@ -81,7 +81,7 @@ extern "C" { /* * Possible Device status (int) values * Application can poll(2) and read(2) device status on device status minor - * nodes (See ugen(7D) for more details). + * nodes (See ugen(4D) for more details). */ #define USB_DEV_STAT_ONLINE 0x1 /* Device is online */ #define USB_DEV_STAT_DISCONNECTED 0x2 /* Device is disconnected */ diff --git a/usr/src/uts/common/sys/usb/clients/usbser/usbser_keyspan/keyspan_49fw.h b/usr/src/uts/common/sys/usb/clients/usbser/usbser_keyspan/keyspan_49fw.h index 3dc5dbfba4..9ff61ffb35 100644 --- a/usr/src/uts/common/sys/usb/clients/usbser/usbser_keyspan/keyspan_49fw.h +++ b/usr/src/uts/common/sys/usb/clients/usbser/usbser_keyspan/keyspan_49fw.h @@ -32,7 +32,7 @@ /* * For the 4-port Keyspan usb-to-serial adapter (usa49wlc) support - * in the usbsksp(7D) driver, users can download a firmware package + * in the usbsksp(4D) driver, users can download a firmware package * from the Keyspan website (http://www.keyspan.com). * Please contact Keyspan technical support for questions regarding * firmware source access. @@ -45,7 +45,7 @@ * $ cd usr/src/uts/intel/usbs49_fw * $ make install * - * See usbsksp(7D) for details on using the Solaris USB keyspan + * See usbsksp(4D) for details on using the Solaris USB keyspan * driver. */ diff --git a/usr/src/uts/common/sys/usb/clients/usbser/usbser_var.h b/usr/src/uts/common/sys/usb/clients/usbser/usbser_var.h index 4cf89fe648..ceba9a81c9 100644 --- a/usr/src/uts/common/sys/usb/clients/usbser/usbser_var.h +++ b/usr/src/uts/common/sys/usb/clients/usbser/usbser_var.h @@ -171,7 +171,7 @@ _NOTE(LOCK_ORDER(usbser_state::us_mutex usbser_port::port_mutex)) * * [2] tty mode open may be blocked waiting for carrier. * if dial-out mode open happens at this time, it is allowed - * for it to overtake the port; from zs(7D) man page: + * for it to overtake the port; from zs(4D) man page: * * This allows a modem to be attached to /dev/term/[n] * and used for dial-in (by enabling the line for login in /etc/inittab) diff --git a/usr/src/uts/common/sys/user.h b/usr/src/uts/common/sys/user.h index ab06eb59be..e8013be325 100644 --- a/usr/src/uts/common/sys/user.h +++ b/usr/src/uts/common/sys/user.h @@ -197,7 +197,7 @@ typedef struct { /* kernel syscall set type */ * for the portions of the kernel that care about aux vectors. * * Applications that need to know how many aux vectors the kernel - * supplies should use the proc(4) interface to read /proc/PID/auxv. + * supplies should use the proc(5) interface to read /proc/PID/auxv. * * This value should not be changed in a patch. */ diff --git a/usr/src/uts/common/sys/watchpoint.h b/usr/src/uts/common/sys/watchpoint.h index 36eb3addc2..7483a1fc35 100644 --- a/usr/src/uts/common/sys/watchpoint.h +++ b/usr/src/uts/common/sys/watchpoint.h @@ -38,7 +38,7 @@ extern "C" { /* * Definitions for the VM implementation of watchpoints. - * See proc(4) and <sys/procfs.h> for definitions of the user interface. + * See proc(5) and <sys/procfs.h> for definitions of the user interface. */ /* diff --git a/usr/src/uts/common/sys/zone.h b/usr/src/uts/common/sys/zone.h index 0d8a690cb8..26b74ca34a 100644 --- a/usr/src/uts/common/sys/zone.h +++ b/usr/src/uts/common/sys/zone.h @@ -226,7 +226,7 @@ typedef struct { /* * zone_status values * - * You must modify zone_status_names in mdb(1M)'s genunix module + * You must modify zone_status_names in mdb(1)'s genunix module * (genunix/zone.c) when you modify this enum. */ typedef enum { @@ -283,7 +283,7 @@ typedef struct zone_cmd_rval { #define GLOBAL_ZONENAME "global" /* - * Extended Regular expression (see regex(5)) which matches all valid zone + * Extended Regular expression (see regex(7)) which matches all valid zone * names. */ #define ZONENAME_REGEXP "[a-zA-Z0-9][-_.a-zA-Z0-9]{0,62}" diff --git a/usr/src/uts/common/syscall/auditsys.c b/usr/src/uts/common/syscall/auditsys.c index 8fa5428ea6..038b3e68bc 100644 --- a/usr/src/uts/common/syscall/auditsys.c +++ b/usr/src/uts/common/syscall/auditsys.c @@ -429,7 +429,7 @@ getpolicy(caddr_t data) * by the value of the global zone's flags at the time the * local zone is created. * - * While auditconfig(1M) allows setting and unsetting policies one bit + * While auditconfig(8) allows setting and unsetting policies one bit * at a time, the mask passed in from auditconfig() is created by a * syscall to getpolicy and then modified based on the auditconfig() * cmd line, so the input policy value is used to replace the existing diff --git a/usr/src/uts/common/syscall/corectl.c b/usr/src/uts/common/syscall/corectl.c index dc99f92a6e..540bcb6db6 100644 --- a/usr/src/uts/common/syscall/corectl.c +++ b/usr/src/uts/common/syscall/corectl.c @@ -48,10 +48,10 @@ * structure (the core dumping sub-system for example) to safely use the * string without holding any locks on it in light of updates. * - * At system and zone boot, init_core() sets init(1M)'s core file path and + * At system and zone boot, init_core() sets init(8)'s core file path and * content to the same value as the fields core_default_path and * core_default_content respectively (for the global zone). All subsequent - * children of init(1M) reference those same settings. During boot coreadm(1M) + * children of init(8) reference those same settings. During boot coreadm(8) * is invoked with the -u option to update the system settings from * /etc/coreadm.conf. This has the effect of also changing the values in * core_default_path and core_default_content which updates the core file @@ -60,7 +60,7 @@ * content are set to the zone's default path and content. * * Processes that have their core file settings explicitly overridden using - * coreadm(1M) no longer reference core_default_path or core_default_content + * coreadm(8) no longer reference core_default_path or core_default_content * so subsequent changes to the default will not affect them. */ diff --git a/usr/src/uts/common/syscall/rctlsys.c b/usr/src/uts/common/syscall/rctlsys.c index aa552bfe8e..c5758d86f0 100644 --- a/usr/src/uts/common/syscall/rctlsys.c +++ b/usr/src/uts/common/syscall/rctlsys.c @@ -1042,7 +1042,7 @@ rctlsys(int code, char *name, void *obuf, void *nbuf, size_t obufsz, int flags) case 3: /* - * Private code for rctladm(1M): "rctlctl". + * Private code for rctladm(8): "rctlctl". */ return (rctlsys_ctl(name, obuf, flags)); case 4: diff --git a/usr/src/uts/common/syscall/stat.c b/usr/src/uts/common/syscall/stat.c index 4085104cc7..a37a86f05a 100644 --- a/usr/src/uts/common/syscall/stat.c +++ b/usr/src/uts/common/syscall/stat.c @@ -216,7 +216,7 @@ cstat(vnode_t *vp, struct stat *ubp, int flag, cred_t *cr) * instead we return the value MAXOFF32_T (LONG_MAX). * * 32-bit applications that care about the size of devices should be - * built 64-bit or use a large file interface (lfcompile(5) or lf64(5)). + * built 64-bit or use a large file interface (lfcompile(7) or lf64(7)). */ if ((vattr.va_size > MAXOFF32_T) && ((vp->v_type == VBLK) || (vp->v_type == VCHR))) { diff --git a/usr/src/uts/common/vm/page_retire.c b/usr/src/uts/common/vm/page_retire.c index f4e8d0737f..dcfb04e9fb 100644 --- a/usr/src/uts/common/vm/page_retire.c +++ b/usr/src/uts/common/vm/page_retire.c @@ -1210,7 +1210,7 @@ page_retire_check_pp(page_t *pp, uint64_t *errors) } /* - * We have magically arranged the bit values returned to fmd(1M) + * We have magically arranged the bit values returned to fmd(8) * to line up with the FMA, MCE, and UE bits of the page_t. */ if (errors) { diff --git a/usr/src/uts/common/xen/io/xdf.c b/usr/src/uts/common/xen/io/xdf.c index bd900f818c..10a48c1540 100644 --- a/usr/src/uts/common/xen/io/xdf.c +++ b/usr/src/uts/common/xen/io/xdf.c @@ -2532,7 +2532,7 @@ xdf_ioctl_eject(xdf_t *vdp) * Watch for media state changes. This can be an insertion of a device * (triggered by a 'xm block-configure' request in another domain) or * the ejection of a device (triggered by a local "eject" operation). - * For a full description of the DKIOCSTATE ioctl behavior see dkio(7I). + * For a full description of the DKIOCSTATE ioctl behavior see dkio(4I). */ static int xdf_dkstate(xdf_t *vdp, enum dkio_state mstate) @@ -3609,7 +3609,7 @@ done: HVMPV_XDF_VERS); #endif /* XPV_HVM_DRIVER */ - /* Create kstat for iostat(1M) */ + /* Create kstat for iostat(8) */ if (xdf_kstat_create(dip) != 0) { cmn_err(CE_WARN, "xdf@%s: failed to create kstat", ddi_get_name_addr(dip)); diff --git a/usr/src/uts/i86pc/io/pci/pci_common.c b/usr/src/uts/i86pc/io/pci/pci_common.c index 1907ea104b..feb5fbfd25 100644 --- a/usr/src/uts/i86pc/io/pci/pci_common.c +++ b/usr/src/uts/i86pc/io/pci/pci_common.c @@ -24,7 +24,7 @@ */ /* - * File that has code which is common between pci(7d) and npe(7d) + * File that has code which is common between pci(4D) and npe(4D) * It shares the following: * - interrupt code * - pci_tools ioctl code diff --git a/usr/src/uts/i86pc/io/pci/pci_common.h b/usr/src/uts/i86pc/io/pci/pci_common.h index d5fa3bfd55..7e3fbcaa31 100644 --- a/usr/src/uts/i86pc/io/pci/pci_common.h +++ b/usr/src/uts/i86pc/io/pci/pci_common.h @@ -35,7 +35,7 @@ extern "C" { /* * Common header file with definitions shared between - * pci(7D) and npe(7D) + * pci(4D) and npe(4D) */ /* State structure. */ @@ -49,7 +49,7 @@ typedef struct pci_state { kmutex_t pci_err_mutex; /* - * The following members are only used by npe(7D). + * The following members are only used by npe(4D). * See uts/i86pc/io/pciex/npe.c for more information. */ ndi_event_hdl_t pci_ndi_event_hdl; @@ -57,8 +57,8 @@ typedef struct pci_state { /* * These are the access routines. - * The pci_bus_map sets the handle to point to these in pci(7D). - * The npe_bus_map sets the handle to point to these in npe(7D). + * The pci_bus_map sets the handle to point to these in pci(4D). + * The npe_bus_map sets the handle to point to these in npe(4D). */ uint8_t pci_config_rd8(ddi_acc_impl_t *hdlp, uint8_t *addr); uint16_t pci_config_rd16(ddi_acc_impl_t *hdlp, uint16_t *addr); diff --git a/usr/src/uts/i86pc/io/pciex/npe.c b/usr/src/uts/i86pc/io/pciex/npe.c index 5543794b54..4e341f2307 100644 --- a/usr/src/uts/i86pc/io/pciex/npe.c +++ b/usr/src/uts/i86pc/io/pciex/npe.c @@ -33,7 +33,7 @@ * npe (Nexus PCIe driver): Host to PCI-Express local bus driver * * npe serves as the driver for PCIe Root Complexes and as the nexus driver - * for PCIe devices. See also: npe(7D). For more information about hotplug, + * for PCIe devices. See also: npe(4D). For more information about hotplug, * see the big theory statement at uts/common/os/ddi_hp_impl.c. * * diff --git a/usr/src/uts/i86pc/io/pciex/npe_misc.c b/usr/src/uts/i86pc/io/pciex/npe_misc.c index 57ae5dc892..87f847adbc 100644 --- a/usr/src/uts/i86pc/io/pciex/npe_misc.c +++ b/usr/src/uts/i86pc/io/pciex/npe_misc.c @@ -25,7 +25,7 @@ */ /* - * Library file that has miscellaneous support for npe(7d) + * Library file that has miscellaneous support for npe(4D) */ #include <sys/conf.h> diff --git a/usr/src/uts/i86pc/io/rootnex.c b/usr/src/uts/i86pc/io/rootnex.c index 612d37b1ff..afab4f466c 100644 --- a/usr/src/uts/i86pc/io/rootnex.c +++ b/usr/src/uts/i86pc/io/rootnex.c @@ -3263,7 +3263,7 @@ rootnex_bind_slowpath(ddi_dma_impl_t *hp, struct ddi_dma_req *dmareq, "replaced with a corrected version for proper " "system operation. To disable this warning, add " "'set rootnex:rootnex_bind_warn=0' to " - "/etc/system(4).", ddi_driver_name(dma->dp_dip)); + "/etc/system(5).", ddi_driver_name(dma->dp_dip)); } return (DDI_DMA_TOOBIG); } diff --git a/usr/src/uts/i86pc/os/fakebop.c b/usr/src/uts/i86pc/os/fakebop.c index cb5b9562b5..4ae1d27056 100644 --- a/usr/src/uts/i86pc/os/fakebop.c +++ b/usr/src/uts/i86pc/os/fakebop.c @@ -658,7 +658,7 @@ boot_prop_display(char *buffer) /* * 2nd part of building the table of boot properties. This includes: - * - values from /boot/solaris/bootenv.rc (ie. eeprom(1m) values) + * - values from /boot/solaris/bootenv.rc (ie. eeprom(8) values) * * lines look like one of: * ^$ @@ -1464,7 +1464,7 @@ process_boot_environment(struct boot_modules *benv) * 1st pass at building the table of boot properties. This includes: * - values set on the command line: -B a=x,b=y,c=z .... * - known values we just compute (ie. from xbp) - * - values from /boot/solaris/bootenv.rc (ie. eeprom(1m) values) + * - values from /boot/solaris/bootenv.rc (ie. eeprom(8) values) * * the grub command line looked like: * kernel boot-file [-B prop=value[,prop=value]...] [boot-args] diff --git a/usr/src/uts/i86pc/os/fastboot.c b/usr/src/uts/i86pc/os/fastboot.c index bd721973d5..7cc9874bed 100644 --- a/usr/src/uts/i86pc/os/fastboot.c +++ b/usr/src/uts/i86pc/os/fastboot.c @@ -1554,7 +1554,7 @@ fastboot_update_and_load(int fcn, char *mdep) if (fcn != AD_FASTREBOOT) { /* * If user has explicitly requested reboot to prom, - * or uadmin(1M) was invoked with other functions, + * or uadmin(8) was invoked with other functions, * don't try to fast reboot after dumping. */ fastreboot_onpanic_disable(); diff --git a/usr/src/uts/i86pc/os/machdep.c b/usr/src/uts/i86pc/os/machdep.c index 7fe5871360..102735b68a 100644 --- a/usr/src/uts/i86pc/os/machdep.c +++ b/usr/src/uts/i86pc/os/machdep.c @@ -276,7 +276,7 @@ mdboot(int cmd, int fcn, char *mdep, boolean_t invoke_cb) * On hypervisors, we reboot very quickly.. Perhaps panic * should only attempt to recover by rebooting if, * say, we were able to mount the root filesystem, - * or if we successfully launched init(1m). + * or if we successfully launched init(8). */ if (panicstr && proc_init == NULL) (void) HYPERVISOR_shutdown(SHUTDOWN_poweroff); diff --git a/usr/src/uts/i86pc/os/mp_startup.c b/usr/src/uts/i86pc/os/mp_startup.c index 0235a786a9..824cd8d9d5 100644 --- a/usr/src/uts/i86pc/os/mp_startup.c +++ b/usr/src/uts/i86pc/os/mp_startup.c @@ -1618,7 +1618,7 @@ done: boot_max_ncpus, ncpus); cmn_err(CE_NOTE, "Use \"boot-ncpus\" parameter to enable more CPU(s). " - "See eeprom(1M)."); + "See eeprom(8)."); } } diff --git a/usr/src/uts/intel/io/amdzen/zen_udf.c b/usr/src/uts/intel/io/amdzen/zen_udf.c index 61d1e79774..3b0f38b289 100644 --- a/usr/src/uts/intel/io/amdzen/zen_udf.c +++ b/usr/src/uts/intel/io/amdzen/zen_udf.c @@ -14,7 +14,7 @@ */ /* - * A companion to zen_udf(7D) that allows user access to read the data fabric + * A companion to zen_udf(4D) that allows user access to read the data fabric * for development purposes. */ diff --git a/usr/src/uts/intel/io/dktp/disk/cmdk.c b/usr/src/uts/intel/io/dktp/disk/cmdk.c index 3d0ba2842d..69fe1418db 100644 --- a/usr/src/uts/intel/io/dktp/disk/cmdk.c +++ b/usr/src/uts/intel/io/dktp/disk/cmdk.c @@ -948,7 +948,7 @@ cmdkioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *credp, int *rvalp) * This is not an update mechanism to add bad blocks * to the bad block structures stored on disk. * - * addbadsec(1M) will update the bad block data on disk + * addbadsec(8) will update the bad block data on disk * and use this ioctl to force the driver to re-initialize * the list of bad blocks in the driver. */ diff --git a/usr/src/uts/intel/io/fibre-channel/impl/fp.conf b/usr/src/uts/intel/io/fibre-channel/impl/fp.conf index e372505308..33785a407a 100644 --- a/usr/src/uts/intel/io/fibre-channel/impl/fp.conf +++ b/usr/src/uts/intel/io/fibre-channel/impl/fp.conf @@ -42,7 +42,7 @@ name="fp" class="fibre-channel" port=1; # fabric devices accessed at boot time need to get manually configured # before the next reboot. Otherwise, fabric devices that are needed at # boot time may not get configured and may cause boot problems. -# To manually configure fabric devices, refer to cfgadm_fp(1M). +# To manually configure fabric devices, refer to cfgadm_fp(8). # manual_configuration_only=1; # diff --git a/usr/src/uts/intel/io/pchtemp/pchtemp.c b/usr/src/uts/intel/io/pchtemp/pchtemp.c index 4694c66456..22689dbdc7 100644 --- a/usr/src/uts/intel/io/pchtemp/pchtemp.c +++ b/usr/src/uts/intel/io/pchtemp/pchtemp.c @@ -68,7 +68,7 @@ /* * In all cases the data we care about is in the first PCI bar, bar 0. Per - * pci(4)/pcie(4), this is always going to be register number 1. + * pci(5)/pcie(5), this is always going to be register number 1. */ #define PCHTEMP_RNUMBER 1 diff --git a/usr/src/uts/intel/io/scsi/targets/st.conf b/usr/src/uts/intel/io/scsi/targets/st.conf index bbd20b6a2c..54f19d10ae 100644 --- a/usr/src/uts/intel/io/scsi/targets/st.conf +++ b/usr/src/uts/intel/io/scsi/targets/st.conf @@ -24,10 +24,6 @@ # # -#pragma ident "%Z%%M% %I% %E% SMI" -# - -# # The officially supported devices do not require a entry under # tape-config-list as their configuration is built in to the driver. # @@ -68,8 +64,8 @@ # tape-config-list, all entries but the last must end with a comma. # The last entry ends with a semicolon. # -# See the driver.conf(4) man page for general information on the conf -# file format, and the st(7d) man page for information specific to st.conf. +# See the driver.conf(5) man page for general information on the conf +# file format, and the st(4D) man page for information specific to st.conf. # # Example: #tape-config-list= @@ -82,7 +78,7 @@ # 2,0x34,0,0x18659,4,0x47,0x47,0x47,0x47,1,120,120,3600,3600,3600,3600,3600; # Other-Config-Name = 1,0x3B,0,0x18659,4,0x40,0x40,0x40,0x40,3; # -# For specific details for of values to use see the st(7D) man pages and +# For specific details for of values to use see the st(4D) man pages and # drive vendor manuals. # diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3s.conf b/usr/src/uts/intel/io/vmxnet3s/vmxnet3s.conf index 8345dc27f4..892a82a30b 100644 --- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3s.conf +++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3s.conf @@ -1,4 +1,4 @@ -# Driver.conf(4) file for VMware Vmxnet Generation 3 adapters. +# driver.conf(5) file for VMware Vmxnet Generation 3 adapters. # TxRingSize -- # diff --git a/usr/src/uts/intel/os/syscall.c b/usr/src/uts/intel/os/syscall.c index 6cf4293ff4..1fc429661c 100644 --- a/usr/src/uts/intel/os/syscall.c +++ b/usr/src/uts/intel/os/syscall.c @@ -285,7 +285,7 @@ pre_syscall() } /* - * From the proc(4) manual page: + * From the proc(5) manual page: * When entry to a system call is being traced, the traced process * stops after having begun the call to the system but before the * system call arguments have been fetched from the process. @@ -549,7 +549,7 @@ post_syscall(long rval1, long rval2) } /* - * From the proc(4) manual page: + * From the proc(5) manual page: * When exit from a system call is being traced, the traced process * stops on completion of the system call just prior to checking for * signals and returning to user level. At this point all return diff --git a/usr/src/uts/intel/sys/regset.h b/usr/src/uts/intel/sys/regset.h index 69b4d86806..5e2fe2acbe 100644 --- a/usr/src/uts/intel/sys/regset.h +++ b/usr/src/uts/intel/sys/regset.h @@ -193,8 +193,8 @@ typedef struct dbregset { * * Note that the ucontext_t actually describes the general register in terms * of the gregset_t data type, as described in this file. Note also - * that the core file content is defined by core(4) in terms of data types - * defined by procfs -- see proc(4). + * that the core file content is defined by core(5) in terms of data types + * defined by procfs -- see proc(5). */ #if defined(__i386) && \ (!defined(_KERNEL) && !defined(_XPG4_2) || defined(__EXTENSIONS__)) diff --git a/usr/src/uts/sparc/io/fibre-channel/impl/fp.conf b/usr/src/uts/sparc/io/fibre-channel/impl/fp.conf index 21e7f6f805..5aaa43c883 100644 --- a/usr/src/uts/sparc/io/fibre-channel/impl/fp.conf +++ b/usr/src/uts/sparc/io/fibre-channel/impl/fp.conf @@ -42,7 +42,7 @@ name="fp" class="fibre-channel" port=1; # fabric devices accessed at boot time need to get manually configured # before the next reboot. Otherwise, fabric devices that are needed at # boot time may not get configured and may cause boot problems. -# To manually configure fabric devices, refer to cfgadm_fp(1M). +# To manually configure fabric devices, refer to cfgadm_fp(8). # manual_configuration_only=1; # @@ -78,7 +78,7 @@ load-ulp-list="1","fcp"; # name="fp" parent="/pci@8,600000/SUNW,qlc@4" port=0 mpxio-disable="yes"; # # NOTE: If you just want to enable or disable MPxIO on all fp ports, it is -# better to use stmsboot(1M) as it also updates /etc/vfstab. +# better to use stmsboot(8) as it also updates /etc/vfstab. # mpxio-disable="yes"; # diff --git a/usr/src/uts/sparc/os/syscall.c b/usr/src/uts/sparc/os/syscall.c index 33abac27c4..07928e668c 100644 --- a/usr/src/uts/sparc/os/syscall.c +++ b/usr/src/uts/sparc/os/syscall.c @@ -417,7 +417,7 @@ pre_syscall(int arg0) } /* - * From the proc(4) manual page: + * From the proc(5) manual page: * When entry to a system call is being traced, the traced process * stops after having begun the call to the system but before the * system call arguments have been fetched from the process. @@ -653,7 +653,7 @@ post_syscall(long rval1, long rval2) } /* - * From the proc(4) manual page: + * From the proc(5) manual page: * When exit from a system call is being traced, the traced process * stops on completion of the system call just prior to checking for * signals and returning to user level. At this point all return diff --git a/usr/src/uts/sparc/sys/regset.h b/usr/src/uts/sparc/sys/regset.h index cebf5939a3..4d6dec58c3 100644 --- a/usr/src/uts/sparc/sys/regset.h +++ b/usr/src/uts/sparc/sys/regset.h @@ -180,8 +180,8 @@ typedef struct gwindows64 { * * Note that the ucontext_t actually describes the general registers in * terms of the gregset_t data type, as described in mcontex.h. Note also - * that the core file content is defined by core(4) in terms of data types - * defined by procfs -- see proc(4). + * that the core file content is defined by core(5) in terms of data types + * defined by procfs -- see proc(5). */ #if !defined(__sparcv9) #if !defined(_KERNEL) && !defined(_XPG4_2) || defined(__EXTENSIONS__) diff --git a/usr/src/uts/sparc/v7/sys/privregs.h b/usr/src/uts/sparc/v7/sys/privregs.h index 59a22369f5..104ff3cc71 100644 --- a/usr/src/uts/sparc/v7/sys/privregs.h +++ b/usr/src/uts/sparc/v7/sys/privregs.h @@ -48,7 +48,7 @@ extern "C" { /* * This structure is only here for compatibility. It is not used by the kernel * and may be removed in a future release. A better way to access this data - * is to use gregset_t; see proc(4) and ucontext(3HEAD). + * is to use gregset_t; see proc(5) and ucontext(3HEAD). */ struct regs { long r_psr; /* processor status register */ diff --git a/usr/src/uts/sun/io/scsi/targets/st.conf b/usr/src/uts/sun/io/scsi/targets/st.conf index c01949a2c8..9cd7888bdd 100644 --- a/usr/src/uts/sun/io/scsi/targets/st.conf +++ b/usr/src/uts/sun/io/scsi/targets/st.conf @@ -24,10 +24,6 @@ # # -#pragma ident "%Z%%M% %I% %E% SMI" -# - -# # The officially supported devices do not require a entry under # tape-config-list as their configuration is built in to the driver. # @@ -68,8 +64,8 @@ # tape-config-list, all entries but the last must end with a comma. # The last entry ends with a semicolon. # -# See the driver.conf(4) man page for general information on the conf -# file format, and the st(7d) man page for information specific to st.conf. +# See the driver.conf(5) man page for general information on the conf +# file format, and the st(4D) man page for information specific to st.conf. # # Example: #tape-config-list= @@ -82,7 +78,7 @@ # 2,0x34,0,0x18659,4,0x47,0x47,0x47,0x47,1,120,120,3600,3600,3600,3600,3600; # Other-Config-Name = 1,0x3B,0,0x18659,4,0x40,0x40,0x40,0x40,3; # -# For specific details for of values to use see the st(7D) man pages and +# For specific details for of values to use see the st(4D) man pages and # drive vendor manuals. # diff --git a/usr/src/uts/sun4/os/machdep.c b/usr/src/uts/sun4/os/machdep.c index ca06f151c9..e10b2e293b 100644 --- a/usr/src/uts/sun4/os/machdep.c +++ b/usr/src/uts/sun4/os/machdep.c @@ -518,7 +518,7 @@ cpu_kstat_intrstat_update(kstat_t *ksp, int rw) } /* - * Called by common/os/cpu.c for psrinfo(1m) kstats + * Called by common/os/cpu.c for psrinfo(8) kstats */ char * cpu_fru_fmri(cpu_t *cp) diff --git a/usr/src/uts/sun4u/io/todds1287.c b/usr/src/uts/sun4u/io/todds1287.c index bf9cb8bd42..64ecff8a8d 100644 --- a/usr/src/uts/sun4u/io/todds1287.c +++ b/usr/src/uts/sun4u/io/todds1287.c @@ -46,7 +46,7 @@ * and held for 4 seconds for the power to go off, otherwise * a momentarily press will delay the power-off for 21 seconds. * - * PSARC/1999/393 describes the pbio(7I) interface. + * PSARC/1999/393 describes the pbio(4I) interface. */ #include <sys/types.h> diff --git a/usr/src/uts/sun4u/io/todopl.c b/usr/src/uts/sun4u/io/todopl.c index 5d510d3c42..e6b853a56c 100644 --- a/usr/src/uts/sun4u/io/todopl.c +++ b/usr/src/uts/sun4u/io/todopl.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * tod driver module for OPL (implements a soft tod) */ @@ -94,7 +92,7 @@ static struct modlinkage modlinkage = { * * Note that on first powerup domain boot, diff is zero. * - * When system updates the time via date(1m): + * When system updates the time via date(1): * * FJSV,set-domain-time * OS ---------> OBP SRAM @@ -109,7 +107,7 @@ static struct modlinkage modlinkage = { * SP will be broken. In this particular case, we notify users that * "there is no time synchronization" and the logic will attempt to * resync with the SP whenever the OS tries to do a TOD update. - * (e.g. via date(1m) or NTP). + * (e.g. via date(1) or NTP). */ static int enable_time_sync = 1; @@ -221,7 +219,7 @@ todopl_get(void) * * When running NTP, tod_set is called at least once per second in order * to update the hardware clock. To minimize pressure on SP, we want only - * to record significant time changes on the SP (when date(1M) is run). + * to record significant time changes on the SP (when date(1) is run). * We have 30 seconds threshold requirement before recording the time change. */ /* ARGSUSED */ diff --git a/usr/src/uts/sun4u/sys/mem_cache.h b/usr/src/uts/sun4u/sys/mem_cache.h index ef65f028be..0ba243d474 100644 --- a/usr/src/uts/sun4u/sys/mem_cache.h +++ b/usr/src/uts/sun4u/sys/mem_cache.h @@ -25,8 +25,6 @@ #ifndef _MEM_CACHE_H #define _MEM_CACHE_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -52,7 +50,7 @@ extern "C" { /* - * Private ioctls for fmd(1M). These interfaces are Sun Private. Applications + * Private ioctls for fmd(8). These interfaces are Sun Private. Applications * and drivers should not make use of these interfaces: they can change without * notice and programs that consume them will fail to run on future releases. */ diff --git a/usr/src/uts/sun4v/io/cnex.c b/usr/src/uts/sun4v/io/cnex.c index 5586b342a4..287648f1e4 100644 --- a/usr/src/uts/sun4v/io/cnex.c +++ b/usr/src/uts/sun4v/io/cnex.c @@ -659,7 +659,7 @@ cnex_add_intr(dev_info_t *dip, uint64_t id, cnex_intrtype_t itype, iinfo->arg1 = arg1; iinfo->arg2 = arg2; - /* save data for DTrace probes used by intrstat(1m) */ + /* save data for DTrace probes used by intrstat(8) */ iinfo->dip = cldcp->dip; iinfo->id = cldcp->id; diff --git a/usr/src/uts/sun4v/io/dr_cpu.c b/usr/src/uts/sun4v/io/dr_cpu.c index 3b6ce50835..2c182c1174 100644 --- a/usr/src/uts/sun4v/io/dr_cpu.c +++ b/usr/src/uts/sun4v/io/dr_cpu.c @@ -1175,7 +1175,7 @@ dr_cpu_unconfigure(processorid_t cpuid, int *status, boolean_t force) * Otherwise, cpu_offline() might reject the request. Note: * if the offline subsequently fails, the target cpu will be * left with interrupts enabled. This is consistent with the - * behavior of psradm(1M) and p_online(2). + * behavior of psradm(8) and p_online(2). */ cpu_intr_enable(cp); diff --git a/usr/src/uts/sun4v/io/drctl.c b/usr/src/uts/sun4v/io/drctl.c index 2fd20ddfee..c6c8deeefa 100644 --- a/usr/src/uts/sun4v/io/drctl.c +++ b/usr/src/uts/sun4v/io/drctl.c @@ -445,7 +445,7 @@ drctl_config_init(int cmd, int flags, drctl_rsrc_t *res, "reconfiguration daemon.\n"; static char drd_msg [] = "Cannot communicate with reconfiguration " "daemon (drd) in target domain.\n" - "drd(1M) SMF service may not be enabled.\n"; + "drd(8) SMF service may not be enabled.\n"; static char busy_msg [] = "Busy executing earlier command; " "please try again later.\n"; size_t rq_size; diff --git a/usr/src/uts/sun4v/io/vcc.c b/usr/src/uts/sun4v/io/vcc.c index 85f722e467..1c67f039e3 100644 --- a/usr/src/uts/sun4v/io/vcc.c +++ b/usr/src/uts/sun4v/io/vcc.c @@ -137,7 +137,7 @@ extern struct mod_ops mod_driverops; #define VCC_ID_PROP "id" /* - * This is the string displayed by modinfo(1m). + * This is the string displayed by modinfo(8). */ static char vcc_ident[] = "sun4v Virtual Console Concentrator Driver"; diff --git a/usr/src/uts/sun4v/io/vdc.c b/usr/src/uts/sun4v/io/vdc.c index 6f55fcc6e6..4eb7694701 100644 --- a/usr/src/uts/sun4v/io/vdc.c +++ b/usr/src/uts/sun4v/io/vdc.c @@ -41,7 +41,7 @@ * allows the LDC clients to transfer data via memory mappings. * * 3) Support exported to upper layers (filesystems, etc) - * The upper layers call into vdc via strategy(9E) and DKIO(7I) + * The upper layers call into vdc via strategy(9E) and dkio(4I) * ioctl calls. vdc will copy the data to be written to the descriptor * ring or maps the buffer to store the data read by the vDisk * server into the descriptor ring. It then sends a message to the @@ -724,7 +724,7 @@ vdc_do_attach(dev_info_t *dip) (void) md_fini_handle(mdp); - /* Create the kstats for saving the I/O statistics used by iostat(1M) */ + /* Create the kstats for saving the I/O statistics used by iostat(8) */ vdc_create_io_kstats(vdc); vdc_create_err_kstats(vdc); @@ -3010,7 +3010,7 @@ done: /* * If this is a block read/write we update the I/O statistics kstat * to indicate that this request has been placed on the queue for - * processing (i.e sent to the vDisk server) - iostat(1M) will + * processing (i.e sent to the vDisk server) - iostat(8) will * report the time waiting for the vDisk server under the %b column * * In the case of an error we take it off the wait queue only if @@ -5504,7 +5504,7 @@ vdc_is_supported_version(vio_ver_msg_t *ver_msg) /* -------------------------------------------------------------------------- */ /* - * DKIO(7) support + * dkio(4I) support */ typedef struct vdc_dk_arg { @@ -5926,7 +5926,7 @@ vdc_scsi_status(vdc_t *vdc, vd_scsi_t *vd_scsi, boolean_t log_error) } /* - * Implemented the USCSICMD uscsi(7I) ioctl. This ioctl is converted to + * Implemented the USCSICMD uscsi(4I) ioctl. This ioctl is converted to * a VD_OP_SCSICMD operation which is sent to the vdisk server. If a SCSI * reset is requested (i.e. a flag USCSI_RESET* is set) then the ioctl is * converted to a VD_OP_RESET operation. @@ -6180,7 +6180,7 @@ vdc_scsi_alloc_persistent_out(uchar_t cmd, int len, int *vd_scsi_len) } /* - * Implement the MHIOCGRP_INKEYS mhd(7i) ioctl. The ioctl is converted + * Implement the MHIOCGRP_INKEYS mhd(4I) ioctl. The ioctl is converted * to a SCSI PERSISTENT IN READ KEYS command which is sent to the vdisk * server with a VD_OP_SCSICMD operation. */ @@ -6292,7 +6292,7 @@ done: } /* - * Implement the MHIOCGRP_INRESV mhd(7i) ioctl. The ioctl is converted + * Implement the MHIOCGRP_INRESV mhd(4I) ioctl. The ioctl is converted * to a SCSI PERSISTENT IN READ RESERVATION command which is sent to * the vdisk server with a VD_OP_SCSICMD operation. */ @@ -6420,7 +6420,7 @@ done: } /* - * Implement the MHIOCGRP_REGISTER mhd(7i) ioctl. The ioctl is converted + * Implement the MHIOCGRP_REGISTER mhd(4I) ioctl. The ioctl is converted * to a SCSI PERSISTENT OUT REGISTER command which is sent to the vdisk * server with a VD_OP_SCSICMD operation. */ @@ -6459,7 +6459,7 @@ vdc_mhd_register(vdc_t *vdc, caddr_t arg, int mode) } /* - * Implement the MHIOCGRP_RESERVE mhd(7i) ioctl. The ioctl is converted + * Implement the MHIOCGRP_RESERVE mhd(4I) ioctl. The ioctl is converted * to a SCSI PERSISTENT OUT RESERVE command which is sent to the vdisk * server with a VD_OP_SCSICMD operation. */ @@ -6500,7 +6500,7 @@ vdc_mhd_reserve(vdc_t *vdc, caddr_t arg, int mode) } /* - * Implement the MHIOCGRP_PREEMPTANDABORT mhd(7i) ioctl. The ioctl is + * Implement the MHIOCGRP_PREEMPTANDABORT mhd(4I) ioctl. The ioctl is * converted to a SCSI PERSISTENT OUT PREEMPT AND ABORT command which * is sent to the vdisk server with a VD_OP_SCSICMD operation. */ @@ -6545,7 +6545,7 @@ vdc_mhd_preemptabort(vdc_t *vdc, caddr_t arg, int mode) } /* - * Implement the MHIOCGRP_REGISTERANDIGNOREKEY mhd(7i) ioctl. The ioctl + * Implement the MHIOCGRP_REGISTERANDIGNOREKEY mhd(4I) ioctl. The ioctl * is converted to a SCSI PERSISTENT OUT REGISTER AND IGNORE EXISTING KEY * command which is sent to the vdisk server with a VD_OP_SCSICMD operation. */ @@ -6934,7 +6934,7 @@ vdc_eio_thread(void *arg) } /* - * Implement the MHIOCENFAILFAST mhd(7i) ioctl. + * Implement the MHIOCENFAILFAST mhd(4I) ioctl. */ static int vdc_failfast(vdc_t *vdc, caddr_t arg, int mode) @@ -6959,7 +6959,7 @@ vdc_failfast(vdc_t *vdc, caddr_t arg, int mode) } /* - * Implement the MHIOCTKOWN and MHIOCRELEASE mhd(7i) ioctls. These ioctls are + * Implement the MHIOCTKOWN and MHIOCRELEASE mhd(4I) ioctls. These ioctls are * converted to VD_OP_SET_ACCESS operations. */ static int @@ -6975,7 +6975,7 @@ vdc_access_set(vdc_t *vdc, uint64_t flags) } /* - * Implement the MHIOCSTATUS mhd(7i) ioctl. This ioctl is converted to a + * Implement the MHIOCSTATUS mhd(4I) ioctl. This ioctl is converted to a * VD_OP_GET_ACCESS operation. */ static int @@ -7166,7 +7166,7 @@ vdc_check_capacity(vdc_t *vdc) } /* - * This structure is used in the DKIO(7I) array below. + * This structure is used in the dkio(4I) array below. */ typedef struct vdc_dk_ioctl { uint8_t op; /* VD_OP_XXX value */ @@ -7179,7 +7179,7 @@ typedef struct vdc_dk_ioctl { } vdc_dk_ioctl_t; /* - * Subset of DKIO(7I) operations currently supported + * Subset of dkio(4I) operations currently supported */ static vdc_dk_ioctl_t dk_ioctl[] = { {VD_OP_FLUSH, DKIOCFLUSHWRITECACHE, 0, @@ -7212,13 +7212,13 @@ static vdc_dk_ioctl_t dk_ioctl[] = { /* DIOCTL_RWCMD is converted to a read or a write */ {0, DIOCTL_RWCMD, sizeof (struct dadkio_rwcmd), NULL}, - /* mhd(7I) non-shared multihost disks ioctls */ + /* mhd(4I) non-shared multihost disks ioctls */ {0, MHIOCTKOWN, 0, vdc_null_copy_func}, {0, MHIOCRELEASE, 0, vdc_null_copy_func}, {0, MHIOCSTATUS, 0, vdc_null_copy_func}, {0, MHIOCQRESERVE, 0, vdc_null_copy_func}, - /* mhd(7I) shared multihost disks ioctls */ + /* mhd(4I) shared multihost disks ioctls */ {0, MHIOCGRP_INKEYS, 0, vdc_null_copy_func}, {0, MHIOCGRP_INRESV, 0, vdc_null_copy_func}, {0, MHIOCGRP_REGISTER, 0, vdc_null_copy_func}, @@ -7226,7 +7226,7 @@ static vdc_dk_ioctl_t dk_ioctl[] = { {0, MHIOCGRP_PREEMPTANDABORT, 0, vdc_null_copy_func}, {0, MHIOCGRP_REGISTERANDIGNOREKEY, 0, vdc_null_copy_func}, - /* mhd(7I) failfast ioctl */ + /* mhd(4I) failfast ioctl */ {0, MHIOCENFAILFAST, 0, vdc_null_copy_func}, /* @@ -7268,7 +7268,7 @@ vd_process_efi_ioctl(void *vdisk, int cmd, uintptr_t arg) * * Arguments: * dev - the device number - * cmd - the operation [dkio(7I)] to be processed + * cmd - the operation [dkio(4I)] to be processed * arg - pointer to user provided structure * (contains data to be set or reference parameter for get) * mode - bit flag, indicating open settings, 32/64 bit type, etc @@ -8095,7 +8095,7 @@ vdc_set_efi_convert(vdc_t *vdc, void *from, void *to, int mode, int dir) * * Description: * This routine fakes up the disk info needed for some DKIO ioctls such - * as DKIOCINFO and DKIOCGMEDIAINFO [just like lofi(7D) and ramdisk(7D) do] + * as DKIOCINFO and DKIOCGMEDIAINFO [just like lofi(4D) and ramdisk(4D) do] * * Note: This function must not be called until the vDisk attributes have * been exchanged as part of the handshake with the vDisk server. diff --git a/usr/src/uts/sun4v/io/vds.c b/usr/src/uts/sun4v/io/vds.c index b6a477dc94..dd1de67c8f 100644 --- a/usr/src/uts/sun4v/io/vds.c +++ b/usr/src/uts/sun4v/io/vds.c @@ -70,7 +70,7 @@ #define VDS_DEV_DELAY 10000000 /* 10 secs */ #define VDS_NCHAINS 32 -/* Identification parameters for MD, synthetic dkio(7i) structures, etc. */ +/* Identification parameters for MD, synthetic dkio(4I) structures, etc. */ #define VDS_NAME "virtual-disk-server" #define VD_NAME "vd" @@ -1040,7 +1040,7 @@ vd_build_default_label(size_t disk_size, size_t bsize, struct dk_label *label) vd_get_readable_size(disk_size, &size, &unit); /* - * We must have a correct label name otherwise format(1m) will + * We must have a correct label name otherwise format(8) will * not recognized the disk as labeled. */ (void) snprintf(label->dkl_asciilabel, LEN_DKL_ASCII, @@ -5724,8 +5724,8 @@ vd_setup_partition_vtoc(vd_t *vd) &size, &unit); /* - * Set some attributes of the geometry to what format(1m) uses - * so that writing a default label using format(1m) does not + * Set some attributes of the geometry to what format(8) uses + * so that writing a default label using format(8) does not * produce any error. */ vd->dk_geom.dkg_bcyl = 0; @@ -5734,7 +5734,7 @@ vd_setup_partition_vtoc(vd_t *vd) vd->dk_geom.dkg_read_reinstruct = 0; /* - * We must have a correct label name otherwise format(1m) will + * We must have a correct label name otherwise format(8) will * not recognized the disk as labeled. */ (void) snprintf(vd->vtoc.v_asciilabel, LEN_DKL_ASCII, @@ -6089,7 +6089,7 @@ vd_setup_disk_image(vd_t *vd) /* * Description: - * Open a device using its device path (supplied by ldm(1m)) + * Open a device using its device path (supplied by ldm(8)) * * Parameters: * vd - pointer to structure containing the vDisk info diff --git a/usr/src/uts/sun4v/io/vnet.c b/usr/src/uts/sun4v/io/vnet.c index 8abeaf911b..376d1ce3e9 100644 --- a/usr/src/uts/sun4v/io/vnet.c +++ b/usr/src/uts/sun4v/io/vnet.c @@ -282,7 +282,7 @@ uint32_t vnet_mac_open_retries = 100; static char macaddr_propname[] = "local-mac-address"; /* - * This is the string displayed by modinfo(1m). + * This is the string displayed by modinfo(8). */ static char vnet_ident[] = "vnet driver"; extern struct mod_ops mod_driverops; diff --git a/usr/src/uts/sun4v/promif/promif_asr.c b/usr/src/uts/sun4v/promif/promif_asr.c index 7bc20982f0..3edb253617 100644 --- a/usr/src/uts/sun4v/promif/promif_asr.c +++ b/usr/src/uts/sun4v/promif/promif_asr.c @@ -24,15 +24,13 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/promif_impl.h> /* * The Automatic System Recovery (ASR) database present in some * versions of firmware is not supported on sun4v platforms. * However, there is an external interface to these prom interfaces - * from the openprom(7D) driver. They are not documented in the + * from the openprom(4D) driver. They are not documented in the * man page, but they should still be handled here, just enough * so the user gets a sensible error back if they stumble onto * them. diff --git a/usr/src/uts/sun4v/promif/promif_key.c b/usr/src/uts/sun4v/promif/promif_key.c index f35064d085..19123a454e 100644 --- a/usr/src/uts/sun4v/promif/promif_key.c +++ b/usr/src/uts/sun4v/promif/promif_key.c @@ -24,17 +24,15 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/promif_impl.h> /* * Secure WAN boot requires firmware support for storing and * retrieving security keys. The user command to set these - * keys in firmware storage is ickey(1M). Currently, sun4v + * keys in firmware storage is ickey(8). Currently, sun4v * platforms do not support this functionality. However, there * is an external interface to these prom interfaces from the - * openprom(7D) driver. They are not documented in the man page, + * openprom(4D) driver. They are not documented in the man page, * but they should still be handled just well enough so that * the user gets a sensible error back. */ diff --git a/usr/src/uts/sun4v/sys/vdc.h b/usr/src/uts/sun4v/sys/vdc.h index bd10ee336c..6d521b6985 100644 --- a/usr/src/uts/sun4v/sys/vdc.h +++ b/usr/src/uts/sun4v/sys/vdc.h @@ -115,7 +115,7 @@ extern "C" { /* * Scheme to store the instance number and the slice number in the minor number. - * (NOTE: Uses the same format and definitions as the sd(7D) driver) + * (NOTE: Uses the same format and definitions as the sd(4D) driver) */ #define VD_MAKE_DEV(instance, minor) ((instance << VDCUNIT_SHIFT) | minor) @@ -365,7 +365,7 @@ typedef struct vdc { clock_t failfast_interval; /* interval in microsecs */ /* - * kstats used to store I/O statistics consumed by iostat(1M). + * kstats used to store I/O statistics consumed by iostat(8). * These are protected by the lock mutex. */ kstat_t *io_stats; diff --git a/usr/src/uts/sun4v/sys/vdsk_common.h b/usr/src/uts/sun4v/sys/vdsk_common.h index ca1ae648f4..7ee15f096b 100644 --- a/usr/src/uts/sun4v/sys/vdsk_common.h +++ b/usr/src/uts/sun4v/sys/vdsk_common.h @@ -531,7 +531,7 @@ int vd_efi_alloc_and_read(vd_efi_dev_t *dev, efi_gpt_t **gpt, efi_gpe_t **gpe); void vd_efi_free(vd_efi_dev_t *dev, efi_gpt_t *gpt, efi_gpe_t *gpe); /* - * Macros to update the I/O statistics kstat consumed by iostat(1m). + * Macros to update the I/O statistics kstat consumed by iostat(8). */ /* |