[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

3 files changed, 3 insertions, 17 deletions

diff --git a/usr/src/man/man1/audioctl.1 b/usr/src/man/man1/audioctl.1
index 78f7df7327..6c65764e86 100644
--- a/usr/src/man/man1/audioctl.1
+++ b/usr/src/man/man1/audioctl.1
@@ -126,21 +126,18 @@ specified).
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.sp
 .ne 2
 .na
 \fB\fBAUDIODEV\fR\fR
 .ad
 .RS 12n
-The full path name of the default audio device to use if on
+The full path name of the default audio device to use if one
 is not specified on the command line.  If this variable is not set,
 \fB/dev/audio\fR is used.
 .RE
 
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
diff --git a/usr/src/man/man1/digest.1 b/usr/src/man/man1/digest.1
index cacf5e296a..b615f0f2fc 100644
--- a/usr/src/man/man1/digest.1
+++ b/usr/src/man/man1/digest.1
@@ -13,13 +13,11 @@ digest \- calculate a message digest
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBdigest\fR utility calculates the message digest of the given files or
 \fBstdin\fR using the algorithm specified. If more than one file is given, each
 line of output is the digest of a single file.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -53,7 +51,6 @@ Verbose output. Includes the algorithm name and filename in the output.
 
 .SH USAGE
 .SS "Algorithms"
-.sp
 .LP
 These algorithms are provided by the Cryptographic Framework. Each algorithm
 supported by the command is an alias of the PKCS #11 mechanism for easier
@@ -128,7 +125,7 @@ sha1 (/usr/lib/inet/ntpd) = 5b4aff102372cea801e7d08acde9655fec81f07c
 \fBExample 4 \fRDisplaying a List of Available Algorithms
 .sp
 .LP
-The following example displays a list of available algortithms to digest:
+The following example displays a list of available algorithms to digest:
 
 .sp
 .in +2
@@ -144,7 +141,6 @@ sha512
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -166,7 +162,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -182,7 +177,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcksum\fR(1), \fBencrypt\fR(1), \fBmac\fR(1), \fBbart\fR(1M),
 \fBcryptoadm\fR(1M), \fBlibpkcs11\fR(3LIB), \fBattributes\fR(5),
diff --git a/usr/src/man/man1/unifdef.1 b/usr/src/man/man1/unifdef.1
index 4ccb5906fe..9bb36bf6d0 100644
--- a/usr/src/man/man1/unifdef.1
+++ b/usr/src/man/man1/unifdef.1
@@ -14,7 +14,6 @@ unifdef \- resolve and remove ifdef'ed lines from C program source
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBunifdef\fR removes \fBifdef\fRed lines from a file while otherwise leaving
 the file alone. It is smart enough to deal with the nested \fBifdef\fRs,
@@ -28,7 +27,7 @@ removed, as appropriate. Any \fBifdef\fR, \fBifndef\fR, \fBelse\fR, and
 .sp
 .LP
 \fBifdef\fRs involving symbols you do not specify are untouched and copied out
-along with their associated \fBifdef\fR, \fBelse\fR, and \fBendiff1\fR lines.
+along with their associated \fBifdef\fR, \fBelse\fR, and \fBendif\fR lines.
 .sp
 .LP
 If an \fBifdef\fR\fIX\fR occurs nested inside another \fBifdef\fR\fIX\fR, then
@@ -40,7 +39,6 @@ significant.
 \fBunifdef\fR copies its output to the standard output and will take its input
 from the standard input if no \fIfilename\fR argument is given.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -113,7 +111,6 @@ Ignore, but print out, lines associated with the undefined symbol \fIname\fR.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -135,11 +132,9 @@ Operation failed.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdiff\fR(1), \fBattributes\fR(5)
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fB\fBPremature\fR \fBEOF\fR\fR