diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-03-15 12:07:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 12:07:15 -0400 |
| commit | 83decd22b44019b0fe369224fb19e1ef21263ab6 (patch) | |
| tree | 0bbbaea9d4231f77a406362904280d6ba53e1d55 /usr/src/cmd | |
| parent | ad491f11d9af43fd3f0d6159c9e08112de475a54 (diff) | |
| download | illumos-joyent-83decd22b44019b0fe369224fb19e1ef21263ab6.tar.gz | |
OS-8361 IPD 4 (man page renumbering) tracking issue
Reviewed by: Brian Bennett <brian.bennett@joyent.com>
Approved by: Brian Bennett <brian.bennett@joyent.com>
Diffstat (limited to 'usr/src/cmd')
541 files changed, 1432 insertions, 1620 deletions
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 d68723a4bb..30f67d7a3c 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 07cb9af9c1..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. @@ -84,17 +84,17 @@ <propval name='untracked' type='astring' value='extended' /> </property_group> - + <template> <common_name> <loctext xml:lang='C'> configure flow extended accounting </loctext> </common_name> - + <documentation> <manpage - title='acctadm' section='1M' + title='acctadm' section='8' manpath='/usr/share/man' /> </documentation> </template> @@ -121,17 +121,17 @@ <propval name='untracked' type='astring' value='extended,host' /> </property_group> - + <template> <common_name> <loctext xml:lang='C'> configure process extended accounting </loctext> </common_name> - + <documentation> <manpage - title='acctadm' section='1M' + title='acctadm' section='8' manpath='/usr/share/man' /> </documentation> </template> @@ -158,17 +158,17 @@ <propval name='untracked' type='astring' value='extended' /> </property_group> - + <template> <common_name> <loctext xml:lang='C'> configure task extended accounting </loctext> </common_name> - + <documentation> <manpage - title='acctadm' section='1M' + title='acctadm' section='8' manpath='/usr/share/man' /> </documentation> </template> @@ -195,22 +195,22 @@ <propval name='untracked' type='astring' value='extended' /> </property_group> - + <template> <common_name> <loctext xml:lang='C'> configure net extended accounting </loctext> </common_name> - + <documentation> <manpage - title='acctadm' section='1M' + title='acctadm' section='8' manpath='/usr/share/man' /> </documentation> </template> </instance> - + <stability value='Unstable' /> </service> 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/acpihpd/acpihpd.xml b/usr/src/cmd/acpihpd/acpihpd.xml index e8e799de08..e16f1f5c72 100644 --- a/usr/src/cmd/acpihpd/acpihpd.xml +++ b/usr/src/cmd/acpihpd/acpihpd.xml @@ -83,7 +83,7 @@ </loctext> </common_name> <documentation> - <manpage title='acpihpd' section='1M' + <manpage title='acpihpd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/allocate.xml b/usr/src/cmd/allocate/allocate.xml index 9de9a1ddb8..9e1ca6d97f 100644 --- a/usr/src/cmd/allocate/allocate.xml +++ b/usr/src/cmd/allocate/allocate.xml @@ -88,12 +88,12 @@ <manpage title='allocate' section='1' manpath='/usr/share/man' /> <manpage title='deallocate' section='1' manpath='/usr/share/man' /> <manpage title='list_devices' section='1' manpath='/usr/share/man' /> - <manpage title='device_allocate' section='1M' manpath='/usr/share/man' /> - <manpage title='mkdevalloc' section='1M' manpath='/usr/share/man' /> - <manpage title='mkdevmaps' section='1M' manpath='/usr/share/man' /> - <manpage title='dminfo' section='1M' manpath='/usr/share/man' /> - <manpage title='device_maps' section='4' manpath='/usr/share/man' /> - <manpage title='device_allocate' section='4' manpath='/usr/share/man' /> + <manpage title='device_allocate' section='8' manpath='/usr/share/man' /> + <manpage title='mkdevalloc' section='8' manpath='/usr/share/man' /> + <manpage title='mkdevmaps' section='8' manpath='/usr/share/man' /> + <manpage title='dminfo' section='8' manpath='/usr/share/man' /> + <manpage title='device_maps' section='5' manpath='/usr/share/man' /> + <manpage title='device_allocate' section='5' manpath='/usr/share/man' /> </documentation> </template> </service> 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 ee6fd6c110..99dba6091c 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: @@ -315,25 +315,25 @@ </common_name> <documentation> <manpage title='auditd' - section='1M' + section='8' manpath='/usr/share/man'/> <manpage title='audit' - section='1M' + section='8' manpath='/usr/share/man'/> <manpage title='auditconfig' - section='1M' + section='8' manpath='/usr/share/man'/> <manpage title='audit_flags' - section='5' + section='7' manpath='/usr/share/man'/> <manpage title='audit_binfile' - section='5' + section='7' manpath='/usr/share/man'/> <manpage title='audit_syslog' - section='5' + section='7' manpath='/usr/share/man'/> <manpage title='audit_remote' - section='5' + section='7' manpath='/usr/share/man'/> </documentation> </template> 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/bnu/uucp.xml b/usr/src/cmd/bnu/uucp.xml index 737a11d9d8..b90d76ce4c 100644 --- a/usr/src/cmd/bnu/uucp.xml +++ b/usr/src/cmd/bnu/uucp.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service description is not editable; its contents may be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -80,7 +78,7 @@ </loctext> </common_name> <documentation> - <manpage title='in.uucpd' section='1M' + <manpage title='in.uucpd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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 835e61f777..236c52aebb 100644 --- a/usr/src/cmd/cmd-crypto/etc/pkcs11.conf +++ b/usr/src/cmd/cmd-crypto/etc/pkcs11.conf @@ -24,7 +24,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-crypto/scripts/cryptosvc.xml b/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml index 578520a142..75a42c4501 100644 --- a/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml +++ b/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml @@ -90,7 +90,7 @@ </loctext> </common_name> <documentation> - <manpage title='cryptoadm' section='1M' + <manpage title='cryptoadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/common/store_forw_creds.c b/usr/src/cmd/cmd-inet/common/store_forw_creds.c index 2b5d7988b3..a8c680ed78 100644 --- a/usr/src/cmd/cmd-inet/common/store_forw_creds.c +++ b/usr/src/cmd/cmd-inet/common/store_forw_creds.c @@ -23,9 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - - #include <pwd.h> #include <locale.h> #include <syslog.h> @@ -38,7 +35,7 @@ extern uint_t kwarn_del_warning(char *); /* * Store the forwarded creds in the user's local ccache and register - * w/ktkt_warnd(1M). + * w/ktkt_warnd(8). */ krb5_error_code store_forw_creds(krb5_context context, @@ -86,7 +83,7 @@ store_forw_creds(krb5_context context, if ((retval = krb5_cc_close(context, *ccache)) != 0) goto cleanup; - /* Register with ktkt_warnd(1M) */ + /* Register with ktkt_warnd(8) */ if ((retval = krb5_unparse_name(context, (*creds)->client, &client_name)) != 0) goto cleanup; @@ -94,7 +91,7 @@ store_forw_creds(krb5_context context, if (kwarn_add_warning(client_name, (*creds)->times.endtime) != 0) { syslog(LOG_AUTH|LOG_NOTICE, "store_forw_creds: kwarn_add_warning" - " failed: ktkt_warnd(1M) down? "); + " failed: ktkt_warnd(8) down? "); } free(client_name); client_name = NULL; diff --git a/usr/src/cmd/cmd-inet/etc/dhcp/inittab b/usr/src/cmd/cmd-inet/etc/dhcp/inittab index 162183939d..d26d74ad64 100644 --- a/usr/src/cmd/cmd-inet/etc/dhcp/inittab +++ b/usr/src/cmd/cmd-inet/etc/dhcp/inittab @@ -29,10 +29,10 @@ # add support for SITE options for clients; no existing options should # be modified. Only SITE options will be preserved during an upgrade. # If you need to configure the Solaris DHCP server to support the vendor -# options of a different client, see dhcptab(4) for details. +# options of a different client, see dhcptab(5) for details. # -# Please consult dhcp_inittab(4) for further information. Note that -# this interface is "Unstable" as defined by attributes(5). +# Please consult dhcp_inittab(5) for further information. Note that +# this interface is "Unstable" as defined by attributes(7). # Subnet STANDARD, 1, IP, 1, 1, sdmi @@ -179,7 +179,7 @@ SHTTPproxy VENDOR, 17, ASCII, 1, 0, smi # the SITE category, meaning it is defined by each individual site. # It is option code 132, which is of type IP Address, consisting of # a potentially infinite number of pairs of IP addresses. (See -# dhcp_inittab(4) for details) +# dhcp_inittab(5) for details) # # ipPairs SITE, 132, IP, 2, 0, sdmi # diff --git a/usr/src/cmd/cmd-inet/etc/dhcp/inittab6 b/usr/src/cmd/cmd-inet/etc/dhcp/inittab6 index 5e8e083a04..b21c4a7693 100644 --- a/usr/src/cmd/cmd-inet/etc/dhcp/inittab6 +++ b/usr/src/cmd/cmd-inet/etc/dhcp/inittab6 @@ -21,13 +21,12 @@ # # CDDL HEADER END # -# ident "%Z%%M% %I% %E% SMI" # # This file provides information about all supported DHCPv6 options, for # use by DHCPv6-related programs. # -# Please consult dhcp_inittab(4) for further information. Note that -# this interface is "Uncommitted" as defined by attributes(5). +# Please consult dhcp_inittab(5) for further information. Note that +# this interface is "Uncommitted" as defined by attributes(7). # # Note: options 10 and 35 are not assigned. # diff --git a/usr/src/cmd/cmd-inet/etc/ike/config.sample b/usr/src/cmd/cmd-inet/etc/ike/config.sample index a9851a8d8a..7355b0a511 100644 --- a/usr/src/cmd/cmd-inet/etc/ike/config.sample +++ b/usr/src/cmd/cmd-inet/etc/ike/config.sample @@ -1,6 +1,4 @@ # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -27,12 +25,12 @@ ## ## This file should be copied into /etc/inet/ike/config to enable the -## launch of the IKE daemon, in.iked(1m), at boot time. You can also +## launch of the IKE daemon, in.iked(8), at boot time. You can also ## launch the IKE daemon after creating this file without rebooting by ## invoking /usr/lib/inet/in.iked with a root shell. ## -# Consult the ike.config(4) man page for further details. Here is a small +# Consult the ike.config(5) man page for further details. Here is a small # example from the man page. ### BEGINNING OF FILE @@ -47,7 +45,7 @@ ## certificate parameters... # Root certificates. I SHOULD use a full Distinguished Name. -# I MUST have this certificate in my local filesystem, see ikecert(1m). +# I MUST have this certificate in my local filesystem, see ikecert(8). cert_root "C=US, O=Sun Microsystems\\, Inc., CN=Sun CA" # Explicitly trusted certs that need no signatures, or perhaps self-signed diff --git a/usr/src/cmd/cmd-inet/etc/inetd.conf b/usr/src/cmd/cmd-inet/etc/inetd.conf index 0965497d35..2a654b6638 100644 --- a/usr/src/cmd/cmd-inet/etc/inetd.conf +++ b/usr/src/cmd/cmd-inet/etc/inetd.conf @@ -23,19 +23,17 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# Legacy configuration file for inetd(1M). See inetd.conf(4). +# Legacy configuration file for inetd(8). See inetd.conf(5). # # This file is no longer directly used to configure inetd. # The Solaris services which were formerly configured using this file -# are now configured in the Service Management Facility (see smf(5)) -# using inetadm(1M). +# are now configured in the Service Management Facility (see smf(7)) +# using inetadm(8). # # Any records remaining in this file after installation or upgrade, # or later created by installing additional software, must be converted -# to smf(5) services and imported into the smf repository using -# inetconv(1M), otherwise the service will not be available. Once +# to smf(7) services and imported into the smf repository using +# inetconv(8), otherwise the service will not be available. Once # a service has been converted using inetconv, further changes made to # its entry here are not reflected in the service. # diff --git a/usr/src/cmd/cmd-inet/etc/ipaddrsel.conf b/usr/src/cmd/cmd-inet/etc/ipaddrsel.conf index 901bb9dad1..0de979d0c0 100644 --- a/usr/src/cmd/cmd-inet/etc/ipaddrsel.conf +++ b/usr/src/cmd/cmd-inet/etc/ipaddrsel.conf @@ -24,7 +24,7 @@ # Use is subject to license terms. # # This is the IPv6 default address selection policy table. See -# ipaddrsel(1M) for details and examples. +# ipaddrsel(8) for details and examples. # # Prefix Precedence Label ::1/128 50 Loopback diff --git a/usr/src/cmd/cmd-inet/etc/ipsecalgs b/usr/src/cmd/cmd-inet/etc/ipsecalgs index a734e5ff13..dda67d86ea 100644 --- a/usr/src/cmd/cmd-inet/etc/ipsecalgs +++ b/usr/src/cmd/cmd-inet/etc/ipsecalgs @@ -24,7 +24,7 @@ # # DO NOT EDIT OR PARSE THIS FILE! # -# Use the ipsecalgs(1m) command to change the contents of this file. +# Use the ipsecalgs(8) command to change the contents of this file. # The algorithm descriptions contained in this file are synchronised to the # kernel with ipsecalgs -s, the kernel validates the entries at this point. diff --git a/usr/src/cmd/cmd-inet/etc/ipsecinit.sample b/usr/src/cmd/cmd-inet/etc/ipsecinit.sample index 76642506f2..4e7d2a6a2a 100644 --- a/usr/src/cmd/cmd-inet/etc/ipsecinit.sample +++ b/usr/src/cmd/cmd-inet/etc/ipsecinit.sample @@ -1,6 +1,4 @@ # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -72,9 +70,9 @@ # # WARNING: This file is read before default routes are established, and # before any naming services have been started. The -# ipsecconf(1M) command attempts to resolve names, but it will +# ipsecconf(8) command attempts to resolve names, but it will # fail unless the machine uses files, or DNS and the DNS server -# is reachable via routing information before ipsecconf(1m) +# is reachable via routing information before ipsecconf(8) # invocation. (E.g. the DNS server is on-subnet, or DHCP # has loaded up the default router already.) # diff --git a/usr/src/cmd/cmd-inet/etc/nca/ncaport.conf b/usr/src/cmd/cmd-inet/etc/nca/ncaport.conf index f2c7fd229b..74b110dfa7 100644 --- a/usr/src/cmd/cmd-inet/etc/nca/ncaport.conf +++ b/usr/src/cmd/cmd-inet/etc/nca/ncaport.conf @@ -23,14 +23,14 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# # # NCA Kernel Module Port Configuration File # # Use this file to tell NCA socket utility library /usr/lib/ncad_addr.so to # convert an AF_INET socket to an AF_NCA socket. Each line consists of two # fields - a key and a value - in the format ncaport=ipaddress/port. See -# man page ncaport(4) for the format and contents of this file. +# man page ncaport(5) for the format and contents of this file. # # Example configuration file: # diff --git a/usr/src/cmd/cmd-inet/etc/secret/ike.preshared b/usr/src/cmd/cmd-inet/etc/secret/ike.preshared index 49160535c7..033d9ed173 100644 --- a/usr/src/cmd/cmd-inet/etc/secret/ike.preshared +++ b/usr/src/cmd/cmd-inet/etc/secret/ike.preshared @@ -1,6 +1,4 @@ # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -34,4 +32,4 @@ # ... # } # -# Consult the man page for ike.preshared(4) for details. +# Consult the man page for ike.preshared(5) for details. diff --git a/usr/src/cmd/cmd-inet/etc/secret/ipseckeys.sample b/usr/src/cmd/cmd-inet/etc/secret/ipseckeys.sample index 256328e7f6..356b765a26 100644 --- a/usr/src/cmd/cmd-inet/etc/secret/ipseckeys.sample +++ b/usr/src/cmd/cmd-inet/etc/secret/ipseckeys.sample @@ -1,6 +1,4 @@ # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -25,7 +23,7 @@ # CDDL HEADER END # -# ipseckeys - This file takes the file format documented in ipseckey(1m). +# ipseckeys - This file takes the file format documented in ipseckey(8). # Note that naming services might not be available when this file # loads, just like ipsecinit.conf. # diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipadm.conf b/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipadm.conf index eeaee090b6..59f632d0e0 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipadm.conf +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipadm.conf @@ -23,4 +23,4 @@ # # DO NOT EDIT OR PARSE THIS FILE! # -# Use the ipadm(1m) command to change the contents of this file. +# Use the ipadm(8) command to change the contents of this file. diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c b/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c index a77be20510..41aeb2d98c 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c @@ -529,7 +529,7 @@ main(int argc, char *argv[]) if (!fg && getenv("SMF_FMRI") == NULL) { (void) fprintf(stderr, - "ipmgmtd is a smf(5) managed service and cannot be run " + "ipmgmtd is a smf(7) managed service and cannot be run " "from the command line.\n"); return (EINVAL); } diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt b/usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt index 6b39cde11f..cad7adf8bb 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt @@ -30,7 +30,7 @@ . /lib/svc/share/smf_include.sh if [ -z "$SMF_FMRI" ]; then - echo "this script can only be invoked by smf(5)" + echo "this script can only be invoked by smf(7)" exit $SMF_EXIT_ERR_NOSMF fi diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml b/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml index 7f2c7f53be..43ae9697ae 100644 --- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml +++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml @@ -86,7 +86,7 @@ </loctext> </description> <documentation> - <manpage title='ipadm' section='1M' + <manpage title='ipadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/main.c b/usr/src/cmd/cmd-inet/lib/nwamd/main.c index 84ff96875d..4d6cca3b4e 100644 --- a/usr/src/cmd/cmd-inet/lib/nwamd/main.c +++ b/usr/src/cmd/cmd-inet/lib/nwamd/main.c @@ -68,7 +68,7 @@ static void graceful_shutdown(void); * * This is the Network Auto-Magic daemon. For further high level information * see the Network Auto-Magic project and the Approachability communities - * on opensolaris.org, nwamd(1M), and the README in the source directory. + * on opensolaris.org, nwamd(8), and the README in the source directory. * * The general structure of the code is as a set of event source threads * which feed events into the event handling thread. Some of these events @@ -88,9 +88,9 @@ static void graceful_shutdown(void); * live here as static functions: * - nlog set-up * - daemonizing - * - looking up SMF(5) properties + * - looking up smf(7) properties * - signal handling - * - managing privileges(5) + * - managing privileges(7) */ static void diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/ncu_ip.c b/usr/src/cmd/cmd-inet/lib/nwamd/ncu_ip.c index e8df88cd77..655b428757 100644 --- a/usr/src/cmd/cmd-inet/lib/nwamd/ncu_ip.c +++ b/usr/src/cmd/cmd-inet/lib/nwamd/ncu_ip.c @@ -159,7 +159,7 @@ nwamd_get_dhcpinfo_data(const char *sym_name, char *ifname) if (ifname == NULL) ifname = ""; - /* find code and category in dhcp_inittab(4) */ + /* find code and category in dhcp_inittab(5) */ entry = inittab_getbyname(ITAB_CAT_SITE | ITAB_CAT_STANDARD | ITAB_CAT_VENDOR | ITAB_CAT_FIELD, ITAB_CONS_INFO, sym_name); diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/ncu_phys.c b/usr/src/cmd/cmd-inet/lib/nwamd/ncu_phys.c index ae1a6d979c..65f71acbdc 100644 --- a/usr/src/cmd/cmd-inet/lib/nwamd/ncu_phys.c +++ b/usr/src/cmd/cmd-inet/lib/nwamd/ncu_phys.c @@ -978,7 +978,7 @@ find_best_wlan_cb(nwam_known_wlan_handle_t kwh, void *data) * If we're >= scan level, don't pick another Known WLAN if still * connected (even if a Known WLAN with higher priority is available). * If the user wants to connect to a different Known WLAN, it can be - * done from the GUI or select-wifi subcommand of nwamadm(1M). + * done from the GUI or select-wifi subcommand of nwamadm(8). */ if (curr_strength >= wireless_scan_level && link->nwamd_link_wifi_connected) { diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/README b/usr/src/cmd/cmd-inet/sbin/dhcpagent/README index 749ec9a665..58b996aab5 100644 --- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/README +++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/README @@ -22,7 +22,6 @@ Use is subject to license terms. Architectural Overview for the DHCP agent Peter Memishian -ident "%Z%%M% %I% %E% SMI" INTRODUCTION ============ @@ -393,7 +392,7 @@ time, using the system's current notion of time. One additional limitation of the `hrtime_t' and `monosec_t' types is that they are unaware of the passage of time across checkpoint/resume -events (e.g., those generated by sys-suspend(1M)). For example, if +events (e.g., those generated by sys-suspend(8)). For example, if gethrtime() returns time T, and then the machine is suspended for 2 hours, and then gethrtime() is called again, the time returned is not T + (2 * 60 * 60 * NANOSEC), but rather approximately still T. diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/README.v6 b/usr/src/cmd/cmd-inet/sbin/dhcpagent/README.v6 index 77adf3655b..33d5ea80da 100644 --- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/README.v6 +++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/README.v6 @@ -45,13 +45,13 @@ Introduction - RFCs 2131 and 2132: IPv4 DHCP - RFCs 2461 and 2462: IPv6 NDP and stateless autoconfiguration - RFC 3484: IPv6 default address selection - - ifconfig(1M): Solaris IP interface configuration - - in.ndpd(1M): Solaris IPv6 Neighbor and Router Discovery daemon - - dhcpagent(1M): Solaris DHCP client + - ifconfig(8): Solaris IP interface configuration + - in.ndpd(8): Solaris IPv6 Neighbor and Router Discovery daemon + - dhcpagent(8): Solaris DHCP client - dhcpinfo(1): Solaris DHCP parameter utility - - ndpd.conf(4): in.ndpd configuration file - - netstat(1M): Solaris network status utility - - snoop(1M): Solaris network packet capture and inspection + - ndpd.conf(5): in.ndpd configuration file + - netstat(8): Solaris network status utility + - snoop(8): Solaris network packet capture and inspection - "DHCPv6 Client High-Level Design" Several terms from those documents (such as the DHCPv6 IA_NA and diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/class_id.c b/usr/src/cmd/cmd-inet/sbin/dhcpagent/class_id.c index 3e5a533466..5e3945ec2f 100644 --- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/class_id.c +++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/class_id.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/stat.h> #include <sys/types.h> #include <fcntl.h> @@ -117,7 +115,7 @@ return_property(int prom_fd, const char *prop) /* * sanitize_class_id(): translates the class id into a canonical format, - * so that it can be used easily with dhcptab(4). + * so that it can be used easily with dhcptab(5). * * input: char *: the class id to canonicalize * output: void diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.dfl b/usr/src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.dfl index 7f5ffd2559..933e94b0a3 100644 --- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.dfl +++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.dfl @@ -26,7 +26,7 @@ # # -# This file contains tunable parameters for dhcpagent(1M). +# This file contains tunable parameters for dhcpagent(8). # # All parameters can be tuned for a specific interface by prepending @@ -105,9 +105,9 @@ # By default, the DHCP agent will try to request the Fully Qualified Domain # Name (FQDN) currently associated with the interface performing DHCP. The -# hostname is defined by using the -h,--reqhost option of ipadm(1M) or the -# ncu ip-reqhost property of nwamcfg(1M) or by flagging the interface as -# primary so that nodename(4) is used as the hostname. +# hostname is defined by using the -h,--reqhost option of ipadm(8) or the +# ncu ip-reqhost property of nwamcfg(8) or by flagging the interface as +# primary so that nodename(5) is used as the hostname. # # A defined hostname will be used as the FQDN if it is "rooted" (i.e., if # it ends with a '.') or if it consists of at least three DNS labels (e.g., @@ -128,19 +128,19 @@ # REQUEST_FQDN=no # By default, the DHCP agent will not attempt to construct an FQDN from a -# PQDN specified by the -h,--reqhost option of ipadm(1M), by the ncu -# ip-reqhost property of nwamcfg(1M), or by nodename(4). Set and +# PQDN specified by the -h,--reqhost option of ipadm(8), by the ncu +# ip-reqhost property of nwamcfg(8), or by nodename(5). Set and # uncomment the following parameter to indicate a domain name to be used by # the DHCP agent to construct if necessary an FQDN. # # DNS_DOMAINNAME= # By default, the DHCP agent will not attempt to use a domain name returned -# by the DHCP server or the domain in resolv.conf(4) to construct an FQDN -# from a PQDN specified by the -h,--reqhost option of ipadm(1M), by the ncu -# ip-reqhost property of nwamcfg(1M), or by nodename(4). Set and uncomment +# by the DHCP server or the domain in resolv.conf(5) to construct an FQDN +# from a PQDN specified by the -h,--reqhost option of ipadm(8), by the ncu +# ip-reqhost property of nwamcfg(8), or by nodename(5). Set and uncomment # the following parameter to indicate that a returned DHCPv4 DNSdmain or the -# domain from resolv.conf(4) should be adopted by the DHCP agent to +# domain from resolv.conf(5) should be adopted by the DHCP agent to # construct if necessary an FQDN. # # ADOPT_DOMAINNAME=yes @@ -148,14 +148,14 @@ # By default, the DHCP agent will try to request the hostname currently # associated with the interface performing DHCP. If this option is # enabled, the agent will attempt to use an -h,--reqhost option saved with -# ipadm(1M) or an ncu ip-reqhost property set with nwamcfg(1M); or else +# ipadm(8) or an ncu ip-reqhost property set with nwamcfg(8); or else # attempt to find a host name in /etc/hostname.<if>, which must contain a # line of the form # # inet name # # where "name" is a single RFC 1101-compliant token; or else use -# nodename(4) for a DHCP interface flagged as primary. If found in any of +# nodename(5) for a DHCP interface flagged as primary. If found in any of # these configurations, the token will be used to request that host name # from the DHCP server. To prevent this, uncomment the following line. # diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.c b/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.c index 6b69dfffe7..4a1c58aa17 100644 --- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.c +++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.c @@ -763,7 +763,7 @@ dhcp_get_nodename(char *buf, size_t buflen) * affirmative and if 1) dsm_msg_reqhost is available; * or 2) hostname is read from an extant * /etc/hostname.<ifname> file; or 3) interface is - * primary and nodename(4) is defined. + * primary and nodename(5) is defined. * * input: dhcp_pkt_t *: pointer to DHCP message being constructed; * dhcp_smach_t *: pointer to interface DHCP state machine; @@ -1000,8 +1000,8 @@ dhcp_pick_domainname(char *namebuf, size_t buflen, dhcp_smach_t *dsmp) /* * dhcp_assemble_fqdn(): Set fqdnbuf if REQUEST_FQDN is set and * either a host name was sent in the IPC message (e.g., - * from ipadm(1M) -h,--reqhost) or the interface is - * primary and a nodename(4) is defined. If the host + * from ipadm(8) -h,--reqhost) or the interface is + * primary and a nodename(5) is defined. If the host * name is not already fully qualified per is_fqdn(), * then dhcp_pick_domainname() is tried to select a * domain to be used to construct an FQDN. diff --git a/usr/src/cmd/cmd-inet/usr.bin/tftp/tftp-udp6.xml b/usr/src/cmd/cmd-inet/usr.bin/tftp/tftp-udp6.xml index d5368753d4..b8a5b4e87e 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/tftp/tftp-udp6.xml +++ b/usr/src/cmd/cmd-inet/usr.bin/tftp/tftp-udp6.xml @@ -73,7 +73,7 @@ operating system upgrade. </loctext> </common_name> <documentation> - <manpage title='in.tftpd' section='1M' + <manpage title='in.tftpd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/bridged/bridge.xml b/usr/src/cmd/cmd-inet/usr.lib/bridged/bridge.xml index 3c9d0b5695..f79a2f1820 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/bridged/bridge.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/bridged/bridge.xml @@ -100,7 +100,7 @@ The "bridge" service provides Ethernet bridging and related protocols. </loctext> </description> <documentation> - <manpage title='bridged' section='1M' + <manpage title='bridged' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd.xml b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd.xml index 567fb9439d..b6a009275e 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd.xml @@ -103,9 +103,9 @@ </loctext> </common_name> <documentation> - <manpage title='ilbd' section='1M' + <manpage title='ilbd' section='8' manpath='/usr/share/man' /> - <manpage title='ilbadm' section='1M' + <manpage title='ilbadm' section='8' manpath='/usr/share/man' /> </documentation> diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_main.c b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_main.c index 3064428a36..fa17a8f96b 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_main.c +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_main.c @@ -2120,7 +2120,7 @@ main(int argc, char *argv[]) /* * If we're operating in "adopt" mode and no interfaces need to be - * tracked, shut down (ifconfig(1M) will restart us on demand if + * tracked, shut down (ifconfig(8) will restart us on demand if * interfaces are subsequently put into multipathing groups). */ if (adopt && phyint_instances == NULL) diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_tables.c b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_tables.c index 71aecb6970..231a7f7c5d 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_tables.c +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/mpd_tables.c @@ -1444,7 +1444,7 @@ phyint_offline(struct phyint *pi, uint_t minred) /* * The interface is now offline, so stop probing it. Note that - * if_mpadm(1M) will down the test addresses, after receiving a + * if_mpadm(8) will down the test addresses, after receiving a * success reply from us. The routing socket message will then make us * close the socket used for sending probes. But it is more logical * that an offlined interface must not be probed, even if it has test diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/net-ipmp b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/net-ipmp index be4263a74b..565b80e374 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/net-ipmp +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/net-ipmp @@ -18,7 +18,7 @@ . /lib/svc/share/smf_include.sh if [ -z "$SMF_FMRI" ]; then - echo "this script can only be invoked by smf(5)" + echo "this script can only be invoked by smf(7)" exit $SMF_EXIT_ERR_NOSMF fi diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/network-ipmp.xml b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/network-ipmp.xml index 282bf5b4df..f3c8b1a7f0 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/network-ipmp.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/network-ipmp.xml @@ -71,7 +71,7 @@ </loctext> </common_name> <documentation> - <manpage title='in.mpathd' section='1M' /> + <manpage title='in.mpathd' section='8' /> </documentation> </template> </service> diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/ndp.xml b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/ndp.xml index 3c9afca895..4459def5c8 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/ndp.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/ndp.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -78,7 +76,7 @@ value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Unstable' /> <!-- @@ -96,7 +94,7 @@ </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routing' type='application'> <stability value='Evolving' /> @@ -121,7 +119,7 @@ </loctext> </common_name> <documentation> - <manpage title='in.ndpd' section='1M' + <manpage title='in.ndpd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/ripng.xml b/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/ripng.xml index 297baaddf5..fbfc77bee1 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/ripng.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/ripng.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -97,7 +95,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Unstable' /> <!-- Identifies service as a routing service --> @@ -107,8 +105,8 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho <propval name='value_authorization' type='astring' value='solaris.smf.value.routing' /> </property_group> - - <!-- Properties in this group are modifiable via routeadm (1M) --> + + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routing' type='application'> <stability value='Evolving' /> @@ -129,7 +127,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho <!-- Equivalent to optional logging file --> <propval name='log_file' type='astring' value='' /> - + <propval name='value_authorization' type='astring' value='solaris.smf.value.routing' /> </property_group> @@ -141,7 +139,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho </loctext> </common_name> <documentation> - <manpage title='in.ripngd' section='1M' + <manpage title='in.ripngd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.sh b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.sh index eb18c250aa..eaef116d36 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.sh +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.sh @@ -97,7 +97,7 @@ n s/'//g p } -/from the inetd.conf(4) format line/{ +/from the inetd.conf(5) format line/{ n p } diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.xml b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.xml index 1944cdf2d6..a5c1a32c37 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd-upgrade.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -101,7 +99,7 @@ inetd-upgrade handles the upgrade of old inetd.conf entries to SMF service insta </loctext> </description> <documentation> - <manpage title='inetd' section='1M' + <manpage title='inetd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c index f1f99ff74d..1ded291af9 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c @@ -3809,23 +3809,23 @@ static void legacy_usage(void) { (void) fprintf(stderr, - "inetd is now an smf(5) managed service and can no longer be run " + "inetd is now an smf(7) managed service and can no longer be run " "from the\n" - "command line. To enable or disable inetd refer to svcadm(1M) on\n" + "command line. To enable or disable inetd refer to svcadm(8) on\n" "how to enable \"%s\", the inetd instance.\n" "\n" "The traditional inetd command line option mappings are:\n" "\t-d : there is no supported debug output\n" "\t-s : inetd is only runnable from within the SMF\n" - "\t-t : See inetadm(1M) on how to enable TCP tracing\n" - "\t-r : See inetadm(1M) on how to set a failure rate\n" + "\t-t : See inetadm(8) on how to enable TCP tracing\n" + "\t-r : See inetadm(8) on how to set a failure rate\n" "\n" - "To specify an alternative configuration file see svccfg(1M)\n" + "To specify an alternative configuration file see svccfg(8)\n" "for how to modify the \"%s/%s\" string type property of\n" "the inetd instance, and modify it according to the syntax:\n" "\"%s [alt_config_file] %%m\".\n" "\n" - "For further information on inetd see inetd(1M).\n", + "For further information on inetd see inetd(8).\n", INETD_INSTANCE_FMRI, START_METHOD_ARG, SCF_PROPERTY_EXEC, INETD_PATH); } diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml index f7ff3c95bc..322cca73d6 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.xml @@ -134,7 +134,7 @@ <stability value='Evolving' /> <propval name='max_con_rate' type='integer' value='-1' /> <propval name='con_rate_offline' type='integer' value='-1' /> - <propval name='max_copies' type='integer' value='-1' /> + <propval name='max_copies' type='integer' value='-1' /> <propval name='failrate_cnt' type='integer' value='40' /> <propval name='failrate_interval' type='integer' value='60' /> <propval name='inherit_env' type='boolean' value='true' /> @@ -177,9 +177,9 @@ services. </loctext> </description> <documentation> - <manpage title='inetd' section='1M' + <manpage title='inetd' section='8' manpath='/usr/share/man' /> - <manpage title='inetadm' section='1M' + <manpage title='inetadm' section='8' manpath='/usr/share/man' /> </documentation> @@ -908,7 +908,7 @@ method context resource pool <description> <loctext xml:lang='C'> The resource pool name on which to launch the method. :default can be used -as a token to indicate the pool specified in the project(4) entry given in +as a token to indicate the pool specified in the project(5) entry given in the project attribute. </loctext> </description> @@ -969,7 +969,7 @@ method credential privileges </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the privilege set as defined in privileges(5). +An optional string specifying the privilege set as defined in privileges(7). </loctext> </description> <cardinality min='1' max='1' /> @@ -985,7 +985,7 @@ method credential limit privilege set <description> <loctext xml:lang='C'> An optional string specifying the limit privilege set as defined in -privileges(5). +privileges(7). </loctext> </description> <cardinality min='1' max='1' /> @@ -1007,13 +1007,13 @@ user, group, privileges, and limit_privileges properties. required='false'> <common_name> <loctext xml:lang='C'> -method profile RBAC profile specification +method profile RBAC profile specification </loctext> </common_name> <description> <loctext xml:lang='C'> The name of an RBAC (role-based access control) profile which, along with the -method executable, identifies an entry in exec_attr(4). +method executable, identifies an entry in exec_attr(5). </loctext> </description> <cardinality min='1' max='1' /> diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/multicast.xml b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/multicast.xml index a6c1901c97..e2f7e50875 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/multicast.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/multicast.xml @@ -90,9 +90,9 @@ <!-- to start stop mdns service --> <property_group name='general' type='framework'> - <propval name='action_authorization' type='astring' + <propval name='action_authorization' type='astring' value='solaris.smf.manage.mdns' /> - <propval name='value_authorization' type='astring' + <propval name='value_authorization' type='astring' value='solaris.smf.manage.mdns' /> </property_group> @@ -140,7 +140,7 @@ <propval name='value_authorization' type='astring' value='solaris.smf.value.firewall.config' /> </property_group> - + </instance> <stability value='Unstable' /> @@ -152,7 +152,7 @@ </loctext> </common_name> <documentation> - <manpage title='mdnsd' section='1M' /> + <manpage title='mdnsd' section='8' /> <doc_link name='Service Discovery OpenSolaris Project Page' uri="http://opensolaris.org/os/project/nwam/service-discovery/"/> </documentation> diff --git a/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/ncaconfd.c b/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/ncaconfd.c index 06972f53dc..8115784a3a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/ncaconfd.c +++ b/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/ncaconfd.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/stat.h> #include <sys/tihdr.h> @@ -155,7 +153,7 @@ logwarn(char *fmt, ...) } /* - * Print out debugging info. Note that syslogd(1M) should be configured to + * Print out debugging info. Note that syslogd(8) should be configured to * take ordinary debug info for it to get this kind of info. */ /*PRINTFLIKE1*/ @@ -996,7 +994,7 @@ get_router_ether_addr(mib_item_t *item, boolean_t *changed) /* * Ping all default routers. It just uses system(3F) to call - * ping(1M) to do the job... + * ping(8) to do the job... */ static void ping_them(void) diff --git a/usr/src/cmd/cmd-inet/usr.lib/slpd/slp.xml b/usr/src/cmd/cmd-inet/usr.lib/slpd/slp.xml index 37b6499da3..577fba071a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/slpd/slp.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/slpd/slp.xml @@ -28,8 +28,6 @@ be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different file. - - ident "%Z%%M% %I% %E% SMI" --> <service_bundle type='manifest' name='SUNWslpr:slpd'> @@ -96,9 +94,9 @@ </loctext> </common_name> <documentation> - <manpage title='slpd' section='1M' /> - <manpage title='slp' section='7P' /> - <manpage title='slp.conf' section='4' /> + <manpage title='slpd' section='8' /> + <manpage title='slp' section='4P' /> + <manpage title='slp.conf' section='5' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.conf b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.conf index cf8160d86f..b95bdf486a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.conf +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.conf @@ -24,4 +24,4 @@ # # DO NOT EDIT OR PARSE THIS FILE! # -# Use the vrrpadm(1m) command to change the contents of this file. +# Use the vrrpadm(8) command to change the contents of this file. diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.xml b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.xml index 5b95f40404..cc02197d12 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrp.xml @@ -2,7 +2,7 @@ <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- CDDL HEADER START - + The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. @@ -86,9 +86,9 @@ <!-- to start/stop the VRRP service --> <property_group name='general' type='framework'> - <propval name='action_authorization' type='astring' + <propval name='action_authorization' type='astring' value='solaris.smf.manage.vrrp' /> - <propval name='value_authorization' type='astring' + <propval name='value_authorization' type='astring' value='solaris.smf.manage.vrrp' /> </property_group> @@ -105,10 +105,10 @@ <loctext xml:lang='C'> VRRP service daemon </loctext> </common_name> - <documentation> - <manpage title='vrrpd' section='1M' - manpath='/usr/share/man' /> - </documentation> + <documentation> + <manpage title='vrrpd' section='8' + manpath='/usr/share/man' /> + </documentation> </template> </service> diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c index 9269e9b94f..6f542ece96 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c @@ -685,7 +685,7 @@ daemon_init() vrrp_log(VRRP_DBG0, "daemon_init()"); if (getenv("SMF_FMRI") == NULL) { - vrrp_log(VRRP_ERR, "daemon_init(): vrrpd is an smf(5) managed " + vrrp_log(VRRP_ERR, "daemon_init(): vrrpd is an smf(7) managed " "service and should not be run from the command line."); return (-1); } diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.xcl b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.xcl index f4e72616cc..7fb5116d4a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.xcl +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.xcl @@ -58,7 +58,7 @@ msgid "daemon_init" msgid "setrlimit" msgid "vrrpd_init" msgid "iu_handle_events" -msgid "smf(5)" +msgid "smf(7)" msgid "vrrpd_init" msgid "dladm_open" msgid "iu_tq_create" diff --git a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa.xml b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa.xml index 40ab72b46d..c096354b8c 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa.xml +++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -86,7 +84,7 @@ </loctext> </common_name> <documentation> - <manpage title='wpad' section='1M' + <manpage title='wpad' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_supplicant.c b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_supplicant.c index 3fb8b133a7..8b243e705d 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_supplicant.c +++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_supplicant.c @@ -790,8 +790,8 @@ main(int argc, char *argv[]) if (!is_smf_context()) { (void) fprintf(stderr, - "wpad is an smf(5) managed service and cannot be run from " - "the command line; please use dladm(1M).\n"); + "wpad is an smf(7) managed service and cannot be run from " + "the command line; please use dladm(8).\n"); return (SMF_EXIT_ERR_NOSMF); } diff --git a/usr/src/cmd/cmd-inet/usr.sbin/comsat.xml b/usr/src/cmd/cmd-inet/usr.sbin/comsat.xml index a66e18a02e..922cd84933 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/comsat.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/comsat.xml @@ -103,9 +103,9 @@ requested to be told when mail arrives. </loctext> </description> <documentation> - <manpage title='in.comsat' section='1M' + <manpage title='in.comsat' section='8' manpath='/usr/share/man' /> - <manpage title='comsat' section='1M' + <manpage title='comsat' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/finger.xml b/usr/src/cmd/cmd-inet/usr.sbin/finger.xml index 2c4281d84a..565eef962c 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/finger.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/finger.xml @@ -101,9 +101,9 @@ status and individual users. </loctext> </description> <documentation> - <manpage title='in.fingerd' section='1M' + <manpage title='in.fingerd' section='8' manpath='/usr/share/man' /> - <manpage title='fingerd' section='1M' + <manpage title='fingerd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c index 9da0ed811f..0475fad29f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c @@ -86,8 +86,8 @@ typedef struct { } if_appflags_t; static const if_appflags_t if_appflags_tbl[] = { - { "dhcpagent(1M)", IFF_DHCPRUNNING, 1 }, - { "in.ndpd(1M)", IFF_ADDRCONF, 3 }, + { "dhcpagent(8)", IFF_DHCPRUNNING, 1 }, + { "in.ndpd(8)", IFF_ADDRCONF, 3 }, { NULL, 0, 0 } }; @@ -643,7 +643,7 @@ ifconfig(int argc, char *argv[], int af, struct ifaddrs *ifa) * sometimes two or more attributes must be set together. For * example, setting an address without a netmask does not make sense. * Yet they can be set separately for IPv4 address using the current - * ifconfig(1M) syntax. The kernel then "infers" the correct netmask + * ifconfig(8) syntax. The kernel then "infers" the correct netmask * using the deprecated "IP address classes." This is simply not * correct. * @@ -660,7 +660,7 @@ ifconfig(int argc, char *argv[], int af, struct ifaddrs *ifa) * it will use the working interface's address to do the query. * It will be wrong now as we don't know the logical interface's name. * - * ifconfig(1M) is too overloaded and the code is so convoluted + * ifconfig(8) is too overloaded and the code is so convoluted * that it is "safer" not to re-architect the code to fix the above * issue, hence this "hack." We may be better off to have a new * command with better syntax for configuring network interface @@ -1074,7 +1074,7 @@ setifaddr(char *addr, int64_t param) } /* - * The following functions are stolen from the ipseckey(1m) program. + * The following functions are stolen from the ipseckey(8) program. * Perhaps they should be somewhere common, but for now, we just maintain * two versions. We do this because of the different semantics for which * algorithms we select ("requested" for ifconfig vs. "actual" for key). @@ -2244,11 +2244,11 @@ again: } /* - * If the interface being moved is under the control of `ipmgmtd(1M)' + * If the interface being moved is under the control of `ipmgmtd(8)' * dameon then we should inform the daemon about this move, so that * the daemon can delete the state associated with this interface. * - * This workaround is needed until the IPMP support in ipadm(1M). + * This workaround is needed until the IPMP support in ipadm(8). */ ipadm_if_move(iph, name); diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm.c b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm.c index 949fcc064c..67de6e31ba 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm.c @@ -50,7 +50,7 @@ ilbadm_errstr(ilbadm_status_t rc) case ILBADM_ENOMEM: return (gettext("memory allocation failure")); case ILBADM_EINVAL: - return (gettext("invalid value - refer to ilbadm(1M)")); + return (gettext("invalid value - refer to ilbadm(8)")); case ILBADM_HCPRINT: return (gettext("failed to print healthcheck values")); case ILBADM_INVAL_AF: @@ -63,7 +63,7 @@ ilbadm_errstr(ilbadm_status_t rc) return (gettext("address is invalid")); case ILBADM_INVAL_ARGS: return (gettext("invalid/incompatible keywords - refer to" - " ilbadm(1M)")); + " ilbadm(8)")); case ILBADM_ENOSGNAME: return (gettext("servergroup name missing")); case ILBADM_ENORULE: @@ -83,21 +83,21 @@ ilbadm_errstr(ilbadm_status_t rc) return (gettext("operation type is invalid")); case ILBADM_INVAL_KEYWORD: return (gettext("keyword is invalid - please refer" - " to ilbadm(1M)")); + " to ilbadm(8)")); case ILBADM_ASSIGNREQ: return (gettext("assignment '=' missing")); case ILBADM_NORECURSIVE: return (gettext("recursive import not allowed")); case ILBADM_INVAL_COMMAND: return (gettext("subcommand is invalid - please refer" - " to ilbadm(1M)")); + " to ilbadm(8)")); case ILBADM_ENOPROXY: return (gettext("proxy-src is missing")); case ILBADM_INVAL_PROXY: return (gettext("proxy-src not allowed")); case ILBADM_ENOOPTION: return (gettext("mandatory argument(s) missing - refer" - " to ilbadm(1M)")); + " to ilbadm(8)")); case ILBADM_TOOMANYIPADDR: return (gettext("address range contains more than 255" " IP addresses")); @@ -105,7 +105,7 @@ ilbadm_errstr(ilbadm_status_t rc) return (gettext("could not export servergroup because" " of lack of space")); case ILBADM_INVAL_SYNTAX: - return (gettext("syntax failure - refer to ilbadm(1M)")); + return (gettext("syntax failure - refer to ilbadm(8)")); case ILBADM_NOKEYWORD_VAL: return (gettext("missing value")); case ILBADM_LIBERR: diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c index f159a3b6d6..dad110a62f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c @@ -1123,7 +1123,7 @@ ilbadm_create_rule(int argc, char *argv[]) if (optind >= argc) { ilbadm_err(gettext("missing mandatory arguments - please refer" " to 'ilbadm create-rule' subcommand description in" - " ilbadm(1M)")); + " ilbadm(8)")); rc = ILBADM_LIBERR; goto out; diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c index 8a0d92bbd7..a27ac5c95a 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c @@ -467,7 +467,7 @@ ilbadm_create_servergroup(int argc, char *argv[]) if (optind >= argc) { ilbadm_err(gettext("missing mandatory arguments - please refer" " to 'create-servergroup' subcommand" - " description in ilbadm(1M)")); + " description in ilbadm(8)")); rc = ILBADM_LIBERR; goto out; } @@ -546,7 +546,7 @@ ilbadm_add_server_to_group(int argc, char **argv) if (optind >= argc) { ilbadm_err(gettext("missing mandatory arguments - please refer" - " to 'add-server' subcommand description in ilbadm(1M)")); + " to 'add-server' subcommand description in ilbadm(8)")); rc = ILBADM_LIBERR; goto out; } diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/rdisc.xml b/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/rdisc.xml index eb223ee0e4..2ef0b8701b 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/rdisc.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/rdisc.xml @@ -78,7 +78,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Unstable' /> <propval name='protocol' type='astring' value='ipv4' /> @@ -89,7 +89,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routing' type='application'> <stability value='Evolving' /> @@ -102,7 +102,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho <!-- Equivalent to -r option if true --> <propval name='act_as_router' type='boolean' value='false' /> - <!-- Equivalent to -a option if true --> + <!-- Equivalent to -a option if true --> <propval name='accept_all' type='boolean' value='false' /> <!-- Equivalent to -p preference option if set --> @@ -127,7 +127,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho </loctext> </common_name> <documentation> - <manpage title='in.rdisc' section='1M' + <manpage title='in.rdisc' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/route.xml b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/route.xml index 530ec5bda7..e9d73eb57f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/route.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/route.xml @@ -80,7 +80,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Unstable' /> <propval name='protocol' type='astring' value='ipv4' /> @@ -90,7 +90,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho value='solaris.smf.value.routing' /> </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routing' type='application'> <stability value='Evolving' /> @@ -122,7 +122,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho <propval name='quiet_mode' type='boolean' value='false' /> <!-- Equivalent to -s option if true --> - <propval name='supply_routes' type='boolean' value='false' /> + <propval name='supply_routes' type='boolean' value='false' /> <!-- Equivalent to -S option if true --> <propval name='default_routes_only' type='boolean' @@ -162,7 +162,7 @@ privileges='basic,proc_owner,proc_fork,proc_exec,proc_info,proc_session,file_cho </loctext> </common_name> <documentation> - <manpage title='in.routed' section='1M' + <manpage title='in.routed' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/talk.xml b/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/talk.xml index c4d2494095..29b70d09cf 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/talk.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/talk.xml @@ -102,9 +102,9 @@ </loctext> </description> <documentation> - <manpage title='in.talkd' section='1M' + <manpage title='in.talkd' section='8' manpath='/usr/share/man' /> - <manpage title='talkd' section='1M' + <manpage title='talkd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c b/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c index bbd38a551c..08ad200c45 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c @@ -488,7 +488,7 @@ rd_and_store_forwarded_creds(krb5_context context, if ((retval = krb5_cc_close(context, ccache)) != 0) goto cleanup; - /* Register with ktkt_warnd(1M) */ + /* Register with ktkt_warnd(8) */ if ((retval = krb5_unparse_name(context, (*creds)->client, &client_name)) != 0) goto cleanup; @@ -496,11 +496,11 @@ rd_and_store_forwarded_creds(krb5_context context, if (kwarn_add_warning(client_name, (*creds)->times.endtime) != 0) { syslog(LOG_AUTH|LOG_NOTICE, "rd_and_store_forwarded_creds: kwarn_add_warning" - " failed: ktkt_warnd(1M) down? "); + " failed: ktkt_warnd(8) down? "); if (auth_debug) (void) fprintf(stderr, "kwarn_add_warning failed:" - " ktkt_warnd(1M) down?\n"); + " ktkt_warnd(8) down?\n"); } free(client_name); client_name = NULL; diff --git a/usr/src/cmd/cmd-inet/usr.sbin/inetconv/inetconv.c b/usr/src/cmd/cmd-inet/usr.sbin/inetconv/inetconv.c index 6419f9e074..376454019f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/inetconv/inetconv.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/inetconv/inetconv.c @@ -24,8 +24,8 @@ */ /* - * inetconv - convert inetd.conf entries into smf(5) service manifests, - * import them into smf(5) repository + * inetconv - convert inetd.conf entries into smf(7) service manifests, + * import them into smf(7) repository */ #include <sys/types.h> @@ -115,7 +115,7 @@ static const char xml_comment[] = "<!--\n" " Service manifest for the %s service.\n" "\n" -" Generated by inetconv(1M) from inetd.conf(4).\n" +" Generated by inetconv(8) from inetd.conf(5).\n" "-->\n\n"; static const char xml_service_bundle[] = diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/ipmpstat.c b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/ipmpstat.c index c9cbade079..a5d8f79bc4 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/ipmpstat.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/ipmpstat.c @@ -280,7 +280,7 @@ main(int argc, char **argv) die_ipmperr(err, "cannot create IPMP handle"); if (ipmp_ping_daemon(ih) != IPMP_SUCCESS) - die("cannot contact in.mpathd(1M) -- is IPMP in use?\n"); + die("cannot contact in.mpathd(8) -- is IPMP in use?\n"); /* * If we've been asked to display probes, then call the probe output diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c index e6257c6184..5ca927ca40 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c @@ -2253,7 +2253,7 @@ print_defaults(char *label, char *description, char *unit, * two ike_defaults_t's, the first contains the hard coded defaults, the second * contains the actual values used. If these differ, then the defaults have been * changed via a config file entry. Note that "-" indicates this default - * is not tunable via ike.config(4) or is system wide tunable. + * is not tunable via ike.config(5) or is system wide tunable. */ static void do_print_defaults(ike_defaults_t *dp) diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecalgs.xml b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecalgs.xml index cdf27133de..4d620d059d 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecalgs.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecalgs.xml @@ -113,7 +113,7 @@ svcadm mark <state> ipsecalgs svcadm clear ipsecalgs - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='action_authorization' @@ -125,7 +125,7 @@ svcadm disable ipsecalgs svcadm enable ipsecalgs - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='value_authorization' type='astring' @@ -158,7 +158,7 @@ <documentation> <manpage title='ipsecalgs' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecconf.c b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecconf.c index e8203530b4..fc94afe658 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecconf.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecconf.c @@ -1341,7 +1341,7 @@ main(int argc, char *argv[]) boolean_t replace_policy = B_FALSE; char *smf_warning = gettext( - "\n\tIPsec policy should be managed using smf(5). Modifying\n" + "\n\tIPsec policy should be managed using smf(7). Modifying\n" "\tthe IPsec policy from the command line while the 'policy'\n" "\tservice is enabled could result in an inconsistent\n" "\tsecurity policy.\n\n"); @@ -5247,7 +5247,7 @@ ipsec_conf_add(boolean_t just_check, boolean_t smf_managed, boolean_t replace) /* * Treat the non-existence of a policy file as a special - * case when ipsecconf is being managed by smf(5). + * case when ipsecconf is being managed by smf(7). * The assumption is the administrator has not yet * created a policy file, this should not force the service * into maintenance mode. diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c index 9667fa4047..cbf429a3e7 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c @@ -191,7 +191,7 @@ handle_errors(char *ep, char *ebuf, boolean_t fatal, boolean_t done) if (ep != NULL) { if (my_fmri == NULL) { /* - * For now suppress the errors when run from smf(5) + * For now suppress the errors when run from smf(7) * because potentially sensitive information could * end up in a publicly readable logfile. */ @@ -1093,7 +1093,7 @@ dodump(int satype, FILE *ofile) (void) fprintf(ofile, gettext("# This key file was generated by the")); (void) fprintf(ofile, - gettext(" ipseckey(1m) command's 'save' feature.\n\n")); + gettext(" ipseckey(8) command's 'save' feature.\n\n")); } msg_init(msg, SADB_DUMP, (uint8_t)satype); rc = key_write(keysock, msg, sizeof (*msg)); @@ -3590,7 +3590,7 @@ main(int argc, char *argv[]) (void) textdomain(TEXT_DOMAIN); /* - * Check to see if the command is being run from smf(5). + * Check to see if the command is being run from smf(7). */ my_fmri = getenv("SMF_FMRI"); @@ -3649,7 +3649,7 @@ main(int argc, char *argv[]) * this file if the file is root owned and only readable * by privileged users. If the command is being run by * the administrator, issue a warning, if this is run by - * smf(5) (IE: boot time) and the permissions are too + * smf(7) (IE: boot time) and the permissions are too * open, we will fail, the SMF service will end up in * maintenace mode. The check is made with fstat() to * eliminate any possible TOT to TOU window. @@ -3719,7 +3719,7 @@ main(int argc, char *argv[]) } /* - * When run from smf(5) flush any existing SA's first + * When run from smf(7) flush any existing SA's first * otherwise you will end up in maintenance mode. */ if ((my_fmri != NULL) && readfile) { diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/manual-key.xml b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/manual-key.xml index d1dac2b94c..fb4fd47374 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/manual-key.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/manual-key.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -86,7 +84,7 @@ <!-- To prevent ipseckey generating warnings about duplicate SAs when the service is refreshed, ipseckey will flush the - existing SAs when its called from smf(5). --> + existing SAs when its called from smf(7). --> <exec_method type='method' @@ -110,7 +108,7 @@ svcadm mark <state> manual-key svcadm clear manual-key - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='action_authorization' @@ -122,7 +120,7 @@ svcadm disable manual-key svcadm enable manual-key - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='value_authorization' @@ -132,8 +130,8 @@ </property_group> <!-- The properties defined below can be changed by a user - with 'solaris.smf.value.ipsec' authorization using the - svccfg(1M) command. + with 'solaris.smf.value.ipsec' authorization using the + svccfg(8) command. EG: @@ -183,7 +181,7 @@ </loctext> </description> <documentation> - <manpage title='ipseckey' section='1M' + <manpage title='ipseckey' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/policy.xml b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/policy.xml index 297e48d1b4..d63c65c3a4 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/policy.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/policy.xml @@ -102,7 +102,7 @@ svcadm mark <state> policy svcadm clear policy - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='action_authorization' @@ -113,7 +113,7 @@ svcadm disable policy svcadm enable policy - see auths(1) and user_attr(4)--> + see auths(1) and user_attr(5)--> <propval name='value_authorization' @@ -123,8 +123,8 @@ </property_group> <!-- The properties defined below can be changed by a user - with 'solaris.smf.value.ipsec' authorization using the - svccfg(1M) command. + with 'solaris.smf.value.ipsec' authorization using the + svccfg(8) command. EG: @@ -176,7 +176,7 @@ </loctext> </description> <documentation> - <manpage title='ipsecconf' section='1M' + <manpage title='ipsecconf' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/kssladm.c b/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/kssladm.c index c2978c564f..7eab57d0cc 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/kssladm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/kssladm.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <ctype.h> #include <stdio.h> #include <stdlib.h> @@ -39,10 +37,10 @@ /* - * kssladm(1M) + * kssladm(8) * * Command to manage the entries in kernel SSL proxy table. This is - * a private command called indirectly from ksslcfg(1M). + * a private command called indirectly from ksslcfg(8). */ boolean_t verbose = B_FALSE; diff --git a/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/kssl-proxy.xml b/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/kssl-proxy.xml index e2be94717c..3728239974 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/kssl-proxy.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/kssl-proxy.xml @@ -40,7 +40,7 @@ grouping='require_all' restart_on='restart' type='service'> - <service_fmri value='svc:/network/socket-filter:kssl' /> + <service_fmri value='svc:/network/socket-filter:kssl' /> </dependency> <dependency @@ -72,7 +72,7 @@ </loctext> </common_name> <documentation> - <manpage title='ksslcfg' section='1M' + <manpage title='ksslcfg' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/ksslcfg.c b/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/ksslcfg.c index 8b9a33349d..84336d0923 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/ksslcfg.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/ksslcfg.c @@ -38,10 +38,10 @@ #include "ksslcfg.h" /* - * ksslcfg(1M) + * ksslcfg(8) * - * ksslcfg manages smf(5) instances for the Kernel SSL proxy module. - * It makes use of kssladm(1M) which does the grunt work. + * ksslcfg manages smf(7) instances for the Kernel SSL proxy module. + * It makes use of kssladm(8) which does the grunt work. */ /* diff --git a/usr/src/cmd/cmd-inet/usr.sbin/login.xml b/usr/src/cmd/cmd-inet/usr.sbin/login.xml index f21084da5f..ba4d875d5f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/login.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/login.xml @@ -45,7 +45,7 @@ <service_fmri value='svc:/network/inetd:default' /> </restarter> - <property_group name='inetd' type='framework'> + <property_group name='inetd' type='framework'> <stability value='Evolving' /> <propval name='endpoint_type' type='astring' value='stream' /> <propval name='wait' type='boolean' value='false' /> @@ -87,7 +87,7 @@ value='solaris.smf.value.firewall.config' /> </property_group> - <property_group name='inetd' type='framework'> + <property_group name='inetd' type='framework'> <propval name='name' type='astring' value='login' /> <propval name='proto' type='astring' value='tcp6' /> </property_group> @@ -134,7 +134,7 @@ </property_group> <!-- Only works over IPv4 at the moment --> - <property_group name='inetd' type='framework'> + <property_group name='inetd' type='framework'> <propval name='name' type='astring' value='klogin' /> <propval name='proto' type='astring' value='tcp' /> </property_group> @@ -182,7 +182,7 @@ remote login with Kerberos authentication </property_group> <!-- Only works over IPv4 at the moment --> - <property_group name='inetd' type='framework'> + <property_group name='inetd' type='framework'> <propval name='name' type='astring' value='eklogin' /> <propval name='proto' type='astring' value='tcp' /> </property_group> @@ -205,9 +205,9 @@ remote login with Kerberos authentication and encryption </loctext> </common_name> <documentation> - <manpage title='in.rlogind' section='1M' + <manpage title='in.rlogind' section='8' manpath='/usr/share/man' /> - <manpage title='rlogind' section='1M' + <manpage title='rlogind' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ndd.c b/usr/src/cmd/cmd-inet/usr.sbin/ndd.c index 8d5fdfa91f..9adf3c8d2d 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ndd.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ndd.c @@ -170,8 +170,8 @@ ndd_perm2str(uint_t perm) * - replace leading underscores with protocol name. * For example: `_strong_iss' --> `tcp_strong_iss' * - * - don't print new public properties that are supported only by ipadm(1M) - * For example: `hostmodel' should be supported only from ipadm(1M). + * - don't print new public properties that are supported only by ipadm(8) + * For example: `hostmodel' should be supported only from ipadm(8). * Such properties are identified by not having leading '_' and not * being present in the mapping table. */ @@ -211,7 +211,7 @@ print_ipadm2ndd(char *oldbuf, uint_t obufsize) } /* * print only if it's a private property. We should - * not be printing any new public property in ndd(1M) + * not be printing any new public property in ndd(8) * output. */ if (!matched && pname[0] == '_') { @@ -234,7 +234,7 @@ print_ipadm2ndd(char *oldbuf, uint_t obufsize) * get/set the value for a given property by calling into libipadm. The * IPH_LEGACY flag is used by libipadm for special handling. For some * properties, libipadm.so displays strings (for e.g., on/off, - * never/passive/active, et al) instead of numerals. However ndd(1M) always + * never/passive/active, et al) instead of numerals. However ndd(8) always * printed numberals. This flag will help in avoiding printing strings. */ static boolean_t @@ -270,7 +270,7 @@ do_ipadm_getset(int cmd, char *buf, int buflen) } if (nimap->ndd_name == NULL && strcmp(pname, "?") != 0) { - /* do not allow set/get of public properties from ndd(1M) */ + /* do not allow set/get of public properties from ndd(8) */ if (ipadm_legacy2new_propname(pname, nname, sizeof (nname), &proto) != 0) { status = IPADM_PROP_UNKNOWN; @@ -371,7 +371,7 @@ gldv3_warning(char *module) "WARNING: The ndd commands for datalink " "administration are obsolete and may be " "removed in a future release of Solaris. " - "Use dladm(1M) to manage datalink tunables.\n")); + "Use dladm(8) to manage datalink tunables.\n")); } } dladm_close(handle); diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ndp.c b/usr/src/cmd/cmd-inet/usr.sbin/ndp.c index 2fc19775ad..c77e1587d9 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ndp.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ndp.c @@ -106,7 +106,7 @@ static boolean_t ndp_run = B_TRUE; #define NETSTAT_PATH "/usr/bin/netstat" /* - * Macros borrowed from route(1M) for working with PF_ROUTE messages + * Macros borrowed from route(8) for working with PF_ROUTE messages */ #define RT_ADVANCE(x, n) ((x) += ndp_salen(n)) #define RT_NEXTADDR(cp, w, u) \ diff --git a/usr/src/cmd/cmd-inet/usr.sbin/rarp.xml b/usr/src/cmd/cmd-inet/usr.sbin/rarp.xml index de1c254018..d7e052396b 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/rarp.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/rarp.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -104,9 +102,9 @@ Reverse Address Resolution Protocol (RARP) server </loctext> </common_name> <documentation> - <manpage title='rarp' section='7P' + <manpage title='rarp' section='4P' manpath='/usr/share/man' /> - <manpage title='in.rarpd' section='1M' + <manpage title='in.rarpd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/rexec.xml b/usr/src/cmd/cmd-inet/usr.sbin/rexec.xml index 98f83f3102..2514e2a04e 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/rexec.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/rexec.xml @@ -106,7 +106,7 @@ </loctext> </common_name> <documentation> - <manpage title='in.rexecd' section='1M' + <manpage title='in.rexecd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/route.c b/usr/src/cmd/cmd-inet/usr.sbin/route.c index 29ccf97bb1..17a63d6f95 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/route.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/route.c @@ -1659,7 +1659,7 @@ save_route(int argc, char **argv, int do_flush) struct flock lock; struct stat st; const char commentstr[] = - "# File generated by route(1M) - do not edit.\n"; + "# File generated by route(8) - do not edit.\n"; perm_fd = open(perm_file, O_RDWR | O_CREAT, fmode); if (perm_fd == -1 || fstat(perm_fd, &st) == -1) diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/forwarding.xml b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/forwarding.xml index b0e777ce50..2bdcaa6299 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/forwarding.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/forwarding.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -110,7 +108,7 @@ value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routeadm' type='application'> <propval name='default-ipv4-forwarding' type='boolean' value='false' /> @@ -132,7 +130,7 @@ </loctext> </description> <documentation> - <manpage title='routeadm' section='1M' + <manpage title='routeadm' section='8' manpath='/usr/share/man' /> </documentation> </template> @@ -214,7 +212,7 @@ value='solaris.smf.manage.routing' /> </property_group> - <!-- Properties in this group are modifiable via routeadm (1M) --> + <!-- Properties in this group are modifiable via routeadm(8) --> <property_group name='routeadm' type='application'> <propval name='default-ipv6-forwarding' type='boolean' value='false' /> @@ -236,7 +234,7 @@ </loctext> </description> <documentation> - <manpage title='routeadm' section='1M' + <manpage title='routeadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/legacy-routing.xml b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/legacy-routing.xml index 5db846b48a..30902c43b5 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/legacy-routing.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/legacy-routing.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -96,7 +94,7 @@ <instance name='ipv4' enabled='false'> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Evolving' /> <propval name='protocol' type='astring' value='ipv4' /> @@ -118,7 +116,7 @@ <instance name='ipv6' enabled='false'> - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='application'> <stability value='Evolving' /> <propval name='protocol' type='astring' value='ipv6' /> @@ -152,7 +150,7 @@ </loctext> </description> <documentation> - <manpage title='routeadm' section='1M' + <manpage title='routeadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c index be826baba2..6fad8a3513 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c @@ -249,7 +249,7 @@ #define RA_SVC_FLAG_IPV6_ROUTING 0x2 #define RA_SMF_UPGRADE_FILE "/var/svc/profile/upgrade" -#define RA_SMF_UPGRADE_MSG " # added by routeadm(1M)" +#define RA_SMF_UPGRADE_MSG " # added by routeadm(8)" #define RA_CONF_FILE "/etc/inet/routing.conf" #define RA_CONF_FILE_OLD "/etc/inet/routing.conf.old" #define RA_MAX_CONF_LINE 256 diff --git a/usr/src/cmd/cmd-inet/usr.sbin/shell.xml b/usr/src/cmd/cmd-inet/usr.sbin/shell.xml index b841f99961..40be5f7572 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/shell.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/shell.xml @@ -92,10 +92,10 @@ </exec_method> <exec_method - type='method' - name='inetd_disable' - exec=':kill' - timeout_seconds='0'> + type='method' + name='inetd_disable' + exec=':kill' + timeout_seconds='0'> </exec_method> <property_group name='firewall_config' type='com.sun,fw_configuration'> @@ -176,9 +176,9 @@ remote shell with Kerberos authentication </loctext> </common_name> <documentation> - <manpage title='in.rshd' section='1M' + <manpage title='in.rshd' section='8' manpath='/usr/share/man' /> - <manpage title='rshd' section='1M' + <manpage title='rshd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c index 5ce947b476..63eb4973a0 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c @@ -112,7 +112,7 @@ select_datalink(const char *linkname, void *arg) /* * Open `linkname' in raw/passive mode (see dlpi_open(3DLPI)). If `linkname' - * is NULL, pick a datalink as per snoop(1M). Also gather some information + * is NULL, pick a datalink as per snoop(8). Also gather some information * about the datalink useful for building the proper packet filters. */ boolean_t diff --git a/usr/src/cmd/cmd-inet/usr.sbin/socket-filter-kssl.xml b/usr/src/cmd/cmd-inet/usr.sbin/socket-filter-kssl.xml index b91fcd47ea..e821a9c964 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/socket-filter-kssl.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/socket-filter-kssl.xml @@ -41,7 +41,7 @@ grouping='require_all' restart_on='none' type='service'> - <service_fmri value='svc:/system/filesystem/root' /> + <service_fmri value='svc:/system/filesystem/root' /> </dependency> <exec_method @@ -70,15 +70,15 @@ <propval name='socket_tuples' type='astring' value='2:2:0,2:2:6,26:2:0,26:2:6' /> </property_group> - + <template> <common_name> <loctext xml:lang='C'> - kernel SSL socket filter + kernel SSL socket filter </loctext> </common_name> <documentation> - <manpage title='ksslcfg' section='1M' + <manpage title='ksslcfg' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/telnet.xml b/usr/src/cmd/cmd-inet/usr.sbin/telnet.xml index a5425c3fc1..b2a8691372 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/telnet.xml +++ b/usr/src/cmd/cmd-inet/usr.sbin/telnet.xml @@ -98,9 +98,9 @@ in.telnetd supports the standard TELNET virtual terminal protocol. </loctext> </description> <documentation> - <manpage title='in.telnetd' section='1M' + <manpage title='in.telnetd' section='8' manpath='/usr/share/man' /> - <manpage title='telnetd' section='1M' + <manpage title='telnetd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/cmd-inet/usr.sbin/telnetd.dfl b/usr/src/cmd/cmd-inet/usr.sbin/telnetd.dfl index a712bd90fd..1228b273f1 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/telnetd.dfl +++ b/usr/src/cmd/cmd-inet/usr.sbin/telnetd.dfl @@ -1,4 +1,3 @@ -#ident "%Z%%M% %I% %E% SMI" # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -25,10 +24,10 @@ # # /etc/default/telnetd # -# telnetd default settings processed via telnetd(1M). +# telnetd default settings processed via telnetd(8). # # BANNER defines the connection banner which is displayed before the -# telnet login prompt, see telnetd(1M) for details. The following +# telnet login prompt, see telnetd(8) for details. The following # commented line shows the default value. # #BANNER="\\r\\n\\r\\n`uname -s` `uname -r`\\r\\n\\r\\n" diff --git a/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c b/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c index 98d452665a..1b9e1955b9 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c @@ -1299,7 +1299,7 @@ setup_socket(struct pr_set *pr, int packet_len) * or whether ICMP will be used instead of UDP. * * For historical reasons, the datagrams sent out by - * traceroute(1M) do not have the "don't fragment" flag set. For + * traceroute(8) do not have the "don't fragment" flag set. For * this reason as well as the ability to set the Loose Source and * Record Route (LSRR) option, a raw IP socket will be used for * IPv4 when run in the global zone. Otherwise, the actual 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/consadm/consadm.xml b/usr/src/cmd/consadm/consadm.xml index f11f0d91e5..d3ed8117b5 100644 --- a/usr/src/cmd/consadm/consadm.xml +++ b/usr/src/cmd/consadm/consadm.xml @@ -78,7 +78,7 @@ <documentation> <manpage title='consadm' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/coreadm/coreadm.xml b/usr/src/cmd/coreadm/coreadm.xml index c6198f885a..fbe621f6af 100644 --- a/usr/src/cmd/coreadm/coreadm.xml +++ b/usr/src/cmd/coreadm/coreadm.xml @@ -124,7 +124,7 @@ <documentation> <manpage title='coreadm' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> </template> 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 d3a4e0b699..26abd30d18 100644 --- a/usr/src/cmd/cron/cron.c +++ b/usr/src/cmd/cron/cron.c @@ -353,7 +353,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; @@ -437,7 +437,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() @@ -689,7 +689,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"); @@ -698,7 +698,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/cron/cron.xml b/usr/src/cmd/cron/cron.xml index f975618cc0..9fe1d37ae4 100644 --- a/usr/src/cmd/cron/cron.xml +++ b/usr/src/cmd/cron/cron.xml @@ -108,7 +108,7 @@ </loctext> </common_name> <documentation> - <manpage title='cron' section='1M' manpath='/usr/share/man' /> + <manpage title='cron' section='8' manpath='/usr/share/man' /> <manpage title='crontab' section='1' manpath='/usr/share/man' /> </documentation> </template> 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/dcs/sparc/sun4u/dcs.xml b/usr/src/cmd/dcs/sparc/sun4u/dcs.xml index a14f03eeb4..4adc35b8e7 100644 --- a/usr/src/cmd/dcs/sparc/sun4u/dcs.xml +++ b/usr/src/cmd/dcs/sparc/sun4u/dcs.xml @@ -104,7 +104,7 @@ </loctext> </common_name> <documentation> - <manpage title='dcs' section='1M' + <manpage title='dcs' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c b/usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c index 187319c234..4682f4cf1f 100644 --- a/usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c +++ b/usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c @@ -31,8 +31,8 @@ * * Project Location * ------- -------- - * Solaris usr/src/cmd/dcs/sparc/sun4u/%M% - * SMS src/sms/lib/librdr/%M% + * Solaris usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c + * SMS src/sms/lib/librdr/rdr_messages.c * * In order for proper communication to occur, the files in the * above locations must match exactly. Any changes that are made @@ -1291,7 +1291,7 @@ rdr_setopt(int fd, int name, int level) * Bind the specified file descriptor to a specified * address. If the address is already bound, no error is * returned. This is the expected behavior if a server - * has been started by inetd (1M). + * has been started by inetd(8). */ static int rdr_bind(int fd, struct sockaddr *addr) @@ -1322,7 +1322,7 @@ rdr_bind(int fd, struct sockaddr *addr) * Ignore the error if EINVAL is returned. In * this case, we assume that this means that * the address was already bound. This is not - * an error for servers started by inetd (1M). + * an error for servers started by inetd(8). */ if ((rc == -1) && (errno != EINVAL)) { return (RDR_NET_ERR); 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/dfs.cmds/sharemgr/group.xml b/usr/src/cmd/dfs.cmds/sharemgr/group.xml index 3b6a4eb210..8d39bb7997 100644 --- a/usr/src/cmd/dfs.cmds/sharemgr/group.xml +++ b/usr/src/cmd/dfs.cmds/sharemgr/group.xml @@ -24,8 +24,6 @@ Copyright 2007 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -47,7 +45,7 @@ grouping='require_all' restart_on='error' type='service'> - <service_fmri value='svc:/system/filesystem/local' /> + <service_fmri value='svc:/system/filesystem/local' /> </dependency> <!-- Also want to have some form of networking up --> <dependency name='network' @@ -117,7 +115,7 @@ </loctext> </common_name> <documentation> - <manpage title='sharemgr' section='1M' + <manpage title='sharemgr' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/dispadmin/scheduler.xml b/usr/src/cmd/dispadmin/scheduler.xml index 51c63de4a8..3926d66866 100755 --- a/usr/src/cmd/dispadmin/scheduler.xml +++ b/usr/src/cmd/dispadmin/scheduler.xml @@ -24,9 +24,6 @@ CDDL HEADER END - - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -51,7 +48,7 @@ /etc/dispadmin.conf. It therefore must have / (root) and /usr mounted readable. svc:/system/filesystem/usr (which remounts / and /usr read-writable) is dependent on svc:/system/scheduler to - ensure that subsequent services can use their own scheduling + ensure that subsequent services can use their own scheduling class. --> @@ -98,7 +95,7 @@ <documentation> <manpage title='dispadmin' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/dladm/dladm.c b/usr/src/cmd/dladm/dladm.c index 1a14de1de0..4477322def 100644 --- a/usr/src/cmd/dladm/dladm.c +++ b/usr/src/cmd/dladm/dladm.c @@ -89,7 +89,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 /* @@ -2096,7 +2096,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"); } @@ -2262,7 +2262,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"); } @@ -2564,12 +2564,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: @@ -4938,7 +4938,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.xml b/usr/src/cmd/dlmgmtd/dlmgmt.xml index e0781a8d8b..6c166257ee 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt.xml +++ b/usr/src/cmd/dlmgmtd/dlmgmt.xml @@ -23,8 +23,6 @@ Copyright 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -81,7 +79,7 @@ </loctext> </common_name> <documentation> - <manpage title='dlmgmtd' section='1M' + <manpage title='dlmgmtd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_main.c b/usr/src/cmd/dlmgmtd/dlmgmt_main.c index 60466fd773..43f3f0eeec 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt_main.c +++ b/usr/src/cmd/dlmgmtd/dlmgmt_main.c @@ -315,7 +315,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/drd/drd.xml b/usr/src/cmd/drd/drd.xml index 317db297de..d8f7634029 100644 --- a/usr/src/cmd/drd/drd.xml +++ b/usr/src/cmd/drd/drd.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -88,7 +86,7 @@ </common_name> <documentation> - <manpage title='drd' section='1M' + <manpage title='drd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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 e7f9189822..645a7eb543 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.SpeculateWithChill.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithChill.d index ebb3b01601..7d7d07671a 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithChill.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithChill.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 6e549afaa7..b5c86098cf 100644 --- a/usr/src/cmd/dumpadm/dconf.c +++ b/usr/src/cmd/dumpadm/dconf.c @@ -264,7 +264,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++) { @@ -360,9 +360,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 65f7fdb900..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 @@ -107,7 +107,7 @@ <documentation> <manpage title='dumpadm' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/dumpadm/svc-dumpadm b/usr/src/cmd/dumpadm/svc-dumpadm index 488ba8d54d..bf574df0cb 100644 --- a/usr/src/cmd/dumpadm/svc-dumpadm +++ b/usr/src/cmd/dumpadm/svc-dumpadm @@ -97,7 +97,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/fcoesvc/fcoe_initiator.xml b/usr/src/cmd/fcoesvc/fcoe_initiator.xml index 4fc2081d71..61d492558e 100644 --- a/usr/src/cmd/fcoesvc/fcoe_initiator.xml +++ b/usr/src/cmd/fcoesvc/fcoe_initiator.xml @@ -92,7 +92,7 @@ Service manifests for the FCoE initiator configuration </loctext> </common_name> <documentation> - <manpage title='fcadm' section='1M' + <manpage title='fcadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/fcoesvc/fcoe_target.xml b/usr/src/cmd/fcoesvc/fcoe_target.xml index 75860465de..7d487207e7 100644 --- a/usr/src/cmd/fcoesvc/fcoe_target.xml +++ b/usr/src/cmd/fcoesvc/fcoe_target.xml @@ -99,7 +99,7 @@ Service manifests for the FCoE target configuration </loctext> </common_name> <documentation> - <manpage title='fcadm' section='1M' + <manpage title='fcadm' section='8' manpath='/usr/share/man' /> </documentation> </template> 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.xml b/usr/src/cmd/fm/fmd/common/fmd.xml index 92881321f4..ceb59fff17 100644 --- a/usr/src/cmd/fm/fmd/common/fmd.xml +++ b/usr/src/cmd/fm/fmd/common/fmd.xml @@ -105,7 +105,7 @@ <documentation> <manpage title='fmd' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> </template> 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/notify/notify-params.xml b/usr/src/cmd/fm/notify/notify-params.xml index 800383c29b..7e3d2a72bd 100644 --- a/usr/src/cmd/fm/notify/notify-params.xml +++ b/usr/src/cmd/fm/notify/notify-params.xml @@ -85,16 +85,16 @@ <stability value='Evolving' /> <template> - <common_name> - <loctext xml:lang='C'> + <common_name> + <loctext xml:lang='C'> Solaris Fault Manager notification parameters </loctext> </common_name> <documentation> - <manpage + <manpage title='smf' - section='5' + section='7' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.xml b/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.xml index 4e6437a924..95668dcde1 100644 --- a/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.xml +++ b/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.xml @@ -103,13 +103,13 @@ <stability value='Evolving' /> <template> - <common_name> - <loctext xml:lang='C'> + <common_name> + <loctext xml:lang='C'> Solaris Email Event Notification Agent </loctext> </common_name> <documentation> - <manpage title='smtp-notify' section='1M' + <manpage title='smtp-notify' section='8' manpath='/usr/share/man' /> </documentation> <pg_pattern name='config' type='application' target='this' @@ -134,7 +134,7 @@ The root directory that will be used for all pathnames evaluated by smtp-notify <visibility value='readwrite'/> <cardinality min='1' max='1'/> </prop_pattern> - </pg_pattern> + </pg_pattern> </template> </service> diff --git a/usr/src/cmd/fm/notify/snmp-notify/common/snmp-notify.xml b/usr/src/cmd/fm/notify/snmp-notify/common/snmp-notify.xml index 17dc4b2923..539c671b41 100644 --- a/usr/src/cmd/fm/notify/snmp-notify/common/snmp-notify.xml +++ b/usr/src/cmd/fm/notify/snmp-notify/common/snmp-notify.xml @@ -104,13 +104,13 @@ <stability value='Evolving' /> <template> - <common_name> - <loctext xml:lang='C'> + <common_name> + <loctext xml:lang='C'> Solaris SNMP Event Notification Agent </loctext> </common_name> <documentation> - <manpage title='snmp-notify' section='1M' + <manpage title='snmp-notify' section='8' manpath='/usr/share/man' /> </documentation> <pg_pattern name='config' type='application' target='this' @@ -135,7 +135,7 @@ The root directory that will be used for all pathnames evaluated by snmp-notify <visibility value='readwrite'/> <cardinality min='1' max='1'/> </prop_pattern> - </pg_pattern> + </pg_pattern> </template> </service> 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 4bc20da317..8a44358f97 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 installboot(1M) to install boot blocks */ +/* use installboot(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 installboot(1M) to install boot blocks\n"); + " Use installboot(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/autofs/autofs.xml b/usr/src/cmd/fs.d/autofs/autofs.xml index f750fd7560..f0e165029b 100644 --- a/usr/src/cmd/fs.d/autofs/autofs.xml +++ b/usr/src/cmd/fs.d/autofs/autofs.xml @@ -124,7 +124,7 @@ </loctext> </common_name> <documentation> - <manpage title='automount' section='1M' + <manpage title='automount' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/nfs/svc/cbd.xml b/usr/src/cmd/fs.d/nfs/svc/cbd.xml index fed8bd027d..f4ee82bee2 100644 --- a/usr/src/cmd/fs.d/nfs/svc/cbd.xml +++ b/usr/src/cmd/fs.d/nfs/svc/cbd.xml @@ -69,7 +69,7 @@ grouping='require_all' restart_on='error' type='service'> - <service_fmri value='svc:/system/filesystem/minimal' /> + <service_fmri value='svc:/system/filesystem/minimal' /> </dependency> <exec_method @@ -105,7 +105,7 @@ </loctext> </common_name> <documentation> - <manpage title='nfs4cbd' section='1M' + <manpage title='nfs4cbd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/fs.d/nfs/svc/client.xml b/usr/src/cmd/fs.d/nfs/svc/client.xml index 7ece2fae75..e6a0d55e44 100644 --- a/usr/src/cmd/fs.d/nfs/svc/client.xml +++ b/usr/src/cmd/fs.d/nfs/svc/client.xml @@ -136,7 +136,7 @@ </loctext> </common_name> <documentation> - <manpage title='mount_nfs' section='1M' + <manpage title='mount_nfs' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/fs.d/nfs/svc/mapid.xml b/usr/src/cmd/fs.d/nfs/svc/mapid.xml index 69dda6fb57..7b12099b0a 100644 --- a/usr/src/cmd/fs.d/nfs/svc/mapid.xml +++ b/usr/src/cmd/fs.d/nfs/svc/mapid.xml @@ -20,7 +20,7 @@ CDDL HEADER END - Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including @@ -71,7 +71,7 @@ grouping='require_all' restart_on='error' type='service'> - <service_fmri value='svc:/system/filesystem/minimal' /> + <service_fmri value='svc:/system/filesystem/minimal' /> </dependency> <exec_method @@ -111,7 +111,7 @@ </loctext> </common_name> <documentation> - <manpage title='nfsmapid' section='1M' + <manpage title='nfsmapid' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/fs.d/nfs/svc/nfslogd.xml b/usr/src/cmd/fs.d/nfs/svc/nfslogd.xml index fa168a6660..b520506491 100644 --- a/usr/src/cmd/fs.d/nfs/svc/nfslogd.xml +++ b/usr/src/cmd/fs.d/nfs/svc/nfslogd.xml @@ -59,7 +59,7 @@ </loctext>
</common_name>
<documentation>
- <manpage title='nfslogd' section='1M'
+ <manpage title='nfslogd' section='8'
manpath='/usr/share/man' />
</documentation>
</template>
diff --git a/usr/src/cmd/fs.d/nfs/svc/nlockmgr.xml b/usr/src/cmd/fs.d/nfs/svc/nlockmgr.xml index 957ff00856..af629c08fd 100644 --- a/usr/src/cmd/fs.d/nfs/svc/nlockmgr.xml +++ b/usr/src/cmd/fs.d/nfs/svc/nlockmgr.xml @@ -110,7 +110,7 @@ </loctext> </common_name> <documentation> - <manpage title='lockd' section='1M' + <manpage title='lockd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/fs.d/nfs/svc/rquota.xml b/usr/src/cmd/fs.d/nfs/svc/rquota.xml index 1f7e6554f3..546a0d87aa 100644 --- a/usr/src/cmd/fs.d/nfs/svc/rquota.xml +++ b/usr/src/cmd/fs.d/nfs/svc/rquota.xml @@ -121,7 +121,7 @@ </loctext> </common_name> <documentation> - <manpage title='rquotad' section='1M' + <manpage title='rquotad' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/fs.d/nfs/svc/server.xml b/usr/src/cmd/fs.d/nfs/svc/server.xml index d4d2cbb063..9393d9da55 100644 --- a/usr/src/cmd/fs.d/nfs/svc/server.xml +++ b/usr/src/cmd/fs.d/nfs/svc/server.xml @@ -192,7 +192,7 @@ </loctext> </common_name> <documentation> - <manpage title='nfsd' section='1M' + <manpage title='nfsd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/fs.d/nfs/svc/status.xml b/usr/src/cmd/fs.d/nfs/svc/status.xml index dce8cba446..330d06ec2c 100644 --- a/usr/src/cmd/fs.d/nfs/svc/status.xml +++ b/usr/src/cmd/fs.d/nfs/svc/status.xml @@ -60,7 +60,7 @@ grouping='require_all' restart_on='error' type='service'> - <service_fmri value='svc:/system/filesystem/local' /> + <service_fmri value='svc:/system/filesystem/local' /> </dependency> <exec_method @@ -102,7 +102,7 @@ </loctext> </common_name> <documentation> - <manpage title='statd' section='1M' + <manpage title='statd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/reparsed/reparsed.xml b/usr/src/cmd/fs.d/reparsed/reparsed.xml index 62f5e5cb21..b07703fd1d 100644 --- a/usr/src/cmd/fs.d/reparsed/reparsed.xml +++ b/usr/src/cmd/fs.d/reparsed/reparsed.xml @@ -62,7 +62,7 @@ grouping='require_all' restart_on='error' type='service'> - <service_fmri value='svc:/system/filesystem/minimal' /> + <service_fmri value='svc:/system/filesystem/minimal' /> </dependency> <exec_method @@ -99,7 +99,7 @@ </loctext> </common_name> <documentation> - <manpage title='reparsed' section='1M' + <manpage title='reparsed' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/fs.d/smbclnt/svc/client.xml b/usr/src/cmd/fs.d/smbclnt/svc/client.xml index f8b601ca62..9fed9e4829 100644 --- a/usr/src/cmd/fs.d/smbclnt/svc/client.xml +++ b/usr/src/cmd/fs.d/smbclnt/svc/client.xml @@ -106,7 +106,7 @@ </loctext> </common_name> <documentation> - <manpage title='mount_smbfs' section='1M' + <manpage title='mount_smbfs' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/gss.xml b/usr/src/cmd/gss/gssd/gss.xml index 0dcdf947c9..6da0460752 100644 --- a/usr/src/cmd/gss/gssd/gss.xml +++ b/usr/src/cmd/gss/gssd/gss.xml @@ -93,7 +93,7 @@ <propval name='endpoint_type' type='astring' value='tli' /> <propval name='name' type='astring' value='100234' /> <propval name='proto' type='astring' value='ticotsord' /> - <propval name='isrpc' type='boolean' value='true' /> + <propval name='isrpc' type='boolean' value='true' /> <propval name='rpc_low_version' type='integer' value='1' /> <propval name='rpc_high_version' type='integer' value='1' /> <propval name='wait' type='boolean' value='true' /> @@ -108,7 +108,7 @@ </loctext> </common_name> <documentation> - <manpage title='gssd' section='1M' + <manpage title='gssd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/hald/solaris/hal.xml b/usr/src/cmd/hal/hald/solaris/hal.xml index 24045bac34..e673e4bb9b 100644 --- a/usr/src/cmd/hal/hald/solaris/hal.xml +++ b/usr/src/cmd/hal/hald/solaris/hal.xml @@ -91,7 +91,7 @@ </loctext> </common_name> <documentation> - <manpage title='hald' section='1M' manpath='/usr/man' /> + <manpage title='hald' section='8' manpath='/usr/man' /> </documentation> </template> 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 6d32972a00..9b4825b98b 100644 --- a/usr/src/cmd/halt/halt.c +++ b/usr/src/cmd/halt/halt.c @@ -46,7 +46,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. */ @@ -1542,7 +1542,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 a94ae87454..ee053cc700 100644 --- a/usr/src/cmd/halt/smf.i386/boot-config.xml +++ b/usr/src/cmd/halt/smf.i386/boot-config.xml @@ -90,7 +90,7 @@ <property_group name='config' type='application'> <stability value='Stable' /> <propval name='auto-reboot-safe' type='boolean' - value='false' /> + value='false' /> <propval name='fastreboot_default' type='boolean' value='true' /> <propval name='fastreboot_onpanic' type='boolean' @@ -98,7 +98,7 @@ <propval name='value_authorization' type='astring' value='solaris.system.shutdown' /> <propval name='uadmin_boot_archive_sync' type='boolean' - value='false' /> + value='false' /> </property_group> <property_group name='fastreboot_blacklist' type='application'> @@ -129,9 +129,9 @@ Apply the configuration defined in this service by uploading the configuration t </loctext> </description> <documentation> - <manpage title='reboot' section='1M' + <manpage title='reboot' section='8' manpath='/usr/share/man' /> - <manpage title='init' section='1M' + <manpage title='init' section='8' manpath='/usr/share/man' /> <manpage title='uadmin' section='2' manpath='/usr/share/man' /> @@ -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 2373176e50..80a2f2414b 100644 --- a/usr/src/cmd/halt/smf.sparc/boot-config.xml +++ b/usr/src/cmd/halt/smf.sparc/boot-config.xml @@ -97,7 +97,7 @@ <propval name='value_authorization' type='astring' value='solaris.system.shutdown' /> <propval name='uadmin_boot_archive_sync' type='boolean' - value='false' /> + value='false' /> </property_group> <property_group name='fastreboot_blacklist' type='application'> @@ -128,9 +128,9 @@ Apply the configuration defined in this service by uploading the configuration t </loctext> </description> <documentation> - <manpage title='reboot' section='1M' + <manpage title='reboot' section='8' manpath='/usr/share/man' /> - <manpage title='init' section='1M' + <manpage title='init' section='8' manpath='/usr/share/man' /> <manpage title='uadmin' section='2' manpath='/usr/share/man' /> @@ -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/hotplug.xml b/usr/src/cmd/hotplugd/hotplug.xml index 19b0ad5572..1478f5889d 100644 --- a/usr/src/cmd/hotplugd/hotplug.xml +++ b/usr/src/cmd/hotplugd/hotplug.xml @@ -87,7 +87,7 @@ </loctext> </common_name> <documentation> - <manpage title='hotplugd' section='1M' + <manpage title='hotplugd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/ibd_upgrade/ibd-post-upgrade.xml b/usr/src/cmd/ibd_upgrade/ibd-post-upgrade.xml index 2540d6de14..a09985135e 100644 --- a/usr/src/cmd/ibd_upgrade/ibd-post-upgrade.xml +++ b/usr/src/cmd/ibd_upgrade/ibd-post-upgrade.xml @@ -83,7 +83,7 @@ <documentation> <manpage title='ibp' - section='7D' + section='4D' manpath='/usr/share/man' /> </documentation> </template> 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.xml b/usr/src/cmd/idmap/idmapd/idmap.xml index 2b6f7b7ad5..da6104d480 100644 --- a/usr/src/cmd/idmap/idmapd/idmap.xml +++ b/usr/src/cmd/idmap/idmapd/idmap.xml @@ -154,9 +154,9 @@ </loctext> </common_name> <documentation> - <manpage title='idmapd' section='1M' + <manpage title='idmapd' section='8' manpath='/usr/share/man' /> - <manpage title='idmap' section='1M' + <manpage title='idmap' section='8' manpath='/usr/share/man' /> </documentation> </template> 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 625d827746..e195573349 100644 --- a/usr/src/cmd/init/init.c +++ b/usr/src/cmd/init/init.c @@ -42,8 +42,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. * @@ -59,35 +59,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. */ @@ -550,7 +550,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 */ @@ -943,8 +943,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 @@ -2024,7 +2024,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) { @@ -2107,7 +2107,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. */ @@ -2226,7 +2226,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 @@ -2236,7 +2236,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 @@ -3073,7 +3073,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 */ @@ -3265,12 +3265,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: @@ -3305,7 +3305,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: @@ -3895,7 +3895,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); @@ -4165,7 +4165,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; } @@ -4179,7 +4179,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; } @@ -4345,11 +4345,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 e93de5568c..038289b630 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/intrd/intrd.xml b/usr/src/cmd/intrd/intrd.xml index f516856c8b..cd6ab0aa57 100644 --- a/usr/src/cmd/intrd/intrd.xml +++ b/usr/src/cmd/intrd/intrd.xml @@ -24,8 +24,6 @@ Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -71,7 +69,7 @@ </loctext> </common_name> <documentation> - <manpage title='intrd' section='1M' + <manpage title='intrd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/svc/ipfilter.xml b/usr/src/cmd/ipf/svc/ipfilter.xml index 72a9750d88..1dade14f5b 100644 --- a/usr/src/cmd/ipf/svc/ipfilter.xml +++ b/usr/src/cmd/ipf/svc/ipfilter.xml @@ -157,7 +157,7 @@ </loctext> </description> <documentation> - <manpage title='ipfilter' section='5' + <manpage title='ipfilter' section='7' manpath='/usr/share/man' /> </documentation> 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/iscsid/iscsi-initiator.xml b/usr/src/cmd/iscsid/iscsi-initiator.xml index 5f74945ac6..d132815117 100644 --- a/usr/src/cmd/iscsid/iscsi-initiator.xml +++ b/usr/src/cmd/iscsid/iscsi-initiator.xml @@ -38,10 +38,10 @@ default back ones) in the "inetd_private" property group of the service. This means that only the "proto" field can be specialized for an instance, which limits the creation of instances of a service to only those with all fields common, bar the "proto" field. This would enable the following two services -to be created as instances of a common service: +to be created as instances of a common service: exec stream tcp nowait root /usr/sbin/in.rexecd in.rexecd -exec stream tcp6 nowait root /usr/sbin/in.rexecd in.rexecd +exec stream tcp6 nowait root /usr/sbin/in.rexecd in.rexecd but dissallow common service create for these (different socket type): @@ -61,7 +61,7 @@ also, so an instance can't have a different method than its service. Inetd is soon going to change to use instance composition for its configuration. This will mean that any of the properties/methods can be present in either the instance or the service (with the instance one overriding in the case both are -present) and that multiple instances can be created for a service with the +present) and that multiple instances can be created for a service with the potential to specialize all the properties/methods. --> @@ -141,7 +141,7 @@ potential to specialize all the properties/methods. /> </method_context> </exec_method> - + <exec_method type='method' name='stop' @@ -155,7 +155,7 @@ potential to specialize all the properties/methods. /> </method_context> </exec_method> - + <!-- Create an enabled instance. --> @@ -176,7 +176,7 @@ potential to specialize all the properties/methods. <documentation> <manpage title='iscsi' - section='7D' + section='4D' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/iscsitsvc/iscsi-target.xml b/usr/src/cmd/iscsitsvc/iscsi-target.xml index 4598d27380..27b8617ab0 100644 --- a/usr/src/cmd/iscsitsvc/iscsi-target.xml +++ b/usr/src/cmd/iscsitsvc/iscsi-target.xml @@ -25,7 +25,7 @@ CDDL HEADER END Copyright 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. -Service manifests for iSCSI Target +Service manifests for iSCSI Target --> <!-- @@ -71,7 +71,7 @@ Service manifests for iSCSI Target /> </method_context> </exec_method> - + <exec_method type='method' name='stop' @@ -100,7 +100,7 @@ Service manifests for iSCSI Target </loctext> </common_name> <documentation> - <manpage title='itadm' section='1M' + <manpage title='itadm' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/isns/isnsd/isns_server.xml b/usr/src/cmd/isns/isnsd/isns_server.xml index 9d60bdd641..3c70873a96 100644 --- a/usr/src/cmd/isns/isnsd/isns_server.xml +++ b/usr/src/cmd/isns/isnsd/isns_server.xml @@ -67,7 +67,7 @@ Service manifests for the iSNS Server /> </method_context> </exec_method> - + <exec_method type='method' name='stop' @@ -81,7 +81,7 @@ Service manifests for the iSNS Server /> </method_context> </exec_method> - + <exec_method type='method' name='refresh' @@ -97,7 +97,7 @@ Service manifests for the iSNS Server </exec_method> <property_group name='general' type='framework'> - <!-- to start stop isns --> + <!-- to start stop isns --> <propval name='action_authorization' type='astring' value='solaris.smf.manage.isns' /> <!-- to manage prop values --> @@ -128,9 +128,9 @@ Service manifests for the iSNS Server </loctext> </common_name> <documentation> - <manpage title='isns' section='1M' + <manpage title='isns' section='8' manpath='/usr/share/man' /> - <manpage title='isnsadm' section='1M' + <manpage title='isnsadm' section='8' manpath='/usr/share /man' /> </documentation> </template> diff --git a/usr/src/cmd/kbd/keymap.xml b/usr/src/cmd/kbd/keymap.xml index c6ec168c28..92b9d807c9 100644 --- a/usr/src/cmd/kbd/keymap.xml +++ b/usr/src/cmd/kbd/keymap.xml @@ -95,7 +95,7 @@ <documentation> <manpage title='kbd' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> 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/keyserv.xml b/usr/src/cmd/keyserv/keyserv.xml index 9f70e6a993..86dd806183 100644 --- a/usr/src/cmd/keyserv/keyserv.xml +++ b/usr/src/cmd/keyserv/keyserv.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -78,7 +76,7 @@ </loctext> </common_name> <documentation> - <manpage title='keyserv' section='1M' + <manpage title='keyserv' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/kadmin.xml b/usr/src/cmd/krb5/kadmin/server/kadmin.xml index e006030c13..4d37e822fa 100644 --- a/usr/src/cmd/krb5/kadmin/server/kadmin.xml +++ b/usr/src/cmd/krb5/kadmin/server/kadmin.xml @@ -4,8 +4,6 @@ Copyright 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -61,7 +59,7 @@ Kerberos administration daemon </loctext> </common_name> <documentation> - <manpage title='kadmind' section='1M' + <manpage title='kadmind' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/krb5kdc/krb5kdc.xml b/usr/src/cmd/krb5/krb5kdc/krb5kdc.xml index 05f1159d76..7b5167d8a4 100644 --- a/usr/src/cmd/krb5/krb5kdc/krb5kdc.xml +++ b/usr/src/cmd/krb5/krb5kdc/krb5kdc.xml @@ -4,8 +4,6 @@ Copyright 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -28,7 +26,7 @@ <dependency name='dns' grouping='require_all' - restart_on='error' + restart_on='error' type='service'> <service_fmri value='svc:/network/dns/client' /> </dependency> @@ -62,7 +60,7 @@ </loctext> </common_name> <documentation> - <manpage title='krb5kdc' section='1M' + <manpage title='krb5kdc' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/krb5/kwarn/ktkt_warn.xml b/usr/src/cmd/krb5/kwarn/ktkt_warn.xml index 3bcc648fac..ec91ce147a 100644 --- a/usr/src/cmd/krb5/kwarn/ktkt_warn.xml +++ b/usr/src/cmd/krb5/kwarn/ktkt_warn.xml @@ -81,7 +81,7 @@ </loctext> </common_name> <documentation> - <manpage title='ktkt_warnd' section='1M' + <manpage title='ktkt_warnd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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 1d62424494..00581ae1ff 100644 --- a/usr/src/cmd/krb5/slave/krb5_prop.xml +++ b/usr/src/cmd/krb5/slave/krb5_prop.xml @@ -4,8 +4,6 @@ Copyright 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - pragma ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -20,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'> @@ -50,7 +48,7 @@ user='root' group='other' privileges='basic,!file_link_any,!proc_info,!proc_session,net_privaddr' - /> + /> </method_context> </exec_method> @@ -69,7 +67,7 @@ </loctext> </common_name> <documentation> - <manpage title='kpropd' section='1M' + <manpage title='kpropd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/ldapcachemgr/client.xml b/usr/src/cmd/ldapcachemgr/client.xml index c5dfe78354..53d90d76c4 100644 --- a/usr/src/cmd/ldapcachemgr/client.xml +++ b/usr/src/cmd/ldapcachemgr/client.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -95,7 +93,7 @@ Information Service lookups </loctext> </description> <documentation> - <manpage title='ldap_cachemgr' section='1M' manpath='/usr/share/man' /> + <manpage title='ldap_cachemgr' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/ldmad/ldoms-agents.xml b/usr/src/cmd/ldmad/ldoms-agents.xml index d968745f19..d5fea93b4b 100644 --- a/usr/src/cmd/ldmad/ldoms-agents.xml +++ b/usr/src/cmd/ldmad/ldoms-agents.xml @@ -76,7 +76,7 @@ </loctext> </common_name> <documentation> - <manpage title='ldmad' section='1M' + <manpage title='ldmad' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/lofiadm/main.c b/usr/src/cmd/lofiadm/main.c index 6ed5b49050..f1c360ec6f 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. @@ -1753,7 +1753,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 bb037041f9..c910dabef7 100644 --- a/usr/src/cmd/logadm/conf.c +++ b/usr/src/cmd/logadm/conf.c @@ -652,7 +652,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 39eea57578..6c0df38306 100644 --- a/usr/src/cmd/logadm/logadm.conf +++ b/usr/src/cmd/logadm/logadm.conf @@ -24,7 +24,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: @@ -50,10 +50,10 @@ vminfod_logs /var/svc/log/*vminfod*.log -C 168 -S 1g -c -p 1h -t '/var/log/vm/vm /var/log/*.debug -C 2 -s 5m -c 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 4515dfcc6a..f747f95201 100644 --- a/usr/src/cmd/login/login.dfl +++ b/usr/src/cmd/login/login.dfl @@ -84,8 +84,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/cmd/lpsched/server.xml b/usr/src/cmd/lp/cmd/lpsched/server.xml index d8df778cd9..bb8c653ff4 100644 --- a/usr/src/cmd/lp/cmd/lpsched/server.xml +++ b/usr/src/cmd/lp/cmd/lpsched/server.xml @@ -111,7 +111,7 @@ <propval name='ipf_method' type='astring' value='/lib/svc/method/print-svc ipfilter' /> </property_group> - + <property_group name='firewall_config' type='com.sun,fw_configuration'> <propval name='policy' type='astring' value='use_global' /> <propval name='block_policy' type='astring' @@ -135,7 +135,7 @@ </loctext> </common_name> <documentation> - <manpage title='lpsched' section='1M' + <manpage title='lpsched' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/man/man.c b/usr/src/cmd/man/man.c index 3935305932..ec8c361190 100644 --- a/usr/src/cmd/man/man.c +++ b/usr/src/cmd/man/man.c @@ -74,6 +74,7 @@ static const struct map_entry { char *old_name; char *new_name; } map[] = { + { "1m", "8" }, { "3b", "3ucb" }, { "3e", "3elf" }, { "3g", "3gen" }, @@ -85,6 +86,16 @@ static const struct map_entry { { "3x", "3curses" }, { "3xc", "3xcurses" }, { "3xn", "3xnet" }, + { "4", "5" }, + { "5", "7" }, + { "7", "4" }, + { "7b", "4b" }, + { "7d", "4d" }, + { "7fs", "4fs" }, + { "7i", "4i" }, + { "7ipp", "4ipp" }, + { "7m", "4m" }, + { "7p", "4p" }, { NULL, NULL } }; @@ -135,18 +146,18 @@ static struct pathmap { dev_t dev; ino_t ino; } bintoman[] = { - { "/sbin", "/usr/share/man,1m", 0, 0 }, - { "/usr/sbin", "/usr/share/man,1m", 0, 0 }, - { "/usr/ucb", "/usr/share/man,1b", 0, 0 }, - { "/usr/bin", "/usr/share/man,1,1m,1s,1t,1c", 0, 0 }, - { "/usr/xpg4/bin", "/usr/share/man,1", 0, 0 }, - { "/usr/xpg6/bin", "/usr/share/man,1", 0, 0 }, - { NULL, NULL, 0, 0 } + { "/sbin", "/usr/share/man,8,1m", 0, 0 }, + { "/usr/sbin", "/usr/share/man,8,1m", 0, 0 }, + { "/usr/ucb", "/usr/share/man,1b", 0, 0 }, + { "/usr/bin", "/usr/share/man,1,8,1m,1s,1t,1c", 0, 0 }, + { "/usr/xpg4/bin", "/usr/share/man,1", 0, 0 }, + { "/usr/xpg6/bin", "/usr/share/man,1", 0, 0 }, + { NULL, NULL, 0, 0 } }; struct man_node { char *path; /* mandir path */ - char **secv; /* submandir suffices */ + char **secv; /* submandir suffixes */ int defsrch; /* hint for man -p */ int frompath; /* hint for man -d */ struct man_node *next; @@ -159,17 +170,16 @@ static int found = 0; static int list = 0; static int makewhatis = 0; static int printmp = 0; -static int sargs = 0; static int psoutput = 0; static int lintout = 0; static int whatis = 0; static int makewhatishere = 0; -static char *mansec; +static char *mansec = NULL; static char *pager = NULL; static char *addlocale(char *); -static struct man_node *build_manpath(char **, int); +static struct man_node *build_manpath(char **, char *, int); static void do_makewhatis(struct man_node *); static char *check_config(char *); static int cmp(const void *, const void *); @@ -182,11 +192,11 @@ static void fullpaths(struct man_node **); static void get_all_sect(struct man_node *); static int getdirs(char *, char ***, int); static void getpath(struct man_node *, char **); -static void getsect(struct man_node *, char **); +static void getsect(struct man_node *, char **, char *); static void init_bintoman(void); static void lower(char *); static void mandir(char **, char *, char *, int); -static int manual(struct man_node *, char *); +static int manual(struct man_node *, char *, char *); static char *map_section(char *, char *); static char *path_to_manpath(char *); static void print_manpath(struct man_node *); @@ -283,7 +293,6 @@ main(int argc, char **argv) break; case 's': mansec = optarg; - sargs++; break; case 'r': lintout++; @@ -334,8 +343,7 @@ main(int argc, char **argv) manpath = DEFMANDIR; } pathv = split(manpath, ':'); - mandirs = build_manpath(pathv, bmp_flags); - freev(pathv); + mandirs = build_manpath(pathv, mansec, bmp_flags); fullpaths(&mandirs); if (makewhatis) { @@ -377,7 +385,7 @@ main(int argc, char **argv) for (i = 0; i < argc; i++) { char *cmd; static struct man_node *mp; - char *pv[2]; + char *pv[2] = {NULL, NULL}; /* * If full path to command specified, customize @@ -389,23 +397,56 @@ main(int argc, char **argv) err(1, "strdup"); pv[1] = NULL; *cmd = '/'; - mp = build_manpath(pv, + mp = build_manpath(pv, mansec, BMP_ISPATH | BMP_FALLBACK_DEFMANDIR); } else { mp = mandirs; } - if (apropos) + if (apropos) { whatapro(mp, argv[i]); - else - ret += manual(mp, argv[i]); + } else { + /* + * If a page is specified with an embedded section, + * such as 'printf.3c' First try to find it literally + * (which has historically worked due to the + * implementation of mandir() and has come to be + * relied upon), if that doesn't work split it at the + * right most '.' to separate a hypothetical name and + * section, and explicitly search under the specified + * section, which will trigger the section name + * compatibility logic. + * + * The error that the page they initially requested + * does not exist will still be produced at this + * point, and indicate (unless clobbered by the pager) + * what has been done. + */ + int lret = 0; + + lret = manual(mp, argv[i], NULL); + if (lret != 0) { + char *sec = NULL; + + if ((sec = strrchr(argv[i], '.')) != NULL) { + char *page = NULL; + *sec++ = '\0'; + if ((page = strdup(argv[i])) == NULL) + err(1, "strdup"); + mp = build_manpath(pathv, sec, 0); + lret = manual(mp, page, sec); + free(page); + } + } + ret += lret; + } if (mp != NULL && mp != mandirs) { free(pv[0]); free_manp(mp); } } - + freev(pathv); return (ret == 0 ? 0 : 1); } @@ -415,7 +456,7 @@ main(int argc, char **argv) * flags. */ static struct man_node * -build_manpath(char **pathv, int flags) +build_manpath(char **pathv, char *sec, int flags) { struct man_node *manpage = NULL; struct man_node *currp = NULL; @@ -458,7 +499,7 @@ build_manpath(char **pathv, int flags) lastp = manpage = currp; getpath(currp, p); - getsect(currp, p); + getsect(currp, p, sec); /* * If there are no new elements in this path, @@ -518,7 +559,7 @@ getpath(struct man_node *manp, char **pv) * directories) into the manp structure. */ static void -getsect(struct man_node *manp, char **pv) +getsect(struct man_node *manp, char **pv, char *explicit_sec) { char *sections; char **sectp; @@ -529,9 +570,10 @@ getsect(struct man_node *manp, char **pv) DPRINTF("-- Adding %s\n", manp->path); manp->secv = NULL; get_all_sect(manp); - } else if (sargs) { - DPRINTF("-- Adding %s: sections=%s\n", manp->path, mansec); - manp->secv = split(mansec, ','); + } else if (explicit_sec != NULL) { + DPRINTF("-- Adding %s: sections=%s\n", manp->path, + explicit_sec); + manp->secv = split(explicit_sec, ','); for (sectp = manp->secv; *sectp; sectp++) lower(*sectp); } else if ((sections = strchr(*pv, ',')) != NULL) { @@ -743,12 +785,12 @@ search_whatis(char *whatpath, char *word) if (regcomp(&preg, pkwd, REG_BASIC | REG_ICASE | REG_NOSUB) != 0) err(1, "regcomp"); - if (sargs) + if (mansec != NULL) ss = split(mansec, ','); while (getline(&line, &linecap, fp) > 0) { if (regexec(&preg, line, 0, NULL, 0) == 0) { - if (sargs) { + if (mansec != NULL) { /* Section-restricted search */ for (i = 0; ss[i] != NULL; i++) { (void) snprintf(s, sizeof (s), "(%s)", @@ -939,7 +981,7 @@ cmp(const void *arg1, const void *arg2) * Find a manpage. */ static int -manual(struct man_node *manp, char *name) +manual(struct man_node *manp, char *name, char *sec) { struct man_node *p; struct man_node *local; @@ -964,7 +1006,7 @@ manual(struct man_node *manp, char *name) if (ndirs != 0) { ldirs[0] = ldir; ldirs[1] = NULL; - local = build_manpath(ldirs, 0); + local = build_manpath(ldirs, mansec, 0); DPRINTF("-- Locale specific subdir: %s\n", ldir); mandir(local->secv, ldir, name, 1); @@ -985,10 +1027,10 @@ manual(struct man_node *manp, char *name) } if (!found) { - if (sargs) { + if (sec != NULL) { (void) fprintf(stderr, gettext( "No manual entry for %s in section(s) %s\n"), - fullname, mansec); + fullname, sec); } else { (void) fprintf(stderr, gettext("No manual entry for %s\n"), fullname); 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/mandoc/mdoc_validate.c b/usr/src/cmd/mandoc/mdoc_validate.c index 5a12c7f440..1870a76114 100644 --- a/usr/src/cmd/mandoc/mdoc_validate.c +++ b/usr/src/cmd/mandoc/mdoc_validate.c @@ -2548,18 +2548,13 @@ post_sh_head(POST_ARGS) goodsec = NULL; switch (sec) { case SEC_ERRORS: + case SEC_RETURN_VALUES: if (*mdoc->meta.msec == '4') break; if (*mdoc->meta.msec == '7') break; goodsec = "2, 3, 4, 7, 9"; /* FALLTHROUGH */ - case SEC_RETURN_VALUES: - if (*mdoc->meta.msec == '7') - break; - if (NULL == goodsec) - goodsec = "2, 3, 7, 9"; - /* FALLTHROUGH */ case SEC_LIBRARY: if (*mdoc->meta.msec == '2') break; diff --git a/usr/src/cmd/mandoc/msec.in b/usr/src/cmd/mandoc/msec.in index 09069603b7..e11aba10b9 100644 --- a/usr/src/cmd/mandoc/msec.in +++ b/usr/src/cmd/mandoc/msec.in @@ -17,7 +17,6 @@ LINE("1", "User Commands") LINE("1B", "BSD Compatibility Package Commands") LINE("1C", "Communication Commands") LINE("1HAS", "User Commands") -LINE("1M", "Maintenance Commands") LINE("1ONBLD", "illumos Build Tools") LINE("1S", "illumos Specific Commands") LINE("2", "System Calls") @@ -95,17 +94,17 @@ LINE("3XCURSES", "X/Open Curses Library Functions") LINE("3XNET", "X/Open Networking Services Library Functions") LINE("3F", "Fortran Library Routines") LINE("3X", "Miscellaneous Library Functions") -LINE("4", "File Formats and Configurations") -LINE("5", "Standards, Environments, and Macros") +LINE("4", "Device and Network Interfaces") +LINE("4D", "Devices") +LINE("4FS", "File Systems") +LINE("4I", "Ioctl Requests") +LINE("4IPP", "IP Quality of Service Modules") +LINE("4M", "STREAMS Modules") +LINE("4P", "Protocols") +LINE("5", "File Formats and Configurations") LINE("6", "Games and Demos") -LINE("7", "Device and Network Interfaces") -LINE("7D", "Devices") -LINE("7FS", "File Systems") -LINE("7I", "Ioctl Requests") -LINE("7IPP", "IP Quality of Service Modules") -LINE("7M", "STREAMS Modules") -LINE("7P", "Protocols") -LINE("8", "Maintenance Procedures") +LINE("7", "Standards, Environments, and Macros") +LINE("8", "Maintenance Commands and Procedures") LINE("9", "Kernel Concepts") LINE("9E", "Driver Entry Points") LINE("9F", "Kernel Functions for Drivers") diff --git a/usr/src/cmd/mdb/common/mdb/mdb_cmds.c b/usr/src/cmd/mdb/common/mdb/mdb_cmds.c index 4a71c04dfb..00a23aacb9 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 acc239b9a6..2166f27bd7 100644 --- a/usr/src/cmd/mdb/common/modules/genunix/genunix.c +++ b/usr/src/cmd/mdb/common/modules/genunix/genunix.c @@ -2463,7 +2463,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); } @@ -4021,7 +4021,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/ndmpd/ndmp.xml b/usr/src/cmd/ndmpd/ndmp.xml index da788ea2c5..e7ff506677 100644 --- a/usr/src/cmd/ndmpd/ndmp.xml +++ b/usr/src/cmd/ndmpd/ndmp.xml @@ -40,7 +40,7 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + --> <service_bundle type='manifest' name='SUNWndmpr:ndmpd'> @@ -150,7 +150,7 @@ POSSIBILITY OF SUCH DAMAGE. <loctext xml:lang='C'> NDMP Service</loctext> </common_name> <documentation> - <manpage title='ndmpd' section='1M' + <manpage title='ndmpd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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 8ab13b7d3f..f9663c7db2 100644 --- a/usr/src/cmd/nsadmin/system +++ b/usr/src/cmd/nsadmin/system @@ -31,7 +31,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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -100,7 +100,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/name-service-cache.xml b/usr/src/cmd/nscd/name-service-cache.xml index e85f22278c..a10ff234ed 100644 --- a/usr/src/cmd/nscd/name-service-cache.xml +++ b/usr/src/cmd/nscd/name-service-cache.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -107,7 +105,7 @@ </loctext> </common_name> <documentation> - <manpage title='nscd' section='1M' manpath='/usr/share/man' /> + <manpage title='nscd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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 d288ac1865..ee9e26c997 100644 --- a/usr/src/cmd/nvmeadm/nvmeadm.c +++ b/usr/src/cmd/nvmeadm/nvmeadm.c @@ -157,13 +157,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 }, @@ -1231,7 +1231,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/oplhpd/oplhpd.xml b/usr/src/cmd/oplhpd/oplhpd.xml index bb192612b3..841345a759 100644 --- a/usr/src/cmd/oplhpd/oplhpd.xml +++ b/usr/src/cmd/oplhpd/oplhpd.xml @@ -5,25 +5,23 @@ Use is subject to license terms. CDDL HEADER START - + The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. - + You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. - + When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] - - CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" + CDDL HEADER END NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including @@ -88,7 +86,7 @@ </loctext> </common_name> <documentation> - <manpage title='oplhpd' section='1M' + <manpage title='oplhpd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/picld/picl.xml b/usr/src/cmd/picl/picld/picl.xml index 5a8f38d988..44a7486dc5 100644 --- a/usr/src/cmd/picl/picld/picl.xml +++ b/usr/src/cmd/picl/picld/picl.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -86,8 +84,8 @@ </loctext> </common_name> <documentation> - <manpage title='picld' section='1M' manpath='/usr/share/man' /> - <manpage title='prtpicl' section='1M' manpath='/usr/share/man' /> + <manpage title='picld' section='8' manpath='/usr/share/man' /> + <manpage title='prtpicl' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/pools/poold/poold.xml b/usr/src/cmd/pools/poold/poold.xml index 87d7ff1f2d..591118ca1f 100644 --- a/usr/src/cmd/pools/poold/poold.xml +++ b/usr/src/cmd/pools/poold/poold.xml @@ -23,8 +23,6 @@ Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -100,7 +98,7 @@ </loctext> </common_name> <documentation> - <manpage title='poold' section='1M' manpath='/usr/share/man' /> + <manpage title='poold' section='8' manpath='/usr/share/man' /> </documentation> </template> </service> diff --git a/usr/src/cmd/pools/pools.xml b/usr/src/cmd/pools/pools.xml index a9feaa7b39..78141fe9cf 100644 --- a/usr/src/cmd/pools/pools.xml +++ b/usr/src/cmd/pools/pools.xml @@ -23,8 +23,6 @@ Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -94,10 +92,10 @@ </common_name> <documentation> <manpage title='libpool' section='3LIB' manpath='/usr/share/man' /> - <manpage title='pooladm' section='1M' manpath='/usr/share/man' /> - <manpage title='poolbind' section='1M' manpath='/usr/share/man' /> - <manpage title='poolcfg' section='1M' manpath='/usr/share/man' /> - <manpage title='poolstat' section='1M' manpath='/usr/share/man' /> + <manpage title='pooladm' section='8' manpath='/usr/share/man' /> + <manpage title='poolbind' section='8' manpath='/usr/share/man' /> + <manpage title='poolcfg' section='8' manpath='/usr/share/man' /> + <manpage title='poolstat' section='8' manpath='/usr/share/man' /> </documentation> </template> </service> 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/power.xml b/usr/src/cmd/power/power.xml index 6183222f41..52ab900e71 100644 --- a/usr/src/cmd/power/power.xml +++ b/usr/src/cmd/power/power.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -99,10 +97,10 @@ </loctext> </common_name> <documentation> - <manpage title='powerd' section='1M' manpath='/usr/share/man' /> - <manpage title='pmconfig' section='1M' manpath='/usr/share/man' /> - <manpage title='dtpower' section='1M' manpath='/usr/share/man' /> - <manpage title='power.conf' section='4' manpath='/usr/share/man' /> + <manpage title='powerd' section='8' manpath='/usr/share/man' /> + <manpage title='pmconfig' section='8' manpath='/usr/share/man' /> + <manpage title='dtpower' section='8' manpath='/usr/share/man' /> + <manpage title='power.conf' section='5' manpath='/usr/share/man' /> </documentation> </template> </service> 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/bsd-sysv-commands/rfc1179.xml b/usr/src/cmd/print/bsd-sysv-commands/rfc1179.xml index b6783bca28..2181b25cb9 100644 --- a/usr/src/cmd/print/bsd-sysv-commands/rfc1179.xml +++ b/usr/src/cmd/print/bsd-sysv-commands/rfc1179.xml @@ -37,7 +37,7 @@ type='service' version='1'> - <create_default_instance enabled='false' /> + <create_default_instance enabled='false' /> <restarter> <service_fmri value='svc:/network/inetd:default' /> @@ -100,7 +100,7 @@ </loctext> </common_name> <documentation> - <manpage title='in.lpd' section='1M' + <manpage title='in.lpd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/print/ppdmgr/ppd-cache-update.xml b/usr/src/cmd/print/ppdmgr/ppd-cache-update.xml index 67ade9b999..57baa310bf 100644 --- a/usr/src/cmd/print/ppdmgr/ppd-cache-update.xml +++ b/usr/src/cmd/print/ppdmgr/ppd-cache-update.xml @@ -24,8 +24,6 @@ Copyright 2007 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -81,7 +79,7 @@ </loctext> </common_name> <documentation> - <manpage title='ppdmgr' section='1M' + <manpage title='ppdmgr' section='8' manpath='/usr/share/man' /> </documentation> </template> 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..2951b9d9c5 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 @@ -45,7 +45,7 @@ different server name if appropriate. 2. Check the Distinguished Name (DN) for correctness. You may enter a different distinguished name of another user if appropriate. This may be the DN of any directory user who has permissions (directory update privileges) to -update printer entries in the LDAP directory for the current ldapclient (1M) +update printer entries in the LDAP directory for the current ldapclient(8) naming service (NS) domain. <p> @@ -77,14 +77,14 @@ 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. <p> The Print Manager always displays printer entries from the current -ldapclient (1M) server. If this is not the domain Master LDAP server then +ldapclient(8) server. If this is not the domain Master LDAP server then the list of printers displayed may <b>not</b> be the current list of printers, this is because the ldapclient replica server may not have been updated by the master server and so be out of sync with the master. Replica servers can have @@ -105,7 +105,7 @@ Users can use the ldap command line utilities (ldapadd (1) & ldapmodify (1)) to update printer entries in the directory, but this is not recommended. If these utilities are used then the user <b>must ensure</b> that the printer-name attribute value is unique within the ou=printers container. If it is not unique -the result of modifies done by the print manager (or lpset (1M)) may not be +the result of modifies done by the print manager (or lpset(8)) may not be predictable. <p> 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 6d82af21ba..2f8e069a10 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/rcap.xml b/usr/src/cmd/rcap/rcapd/rcap.xml index 41fae6decf..777f093fcb 100644 --- a/usr/src/cmd/rcap/rcapd/rcap.xml +++ b/usr/src/cmd/rcap/rcapd/rcap.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -106,11 +104,11 @@ </loctext> </common_name> <documentation> - <manpage title='rcapd' section='1M' + <manpage title='rcapd' section='8' manpath='/usr/share/man' /> - <manpage title='rcapstat' section='1M' + <manpage title='rcapstat' section='8' manpath='/usr/share/man' /> - <manpage title='rcapadm' section='1M' + <manpage title='rcapadm' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/rmvolmgr.xml b/usr/src/cmd/rmvolmgr/rmvolmgr.xml index 29a3e209d7..72d936c360 100644 --- a/usr/src/cmd/rmvolmgr/rmvolmgr.xml +++ b/usr/src/cmd/rmvolmgr/rmvolmgr.xml @@ -100,7 +100,7 @@ </loctext> </common_name> <documentation> - <manpage title='rmvolmgr' section='1M' manpath='/usr/man' /> + <manpage title='rmvolmgr' section='8' manpath='/usr/man' /> </documentation> </template> 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 c1f264e5f4..eb26f25d9b 100644 --- a/usr/src/cmd/rpcbind/bind.xml +++ b/usr/src/cmd/rpcbind/bind.xml @@ -3,24 +3,24 @@ <!-- CDDL HEADER START - + The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. - + You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. - + When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] - + CDDL HEADER END - + Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> Copyright 2015 Nexenta Systems, Inc. All rights reserved. Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved. @@ -42,7 +42,7 @@ type='service' version='1'> - <create_default_instance enabled='true' /> + <create_default_instance enabled='true' /> <single_instance /> @@ -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 @@ -213,7 +213,7 @@ </loctext> </common_name> <documentation> - <manpage title='rpcbind' section='1M' + <manpage title='rpcbind' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/rpcsvc/rpc.bootparamd/bootparams.xml b/usr/src/cmd/rpcsvc/rpc.bootparamd/bootparams.xml index 0fd6257a73..5ce31ed599 100644 --- a/usr/src/cmd/rpcsvc/rpc.bootparamd/bootparams.xml +++ b/usr/src/cmd/rpcsvc/rpc.bootparamd/bootparams.xml @@ -122,7 +122,7 @@ diskless clients at boot time. </loctext> </description> <documentation> - <manpage title='rpc.bootparamd' section='1M' + <manpage title='rpc.bootparamd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/rpcsvc/rstat.xml b/usr/src/cmd/rpcsvc/rstat.xml index 7d3676eca7..ac9fcb3906 100644 --- a/usr/src/cmd/rpcsvc/rstat.xml +++ b/usr/src/cmd/rpcsvc/rstat.xml @@ -82,7 +82,7 @@ <stability value='Evolving' /> <propval name='name' type='astring' value='rstatd' /> <propval name='endpoint_type' type='astring' value='tli' /> - <propval name='proto' type='astring' value='datagram_v' + <propval name='proto' type='astring' value='datagram_v' override='true' /> <propval name='isrpc' type='boolean' value='true' /> <propval name='rpc_low_version' type='integer' value='2' /> @@ -113,9 +113,9 @@ </loctext> </common_name> <documentation> - <manpage title='rpc.rstatd' section='1M' + <manpage title='rpc.rstatd' section='8' manpath='/usr/share/man' /> - <manpage title='rstatd' section='1M' + <manpage title='rstatd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/rpcsvc/rusers.xml b/usr/src/cmd/rpcsvc/rusers.xml index c033136ac4..4086a5b64d 100644 --- a/usr/src/cmd/rpcsvc/rusers.xml +++ b/usr/src/cmd/rpcsvc/rusers.xml @@ -117,9 +117,9 @@ </loctext> </common_name> <documentation> - <manpage title='rpc.rusersd' section='1M' + <manpage title='rpc.rusersd' section='8' manpath='/usr/share/man' /> - <manpage title='rusersd' section='1M' + <manpage title='rusersd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/rpcsvc/spray.xml b/usr/src/cmd/rpcsvc/spray.xml index 03f886b05e..cc7a47e305 100644 --- a/usr/src/cmd/rpcsvc/spray.xml +++ b/usr/src/cmd/rpcsvc/spray.xml @@ -113,9 +113,9 @@ </loctext> </common_name> <documentation> - <manpage title='rpc.sprayd' section='1M' + <manpage title='rpc.sprayd' section='8' manpath='/usr/share/man' /> - <manpage title='sprayd' section='1M' + <manpage title='sprayd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/rpcsvc/wall.xml b/usr/src/cmd/rpcsvc/wall.xml index acf23ede82..777eac7bc8 100644 --- a/usr/src/cmd/rpcsvc/wall.xml +++ b/usr/src/cmd/rpcsvc/wall.xml @@ -113,9 +113,9 @@ </loctext> </common_name> <documentation> - <manpage title='rpc.rwalld' section='1M' + <manpage title='rpc.rwalld' section='8' manpath='/usr/share/man' /> - <manpage title='rwalld' section='1M' + <manpage title='rwalld' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/sa/sar.xml b/usr/src/cmd/sa/sar.xml index f091f2849f..2ec80604f8 100644 --- a/usr/src/cmd/sa/sar.xml +++ b/usr/src/cmd/sa/sar.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -90,7 +88,7 @@ </loctext> </common_name> <documentation> - <manpage title='sar' section='1M' manpath='/usr/share/man' /> + <manpage title='sar' section='8' manpath='/usr/share/man' /> </documentation> </template> </service> diff --git a/usr/src/cmd/saf/sac.xml b/usr/src/cmd/saf/sac.xml index 9cd385bb1f..c887e04ee4 100644 --- a/usr/src/cmd/saf/sac.xml +++ b/usr/src/cmd/saf/sac.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -52,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 @@ -101,7 +99,7 @@ </loctext> </common_name> <documentation> - <manpage title='sac' section='1M' manpath='/usr/share/man' /> + <manpage title='sac' section='8' manpath='/usr/share/man' /> </documentation> </template> </service> 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 e0e281f61e..16529d8d9f 100644 --- a/usr/src/cmd/savecore/savecore.c +++ b/usr/src/cmd/savecore/savecore.c @@ -1556,7 +1556,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. * @@ -1567,7 +1567,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) @@ -1972,7 +1972,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/sckmd/sckmd.xml b/usr/src/cmd/sckmd/sckmd.xml index 7745e669df..289ba60958 100644 --- a/usr/src/cmd/sckmd/sckmd.xml +++ b/usr/src/cmd/sckmd/sckmd.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -98,7 +96,7 @@ </loctext> </common_name> <documentation> - <manpage title='sckmd' section='1M' + <manpage title='sckmd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/sendmail-client.xml b/usr/src/cmd/sendmail/lib/sendmail-client.xml index 4acebbeee8..3cb60d9c71 100644 --- a/usr/src/cmd/sendmail/lib/sendmail-client.xml +++ b/usr/src/cmd/sendmail/lib/sendmail-client.xml @@ -2,24 +2,24 @@ <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- CDDL HEADER START - + The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. - + You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. - + When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] - + CDDL HEADER END - + Copyright 2009 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. @@ -125,7 +125,7 @@ <propval name='path_to_submit_mc' type='astring' value='' /> </property_group> - + <template> <common_name> <loctext xml:lang='C'> @@ -133,7 +133,7 @@ </loctext> </common_name> <documentation> - <manpage title='sendmail' section='1M' + <manpage title='sendmail' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/lib/smtp-sendmail.xml b/usr/src/cmd/sendmail/lib/smtp-sendmail.xml index 168d98b4c1..137a858c44 100644 --- a/usr/src/cmd/sendmail/lib/smtp-sendmail.xml +++ b/usr/src/cmd/sendmail/lib/smtp-sendmail.xml @@ -2,24 +2,24 @@ <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- CDDL HEADER START - + The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. - + You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. - + When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] - + CDDL HEADER END - + Copyright 2009 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. @@ -183,7 +183,7 @@ <propval name='value_authorization' type='astring' value='solaris.smf.value.sendmail' /> </property_group> - + <template> <common_name> <loctext xml:lang='C'> @@ -191,7 +191,7 @@ </loctext> </common_name> <documentation> - <manpage title='sendmail' section='1M' + <manpage title='sendmail' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/sf880drd/sf880drd.xml b/usr/src/cmd/sf880drd/sf880drd.xml index 08f87bd19c..b6b14d918c 100644 --- a/usr/src/cmd/sf880drd/sf880drd.xml +++ b/usr/src/cmd/sf880drd/sf880drd.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -79,7 +77,7 @@ SunFire-880 dynamic reconfiguration </loctext> </common_name> <documentation> - <manpage title='sf880drd' section='1M' + <manpage title='sf880drd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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 76e6c78c49..0b8510a95a 100644 --- a/usr/src/cmd/sgs/libconv/common/corenote.c +++ b/usr/src/cmd/sgs/libconv/common/corenote.c @@ -519,7 +519,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/smbsrv/smbd/server.xml b/usr/src/cmd/smbsrv/smbd/server.xml index 7dad5cc0b9..44e3666067 100644 --- a/usr/src/cmd/smbsrv/smbd/server.xml +++ b/usr/src/cmd/smbsrv/smbd/server.xml @@ -280,7 +280,7 @@ file. <loctext xml:lang='C'> smbd daemon</loctext> </common_name> <documentation> - <manpage title='smbd' section='1M' + <manpage title='smbd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/smserverd/smserver.xml b/usr/src/cmd/smserverd/smserver.xml index 7496d6e9c7..cdb30366bd 100644 --- a/usr/src/cmd/smserverd/smserver.xml +++ b/usr/src/cmd/smserverd/smserver.xml @@ -103,7 +103,7 @@ </loctext> </common_name> <documentation> - <manpage title='rpc.smserverd' section='1M' + <manpage title='rpc.smserverd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/srptsvc/target.xml b/usr/src/cmd/srptsvc/target.xml index c21b4fe471..37ee523322 100644 --- a/usr/src/cmd/srptsvc/target.xml +++ b/usr/src/cmd/srptsvc/target.xml @@ -64,7 +64,7 @@ Service manifests for SRP Target Port Provider /> </method_context> </exec_method> - + <exec_method type='method' name='stop' @@ -93,7 +93,7 @@ Service manifests for SRP Target Port Provider </loctext> </common_name> <documentation> - <manpage title='srpt' section='7D' + <manpage title='srpt' section='4D' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/stmfsvc/stmf.xml b/usr/src/cmd/stmfsvc/stmf.xml index b3119da1a0..d55405544a 100644 --- a/usr/src/cmd/stmfsvc/stmf.xml +++ b/usr/src/cmd/stmfsvc/stmf.xml @@ -26,7 +26,7 @@ Copyright 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. -Service manifests for SCSI Target Mode Framework +Service manifests for SCSI Target Mode Framework --> <!-- @@ -65,7 +65,7 @@ Service manifests for SCSI Target Mode Framework /> </method_context> </exec_method> - + <exec_method type='method' name='stop' @@ -103,13 +103,13 @@ Service manifests for SCSI Target Mode Framework <template> <common_name> <loctext xml:lang='C'> - STMF + STMF </loctext> </common_name> <documentation> - <manpage title='stmf' section='7D' + <manpage title='stmf' section='4D' manpath='/usr/share/man' /> - <manpage title='stmfadm' section='1M' + <manpage title='stmfadm' section='8' manpath='/usr/share /man' /> </documentation> </template> 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 d3c8fac461..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'> @@ -86,7 +86,7 @@ <documentation> <manpage title='stmsboot' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> </template> 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 4c3a7d0816..40726dd1d0 100644 --- a/usr/src/cmd/svc/configd/backend.c +++ b/usr/src/cmd/svc/configd/backend.c @@ -28,7 +28,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 @@ -1979,7 +1979,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" @@ -1988,7 +1988,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 8ddaaf29ac..8cc6495b2d 100644 --- a/usr/src/cmd/svc/milestone/console-login +++ b/usr/src/cmd/svc/milestone/console-login @@ -29,7 +29,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/early-manifest-import.xml b/usr/src/cmd/svc/milestone/early-manifest-import.xml index 270ffc8029..f10437c793 100644 --- a/usr/src/cmd/svc/milestone/early-manifest-import.xml +++ b/usr/src/cmd/svc/milestone/early-manifest-import.xml @@ -64,7 +64,7 @@ <!-- Make service transient, so that startd doesn't try to restart - the service when there are no processes associated with it. + the service when there are no processes associated with it. --> <property_group name='startd' type='framework'> <propval name='duration' type='astring' @@ -87,13 +87,13 @@ early manifest import </loctext> </description> <documentation> - <manpage title='svc.startd' section='1M' + <manpage title='svc.startd' section='8' manpath='/usr/share/man' /> - <manpage title='smf_method' section='5' + <manpage title='smf_method' section='7' manpath='/usr/share/man' /> - <manpage title='smf' section='5' + <manpage title='smf' section='7' manpath='/usr/share/man' /> - <manpage title='smf_bootstrap' section='5' + <manpage title='smf_bootstrap' section='7' manpath='/usr/share/man' /> </documentation> diff --git a/usr/src/cmd/svc/milestone/global.xml b/usr/src/cmd/svc/milestone/global.xml index 4ebc6ddaf0..10597f8211 100644 --- a/usr/src/cmd/svc/milestone/global.xml +++ b/usr/src/cmd/svc/milestone/global.xml @@ -68,9 +68,9 @@ system-wide configuration definitions </loctext> </common_name> <documentation> - <manpage title='smf' section='5' + <manpage title='smf' section='7' manpath='/usr/share/man' /> - <manpage title='smf_template' section='5' + <manpage title='smf_template' section='7' manpath='/usr/share/man' /> </documentation> @@ -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/identity.xml b/usr/src/cmd/svc/milestone/identity.xml index 3fdcf56496..140cb562d6 100644 --- a/usr/src/cmd/svc/milestone/identity.xml +++ b/usr/src/cmd/svc/milestone/identity.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -80,7 +78,7 @@ </loctext> </common_name> <documentation> - <manpage title='nodename' section='4' + <manpage title='nodename' section='5' manpath='/usr/share/man' /> </documentation> </template> @@ -110,9 +108,9 @@ </loctext> </common_name> <documentation> - <manpage title='domainname' section='1M' + <manpage title='domainname' section='8' manpath='/usr/share/man' /> - <manpage title='defaultdomain' section='4' + <manpage title='defaultdomain' section='5' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/make-console-login-xml b/usr/src/cmd/svc/milestone/make-console-login-xml index 2b78164e78..bcb13c1c7c 100644 --- a/usr/src/cmd/svc/milestone/make-console-login-xml +++ b/usr/src/cmd/svc/milestone/make-console-login-xml @@ -124,7 +124,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' @@ -239,7 +239,7 @@ Console login </loctext> </common_name> <documentation> - <manpage title='ttymon' section='1M' + <manpage title='ttymon' section='8' manpath='/usr/share/man' /> </documentation> diff --git a/usr/src/cmd/svc/milestone/manifest-import b/usr/src/cmd/svc/milestone/manifest-import index 43fb677b92..b67361183f 100644 --- a/usr/src/cmd/svc/milestone/manifest-import +++ b/usr/src/cmd/svc/milestone/manifest-import @@ -243,13 +243,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:" @@ -322,7 +322,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/manifest-import.xml b/usr/src/cmd/svc/milestone/manifest-import.xml index 2ef9021401..18723d957d 100644 --- a/usr/src/cmd/svc/milestone/manifest-import.xml +++ b/usr/src/cmd/svc/milestone/manifest-import.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -81,7 +79,7 @@ </loctext> </common_name> <documentation> - <manpage title='smf_bootstrap' section='5' + <manpage title='smf_bootstrap' section='7' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/multi-user-server.xml b/usr/src/cmd/svc/milestone/multi-user-server.xml index a4e48fd9ac..7c590be9c4 100644 --- a/usr/src/cmd/svc/milestone/multi-user-server.xml +++ b/usr/src/cmd/svc/milestone/multi-user-server.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -103,7 +101,7 @@ multi-user plus exports milestone </loctext> </common_name> <documentation> - <manpage title='init' section='1M' + <manpage title='init' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/multi-user.xml b/usr/src/cmd/svc/milestone/multi-user.xml index a5b6698e47..8e59064861 100644 --- a/usr/src/cmd/svc/milestone/multi-user.xml +++ b/usr/src/cmd/svc/milestone/multi-user.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -135,7 +133,7 @@ multi-user milestone </loctext> </common_name> <documentation> - <manpage title='init' section='1M' + <manpage title='init' section='8' manpath='/usr/share/man' /> </documentation> </template> 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-routing-setup b/usr/src/cmd/svc/milestone/net-routing-setup index 7f6d457b33..3ac6a3f7aa 100644 --- a/usr/src/cmd/svc/milestone/net-routing-setup +++ b/usr/src/cmd/svc/milestone/net-routing-setup @@ -53,7 +53,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). # @@ -177,7 +177,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-initial.xml b/usr/src/cmd/svc/milestone/network-initial.xml index b0f3a9e87b..f4414f18b4 100644 --- a/usr/src/cmd/svc/milestone/network-initial.xml +++ b/usr/src/cmd/svc/milestone/network-initial.xml @@ -85,7 +85,7 @@ initial network services </loctext> </description> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-install.xml b/usr/src/cmd/svc/milestone/network-install.xml index 69e49986f4..461a6c4832 100644 --- a/usr/src/cmd/svc/milestone/network-install.xml +++ b/usr/src/cmd/svc/milestone/network-install.xml @@ -105,7 +105,7 @@ </loctext> </common_name> <documentation> - <manpage title='ipadm' section='1M' + <manpage title='ipadm' section='8' manpath='/usr/share/man' /> </documentation> <pg_pattern name='install_ipv4_interface' type='application' @@ -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-ipqos.xml b/usr/src/cmd/svc/milestone/network-ipqos.xml index c1fcdb0fcd..d8d5e9159e 100644 --- a/usr/src/cmd/svc/milestone/network-ipqos.xml +++ b/usr/src/cmd/svc/milestone/network-ipqos.xml @@ -89,7 +89,7 @@ </loctext> </description> <documentation> - <manpage title='ipqosconf' section='1M' + <manpage title='ipqosconf' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-iptun.xml b/usr/src/cmd/svc/milestone/network-iptun.xml index d55df08553..1bc04d1ae6 100644 --- a/usr/src/cmd/svc/milestone/network-iptun.xml +++ b/usr/src/cmd/svc/milestone/network-iptun.xml @@ -85,7 +85,7 @@ </loctext> </description> <documentation> - <manpage title='dladm' section='1M' + <manpage title='dladm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-location.xml b/usr/src/cmd/svc/milestone/network-location.xml index 5e23d92481..f669d38d4c 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 @@ -88,7 +88,7 @@ <service_fmri value='svc:/system/filesystem/usr' /> </dependency> - <!-- + <!-- This dependency on system/manifest-import is just for the case of the boot after upgrade. We don't want network/location starting up until network/netcfg has been @@ -149,7 +149,7 @@ </dependent> <!-- - The following three dependents will be refreshed by + The following three dependents will be refreshed by /lib/svc/method/net-loc, rather than restarted, when network/location is refreshed. --> @@ -224,7 +224,7 @@ </loctext> </common_name> <documentation> - <manpage title='nwamd' section='1M' + <manpage title='nwamd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-loopback.xml b/usr/src/cmd/svc/milestone/network-loopback.xml index bd51e960cd..7388c0651b 100644 --- a/usr/src/cmd/svc/milestone/network-loopback.xml +++ b/usr/src/cmd/svc/milestone/network-loopback.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -68,7 +66,7 @@ </loctext> </common_name> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-netcfg.xml b/usr/src/cmd/svc/milestone/network-netcfg.xml index edc15da18f..fe7748bad1 100644 --- a/usr/src/cmd/svc/milestone/network-netcfg.xml +++ b/usr/src/cmd/svc/milestone/network-netcfg.xml @@ -93,7 +93,7 @@ </loctext> </common_name> <documentation> - <manpage title='netcfgd' section='1M' + <manpage title='netcfgd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-netmask.xml b/usr/src/cmd/svc/milestone/network-netmask.xml index 31caeb3f1d..48499f9d8c 100644 --- a/usr/src/cmd/svc/milestone/network-netmask.xml +++ b/usr/src/cmd/svc/milestone/network-netmask.xml @@ -31,7 +31,7 @@ <service_bundle type='manifest' name='SUNWcsr:network-netmask'> -<!-- +<!-- network/netmask service resets the netmask and broadcast address whenever new information is available from NIS. --> @@ -107,7 +107,7 @@ </loctext> </description> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-physical.xml b/usr/src/cmd/svc/milestone/network-physical.xml index f26c9647a1..d0eb7db1b9 100644 --- a/usr/src/cmd/svc/milestone/network-physical.xml +++ b/usr/src/cmd/svc/milestone/network-physical.xml @@ -103,7 +103,7 @@ </loctext> </common_name> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-routing-setup.xml b/usr/src/cmd/svc/milestone/network-routing-setup.xml index 85a74756da..c84a88577e 100644 --- a/usr/src/cmd/svc/milestone/network-routing-setup.xml +++ b/usr/src/cmd/svc/milestone/network-routing-setup.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -110,7 +108,7 @@ <instance name='default' enabled='true' > - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='framework'> <stability value='Evolving' /> <!-- set if routeadm -e/d ipv4-routing is explicitly invoked --> @@ -147,7 +145,7 @@ </loctext> </common_name> <documentation> - <manpage title='routeadm' section='1M' + <manpage title='routeadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-service.xml b/usr/src/cmd/svc/milestone/network-service.xml index ec12896e53..598d4d99f4 100644 --- a/usr/src/cmd/svc/milestone/network-service.xml +++ b/usr/src/cmd/svc/milestone/network-service.xml @@ -120,7 +120,7 @@ </loctext> </description> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/process-security.xml b/usr/src/cmd/svc/milestone/process-security.xml index bd4b2ac6b7..bc081692e5 100644 --- a/usr/src/cmd/svc/milestone/process-security.xml +++ b/usr/src/cmd/svc/milestone/process-security.xml @@ -76,7 +76,7 @@ <loctext xml:lang='C'>Security Flag Configuration</loctext> </common_name> <documentation> - <manpage title='security-flags' section='5' + <manpage title='security-flags' section='7' manpath='/usr/share/man' /> <manpage title='psecflags' section='1' manpath='/usr/share/man' /> diff --git a/usr/src/cmd/svc/milestone/restarter.xml b/usr/src/cmd/svc/milestone/restarter.xml index c867736d51..f25d133192 100644 --- a/usr/src/cmd/svc/milestone/restarter.xml +++ b/usr/src/cmd/svc/milestone/restarter.xml @@ -72,11 +72,11 @@ master restarter </loctext> </common_name> <documentation> - <manpage title='svc.startd' section='1M' + <manpage title='svc.startd' section='8' manpath='/usr/share/man' /> - <manpage title='smf_method' section='5' + <manpage title='smf_method' section='7' manpath='/usr/share/man' /> - <manpage title='smf' section='5' + <manpage title='smf' section='7' manpath='/usr/share/man' /> </documentation> @@ -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/milestone/single-user.xml b/usr/src/cmd/svc/milestone/single-user.xml index 579ecb5ddd..88b846a2ce 100644 --- a/usr/src/cmd/svc/milestone/single-user.xml +++ b/usr/src/cmd/svc/milestone/single-user.xml @@ -128,7 +128,7 @@ </loctext> </common_name> <documentation> - <manpage title='init' section='1M' + <manpage title='init' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/vtdaemon.xml b/usr/src/cmd/svc/milestone/vtdaemon.xml index 920792bc5b..6168413d51 100644 --- a/usr/src/cmd/svc/milestone/vtdaemon.xml +++ b/usr/src/cmd/svc/milestone/vtdaemon.xml @@ -101,7 +101,7 @@ vtdaemon for virtual console secure switch </loctext> </common_name> <documentation> - <manpage title='vtdaemon' section='1M' + <manpage title='vtdaemon' section='8' manpath='/usr/share/man' /> </documentation> </template> 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 9f8a5f6cd9..7aef5c73a9 100644 --- a/usr/src/cmd/svc/shell/smf_include.sh +++ b/usr/src/cmd/svc/shell/smf_include.sh @@ -243,7 +243,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 d514b19c38..685c1c262c 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 402b40f4ca..9beb62047c 100644 --- a/usr/src/cmd/svc/svcs/svcs.c +++ b/usr/src/cmd/svc/svcs/svcs.c @@ -89,7 +89,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) \ @@ -1824,7 +1824,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"); @@ -1921,7 +1921,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/syseventd/sysevent.xml b/usr/src/cmd/syseventd/sysevent.xml index a136c877a0..3e3eb0e2d6 100644 --- a/usr/src/cmd/syseventd/sysevent.xml +++ b/usr/src/cmd/syseventd/sysevent.xml @@ -92,7 +92,7 @@ <documentation> <manpage title='syseventd' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> </template> 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 7f7ad92d96..d8b3eaf9d7 100644 --- a/usr/src/cmd/syslogd/system-log +++ b/usr/src/cmd/syslogd/system-log @@ -42,11 +42,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 8802d363b7..71cd75bf72 100644 --- a/usr/src/cmd/syslogd/system-log.xml +++ b/usr/src/cmd/syslogd/system-log.xml @@ -2,24 +2,24 @@ <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- CDDL HEADER START - + The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. - + You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. - + When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] - + CDDL HEADER END - + Copyright 2009 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. @@ -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 @@ -162,7 +162,7 @@ </loctext> </common_name> <documentation> - <manpage title='syslogd' section='1M' + <manpage title='syslogd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/troff/troff.d/tmac.d/an b/usr/src/cmd/troff/troff.d/tmac.d/an index f4abe08263..2884709215 100644 --- a/usr/src/cmd/troff/troff.d/tmac.d/an +++ b/usr/src/cmd/troff/troff.d/tmac.d/an @@ -138,16 +138,14 @@ .if '\\$2'1' .ds ]D User Commands .if '\\$2'1B' .ds ]D SunOS/BSD Compatibility Package Commands .if '\\$2'1b' .ds ]D SunOS/BSD Compatibility Package Commands -.if '\\$2'1C' .ds ]D Communication Commands +.if '\\$2'1C' .ds ]D Communication Commands .if '\\$2'1c' .ds ]D Communication Commands -.if '\\$2'1F' .ds ]D FMLI Commands +.if '\\$2'1F' .ds ]D FMLI Commands .if '\\$2'1f' .ds ]D FMLI Commands -.if '\\$2'1G' .ds ]D Graphics and CAD Commands -.if '\\$2'1g' .ds ]D Graphics and CAD Commands +.if '\\$2'1G' .ds ]D Graphics and CAD Commands +.if '\\$2'1g' .ds ]D Graphics and CAD Commands .if '\\$2'1HAS' .ds ]D User Commands .if '\\$2'1has' .ds ]D User Commands -.if '\\$2'1M' .ds ]D Maintenance Commands -.if '\\$2'1m' .ds ]D Maintenance Commands .if '\\$2'1S' .ds ]D SunOS Specific Commands .if '\\$2'1s' .ds ]D SunOS Specific Commands .if '\\$2'2' .ds ]D System Calls @@ -328,29 +326,29 @@ .if '\\$2'3x' .ds ]D Miscellaneous Library Functions .if '\\$2'3XC' .ds ]D X/Open Curses Library Functions .if '\\$2'3xc' .ds ]D X/Open Curses Library Functions -.if '\\$2'3XN' .ds ]D X/Open Networking Services Library Functions +.if '\\$2'3XN' .ds ]D X/Open Networking Services Library Functions .if '\\$2'3xn' .ds ]D X/Open Networking Services Library Functions -.if '\\$2'4' .ds ]D File Formats -.if '\\$2'4B' .ds ]D SunOS/BSD Compatibility Package File Formats -.if '\\$2'4b' .ds ]D SunOS/BSD Compatibility Package File Formats -.if '\\$2'5' .ds ]D Standards, Environments, and Macros +.if '\\$2'4' .ds ]D Device and Network Interfaces +.if '\\$2'4B' .ds ]D SunOS/BSD Compatibility Special Files +.if '\\$2'4b' .ds ]D SunOS/BSD Compatibility Special Files +.if '\\$2'4D' .ds ]D Devices +.if '\\$2'4d' .ds ]D Devices +.if '\\$2'4FS' .ds ]D File Systems +.if '\\$2'4fs' .ds ]D File Systems +.if '\\$2'4I' .ds ]D Ioctl Requests +.if '\\$2'4i' .ds ]D Ioctl Requests +.if '\\$2'4IPP' .ds ]D IP Quality of Service Modules +.if '\\$2'4ipp' .ds ]D IP Quality of Service Modules +.if '\\$2'4M' .ds ]D STREAMS Modules +.if '\\$2'4m' .ds ]D STREAMS Modules +.if '\\$2'4P' .ds ]D Protocols +.if '\\$2'4p' .ds ]D Protocols +.if '\\$2'5' .ds ]D File Formats +.if '\\$2'5B' .ds ]D SunOS/BSD Compatibility Package File Formats +.if '\\$2'5b' .ds ]D SunOS/BSD Compatibility Package File Formats .if '\\$2'6' .ds ]D Games and Demos -.if '\\$2'7' .ds ]D Device and Network Interfaces -.if '\\$2'7B' .ds ]D SunOS/BSD Compatibility Special Files -.if '\\$2'7b' .ds ]D SunOS/BSD Compatibility Special Files -.if '\\$2'7D' .ds ]D Devices -.if '\\$2'7d' .ds ]D Devices -.if '\\$2'7FS' .ds ]D File Systems -.if '\\$2'7fs' .ds ]D File Systems -.if '\\$2'7I' .ds ]D Ioctl Requests -.if '\\$2'7i' .ds ]D Ioctl Requests -.if '\\$2'7IPP' .ds ]D IP Quality of Service Modules -.if '\\$2'7ipp' .ds ]D IP Quality of Service Modules -.if '\\$2'7M' .ds ]D STREAMS Modules -.if '\\$2'7m' .ds ]D STREAMS Modules -.if '\\$2'7P' .ds ]D Protocols -.if '\\$2'7p' .ds ]D Protocols -.if '\\$2'8' .ds ]D Maintenance Procedures +.if '\\$2'7' .ds ]D Standards, Environments, and Macros +.if '\\$2'8' .ds ]D Maintenance Commands and Procedures .if '\\$2'8C' .ds ]D Maintenance Procedures .if '\\$2'8c' .ds ]D Maintenance Procedures .if '\\$2'8S' .ds ]D Maintenance Procedures diff --git a/usr/src/cmd/troff/troff.d/tmac.d/ansun b/usr/src/cmd/troff/troff.d/tmac.d/ansun index f1303bccd3..0893087b80 100644 --- a/usr/src/cmd/troff/troff.d/tmac.d/ansun +++ b/usr/src/cmd/troff/troff.d/tmac.d/ansun @@ -1,6 +1,5 @@ -.\" Copyright Notice -.\" ident "%Z%%M% %I% %E% SMI" -.\"Notice of copyright on this source code product does not indicate +.\" Copyright Notice +.\"Notice of copyright on this source code product does not indicate .\"publication. .\" .\" Copyright 2005 Sun Microsystems, Inc. All rights reserved. @@ -201,7 +200,7 @@ . ds ]L . ds T1 \\*(]W . ds ]W -. bp +. bp . \} . \} .\} @@ -209,14 +208,12 @@ .if '\\$2'1' .ds ]D User Commands .if '\\$2'1B' .ds ]D SunOS/BSD Compatibility Package Commands .if '\\$2'1b' .ds ]D SunOS/BSD Compatibility Package Commands -.if '\\$2'1C' .ds ]D Communication Commands +.if '\\$2'1C' .ds ]D Communication Commands .if '\\$2'1c' .ds ]D Communication Commands -.if '\\$2'1F' .ds ]D FMLI Commands +.if '\\$2'1F' .ds ]D FMLI Commands .if '\\$2'1f' .ds ]D FMLI Commands -.if '\\$2'1G' .ds ]D Graphics and CAD Commands -.if '\\$2'1g' .ds ]D Graphics and CAD Commands -.if '\\$2'1M' .ds ]D Maintenance Commands -.if '\\$2'1m' .ds ]D Maintenance Commands +.if '\\$2'1G' .ds ]D Graphics and CAD Commands +.if '\\$2'1g' .ds ]D Graphics and CAD Commands .if '\\$2'1S' .ds ]D SunOS Specific Commands .if '\\$2'1s' .ds ]D SunOS Specific Commands .if '\\$2'2' .ds ]D System Calls @@ -333,27 +330,29 @@ .if '\\$2'3x' .ds ]D Miscellaneous Library Functions .if '\\$2'3XC' .ds ]D X/Open Curses Library Functions .if '\\$2'3xc' .ds ]D X/Open Curses Library Functions -.if '\\$2'3XN' .ds ]D X/Open Networking Services Library Functions +.if '\\$2'3XN' .ds ]D X/Open Networking Services Library Functions .if '\\$2'3xn' .ds ]D X/Open Networking Services Library Functions -.if '\\$2'4' .ds ]D File Formats -.if '\\$2'4B' .ds ]D SunOS/BSD Compatibility Package File Formats -.if '\\$2'4b' .ds ]D SunOS/BSD Compatibility Package File Formats -.if '\\$2'5' .ds ]D Standards, Environments, and Macros +.if '\\$2'4' .ds ]D Device and Network Interfaces +.if '\\$2'4B' .ds ]D SunOS/BSD Compatibility Special Files +.if '\\$2'4b' .ds ]D SunOS/BSD Compatibility Special Files +.if '\\$2'4D' .ds ]D Devices +.if '\\$2'4d' .ds ]D Devices +.if '\\$2'4FS' .ds ]D File Systems +.if '\\$2'4fs' .ds ]D File Systems +.if '\\$2'4I' .ds ]D Ioctl Requests +.if '\\$2'4i' .ds ]D Ioctl Requests +.if '\\$2'4IPP' .ds ]D IP Quality of Service Modules +.if '\\$2'4ipp' .ds ]D IP Quality of Service Modules +.if '\\$2'4M' .ds ]D STREAMS Modules +.if '\\$2'4m' .ds ]D STREAMS Modules +.if '\\$2'4P' .ds ]D Protocols +.if '\\$2'4p' .ds ]D Protocols +.if '\\$2'5' .ds ]D File Formats +.if '\\$2'5B' .ds ]D SunOS/BSD Compatibility Package File Formats +.if '\\$2'5b' .ds ]D SunOS/BSD Compatibility Package File Formats .if '\\$2'6' .ds ]D Games and Demos -.if '\\$2'7' .ds ]D Device and Network Interfaces -.if '\\$2'7B' .ds ]D SunOS/BSD Compatibility Special Files -.if '\\$2'7b' .ds ]D SunOS/BSD Compatibility Special Files -.if '\\$2'7D' .ds ]D Devices -.if '\\$2'7d' .ds ]D Devices -.if '\\$2'7FS' .ds ]D File Systems -.if '\\$2'7fs' .ds ]D File Systems -.if '\\$2'7I' .ds ]D Ioctl Requests -.if '\\$2'7i' .ds ]D Ioctl Requests -.if '\\$2'7M' .ds ]D STREAMS Modules -.if '\\$2'7m' .ds ]D STREAMS Modules -.if '\\$2'7P' .ds ]D Protocols -.if '\\$2'7p' .ds ]D Protocols -.if '\\$2'8' .ds ]D Maintenance Procedures +.if '\\$2'7' .ds ]D Standards, Environments, and Macros +.if '\\$2'8' .ds ]D Maintenance Commands and Procedures .if '\\$2'8C' .ds ]D Maintenance Procedures .if '\\$2'8c' .ds ]D Maintenance Procedures .if '\\$2'8S' .ds ]D Maintenance Procedures @@ -467,7 +466,7 @@ .ie \\$1RETURN \{ . if \\$2VALUES \{ . ds s1 \\$1\\ \\$2 -. ds s2 +. ds s2 . \} .\} .el \{\ @@ -501,7 +500,7 @@ .de }X .if t .rs .}E -.if t .in \\$1 +.if t .in \\$1 .if n .ti \\$1 .sp \\n()Pu .sp \\n()Pu @@ -509,7 +508,7 @@ .ne 2 .if t .mk #H .if t .nr )R 1i -.if n .nr )R 0n +.if n .nr )R 0n .fi .it 1 }N .if t .ll 1.25i @@ -581,7 +580,7 @@ .. . # small and boldface .de SB -.ps -1 +.ps -1 .it 1 }N .if !"\\$1"" \&\f3\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 .. @@ -597,7 +596,7 @@ .ne 2 .}E .nr )I .5i -.ns +.ns .. . # paragraph distance .de PD diff --git a/usr/src/cmd/troff/troff.d/tmac.d/tz.map b/usr/src/cmd/troff/troff.d/tmac.d/tz.map index 61b6fa3c4d..6166ad5c31 100644 --- a/usr/src/cmd/troff/troff.d/tmac.d/tz.map +++ b/usr/src/cmd/troff/troff.d/tmac.d/tz.map @@ -65,13 +65,13 @@ .if '\\$1'PROGUTILS' .ds Tz "Programming Utilities Guide .if '\\$1'REFMAN' .ds Tz "SunOS Reference Manual .if '\\$1'REFMAN1' .ds Tz "man Pages(1): User Commands -.if '\\$1'REFMAN1M' .ds Tz "man Pages(1M): System Administration Commands .if '\\$1'REFMAN2' .ds Tz "man Pages(2): System Calls .if '\\$1'REFMAN3' .ds Tz "man Pages(3): Library Routines -.if '\\$1'REFMAN4' .ds Tz "man Pages(4): File Formats -.if '\\$1'REFMAN5' .ds Tz "man Pages(5): Headers, Tables and Macros +.if '\\$1'REFMAN4' .ds Tz "man Pages(4): Device and Network Interfaces +.if '\\$1'REFMAN5' .ds Tz "man Pages(5): File Formats .if '\\$1'REFMAN6' .ds Tz "man Pages(6): Demos -.if '\\$1'REFMAN7' .ds Tz "man Pages(7): Device and Network Interfaces +.if '\\$1'REFMAN7' .ds Tz "man Pages(7): Headers, Tables and Macros +.if '\\$1'REFMAN8' .ds Tz "man Pages(8): System Administration Commands .if '\\$1'REFMAN9' .ds Tz "man Pages(9): Device Driver Interfaces .if '\\$1'REFMAN9E' .ds Tz "man Pages(9E): Driver Entry Points .if '\\$1'REFMAN9F' .ds Tz "man Pages(9F): Kernel Functions for Drivers 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/tnctl/tnctl.xml b/usr/src/cmd/tsol/tnctl/tnctl.xml index 0960d6b118..68c08c1032 100644 --- a/usr/src/cmd/tsol/tnctl/tnctl.xml +++ b/usr/src/cmd/tsol/tnctl/tnctl.xml @@ -22,8 +22,6 @@ Copyright 2007 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - - ident "%Z%%M% %I% %E% SMI" --> <service_bundle type='manifest' name='SUNWtsg:tnctl'> @@ -81,7 +79,7 @@ </loctext> </common_name> <documentation> - <manpage title='tnctl' section='1M' + <manpage title='tnctl' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/tsol/tnd/tnd.xml b/usr/src/cmd/tsol/tnd/tnd.xml index 7bcec09138..f45d9828f1 100644 --- a/usr/src/cmd/tsol/tnd/tnd.xml +++ b/usr/src/cmd/tsol/tnd/tnd.xml @@ -23,7 +23,6 @@ Copyright 2007 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - ident "%Z%%M% %I% %E% SMI" --> <service_bundle type='manifest' name='SUNWtsg:tnd'> @@ -118,7 +117,7 @@ </loctext> </common_name> <documentation> - <manpage title='tnd' section='1M' + <manpage title='tnd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/tsol/tsol-zones/tsol-zones.xml b/usr/src/cmd/tsol/tsol-zones/tsol-zones.xml index bb157c457a..c91e22552b 100644 --- a/usr/src/cmd/tsol/tsol-zones/tsol-zones.xml +++ b/usr/src/cmd/tsol/tsol-zones/tsol-zones.xml @@ -69,7 +69,7 @@ <documentation> <manpage title='tsol' - section='5' + section='7' manpath='/usr/man' /> </documentation> </template> 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/utmp.xml b/usr/src/cmd/utmpd/utmp.xml index 5e16f07f3d..7070b3940f 100644 --- a/usr/src/cmd/utmpd/utmp.xml +++ b/usr/src/cmd/utmpd/utmp.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -84,9 +82,9 @@ </loctext> </common_name> <documentation> - <manpage title='utmpd' section='1M' + <manpage title='utmpd' section='8' manpath='/usr/share/man' /> - <manpage title='utmpx' section='4' + <manpage title='utmpx' section='5' manpath='/usr/share/man' /> </documentation> </template> 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/varpd/varpd.c b/usr/src/cmd/varpd/varpd.c index cfba560e9f..84283cce5c 100644 --- a/usr/src/cmd/varpd/varpd.c +++ b/usr/src/cmd/varpd/varpd.c @@ -22,7 +22,7 @@ * * varpd's purpose it to provide a means for looking up the destination on the * underlay network for a host on an overlay network and to also be a door - * server such that dladm(1M) via libdladm can configure and get useful status + * server such that dladm(8) via libdladm can configure and get useful status * information. The heavy lifting is all done by libvarpd and the various lookup * plugins. * 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/vntsd/vntsd.xml b/usr/src/cmd/vntsd/vntsd.xml index 4d04e07162..ed623c402a 100644 --- a/usr/src/cmd/vntsd/vntsd.xml +++ b/usr/src/cmd/vntsd/vntsd.xml @@ -68,7 +68,7 @@ <!-- these are passed to vntsd in the method script --> <property_group name='vntsd' type='application'> - <propval name='vcc_device' type='astring' + <propval name='vcc_device' type='astring' value='virtual-console-concentrator@0' /> <propval name='listen_addr' type='astring' value='localhost' /> <propval name='timeout_minutes' type='integer' value='0' /> @@ -84,7 +84,7 @@ </loctext> </common_name> <documentation> - <manpage title='vntsd' section='1M' + <manpage title='vntsd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/vscan/vscand/vs_main.c b/usr/src/cmd/vscan/vscand/vs_main.c index bcc4a055ae..5e13bf5870 100644 --- a/usr/src/cmd/vscan/vscand/vs_main.c +++ b/usr/src/cmd/vscan/vscand/vs_main.c @@ -139,7 +139,7 @@ vscand_sig_handler(int sig) /* * main * - * main must return SMF return code (see smf_method (5)) if vscand + * main must return SMF return code (see smf_method(7)) if vscand * is invoked directly by smf (see manifest: vscan.xml) * Exit codes: SMF_EXIT_ERR_CONFIG - error * SMF_EXIT_ERR_FATAL - fatal error diff --git a/usr/src/cmd/vscan/vscand/vscan.xml b/usr/src/cmd/vscan/vscand/vscan.xml index 87648f4f26..d8b750e3d1 100644 --- a/usr/src/cmd/vscan/vscand/vscan.xml +++ b/usr/src/cmd/vscan/vscand/vscan.xml @@ -116,7 +116,7 @@ <loctext xml:lang='C'> VSCAN Service daemon</loctext> </common_name> <documentation> - <manpage title='vscand' section='1M' + <manpage title='vscand' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/xvm/ipagent/ipagent.xml b/usr/src/cmd/xvm/ipagent/ipagent.xml index 05ae970ab9..9c020cefef 100644 --- a/usr/src/cmd/xvm/ipagent/ipagent.xml +++ b/usr/src/cmd/xvm/ipagent/ipagent.xml @@ -74,7 +74,7 @@ </loctext> </common_name> <documentation> - <manpage title='xVM' section='5' + <manpage title='xVM' section='7' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/ypcmd/client.xml b/usr/src/cmd/ypcmd/client.xml index b7c1c587a1..d77f79fe6d 100644 --- a/usr/src/cmd/ypcmd/client.xml +++ b/usr/src/cmd/ypcmd/client.xml @@ -98,7 +98,7 @@ </loctext> </common_name> <documentation> - <manpage title='ypstart' section='1M' + <manpage title='ypstart' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/server.xml b/usr/src/cmd/ypcmd/server.xml index e0baf7a0fa..affa1037e0 100644 --- a/usr/src/cmd/ypcmd/server.xml +++ b/usr/src/cmd/ypcmd/server.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -86,7 +84,7 @@ </loctext> </common_name> <documentation> - <manpage title='ypserv' section='1M' + <manpage title='ypserv' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/ypcmd/xfr.xml b/usr/src/cmd/ypcmd/xfr.xml index 805b64abb6..17acdd0c72 100644 --- a/usr/src/cmd/ypcmd/xfr.xml +++ b/usr/src/cmd/ypcmd/xfr.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -78,7 +76,7 @@ </loctext> </common_name> <documentation> - <manpage title='ypxfrd' section='1M' + <manpage title='ypxfrd' section='8' manpath='/usr/share/man' /> </documentation> </template> 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/ypcmd/yppasswd/passwd.xml b/usr/src/cmd/ypcmd/yppasswd/passwd.xml index 763af491e8..a1f9d5cdca 100644 --- a/usr/src/cmd/ypcmd/yppasswd/passwd.xml +++ b/usr/src/cmd/ypcmd/yppasswd/passwd.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -78,7 +76,7 @@ </loctext> </common_name> <documentation> - <manpage title='rpc.yppasswdd' section='1M' + <manpage title='rpc.yppasswdd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/ypcmd/ypupdated/update.xml b/usr/src/cmd/ypcmd/ypupdated/update.xml index 0515239573..42fe6cb065 100644 --- a/usr/src/cmd/ypcmd/ypupdated/update.xml +++ b/usr/src/cmd/ypcmd/ypupdated/update.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -78,7 +76,7 @@ </loctext> </common_name> <documentation> - <manpage title='rpc.ypupdated' section='1M' + <manpage title='rpc.ypupdated' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index 89ad29c4c0..7e81e2143b 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -6308,7 +6308,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); @@ -6325,7 +6325,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); } @@ -6826,7 +6826,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); @@ -6845,7 +6845,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); @@ -7101,7 +7101,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)) { @@ -7120,7 +7120,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)) { @@ -7249,7 +7249,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 fb219918c5..5438549648 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. @@ -1043,7 +1043,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, @@ -1164,8 +1164,8 @@ zone_login_cmd(brand_handle_t bh, const char *login) } /* - * Prepare argv array for exec'd process. If commands are passed to the new - * process and su(1M) is avalable, use it for the invocation. Otherwise, use + * Prepare argv array for exec'd process; if we're passing commands to the + * 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). @@ -1716,7 +1716,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")); @@ -2376,7 +2376,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/resource-mgmt.xml b/usr/src/cmd/zoneadm/resource-mgmt.xml index 264f26733f..75ee87b210 100644 --- a/usr/src/cmd/zoneadm/resource-mgmt.xml +++ b/usr/src/cmd/zoneadm/resource-mgmt.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -104,10 +102,10 @@ </loctext> </common_name> <documentation> - <manpage title='zones' section='5' manpath='/usr/share/man' /> + <manpage title='zones' section='7' manpath='/usr/share/man' /> <manpage title='zonecfg' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/zoneadm/svc-zones b/usr/src/cmd/zoneadm/svc-zones index 41f6b3325f..09a9dc4d10 100644 --- a/usr/src/cmd/zoneadm/svc-zones +++ b/usr/src/cmd/zoneadm/svc-zones @@ -160,7 +160,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 3487dcc7e6..05a5006e42 100644 --- a/usr/src/cmd/zoneadm/zoneadm.c +++ b/usr/src/cmd/zoneadm/zoneadm.c @@ -229,7 +229,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.")); @@ -239,11 +239,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 " @@ -267,12 +267,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 " @@ -282,7 +282,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: @@ -295,7 +295,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 " @@ -311,7 +311,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' " @@ -1546,16 +1546,16 @@ sanity_check(char *zone, int cmd_num, boolean_t need_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 " @@ -2341,7 +2341,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 @@ -2682,10 +2682,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; } @@ -5262,7 +5262,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/zoneadm/zones.xml b/usr/src/cmd/zoneadm/zones.xml index b094bc660b..91b9f0eda4 100644 --- a/usr/src/cmd/zoneadm/zones.xml +++ b/usr/src/cmd/zoneadm/zones.xml @@ -109,10 +109,10 @@ </loctext> </common_name> <documentation> - <manpage title='zones' section='5' manpath='/usr/share/man' /> + <manpage title='zones' section='7' manpath='/usr/share/man' /> <manpage title='zonecfg' - section='1M' + section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c index bc276fd079..d38d78c0cf 100644 --- a/usr/src/cmd/zoneadmd/vplat.c +++ b/usr/src/cmd/zoneadmd/vplat.c @@ -1286,7 +1286,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 @@ -2243,6 +2243,9 @@ configure_one_interface(zlog_t *zlogp, zoneid_t zone_id, if (ioctl(s, SIOCLIFADDIF, (caddr_t)&lifr) < 0) { /* * Here, we know that the interface can't be brought up. + * A similar warning message was already printed out to + * the console by zoneadm(8) so instead we log the + * message to syslog and continue. */ (void) close(s); return (Z_OK); @@ -2385,7 +2388,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 *) @@ -4201,7 +4204,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); @@ -4431,7 +4434,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", @@ -4474,7 +4477,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 efc3c390d4..09a9f9ba8e 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 manager side. + * zcons(4D) instance and an open file descriptor to the manager 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 ba17c587a4..1c38d5b282 100644 --- a/usr/src/cmd/zoneadmd/zoneadmd.c +++ b/usr/src/cmd/zoneadmd/zoneadmd.c @@ -36,7 +36,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 @@ -316,7 +316,8 @@ strnappend(char *dest, size_t destsize, const char *src) } /* - * Since illumos boot arguments are getopt(3c) compatible (see kernel(1m)), we + * Emit a warning for any boot arguments which are unrecognized. Since + * 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. Non-native brands * may support alternate forms of boot arguments so we must handle that as well. @@ -1337,10 +1338,10 @@ zone_bootup(zlog_t *zlogp, const char *bootargs, int zstate, boolean_t debug) 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 (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; } @@ -2220,7 +2221,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. * @@ -2235,7 +2236,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: @@ -2245,7 +2246,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) @@ -2303,7 +2304,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 20f30e6e0c..f7bd684606 100644 --- a/usr/src/cmd/zonecfg/zonecfg.c +++ b/usr/src/cmd/zonecfg/zonecfg.c @@ -1117,7 +1117,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, " @@ -1145,7 +1145,7 @@ usage(boolean_t verbose, uint_t flags) pt_to_str(PT_GNIC), gettext("<global zone NIC>")); (void) fprintf(fp, "\t%s %s=%s\n", cmd_to_str(CMD_SET), pt_to_str(PT_VLANID), gettext("<vlan ID>")); - (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 " @@ -4554,7 +4554,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); } @@ -6456,7 +6456,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 d8b2fadb2f..107f8252a8 100644 --- a/usr/src/cmd/zonecfg/zonecfg_grammar.y +++ b/usr/src/cmd/zonecfg/zonecfg_grammar.y @@ -26,7 +26,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/zonestat/zonestatd/zonestat.xml b/usr/src/cmd/zonestat/zonestatd/zonestat.xml index e756cc273a..86287e73d4 100644 --- a/usr/src/cmd/zonestat/zonestatd/zonestat.xml +++ b/usr/src/cmd/zonestat/zonestatd/zonestat.xml @@ -40,11 +40,11 @@ <single_instance/> <dependency - name='fs' - grouping='require_any' - restart_on='none' - type='service'> - <service_fmri value='svc:/system/filesystem/minimal' /> + name='fs' + grouping='require_any' + restart_on='none' + type='service'> + <service_fmri value='svc:/system/filesystem/minimal' /> </dependency> <dependency @@ -56,11 +56,11 @@ </dependency> <dependency - name='process_accounting' - grouping='optional_all' - restart_on='none' - type='service'> - <service_fmri value='svc:/system/extended-accounting:process' /> + name='process_accounting' + grouping='optional_all' + restart_on='none' + type='service'> + <service_fmri value='svc:/system/extended-accounting:process' /> </dependency> <dependency @@ -100,17 +100,17 @@ <property_group name='config' type='application'> <propval name='sample_interval' type='count' value='5' /> - <propval name='value_authorization' type='astring' - value='solaris.zones.manage' /> + <propval name='value_authorization' type='astring' + value='solaris.zones.manage' /> </property_group> - <property_group name='general' type='framework'> - <!-- to start/stop zones monitoring service --> - <propval name='action_authorization' type='astring' - value='solaris.zones.manage' /> - <propval name='value_authorization' type='astring' - value='solaris.zones.manage' /> - </property_group> + <property_group name='general' type='framework'> + <!-- to start/stop zones monitoring service --> + <propval name='action_authorization' type='astring' + value='solaris.zones.manage' /> + <propval name='value_authorization' type='astring' + value='solaris.zones.manage' /> + </property_group> <stability value='Stable' /> @@ -121,7 +121,7 @@ </loctext> </common_name> <documentation> - <manpage title='zonestatd' section='1M' + <manpage title='zonestatd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c index 43da32d439..5eb4eacc46 100644 --- a/usr/src/cmd/zpool/zpool_main.c +++ b/usr/src/cmd/zpool/zpool_main.c @@ -503,7 +503,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")); } /* @@ -7194,7 +7194,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: @@ -7715,7 +7715,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); } |