[illumos-gate merge]

commit 22cc57556161a28b2141976ff578db2558def3e1
    8098 Some xdr_simple(3nsl) and xdr_complex(3nsl) functions can succeed for undefined xdrs->x_op values
commit bccbd30bb6d0c20635d3f23e8d63f3f8170d3c46
    8138 Improve manpage spelling
commit 719db50f9baba455978a31987e3e235ebd8a1592
    8142 bootadm: get_boot_cap() should test for both 32-bit and 64-bit kernel
commit 903134fe16f881063d995b98c1abaa8151f102b6
    8146 Update hwdata - 20170502
commit 1a96bf60a6b9227444199581bdccccf87e84b308
    8133 bootadm: is_ramdisk test is not functional

17 files changed, 47 insertions, 102 deletions

diff --git a/usr/src/man/man1m/beadm.1m b/usr/src/man/man1m/beadm.1m
index 8e92d8767b..b62e31331c 100644
--- a/usr/src/man/man1m/beadm.1m
+++ b/usr/src/man/man1m/beadm.1m
@@ -346,7 +346,7 @@ and snapshot operations for boot environments from non-active global parent
 BE aren't supported, destroy is allowed if these boot environments aren't
 active on boot.
 .sp
-Each line in the machine parasable output has the boot environment name as the
+Each line in the machine parsable output has the boot environment name as the
 first field.  The 'Space' field is displayed in bytes and the 'Created' field
 is displayed in UTC format.  The \fB-H\fR option used with no other options
 gives
diff --git a/usr/src/man/man1m/cfgadm_pci.1m b/usr/src/man/man1m/cfgadm_pci.1m
index 7015a06f33..ebed12b823 100644
--- a/usr/src/man/man1m/cfgadm_pci.1m
+++ b/usr/src/man/man1m/cfgadm_pci.1m
@@ -666,7 +666,7 @@ example# \fBcfgadm -c configure cpci_slot4\fR
 
 .sp
 .LP
-The change can be verifed by entering the following command:
+The change can be verified by entering the following command:
 
 .sp
 .in +2
diff --git a/usr/src/man/man1m/chat.1m b/usr/src/man/man1m/chat.1m
index db5b98ebd5..7b233ae62f 100644
--- a/usr/src/man/man1m/chat.1m
+++ b/usr/src/man/man1m/chat.1m
@@ -640,7 +640,7 @@ in expect.)
 .LP
 Environment variables are available within \fBchat\fR scripts if the \fB-E\fR
 option is specified on the command line. The metacharacter \fB$\fR introduces
-the name of the environment variable to substitute. If the substition fails
+the name of the environment variable to substitute. If the substitution fails
 because the requested environment variable is not set, nothing is replaced for
 the variable.
 .SH EXIT STATUS
diff --git a/usr/src/man/man1m/in.telnetd.1m b/usr/src/man/man1m/in.telnetd.1m
index 9cd0b4874b..ba6d80c2dc 100644
--- a/usr/src/man/man1m/in.telnetd.1m
+++ b/usr/src/man/man1m/in.telnetd.1m
@@ -15,7 +15,6 @@ in.telnetd, telnetd \- DARPA TELNET protocol server
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBin.telnetd\fR is a server that supports the \fBDARPA\fR standard
 \fBTELNET\fR virtual terminal protocol. \fBin.telnetd\fR is normally invoked in
@@ -94,7 +93,6 @@ BANNER=""
 .in -2
 
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -218,11 +216,9 @@ Disables Kerberos V5 authentication support negotiation.
 .RE
 
 .SH USAGE
-.sp
 .LP
 \fBtelnetd\fR and \fBin.telnetd\fR are IPv6-enabled. See \fBip6\fR(7P).
 .SH SECURITY
-.sp
 .LP
 \fBin.telnetd\fR can authenticate using Kerberos V5 authentication,
 \fBpam\fR(3PAM), or both. By default, the telnet server will accept valid
@@ -263,8 +259,8 @@ session management, and password management modules.
 .in +2
 .nf
 telnet  auth requisite          pam_authtok_get.so.1
-telent  auth required           pam_dhkeys.so.1
-telent  auth required           pam_unix_auth.so.1
+telnet  auth required           pam_dhkeys.so.1
+telnet  auth required           pam_unix_auth.so.1
 
 telnet  account requisite       pam_roles.so.1
 telnet  account required        pam_projects.so.1
@@ -273,7 +269,7 @@ telnet  account required        pam_unix_account.so.1
 telnet  session required        pam_unix_session.so.1
 
 telnet  password required       pam_dhkeys.so.1
-telent  password requisite      pam_authtok_get.so.1
+telnet  password requisite      pam_authtok_get.so.1
 telnet  password requisite      pam_authtok_check.so.1
 telnet  password required       pam_authtok_store.so.1
 .fi
@@ -289,7 +285,6 @@ then the user may be prompted for multiple passwords.
 For a Kerberized telnet service, the correct \fBPAM\fR service name is
 \fBktelnet\fR.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/default/telnetd\fR\fR
@@ -299,7 +294,6 @@ For a Kerberized telnet service, the correct \fBPAM\fR service name is
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlogin\fR(1), \fBsvcs\fR(1), \fBtelnet\fR(1),
 \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBkadmin\fR(1M), \fBsvcadm\fR(1M),
@@ -361,7 +355,6 @@ Ts'o, T., \fITelnet Data Encryption Option, RFC 2946\fR. September 2000.
 Ts'o, T., \fITelnet Encryption: DES 64 bit Cipher Feedback, RFC 2952\fR.
 September 2000.
 .SH NOTES
-.sp
 .LP
 Some \fBTELNET\fR commands are only partially implemented.
 .sp
diff --git a/usr/src/man/man1m/pkgadm.1m b/usr/src/man/man1m/pkgadm.1m
index 2a5180eb5e..b204fe0f4f 100644
--- a/usr/src/man/man1m/pkgadm.1m
+++ b/usr/src/man/man1m/pkgadm.1m
@@ -49,7 +49,7 @@ Writes the contents file and rolls the contents log file. With use of the
 The Solaris operating system relies upon enhanced System V revision 4 (SVr4)
 packages as the basis for its software installation and revision management.
 The package maintenance software stores information about installed packages in
-an internal database. The \fBpkgadm\fR subcomand \fBdbstatus\fR is used to
+an internal database. The \fBpkgadm\fR subcommand \fBdbstatus\fR is used to
 determine how the package internal database is implemented. The \fBdbstatus\fR
 command returns a string that indicates the type of internal database in use.
 In the current implementation, the \fBdbstatus\fR command always returns the
diff --git a/usr/src/man/man1m/pmconfig.1m b/usr/src/man/man1m/pmconfig.1m
index 2bf343db50..05e34b317a 100644
--- a/usr/src/man/man1m/pmconfig.1m
+++ b/usr/src/man/man1m/pmconfig.1m
@@ -1,9 +1,10 @@
 '\" te
+.\" Copyright (c) 2017 Peter Tribble
 .\"  Copyright (c) 2004, Sun Microsystems, Inc.  All Rights Reserved
 .\" 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]
-.TH PMCONFIG 1M "Aug 12, 2004"
+.TH PMCONFIG 1M "May 1, 2017"
 .SH NAME
 pmconfig \- Configure the Power Management system
 .SH SYNOPSIS
@@ -13,33 +14,27 @@ pmconfig \- Configure the Power Management system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
-The \fBpmconfig\fR utility sets the Power Management and  suspend-resume
+The \fBpmconfig\fR utility sets the Power Management and suspend-resume
 configuration. User has permission to change Power Management configuration
 using \fBpmconfig\fR only if he is allowed to do so according to
-\fBPMCHANGEPERM \fRkeyword of \fB/etc/default/power\fR. User has permission to
-change  the suspend-resume  configuration using \fBpmconfig\fR only if he is
-allowed to do so according to the \fBCPRCHANGEPERM \fRkeyword of
+\fBPMCHANGEPERM\fR keyword of \fB/etc/default/power\fR. User has permission to
+change the suspend-resume configuration using \fBpmconfig\fR only if he is
+allowed to do so according to the \fBCPRCHANGEPERM\fR keyword of
 \fB/etc/default/power\fR. See FILES section below for a description of the
-\fBPMCHANGEPERM \fRand \fBCPRCHANGEPERM \fR keywords of
+\fBPMCHANGEPERM\fR and \fBCPRCHANGEPERM\fR keywords of
 \fB/etc/default/power\fR.
 .sp
 .LP
-Based on user permissions, \fBpmconfig\fR first resets the  Power Management
-and/or   suspend-resume  state back to its default and then reads the new
-Power Management and/or   suspend-resume  configuration from
-\fB/etc/power.conf\fR and issues the commands to activiate the new
+Based on user permissions, \fBpmconfig\fR first resets the Power Management
+and/or suspend-resume state back to its default and then reads the new
+Power Management and/or suspend-resume configuration from
+\fB/etc/power.conf\fR and issues the commands to activate the new
 configuration. The \fBpmconfig\fR utility is run at system boot. This utility
 can also be run from the command line after manual changes have been made to
-the \fB/etc/power.conf\fR file. For editing changes made to the
+the \fB/etc/power.conf\fR file. For changes made to the
 \fB/etc/power.conf\fR file to take effect, users must run \fBpmconfig\fR.
-.sp
-.LP
-The preferred interface for changing  Power Management and suspend-resume
-configuration is \fBdtpower\fR(1M).
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -48,13 +43,12 @@ The following options are supported:
 \fB\fB-r\fR\fR
 .ad
 .RS 6n
- Reset  Power Management and suspend-resume  state to default and exit. User
-must have both  Power Management and suspend-resume  configuration permission
+Reset Power Management and suspend-resume state to default and exit. User
+must have both Power Management and suspend-resume configuration permission
 for this option.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -76,13 +70,12 @@ An error occurred
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/power.conf\fR\fR
 .ad
 .RS 22n
-System  Power Management configuration file
+System Power Management configuration file.
 .RE
 
 .sp
@@ -91,10 +84,10 @@ System  Power Management configuration file
 \fB\fB/etc/default/power\fR\fR
 .ad
 .RS 22n
-File that controls permissions for system's  Power Management and
-suspend-resume  features. The \fBPMCHANGEPERM\fR keyboard controls the Power
-Management configuration permissions, while the \fBCPRCHANGEPERM \fRkeyword
-controls the  suspend-resume  configuration permissions.
+File that controls permissions for system's Power Management and
+suspend-resume features. The \fBPMCHANGEPERM\fR keyboard controls the Power
+Management configuration permissions, while the \fBCPRCHANGEPERM\fR keyword
+controls the suspend-resume configuration permissions.
 .RE
 
 .sp
@@ -124,7 +117,7 @@ No one except super-user can change the configuration.
 \fB\fB<user1, user2,...>\fR\fR
 .ad
 .RS 22n
-A  user in this user list or a super-user can change the configuration. The
+A user in this user list or a super-user can change the configuration. The
 user list is a space and/or comma (,) separated list. You must enclose the list
 in < and > characters.
 .RE
@@ -135,7 +128,7 @@ in < and > characters.
 \fB\fBconsole-owner\fR\fR
 .ad
 .RS 22n
-A  user who owns the system console device node or a super-user can change the
+A user who owns the system console device node or a super-user can change the
 configuration.
 .RE
 
@@ -144,7 +137,6 @@ configuration.
 The default values are \fBPMCHANGEPERM=console-owner\fR and
 \fBCPRCHANGEPERM=console-owner\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -156,11 +148,10 @@ c | c
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Interface stability 	Unstable
+Interface Stability 	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsvcs\fR(1), \fBpowerd\fR(1M), \fBpower.conf\fR(4), \fBsvcadm\fR(1M),
 \fBattributes\fR(5), \fBsmf\fR(5), \fBcpr\fR(7), \fBpm\fR(7D)
@@ -168,7 +159,6 @@ Interface stability 	Unstable
 .LP
 \fIUsing Power Management\fR
 .SH NOTES
-.sp
 .LP
 The \fBpmconfig\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifier:
@@ -186,14 +176,13 @@ Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
 status can be queried using the \fBsvcs\fR(1) command.
 .SH DIAGNOSTICS
-.sp
 .LP
 If the program cannot open the configuration file, it prints an error message
 to standard error. If the program encounters a syntax error in the
 configuration file, it prints an error message and the line number of the error
-in the  configuration file. It then skips the rest of the information on that
+in the configuration file. It then skips the rest of the information on that
 line and processes the next line. Any configuration information already
 processed on the line containing the error is used. If user does not have
-permission to change Power Management and/or  suspend-resume configuration, and
+permission to change Power Management and/or suspend-resume configuration, and
 configuration file has entries for which user doesn't have permission, it
 process the entries for which user has permissions and prints error on rest.
diff --git a/usr/src/man/man1m/poold.1m b/usr/src/man/man1m/poold.1m
index 0fdee07ddd..84039a1b34 100644
--- a/usr/src/man/man1m/poold.1m
+++ b/usr/src/man/man1m/poold.1m
@@ -13,7 +13,6 @@ poold \- automated resource pools partitioning daemon
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBpoold\fR provides automated resource partitioning facilities. \fBpoold\fR
 can be enabled or disabled using the Solaris Service Management Facility,
@@ -62,7 +61,6 @@ system administrator must determine which resource pools are most deserving of
 scarce resource and indicate this through the importance of resource pools and
 objectives.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -71,7 +69,7 @@ The following options are supported:
 \fB\fB-l\fR \fIlevel\fR\fR
 .ad
 .RS 12n
-Specify the vebosity level for logging information.
+Specify the verbosity level for logging information.
 .sp
 Specify \fIlevel\fR as \fBALERT\fR, \fBCRIT\fR, \fBERR\fR, \fBWARNING\fR,
 \fBNOTICE\fR, \fBINFO\fR, and \fBDEBUG\fR. If \fIlevel\fR is not supplied, then
@@ -178,7 +176,6 @@ The following command enables dynamic resource pools:
 .sp
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -197,7 +194,6 @@ Interface Stability	See below.
 .LP
 The invocation is Evolving. The output is Unstable.
 .SH SEE ALSO
-.sp
 .LP
 \fBpooladm\fR(1M), \fBpoolbind\fR(1M), \fBpoolcfg\fR(1M), \fBpoolstat\fR(1M),
 \fBsvcadm\fR(1M), \fBpool_set_status\fR(3POOL), \fBlibpool\fR(3LIB),
diff --git a/usr/src/man/man1m/print-service.1m b/usr/src/man/man1m/print-service.1m
index 681a611101..2d8a31ed48 100644
--- a/usr/src/man/man1m/print-service.1m
+++ b/usr/src/man/man1m/print-service.1m
@@ -14,7 +14,6 @@ system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBprint-service\fR utility manages print service selection, as well as
 export and import of basic print queue configuration.
@@ -23,7 +22,6 @@ export and import of basic print queue configuration.
 Only a user root privileges or with the Printer Management profile can change
 the active print service or import print queue configuration.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -138,7 +136,6 @@ service.
 .sp
 
 .SH EXIT STATUS
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -159,7 +156,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -175,11 +171,9 @@ Interface Stability	Obsolete
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBintro\fR(1), \fBattributes\fR(5)
+\fBIntro\fR(1), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 The print queue configuration saved and restored during export, import, and
 migration is limited to queue name and device name. It is likely that further
diff --git a/usr/src/man/man1m/projdel.1m b/usr/src/man/man1m/projdel.1m
index ba7674ea9b..e680658b0a 100644
--- a/usr/src/man/man1m/projdel.1m
+++ b/usr/src/man/man1m/projdel.1m
@@ -14,12 +14,10 @@ projdel \- delete a project from the system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBprojdel\fR utility deletes a project from the system and makes the
 appropriate changes to the system file.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -33,7 +31,6 @@ system project file, \fB/etc/project\fR, is modified.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -46,7 +43,6 @@ The name of the project to be deleted.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -122,7 +118,6 @@ Cannot update the \fB/etc/project\fR file.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/project\fR\fR
@@ -141,7 +136,6 @@ System project file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -153,26 +147,23 @@ c | c
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Interface stabilty	See below.
+Interface Stability	See below.
 .TE
 
 .sp
 .LP
 Invocation is evolving. Human readable output is unstable.
 .SH SEE ALSO
-.sp
 .LP
 \fBprojects\fR(1), \fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBgroupmod\fR(1M),
 \fBgrpck\fR(1M), \fBlogins\fR(1M), \fBprojadd\fR(1M), \fBprojmod\fR(1M),
 \fBuseradd\fR(1M), \fBuserdel\fR(1M), \fBusermod\fR(1M), \fBproject\fR(4),
 \fBattributes\fR(5)
 .SH DIAGNOSTICS
-.sp
 .LP
 In case of an error, \fBprojdel\fR prints an error message and exits with a
 non-zero status.
 .SH NOTES
-.sp
 .LP
 \fBprojdel\fR deletes a project definition only on the local system. If a
 network name service such as \fBNIS\fR or \fBLDAP\fR is being used to
diff --git a/usr/src/man/man1m/rmt.1m b/usr/src/man/man1m/rmt.1m
index 82f8614b77..1aa7557997 100644
--- a/usr/src/man/man1m/rmt.1m
+++ b/usr/src/man/man1m/rmt.1m
@@ -14,7 +14,6 @@ rmt \- remote magtape protocol module
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBrmt\fR is a program used by the remote dump and restore programs in
 manipulating a magnetic tape drive through an interprocess communication
@@ -54,7 +53,7 @@ Unsuccessful commands are responded to with:
 .sp .6
 .RS 4n
 where \fIerror-number\fR is one of the possible error numbers described in
-\fBintro\fR(3), and \fIerror-message\fR is the corresponding error string as
+\fBIntro\fR(3), and \fIerror-message\fR is the corresponding error string as
 printed from a call to \fBperror\fR(3C).
 .RE
 
@@ -143,17 +142,14 @@ value is returned from the \fBwrite\fR(9E) call.
 .LP
 Any other command causes \fBrmt\fR to exit.
 .SH SEE ALSO
-.sp
 .LP
-\fBufsdump\fR(1M), \fBufsrestore\fR(1M), \fBintro\fR(3), \fBioctl\fR(2),
+\fBufsdump\fR(1M), \fBufsrestore\fR(1M), \fBIntro\fR(3), \fBioctl\fR(2),
 \fBlseek\fR(2), \fBperror \fR(3C), \fBrcmd\fR(3SOCKET), \fBrexec\fR(3SOCKET),
 \fBattributes\fR(5), \fBmtio\fR(7I), \fBopen\fR(9E), \fBread\fR(9E),
 \fBwrite\fR(9E)
 .SH DIAGNOSTICS
-.sp
 .LP
 All responses are of the form described above.
 .SH BUGS
-.sp
 .LP
 Do not use this for a remote file access protocol.
diff --git a/usr/src/man/man1m/rsh.1m b/usr/src/man/man1m/rsh.1m
index 025f371aec..85696ba0f4 100644
--- a/usr/src/man/man1m/rsh.1m
+++ b/usr/src/man/man1m/rsh.1m
@@ -13,7 +13,6 @@ rsh, restricted_shell \- restricted shell command interpreter
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBrsh\fR is a limiting version of the standard command interpreter \fBsh\fR,
 used to restrict logins to execution environments whose capabilities are more
@@ -44,7 +43,7 @@ setting the value of $\fBPATH\fR,
 .TP
 .ie t \(bu
 .el o
-pecifying path or command names containing \fB/\fR,
+specifying path or command names containing \fB/\fR,
 .RE
 .RS +4
 .TP
@@ -79,7 +78,7 @@ the shell is invoked and \fBrsh\fR is the file name part of argument 0;
 .RS +4
 .TP
 4.
-the shell is invoke with the \fB-r\fR option.
+the shell is invoked with the \fB-r\fR option.
 .RE
 .sp
 .LP
@@ -100,19 +99,16 @@ The system administrator often sets up a directory of commands (that is,
 \fB/usr/rbin\fR) that can be safely invoked by a restricted shell. Some systems
 also provide a restricted editor, \fBred\fR.
 .SH EXIT STATUS
-.sp
 .LP
 Errors detected by the shell, such as syntax errors, cause the shell to return
 a non-zero exit status. If the shell is being used non-interactively execution
 of the shell file is abandoned. Otherwise, the shell returns the exit status of
 the last command executed.
 .SH SEE ALSO
-.sp
 .LP
-\fBintro\fR(1), \fBcd\fR(1), \fBlogin\fR(1), \fBrsh\fR(1), \fBsh\fR(1), \fB
-exec\fR(2), \fBpasswd\fR(4), \fBprofile\fR(4), \fBattributes\fR(5)
+\fBIntro\fR(1), \fBcd\fR(1), \fBlogin\fR(1), \fBrsh\fR(1), \fBsh\fR(1),
+\fBexec\fR(2), \fBpasswd\fR(4), \fBprofile\fR(4), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 The restricted shell, \fB/usr/lib/rsh\fR, should not be confused with the
 remote shell, \fB/usr/bin/rsh\fR, which is documented in \fBrsh\fR(1).
diff --git a/usr/src/man/man1m/smbstat.1m b/usr/src/man/man1m/smbstat.1m
index c45736767f..04723e3d7e 100644
--- a/usr/src/man/man1m/smbstat.1m
+++ b/usr/src/man/man1m/smbstat.1m
@@ -168,7 +168,7 @@ specified, and subsequent outputs represent the activity in the interval that
 just finished.
 .El
 .Sh INTERFACE STABILITY
-.Sy Uncommited .
+.Sy Uncommitted .
 Output format is
 .Sy Not-an-Interface.
 .Sh SEE ALSO
diff --git a/usr/src/man/man1m/stmfadm.1m b/usr/src/man/man1m/stmfadm.1m
index 4bc6ea1429..8493c20d04 100644
--- a/usr/src/man/man1m/stmfadm.1m
+++ b/usr/src/man/man1m/stmfadm.1m
@@ -633,7 +633,7 @@ View Entry: 0
 .Ed
 .El
 .Sh INTERFACE STABILITY
-.Sy Commited
+.Sy Committed
 .Sh SEE ALSO
 .Xr sbdadm 1M ,
 .Xr attributes 5
diff --git a/usr/src/man/man1m/svadm.1m b/usr/src/man/man1m/svadm.1m
index 1f923fc99d..82ba35ba94 100644
--- a/usr/src/man/man1m/svadm.1m
+++ b/usr/src/man/man1m/svadm.1m
@@ -44,13 +44,11 @@ operations
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsvadm\fR command controls the Storage Volume (SV) driver by providing
 facilities to enable and disable the SV driver for specified volumes, and to
 dynamically reconfigure the system.
 .SH OPTIONS
-.sp
 .LP
 If you specify no arguments to an \fBsvadm\fR command, the utility displays the
 list of volumes currently under SV control. \fBsvadm\fR supports the following
@@ -153,10 +151,9 @@ Displays the SV version number.
 .RE
 
 .SH USAGE
-.sp
 .LP
 When an SV volume is enabled, normal system call access to the device (see
-\fBintro\fR(2)) is redirected into the StoreEdge architecture software. This
+\fBIntro\fR(2)) is redirected into the StoreEdge architecture software. This
 allows standard applications to use StorageTek features such as Sun StorageTek
 Point-in-Time Copy and Remote Mirror Software.
 .sp
@@ -165,7 +162,6 @@ The \fBsvadm\fR command generates an entry in the Availability Suite log file,
 \fB/var/adm/ds.log\fR (see \fBds.log\fR(4)), when performing enable (\fB-e\fR)
 and disable (\fB-d\fR) operations.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -181,6 +177,5 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdscfg\fR(1M), \fBds.log\fR(4), \fBattributes\fR(5), \fBsv\fR(7D)
diff --git a/usr/src/man/man1m/syncinit.1m b/usr/src/man/man1m/syncinit.1m
index b9275fde3a..2eda0dd927 100644
--- a/usr/src/man/man1m/syncinit.1m
+++ b/usr/src/man/man1m/syncinit.1m
@@ -14,7 +14,6 @@ syncinit \- set serial line interface operating parameters
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsyncinit\fR utility allows the user to modify some of the hardware
 operating modes common to synchronous serial lines. This can be useful in
@@ -26,7 +25,6 @@ If run without options, \fBsyncinit\fR reports the options as presently set on
 the port. If options are specified, the new settings are reported after they
 have been made.
 .SH OPTIONS
-.sp
 .LP
 Options to \fBsyncinit\fR normally take the form of a keyword, followed by an
 equal sign and a value. The exception is that a baud rate may be specified as a
@@ -139,12 +137,10 @@ speed=0, loopback=no, echo=no, nrzi=no, txc=txc, rxc=rxc
 .sp
 
 .SH SEE ALSO
-.sp
 .LP
-\fBsyncloop\fR(1M), \fBsyncstat\fR(1M), \fBintro\fR(2), \fBioctl\fR(2),
+\fBsyncloop\fR(1M), \fBsyncstat\fR(1M), \fBIntro\fR(2), \fBioctl\fR(2),
 \fBattributes\fR(5), \fB zsh\fR(7D)
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fB\fIdevice\fR\fB missing minor device number\fR\fR
@@ -184,11 +180,10 @@ The string  \fIarg\fR did not make sense as an option.
 .sp .6
 .RS 4n
 An \fBioctl\fR(2) system called failed. The meaning of the value of
-\fIerrno\fR may be found in \fBintro\fR(2).
+\fIerrno\fR may be found in \fBIntro\fR(2).
 .RE
 
 .SH WARNINGS
-.sp
 .LP
 Do not use \fBsyncinit\fR on an active serial link, unless needed to resolve
 an error condition. Do not use this command casually or without being aware of
diff --git a/usr/src/man/man1m/tpmadm.1m b/usr/src/man/man1m/tpmadm.1m
index c60b356165..f1c99db6ff 100644
--- a/usr/src/man/man1m/tpmadm.1m
+++ b/usr/src/man/man1m/tpmadm.1m
@@ -74,7 +74,7 @@ The following subcommands are used in the form:
 .sp
 .in +2
 .nf
-# tpamadm \fI<subcommand>\fR \fI[operand]\fR
+# tpmadm \fI<subcommand>\fR \fI[operand]\fR
 .fi
 .in -2
 .sp
diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m
index 1c7dce2559..2f24b89339 100644
--- a/usr/src/man/man1m/zfs.1m
+++ b/usr/src/man/man1m/zfs.1m
@@ -949,7 +949,7 @@ settings for this property,
 .Sy on
 does not select a fixed compression type. As new compression algorithms are
 added to ZFS and enabled on a pool, the default compression algorithm may
-change. The current default compression algorthm is either
+change. The current default compression algorithm is either
 .Sy lzjb
 or, if the
 .Sy lz4_compress