[illumos-gate merge]

commit 2e25d8e1fe9b3743d7dec073fd05a9f95fbca2a7
    12225 normalize complex float names across compilers
commit f4b3fdc1b1ec48bd52b545ef80d866244e76d91b
    12291 python3.8 fails versioning check
commit 94494656088303cd79a8b970e5535468c5f0117d
    12307 Fix markup errors in mtx(3C)
commit c40d33be34d8bd92100aad1cfae8c1aaeee375d6
    12309 errors in section 9e of the manual
commit 0dc3799518631a169651844259f4357ece16ffa6
    12305 typos in dhcp man pages
commit d7ab8532a7a0f65d1c2b7bc3f45072f665860b20
    12236 getmembers_DN doesn't properly handle errors from __ns_ldap_dn2uid
    12240 nss_ldap does not properly look up group members by distinguished name
commit f5f3cbec075f8308da054292c7c7d96373c956ee
    12288 getfacl and setfacl could stand improvement
commit 5642709df07e9b3a809f898f938aac4fc9903255
    12211 loader: build with smatch fixes
commit 8b6e4188cd6fe49ddc2ff1e635b9c1538fbd5d48
    12303 nfs/nfs4_drc.h: No such file or directory
commit d3879c39d2a534146eaf46dc510b80678ea24023
    12181 zvol tests should avoid grep -w
    12281 zvol_swap_003_pos shouldn't use swapadd in cleanup
commit b0daad2a8784078aa662f966577891e83a581d3a
    12287 errors in audio utility man pages
commit dd50e0cc4cbe1474096300fe52e9855769c0d478
    11682 zpool iostat and status improvements
commit 3df9f0641f28754051d5e82c6457527cf4af1258
    12227 libctf incorrectly handles clang anonymous unions
commit 6d9e11ccb59a5d4ea2127e1791163333c4337a08
    12224 ctfconvert conv backend error missing newline
commit b40354493afafb9870e25372645af933e189b24f
    10931 BUILDPY2TOOLS and BUILDPY3TOOLS need to be documented in illumos.sh

	Conflicts:
	usr/src/uts/common/fs/zfs/zio.c
	usr/src/uts/common/fs/zfs/sys/zio.h

8 files changed, 125 insertions, 233 deletions

diff --git a/usr/src/man/man1/audioconvert.1 b/usr/src/man/man1/audioconvert.1
index 3e674ce292..8dd302761c 100644
--- a/usr/src/man/man1/audioconvert.1
+++ b/usr/src/man/man1/audioconvert.1
@@ -3,23 +3,20 @@
 .\" 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 AUDIOCONVERT 1 "Feb 16, 2001"
+.TH AUDIOCONVERT 1 "Feb 8, 2020"
 .SH NAME
 audioconvert \- convert audio file formats
 .SH SYNOPSIS
-.LP
 .nf
 \fBaudioconvert\fR [\fB-pF\fR] [\fB-f\fR \fIoutfmt\fR] [\fB-o\fR \fIoutfile\fR]
      [ [\fB-i\fR \fIinfmt\fR] [\fIfile\fR]...] ...
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBaudioconvert\fR converts audio data between a set of supported audio
 encodings and file formats. It can be used to compress and decompress audio
 data, to add audio file headers to raw audio data files, and to convert between
-standard data encodings, such as -law and linear PCM.
+standard data encodings, such as u-law and linear PCM.
 .sp
 .LP
 If no filenames are present, \fBaudioconvert\fR reads the data from the
@@ -50,8 +47,6 @@ overwritten with the converted data.
 The \fBfile\fR(1) command decodes and prints the audio data format of Sun audio
 files.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -141,8 +136,6 @@ input.
 .RE
 
 .SS "Format Specification"
-.sp
-.LP
 The syntax for the input and output format specification is:
 .sp
 .LP
@@ -190,7 +183,7 @@ values are:
 \fB\fBulaw\fR\fR
 .ad
 .RS 13n
-\fBCCITT G.711\fR -law encoding. This is an 8-bit format primarily used for
+\fBCCITT G.711\fR u-law encoding. This is an 8-bit format primarily used for
 telephone quality speech.
 .RE
 
@@ -240,7 +233,7 @@ Same as \fBlinear16\fR.
 .RS 13n
 \fBCCITT G.721\fR compression format. This encoding uses Adaptive Delta Pulse
 Code Modulation (ADPCM) with 4-bit precision. It is primarily used for
-compressing -law voice data (achieving a 2:1 compression ratio).
+compressing u-law voice data (achieving a 2:1 compression ratio).
 .RE
 
 .sp
@@ -251,7 +244,7 @@ compressing -law voice data (achieving a 2:1 compression ratio).
 .RS 13n
 \fBCCITT G.723\fR compression format. This encoding uses Adaptive Delta Pulse
 Code Modulation (ADPCM) with 3-bit precision. It is primarily used for
-compressing -law voice data (achieving an 8:3 compression ratio). The audio
+compressing u-law voice data (achieving an 8:3 compression ratio). The audio
 quality is similar to \fBG.721,\fR but may result in lower quality when used
 for non-speech data.
 .RE
@@ -327,13 +320,10 @@ unrecognized file header.
 .RE
 
 .SH USAGE
-.sp
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of
-\fBaudioconvert\fR when encountering files greater than or equal to 2 Gbyte (
-2^31 bytes).
+\fBaudioconvert\fR when encountering files greater than or equal to 2 Gbyte
+(2^31 bytes).
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRRecording and compressing voice data before storing it
 .sp
 .LP
@@ -377,32 +367,10 @@ example% \fBaudioconvert -p -i voice -f sun *.au\fR
 .in -2
 .sp
 
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Architecture	SPARC, x86
-_
-Interface Stability	Evolving
-.TE
-
 .SH SEE ALSO
-.sp
-.LP
-\fBaudioplay\fR(1), \fBaudiorecord\fR(1), \fBfile\fR(1), \fBattributes\fR(5),
+\fBaudioplay\fR(1), \fBaudiorecord\fR(1), \fBfile\fR(1),
 \fBlargefile\fR(5)
 .SH NOTES
-.sp
-.LP
 The algorithm used for converting multi-channel data to mono is implemented by
 simply summing the channels together. If the input data is perfectly in phase
 (as would be the case if a mono file is converted to stereo and back to mono),
diff --git a/usr/src/man/man1/audioctl.1 b/usr/src/man/man1/audioctl.1
index a26bce598e..1916b82ed7 100644
--- a/usr/src/man/man1/audioctl.1
+++ b/usr/src/man/man1/audioctl.1
@@ -11,8 +11,9 @@
 .\"
 .\"
 .\" Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+.\" Copyright 2020 Peter Tribble.
 .\"
-.TH AUDIOCTL 1 "Mar 18, 2011"
+.TH AUDIOCTL 1 "Feb 8, 2020"
 .SH NAME
 audioctl - audio device control command line interface
 .SH SYNOPSIS
@@ -27,22 +28,27 @@ audioctl - audio device control command line interface
 
 .LP
 .nf
-\fBaudioctl\fR \fBshow-control\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fB] [\fIcontrol\fR ...]
+\fBaudioctl\fR \fBshow-control\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fR] [\fIcontrol\fR ...]
 .fi
 
 .LP
 .nf
-\fBaudioctl\fR \fBset-control\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fB] \fIcontrol\fR \fIvalue\fR
+\fBaudioctl\fR \fBset-control\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fR] \fIcontrol\fR \fIvalue\fR
 .fi
 
 .LP
 .nf
-\fBaudioctl\fR \fBsave-controls\fR [\fB-d\fR \fIdevice\fB] [\fB-f\fR] \fIfile\fR
+\fBaudioctl\fR \fBsave-controls\fR [\fB-d\fR \fIdevice\fR] [\fB-f\fR] \fIfile\fR
 .fi
 
 .LP
 .nf
-\fBaudioctl\fR \fBload-controls\fR [\fB-d\fR \fIdevice\fB] \fIfile\fR
+\fBaudioctl\fR \fBload-controls\fR [\fB-d\fR \fIdevice\fR] \fIfile\fR
+.fi
+
+.LP
+.nf
+\fBaudioctl\fR \fBhelp\fR
 .fi
 
 .SH DESCRIPTION
@@ -64,7 +70,7 @@ List all the audio devices on the system.
 .sp
 .ne 2
 .na
-\fBshow-device\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fR] [\fBcontrol\fR ... ]
+\fBshow-device\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fR]
 .ad
 .sp .6
 .RS 4n
@@ -76,7 +82,7 @@ will be displayed.
 .sp
 .ne 2
 .na
-\fBshow-control\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fR]
+\fBshow-control\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fR] [\fBcontrol\fR ... ]
 .ad
 .sp .6
 .RS 4n
@@ -89,7 +95,7 @@ the \fB-v\fR option is specified, then more detail will be displayed.
 .sp
 .ne 2
 .na
-\fBset-control\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fB] \fIcontrol\fR \fIvalue\fR
+\fBset-control\fR [\fB-v\fR] [\fB-d\fR \fIdevice\fR] \fIcontrol\fR \fIvalue\fR
 .ad
 .sp .6
 .RS 4n
@@ -101,7 +107,7 @@ option is specified, then more verbose output be displayed.
 .sp
 .ne 2
 .na
-\fBsave-controls\fR [\fB-f\fR] [\fB-d\fR \fIdevice\fB] \fIfile\fR
+\fBsave-controls\fR [\fB-f\fR] [\fB-d\fR \fIdevice\fR] \fIfile\fR
 .ad
 .sp .6
 .RS 4n
@@ -113,7 +119,7 @@ or modify an existing file unless \fB-f\fR (force) is specified.
 .sp
 .ne 2
 .na
-\fBload-controls\fR [\fB-d\fR \fIdevice\fB] \fIfile\fR
+\fBload-controls\fR [\fB-d\fR \fIdevice\fR] \fIfile\fR
 .ad
 .sp .6
 .RS 4n
@@ -122,6 +128,16 @@ into a \fIdevice\fR (or all audio devices if not
 specified).
 .RE
 
+.sp
+.ne 2
+.na
+\fBhelp\fR
+.ad
+.sp .6
+.RS 4n
+Display the usage message.
+.RE
+
 .SH ENVIRONMENT VARIABLES
 .ne 2
 .na
@@ -133,21 +149,7 @@ is not specified on the command line.  If this variable is not set,
 \fB/dev/audio\fR is used.
 .RE
 
-
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	See below.
-.TE
-.LP
 The \fBaudioctl\fR command and its subcommands are Committed.  The
 names of controls, their values, and device names are Uncommitted.
 The display output is intended for human consumption, and is Not An
@@ -156,4 +158,4 @@ Interface.  The format of the state files used by the
 Private.
 .SH SEE ALSO
 \fBaudioplay\fR(1), \fBaudiorecord\fR(1), \fBdsp\fR(7I),
-\fBmixer\fR(7I), \fBattributes\fR(5)
+\fBmixer\fR(7I)
diff --git a/usr/src/man/man1/audioplay.1 b/usr/src/man/man1/audioplay.1
index 324e26940b..64f6115201 100644
--- a/usr/src/man/man1/audioplay.1
+++ b/usr/src/man/man1/audioplay.1
@@ -3,17 +3,15 @@
 .\" 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 AUDIOPLAY 1 "May 13, 2017"
+.TH AUDIOPLAY 1 "Feb 8, 2020"
 .SH NAME
 audioplay \- play audio files
 .SH SYNOPSIS
-.LP
 .nf
 \fBaudioplay\fR [\fB-iV\fR] [\fB-v\fR \fIvol\fR] [\fB-d\fR \fIdev\fR] [\fIfile\fR]...
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBaudioplay\fR utility copies the named audio files (or the standard input
 if no filenames are present) to the audio device. If no input file is specified
 and standard input is a tty, the program exits with an error message.
@@ -31,7 +29,6 @@ ignored. This allows, for instance, data sampled at 8012 Hz to be played on an
 audio device that only supports 8000 Hz. If the \fB-V\fR option is present,
 such deviations are flagged with warning messages.
 .SH OPTIONS
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -84,7 +81,7 @@ the audio device or when sample rate deviations are detected.
 .sp
 .ne 2
 .na
-\fB\fB\(mi\e?\fR\fR
+\fB\fB-?\fR\fR
 .ad
 .RS 11n
 \fIHelp\fR: Prints a command line usage message.
@@ -105,9 +102,8 @@ variable is consulted (see below).
 .RE
 
 .SH USAGE
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBaudioplay\fR
-when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
+when encountering files greater than or equal to 2 Gbyte (2^31 bytes).
 .SH ENVIRONMENT VARIABLES
 .ne 2
 .na
@@ -130,29 +126,10 @@ specified explicitly in the search path. If the \fBAUDIOPATH\fR variable is not
 set, only the current directory is searched.
 .RE
 
-.SH ATTRIBUTES
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Architecture	SPARC, x86
-_
-Interface Stability	Committed
-.TE
-
 .SH SEE ALSO
-.LP
 \fBaudioconvert\fR(1), \fBaudiorecord\fR(1),
-\fBattributes\fR(5), \fBlargefile\fR(5), \fBaudio\fR(7I)
+\fBlargefile\fR(5), \fBaudio\fR(7I)
 .SH BUGS
-.LP
 \fBaudioplay\fR currently supports a limited set of audio format conversions.
 If the audio file is not in a format supported by the audio device, it must
 first be converted. For example, to convert to voice format on the fly, use the
diff --git a/usr/src/man/man1/audiorecord.1 b/usr/src/man/man1/audiorecord.1
index 8f4354a524..7ffedbd976 100644
--- a/usr/src/man/man1/audiorecord.1
+++ b/usr/src/man/man1/audiorecord.1
@@ -1,28 +1,27 @@
 '\" te
 .\"  Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
+.\" Copyright 2020 Peter Tribble.
 .\" 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 AUDIORECORD 1 "May 13, 2017"
+.TH AUDIORECORD 1 "Feb 8, 2020"
 .SH NAME
 audiorecord \- record an audio file
 .SH SYNOPSIS
-.LP
 .nf
-\fBaudiorecord\fR [\fB-af\fR] [\fB-v\fR \fIvol\fR] [\fB-c\fR \fIchannels\fR] [\fI-s\fR \fIrate\fR]
+\fBaudiorecord\fR [\fB-af\fR] [\fB-v\fR \fIvol\fR] [\fB-c\fR \fIchannels\fR] [\fB-s\fR \fIrate\fR]
      [\fB-e\fR \fIencoding\fR] [\fB-t\fR \fItime\fR] [\fB-i\fR \fIinfo\fR] [\fB-d\fR \fIdev\fR]
-     [\fB-T\fR \fBau\fR | \fBaif\fR[\fBf\fR] | \fBwav\fR] [\fIfile\fR[.\fBau\fR|.\fBaif\fR[\fBf\fR]]|.\fBwav\fR]
+     [\fB-T\fR \fBau\fR|\fBaif\fR[\fBf\fR]|\fBwav\fR] [\fIfile\fR[.\fBau\fR|.\fBaif\fR[\fBf\fR]|.\fBwav\fR]]
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBaudiorecord\fR utility copies audio data from the audio device to a
 named audio file, or to the standard output if no filename is present. If no
 output file is specified and standard output is a tty, the program exits with
 an error message.
 .sp
 .LP
-By default, monaural audio data is recorded at 8 kHz and encoded in \fB-law\fR
+By default, monaural audio data is recorded at 8 kHz and encoded in \fBu-law\fR
 format. If the audio device supports additional configurations, the \fB-c\fR,
 \fB-s\fR, and \fB-e\fR options may be used to specify the data format. The
 output file is prefixed by an audio file header that identifies the format of
@@ -37,12 +36,11 @@ example, Control-c) is received. If the \fB-t\fR option is specified,
 If the audio device is unavailable, that is, if another process currently has
 read access, \fBaudiorecord\fR prints an error message and exits immediately.
 .SH OPTIONS
-.LP
 The following options are supported:
 .sp
 .ne 2
 .na
-\fB\fB-\e?\fR\fR
+\fB\fB-?\fR\fR
 .ad
 .RS 24n
 \fIHelp\fR: Prints a command line usage message.
@@ -165,7 +163,7 @@ set by any process.
 .SH OPERANDS
 .ne 2
 .na
-\fB\fIfile\fR[\fB\&.au\fR|\fB\&.aif\fR[\fBf\fR]]|\fB\&.wav\fR\fR
+\fIfile\fR[\fB\&.au\fR|\fB\&.aif\fR[\fBf\fR]|\fB\&.wav\fR]
 .ad
 .sp .6
 .RS 4n
@@ -181,9 +179,8 @@ file suffix.
 .RE
 
 .SH USAGE
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBaudiorecord\fR
-when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
+when encountering files greater than or equal to 2 Gbyte (2^31 bytes).
 .SH ENVIRONMENT VARIABLES
 .ne 2
 .na
@@ -195,24 +192,6 @@ is supplied. If the \fBAUDIODEV\fR variable is not set, \fB/dev/audio\fR is
 used.
 .RE
 
-.SH ATTRIBUTES
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Architecture	SPARC, x86
-_
-Interface Stability	Committed
-.TE
-
 .SH SEE ALSO
-.LP
 \fBaudioconvert\fR(1), \fBaudioplay\fR(1),
-\fBattributes\fR(5), \fBlargefile\fR(5), \fBaudio\fR(7I)
+\fBlargefile\fR(5), \fBaudio\fR(7I)
diff --git a/usr/src/man/man1/audiotest.1 b/usr/src/man/man1/audiotest.1
index 8c122094df..67e6a77b6e 100644
--- a/usr/src/man/man1/audiotest.1
+++ b/usr/src/man/man1/audiotest.1
@@ -1,30 +1,28 @@
 '\" te
 .\"  Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
+.\" Copyright 2020 Peter Tribble.
 .\" 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 AUDIOTEST 1 "May 13, 2017"
+.TH AUDIOTEST 1 "Feb 8, 2020"
 .SH NAME
 audiotest \- test audio device
 .SH SYNOPSIS
-.LP
 .nf
-\fBaudiotest\fR [\fB-24571\fR] [\fIdev\fR] ...
+\fBaudiotest\fR [\fB-2457\fR] [\fB-l\fR] [\fB-r\fR \fIrate\fR] [\fIdev\fR] ...
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBaudiotest\fR utility runs a test for the named audio device (or all
 audio devices found on the system if none is given). The test includes playing
 an audio sample over each channel and measuring the rate of playback for clock
 drift.
 .SH OPTIONS
-.LP
 The following options are supported:
 .sp
 .ne 2
 .na
-\fB\fB-1\fR\fR
+\fB-l\fR
 .ad
 .RS 6n
 Loop mode. The test is run in an infinite loop.
@@ -33,7 +31,16 @@ Loop mode. The test is run in an infinite loop.
 .sp
 .ne 2
 .na
-\fB\fB-2\fR\fR
+\fB-r\fR \fIrate\fR
+.ad
+.RS 6n
+Sample rate. By default 48000Hz is used.
+.RE
+
+.sp
+.ne 2
+.na
+\fB-2\fR
 .ad
 .RS 6n
 Stereo (2-channel) mode. This is the default mode. Playback assumes 2 channels
@@ -43,7 +50,7 @@ are present.
 .sp
 .ne 2
 .na
-\fB\fB-4\fR\fR
+\fB-4\fR
 .ad
 .RS 6n
 Quadraphonic mode (4-channel surround). The test assumes that four surround
@@ -53,7 +60,7 @@ channels are present.
 .sp
 .ne 2
 .na
-\fB\fB-5\fR\fR
+\fB-5\fR
 .ad
 .RS 6n
 Surround sound mode (5.1). The test checks the left, right, surround left,
@@ -64,7 +71,7 @@ tested.
 .sp
 .ne 2
 .na
-\fB\fB-7\fR\fR
+\fB-7\fR
 .ad
 .RS 6n
 Surround sound mode (7.1). The test checks the left, right, surround left,
@@ -72,38 +79,23 @@ surround right, back surround left, back surround right, and center channels.
 The low frequency effects channel is not tested.
 .RE
 
+.sp
+.LP
+If multiple modes are specified, the last one specified is used.
+
 .SH OPERANDS
 .ne 2
 .na
-\fB\fIdev\fR\fR
+\fIdev\fR
 .ad
 .RS 7n
-The path the device to test, for example, \fB/dev/dsp0\fR.
+The path to the device to test, for example, \fB/dev/dsp0\fR.
 .RE
 
-.SH ATTRIBUTES
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Architecture	SPARC, x86
-_
-Interface Stability	Committed
-.TE
-
 .SH SEE ALSO
-.LP
 \fBaudioconvert\fR(1), \fBaudiorecord\fR(1),
-\fBattributes\fR(5), \fBaudio\fR(7I)
+\fBaudio\fR(7I)
 .SH BUGS
-.LP
 \fBaudiotest\fR has no way to detect the number of actual audio channels
 supported by the physical device.
 .sp
diff --git a/usr/src/man/man1/dhcpinfo.1 b/usr/src/man/man1/dhcpinfo.1
index 24b8918a8b..7222ffeb60 100644
--- a/usr/src/man/man1/dhcpinfo.1
+++ b/usr/src/man/man1/dhcpinfo.1
@@ -1,14 +1,14 @@
 '\" te
 .\"  Copyright (c) 1992-1996 Competitive Automation, Inc.
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved.
+.\" Copyright (c) 2020 Peter Tribble
 .\" 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 DHCPINFO 1 "May 15, 2009"
+.TH DHCPINFO 1 "Feb 13, 2020"
 .SH NAME
 dhcpinfo \- display values of parameters received through DHCP
 .SH SYNOPSIS
-.LP
 .nf
 \fBdhcpinfo\fR [\fB-c\fR] [\fB-i\fR \fIinterface\fR] [\fB-n\fR \fIlimit\fR] [\fB-v 4|6\fR] \fIcode\fR
 .fi
@@ -19,14 +19,11 @@ dhcpinfo \- display values of parameters received through DHCP
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBdhcpinfo\fR utility prints the \fBDHCP\fR-supplied value(s) of the
 parameter requested on the command line. The parameter can be identified either
 by its numeric code in the \fBDHCP\fR specification, or by its mnemonic
 identifier, as listed in \fBdhcp_inittab\fR(4). This command is intended to be
-used in command substitutions in the shell scripts invoked by \fBinit\fR(1M) at
-system boot. It first contacts the \fBDHCP\fR client daemon at system boot or
+used in command substitutions in the shell scripts invoked at system boot or
 in event scripts as described in \fBdhcpagent\fR(1M). It first contacts the
 DHCP client daemon \fBdhcpagent\fR(1M) to verify that \fBDHCP\fR has
 successfully completed on the requested interface. If \fBDHCP\fR has
@@ -41,8 +38,6 @@ Extensions\fR for more details on DHCPv4 parameters, and RFC 3315, Dynamic Host
 Configuration Protocol for IPv6 (DHCPv6), for more details on DHCPv6
 parameters.
 .SS "Output Format"
-.sp
-.LP
 The output from \fBdhcpinfo\fR consists of one or more lines of \fBASCII\fR
 text; the format of the output depends upon the requested parameter. The number
 of values returned per line and the total number of lines output for a given
@@ -81,8 +76,6 @@ T}	\fBDOMAIN\fR
 .TE
 
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -130,16 +123,14 @@ Limits the list of values displayed to \fIlimit\fR lines.
 .sp
 .ne 2
 .na
-\fB\fB-v\fR\fB4 | 6\fR\fR
+\fB\fB-v 4|6\fR\fR
 .ad
 .RS 16n
-Specifies the DHCP version to query. Use \fB-v4\fRfor DHCPv4 and \fB-v6\fR for
-DHCPv6.
+Specifies the DHCP version to query. Use \fB-v 4\fR for DHCPv4 and \fB-v 6\fR
+for DHCPv6.
 .RE
 
 .SH OPERANDS
-.sp
-.LP
 The following operands are supported:
 .sp
 .ne 2
@@ -163,8 +154,6 @@ Mnemonic symbol for the requested \fBDHCP\fR parameter, as listed in
 .RE
 
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -214,8 +203,6 @@ System error (should never occur).
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -230,9 +217,7 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBdhcpagent\fR(1M), \fBifconfig\fR(1M), \fBinit\fR(1M), \fBdhcp_inittab\fR(4),
+\fBdhcpagent\fR(1M), \fBifconfig\fR(1M), \fBdhcp_inittab\fR(4),
 \fBattributes\fR(5)
 .sp
 .LP
diff --git a/usr/src/man/man1/getfacl.1 b/usr/src/man/man1/getfacl.1
index a90b61deff..8eca23b106 100644
--- a/usr/src/man/man1/getfacl.1
+++ b/usr/src/man/man1/getfacl.1
@@ -1,20 +1,18 @@
 '\" te
 .\" \&.Copyright (c) 2002, Sun Microsystems, Inc.  All Rights Reserved
+.\" Copyright (c) 2020 Peter Tribble.
 .\" 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 GETFACL 1 "Nov 5, 1994"
+.TH GETFACL 1 "Feb 8, 2020"
 .SH NAME
 getfacl \- display discretionary file information
 .SH SYNOPSIS
-.LP
 .nf
 \fBgetfacl\fR [\fB-ad\fR] \fIfile\fR...
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 For each argument that is a regular file, special file, or named pipe, the
 \fBgetfacl\fR utility displays the owner, the group, and the Access Control
 List (\fBACL\fR). For each directory argument, \fBgetfacl\fR displays the
@@ -22,6 +20,13 @@ owner, the group, and the \fBACL\fR and/or the default \fBACL\fR. Only
 directories contain default \fBACL\fRs.
 .sp
 .LP
+The \fBgetfacl\fR utility will fail if executed on a file system that supports
+NFSv4 \fBACL\fRs.  See \fBacl\fR(5) for a description of the difference
+between the older POSIX-draft \fBACL\fRs and the newer NFSv4 \fBACL\fRs.  The
+\fBls\fR(1) utility, when used with the \fB-v\fR or \fB-V\fR options, will
+display \fBACL\fRs on all types of file system.
+.sp
+.LP
 The \fBgetfacl\fR utility may be executed on a file system that does not
 support \fBACL\fRs. It reports the \fBACL\fR based on the base permission bits.
 .sp
@@ -30,8 +35,6 @@ With no options specified, \fBgetfacl\fR displays the filename, the file owner,
 the file group owner, and both the \fBACL\fR and the default \fBACL\fR, if it
 exists.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -54,8 +57,6 @@ Displays the filename, the file owner, the file group owner, and the default
 .RE
 
 .SH OPERANDS
-.sp
-.LP
 The following operands are supported:
 .sp
 .ne 2
@@ -67,26 +68,24 @@ The path name of a regular file, special file, or named pipe.
 .RE
 
 .SH OUTPUT
-.sp
-.LP
 The format for \fBACL\fR output is as follows:
 .sp
 .in +2
 .nf
-# file: filename	
-# owner: uid	
-# group: gid	
-user::perm	
-user:uid:perm	
-group::perm	
-group:gid:perm	
-mask:perm	
-other:perm	
-default:user::perm	
-default:user:uid:perm	
-default:group::perm	
-default:group:gid:perm	
-default:mask:perm	
+# file: filename
+# owner: uid
+# group: gid
+user::perm
+user:uid:perm
+group::perm
+group:gid:perm
+mask:perm
+other:perm
+default:user::perm
+default:user:uid:perm
+default:group::perm
+default:group:gid:perm
+default:mask:perm
 default:other:perm
 .fi
 .in -2
@@ -115,7 +114,7 @@ permissions that are granted to the specified users.
 .LP
 The \fBgroup\fR entry without a group \fBID\fR indicates the permissions that
 are granted to the file group owner. One or more additional group entries
-indicate the permissions that  are granted to the specified groups.
+indicate the permissions that are granted to the specified groups.
 .sp
 .LP
 The \fBmask\fR entry indicates the \fBACL\fR mask permissions. These are the
@@ -143,18 +142,17 @@ character \fB\(mi\fR\&. The \fBperm\fR is displayed in the following order:
 holder character appears.
 .sp
 .LP
-If  you use the \fBchmod\fR(1) command to change the file group owner
+If you use the \fBchmod\fR(1) command to change the file group owner
 permissions on a file with \fBACL\fR entries, both the file group owner
 permissions and the \fBACL\fR mask are changed to the new permissions. Be aware
 that the new \fBACL\fR mask permissions may change the effective permissions
 for additional users and groups who have \fBACL\fR entries on the file.
 .sp
 .LP
-In order to indicate that the \fBACL\fR mask  restricts an \fBACL\fR entry,
+In order to indicate that the \fBACL\fR mask restricts an \fBACL\fR entry,
 \fBgetfacl\fR displays an additional tab character, pound sign (\fB#\fR), and
 the actual permissions granted, following the entry.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRDisplaying file information
 .sp
 .LP
@@ -258,7 +256,6 @@ default:other::\|\(mi\|\(mi\|\(mi
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/passwd\fR\fR
@@ -277,8 +274,6 @@ group file
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -293,13 +288,10 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBchmod\fR(1), \fBls\fR(1), \fBsetfacl\fR(1), \fBacl\fR(2),
-\fBaclsort\fR(3SEC), \fBgroup\fR(4), \fBpasswd\fR(4), \fBattributes\fR(5)
+\fBaclsort\fR(3SEC), \fBgroup\fR(4), \fBpasswd\fR(4), \fBacl\fR(5),
+\fBattributes\fR(5)
 .SH NOTES
-.sp
-.LP
 The output from \fBgetfacl\fR is in the correct format for input to the
 \fBsetfacl\fR \fB-f\fR command. If the output from \fBgetfacl\fR is redirected
 to a file, the file may be used as input to \fBsetfacl\fR. In this way, a user
diff --git a/usr/src/man/man1/setfacl.1 b/usr/src/man/man1/setfacl.1
index 11c7b644f3..526e2c0321 100644
--- a/usr/src/man/man1/setfacl.1
+++ b/usr/src/man/man1/setfacl.1
@@ -1,13 +1,13 @@
 '\" te
 .\"  Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved
+.\" Copyright (c) 2020 Peter Tribble.
 .\" 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 SETFACL 1 "Dec 19, 2006"
+.TH SETFACL 1 "Feb 8, 2020"
 .SH NAME
 setfacl \- modify the Access Control List (ACL) for a file or files
 .SH SYNOPSIS
-.LP
 .nf
 \fBsetfacl\fR [\fB-r\fR] \fB-s\fR \fIacl_entries\fR \fIfile\fR
 .fi
@@ -23,14 +23,18 @@ setfacl \- modify the Access Control List (ACL) for a file or files
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 For each file specified, \fBsetfacl\fR either replaces its entire \fBACL\fR,
 including the default \fBACL\fR on a directory, or it adds, modifies, or
 deletes one or more \fBACL\fR entries, including default entries on
 directories.
 .sp
 .LP
+The \fBsetfacl\fR utility can only manipulate POSIX-draft \fBACL\fRs.  See
+\fBacl\fR(5) for a description of the difference between the older POSIX-draft
+\fBACL\fRs and the newer NFSv4 \fBACL\fRs.  The \fBchmod\fR(1) utility can
+be used to manipulate \fBACL\fRs on all types of file system.
+.sp
+.LP
 When the \fBsetfacl\fR command is used, it can result in changes to the file
 permission bits. When the user \fBACL\fR entry for the file owner is changed,
 the file owner class permission bits are modified. When the group \fBACL\fR
@@ -63,8 +67,6 @@ supports POSIX-draft ACLS (or \fBaclent_t\fR style ACLs). Use the \fBchmod\fR
 command to set ACLs on files in a ZFS file system, which supports NFSv4-style
 ACLS (or \fBace_t\fR style ACLs).
 .SS "\fIacl_entries\fR Syntax"
-.sp
-.LP
 For the \fB-m\fR and \fB-s\fR options, \fIacl_entries\fR are one or more
 comma-separated \fBACL\fR entries.
 .sp
@@ -114,12 +116,12 @@ c c
 l l .
 \fBACL\fR Entry	Description
 _
-u[ser]::\fIperms\fR 	File owner permissions.
-g[roup]::\fIperms\fR 	File group owner permissions.
-o[ther]:\fIperms\fR 	T{
+u[ser]::\fIperms\fR	File owner permissions.
+g[roup]::\fIperms\fR	File group owner permissions.
+o[ther]:\fIperms\fR	T{
 Permissions for users other than the file owner or members of file group owner.
 T}
-m[ask]:\fIperms\fR 	T{
+m[ask]:\fIperms\fR	T{
 The \fBACL\fR mask. The mask entry indicates the maximum permissions allowed for users (other than the owner) and for groups. The mask is a quick way to change permissions on all the users and groups.
 T}
 u[ser]:\fIuid:perms\fR	T{
@@ -128,12 +130,12 @@ T}
 g[roup]:\fIgid:perms\fR	T{
 Permissions for a specific group. For \fIgid\fR, you can specify either a group name or a numeric GID.
 T}
-d[efault]:u[ser]::\fIperms\fR 	Default file owner permissions.
-d[efault]:g[roup]::\fIperms\fR 	Default file group owner permissions.
-d[efault]:o[ther]:\fIperms\fR 	T{
+d[efault]:u[ser]::\fIperms\fR	Default file owner permissions.
+d[efault]:g[roup]::\fIperms\fR	Default file group owner permissions.
+d[efault]:o[ther]:\fIperms\fR	T{
 Default permissions for users other than the file owner or members of the file group owner.
 T}
-d[efault]:m[ask]:\fIperms\fR 	Default \fBACL\fR mask.
+d[efault]:m[ask]:\fIperms\fR	Default \fBACL\fR mask.
 d[efault]:u[ser]:\fIuid\fR:\fIperms\fR	T{
 Default permissions for a specific user. For \fIuid\fR, you can specify either a user name or a numeric UID.
 T}
@@ -148,8 +150,6 @@ For the \fB-d\fR option, \fIacl_entries\fR are one or more comma-separated
 \fBACL\fR entries without permissions. Notice that the entries for file owner,
 file group owner, \fBACL\fR mask, and others can not be deleted.
 .SH OPTIONS
-.sp
-.LP
 The options have the following meaning:
 .sp
 .ne 2
@@ -293,7 +293,6 @@ group\fR entries with the same \fIgid\fR.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRAdding read permission only
 .sp
 .LP
@@ -353,7 +352,6 @@ The following example sets the same \fBACL\fR on file \fBabc\fR as the file
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/passwd\fR\fR
@@ -372,7 +370,6 @@ group file
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBchmod\fR(1), \fBgetfacl\fR(1), \fBumask\fR(1), \fBaclcheck\fR(3SEC),
-\fBaclsort\fR(3SEC), \fBgroup\fR(4), \fBpasswd\fR(4), \fBattributes\fR(5)
+\fBaclsort\fR(3SEC), \fBgroup\fR(4), \fBpasswd\fR(4), \fBacl\fR(5),
+\fBattributes\fR(5)