[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

2 files changed, 28 insertions, 38 deletions

diff --git a/usr/src/man/man5/acl.5 b/usr/src/man/man5/acl.5
index b1db6df1ae..cc42c5d4df 100644
--- a/usr/src/man/man5/acl.5
+++ b/usr/src/man/man5/acl.5
@@ -1,17 +1,17 @@
 '\" te
+.\" Copyright (c) 2020 Peter Tribble.
 .\" Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 .\" Copyright (c) 2008, 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 ACL 5 "Nov 24, 2014"
+.TH ACL 5 "Feb 8, 2020"
 .SH NAME
 acl \- Access Control Lists
 .SH DESCRIPTION
-.LP
 Access control lists (ACLs) are discretionary access control mechanisms that
 grant and deny access to files and directories. Two different ACL models are
-supported in the Solaris release: POSIX-draft ACLs and NFSv4 ACLs.
+supported in this release: POSIX-draft ACLs and NFSv4 ACLs.
 .sp
 .LP
 The older, POSIX-draft model is supported by the UFS file system. This model is
@@ -23,10 +23,9 @@ The other model is based on the standards of the NFSv4 working group and is an
 approved standard from the Internet Engineering Task Force (IETF). The ZFS file
 system uses the NFSv4 model, and provides richer semantics and finer grained
 permission capabilities than the POSIX-draft model.
-.SS "\fBPOSIX\fR-draft \fBACL\fRs"
-.LP
+.SS "POSIX-draft ACLs"
 POSIX-draft ACLs provide an alternative security mechanism to basic UNIX file
-permissions in the Solaris release. Their purpose is to further restrict access
+permissions. Their purpose is to further restrict access
 to files and directories or to extend permissions to a particular user. ACLs
 can be used to change the permissions for the standard owner, group and other
 class bits of a file's mode. ACLs can give additional users and groups access
@@ -104,9 +103,8 @@ user:joe:rw-
 .in -2
 .sp
 
-.SS "\fBNFS\fRv4 \fBACL\fRs"
-.LP
-NFSv4 ACL model is based loosely on the Windows NT ACL model. NFSv4 ACLs
+.SS "NFSv4 ACLs"
+The NFSv4 ACL model is based loosely on the Windows NT ACL model. NFSv4 ACLs
 provide a much richer ACL model than POSIX-draft ACLs.
 .sp
 .LP
@@ -151,7 +149,7 @@ subdirectories of the directory.
 .ie t \(bu
 .el o
 NFSv4 ACLs provide a mechanism for hooking into a system's audit trail.
-Currently, Solaris does not support this mechanism.
+Currently, illumos does not support this mechanism.
 .RE
 .RS +4
 .TP
@@ -540,10 +538,9 @@ user:fred:rwR:f------:allow
 .in -2
 .sp
 
-.SS "Shell-level Solaris \fBAPI\fR"
-.LP
-The Solaris command interface supports the manipulation of ACLs. The following
-Solaris utilities accommodate both ACL models:
+.SS "Shell-level API"
+Several utilities support the manipulation of ACLs. The following
+utilities accommodate both ACL models:
 .sp
 .ne 2
 .na
@@ -656,12 +653,11 @@ When a file with an ACL is unpacked, the unpacked file retains the ACL
 information.
 .RE
 
-.SS "Application-level \fBAPI\fR"
-.LP
+.SS "Application-level API"
 The primary interfaces required to access file system ACLs at the programmatic
 level are the \fBacl_get()\fR and \fBacl_set()\fR functions. These functions
-support both POSIX draft ACLs and NFSv4 ACLs.
-.SS "Retrieving a file's \fBACL\fR"
+support both POSIX-draft ACLs and NFSv4 ACLs.
+.SS "Retrieving a file's ACL"
 .in +2
 .nf
 int acl_get(const char *path, int flag, acl_t **aclp);
@@ -671,23 +667,23 @@ int facl_get(int fd, int flag, acl_t **aclp);
 
 .sp
 .LP
-The \fBacl_get\fR(3SEC) and \fBfacl_get\fR(3SEC) functions retrieves an ACL on
+The \fBacl_get\fR(3SEC) and \fBfacl_get\fR(3SEC) functions retrieve an ACL on
 a file whose name is given by path or referenced by the open file descriptor
 fd. The flag argument specifies whether a trivial ACL should be retrieved. When
-the flag argument equals \fBACL_NO_TRIVIAL\fR then only ACLs that are not
+the flag argument equals \fBACL_NO_TRIVIAL\fR only ACLs that are not
 trivial are retrieved. The ACL is returned in the \fBaclp\fR argument.
-.SS "Freeing \fBACL\fR structure"
+.SS "Freeing ACL structure"
 .in +2
 .nf
-void acl_free(acl_t *aclp)s;
+void acl_free(acl_t *aclp);
 .fi
 .in -2
 
 .sp
 .LP
 The \fBacl_free()\fR function frees up memory allocated for the argument
-\fBaclp;\fR.
-.SS "Setting an \fBACL\fR on a file"
+\fBaclp\fR.
+.SS "Setting an ACL on a file"
 .in +2
 .nf
 int acl_set(const char *path, acl_t *aclp);
@@ -700,10 +696,10 @@ int facl_set(int fd, acl_t *aclp);
 The \fBacl_set\fR(3SEC) and \fBfacl_get\fR(3SEC) functions are used for setting
 an ACL on a file whose name is given by path or referenced by the open file
 descriptor \fBfd\fR. The \fBaclp\fR argument specifies the ACL to set. The
-\fBacl_set\fR(3SEC) translates an POSIX-draft ACL into a NFSv4 ACL when the
-target file systems supports NFSv4 ACLs. No translation is performed when
+\fBacl_set\fR(3SEC) function translates a POSIX-draft ACL into a NFSv4 ACL when
+the target file system supports NFSv4 ACLs. No translation is performed when
 trying to set an NFSv4 ACL on a POSIX-draft ACL supported file system.
-.SS "Determining an \fBACL\fR's trivialness"
+.SS "Determining an ACL's trivialness"
 .in +2
 .nf
 int acl_trivial(const char *path);
@@ -714,7 +710,7 @@ int acl_trivial(const char *path);
 .LP
 The \fBacl_trivial()\fR function is used to determine whether a file has a
 trivial ACL.
-.SS "Removing all \fBACL\fRs from a file"
+.SS "Removing all ACLs from a file"
 .in +2
 .nf
 int acl_strip(const char *path, uid_t uid, gid_t gid, mode_t mode);
@@ -727,7 +723,7 @@ The \fBacl_strip()\fR function removes all ACLs from a file and replaces them
 with a trivial ACL based off of the passed in argument mode. After replacing
 the ACL the owner and group of the file are set to the values specified in the
 uid and gid parameters.
-.SS "Converting \fBACL\fRs to/from external representation"
+.SS "Converting ACLs to/from external representation"
 .in +2
 .nf
 int acl_fromtext(const char *path, acl_t **aclp);
@@ -742,11 +738,10 @@ to by aclp into an external representation. See \fBDESCRIPTION\fR for details
 about external representation.
 .sp
 .LP
-The \fBacl_fromtext()\fR functions converts and external representation into an
+The \fBacl_fromtext()\fR function converts an external representation into an
 internal representation. See \fBDESCRIPTION\fR for details about external
 representation.
 .SH EXAMPLES
-.LP
 The following examples demonstrate how the API can be used to perform basic
 operations on ACLs.
 .LP
@@ -831,7 +826,6 @@ error = acl_strip("file", 10, 100, 0644);
 .in -2
 
 .SH SEE ALSO
-.LP
 \fBchgrp\fR(1), \fBchmod\fR(1), \fBchown\fR(1), \fBcp\fR(1), \fBcpio\fR(1),
 \fBfind\fR(1), \fBls\fR(1), \fBmv\fR(1), \fBtar\fR(1), \fBsetfacl\fR(1),
 \fBchmod\fR(2), \fBacl\fR(2), \fBstat\fR(2), \fBacl_get\fR(3SEC),
diff --git a/usr/src/man/man5/dhcp.5 b/usr/src/man/man5/dhcp.5
index 6a662bd6b1..33b8707449 100644
--- a/usr/src/man/man5/dhcp.5
+++ b/usr/src/man/man5/dhcp.5
@@ -4,11 +4,10 @@
 .\" 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 DHCP 5 "Aug 15, 2014"
+.TH DHCP 5 "Feb 13, 2020"
 .SH NAME
 dhcp \- Dynamic Host Configuration Protocol
 .SH DESCRIPTION
-.LP
 Dynamic Host Configuration Protocol (\fBDHCP\fR) enables host systems in a
 \fBTCP/IP\fR network to be configured automatically for the network as they
 boot. \fBDHCP\fR uses a client/server mechanism: servers store configuration
@@ -19,7 +18,6 @@ network services available to the client.
 This manual page provides a brief summary of the \fBDHCP\fR
 implementation.
 .SS "DHCP Client"
-.LP
 The DHCP client is implemented as background daemon,
 \fBdhcpagent\fR(1M).
 .LP
@@ -40,13 +38,11 @@ changing the tunables in the \fB/etc/default/dhcpagent\fR file. The daemon is
 controlled by the \fBifconfig\fR(1M) utility. Check the status of the daemon
 using the \fBnetstat\fR(1M) and \fBifconfig\fR(1M) commands.
 .SH SEE ALSO
-.LP
 \fBdhcpinfo\fR(1), \fBdhcpagent\fR(1M),
 \fBifconfig\fR(1M),
 \fBin.ndpd\fR(1M), \fBnetstat\fR(1M),
 \fBsyslog\fR(3C),
-\fBdhcp_network\fR(4), \fBdhcptab\fR(4), \fBdhcpsvc.conf\fR(4),
-\fBdhcp_inittab\fR(4), \fBndpd.conf\fR(4), \fBdhcp_modules\fR(5)
+\fBdhcp_inittab\fR(4), \fBndpd.conf\fR(4)
 .LP
 Alexander, S., and R. Droms. \fIRFC 2132, DHCP Options and BOOTP Vendor
 Extensions\fR. Silicon Graphics, Inc. Bucknell University. March 1997.