[illumos-gate merge]

commit 6027b8601527b83fd174dc857073dfd37e9a3de8
    13397 ls calls time() many more times than necessary
commit 9dd2e6b590a600c51a70c5d4c872d4cdeedc9aab
    13830 Manual errors in SEE ALSO section

Conflicts:
    usr/src/man/man5/brands.5

3 files changed, 7 insertions, 24 deletions

diff --git a/usr/src/man/man5/ad.5 b/usr/src/man/man5/ad.5
index 7f8773717d..a614a553be 100644
--- a/usr/src/man/man5/ad.5
+++ b/usr/src/man/man5/ad.5
@@ -3,12 +3,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 AD 5 "Oct 22, 2008"
+.TH AD 5 "May 23, 2021"
 .SH NAME
 ad \- Active Directory as a naming repository
 .SH DESCRIPTION
-.sp
-.LP
 Solaris clients can obtain naming information from Active Directory (AD)
 servers.
 .sp
@@ -41,7 +39,6 @@ The client uses the SASL/GSSAPI/KRB5 security model. The \fBkclient\fR utility
 is used to join the client to AD. During the join operation, \fBkclient\fR
 configures Kerberos v5 on the client. See \fBkclient\fR(1M).
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/nsswitch.conf\fR\fR
@@ -70,8 +67,6 @@ Name service switch module for AD.
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBpasswd\fR(1), \fBsvcs\fR(1), \fBidmap\fR(1M), \fBidmapd\fR(1M),
-\fBkclient\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M), \fBsvccfg\fR(1M),
+\fBkclient\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
 \fBnsswitch.conf\fR(4), \fBuser_attr\fR(4), \fBsmf\fR(5)
diff --git a/usr/src/man/man5/brands.5 b/usr/src/man/man5/brands.5
index cc79ac173a..0f9780aafd 100644
--- a/usr/src/man/man5/brands.5
+++ b/usr/src/man/man5/brands.5
@@ -3,12 +3,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 BRANDS 5 "Jul 29, 2009"
+.TH BRANDS 5 "May 23, 2021"
 .SH NAME
 brands \- alternate operating environments for non-global zones
 .SH DESCRIPTION
-.sp
-.LP
 The branded zone (BrandZ) framework extends the Solaris Zones infrastructure
 described in \fBzones\fR(5) to include the creation of brands, which provide
 non-global zones that contain non-native operating environments.
@@ -52,8 +50,6 @@ The zoneadm tool (see \fBzoneadm\fR(1M)) is used to report a zone's brand type
 and administer the zone.
 .RE
 .SS "Device Support"
-.sp
-.LP
 The devices supported by each zone are documented in the man pages and other
 documentation for that brand. The zones infrastructure detects any attempt to
 add an unsupported device and issues a warning to the administrator. If the
@@ -61,8 +57,6 @@ administrator chooses to add an unsupported device despite that warning, that
 device might or might not work as expected. The configuration will be untested
 and unsupported.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
 
@@ -77,10 +71,4 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBmdb\fR(1), \fBzlogin\fR(1), \fBzonename\fR(1), \fBdtrace\fR(1M),
-\fBin.rlogind\fR(1M), \fBsshd\fR(1M), \fBzoneadm\fR(1M), \fBzonecfg\fR(1M),
-\fBkill\fR(2), \fBpriocntl\fR(2), \fBgetzoneid\fR(3C), \fBucred_get\fR(3C),
-\fBgetzoneid\fR(3C), \fBproc\fR(4), \fBattributes\fR(5), \fBlx\fR(5),
-\fBprivileges\fR(5), \fBzones\fR(5), \fBcrgetzoneid\fR(9F)
+\fBzoneadm\fR(1M), \fBzonecfg\fR(1M), \fBattributes\fR(5), \fBzones\fR(5)
diff --git a/usr/src/man/man5/zones.5 b/usr/src/man/man5/zones.5
index d860f3b290..8badc27d3b 100644
--- a/usr/src/man/man5/zones.5
+++ b/usr/src/man/man5/zones.5
@@ -5,7 +5,7 @@
 .\" 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]
 .\"
 .\" Copyright 2020 Joyent, Inc.
-.TH ZONES 5 "Jan 29, 2009"
+.TH ZONES 5 "May 23, 2021"
 .SH NAME
 zones \- Solaris application containers
 .SH DESCRIPTION
@@ -26,7 +26,7 @@ You can configure and administer zones with the \fBzoneadm\fR(1M) and
 install file system contents including software packages into the zone, and
 manage the runtime state of the zone. You can use the \fBzlogin\fR(1) to run
 commands within an active zone. You can do this without logging in through a
-network-based login server such as \fBin.rlogind\fR(1M) or \fBsshd\fR(1M).
+network-based login server such as \fBsshd\fR(1M).
 .sp
 .LP
 The autobooting of zones is enabled and disabled by the zones service,
@@ -234,7 +234,7 @@ zone emulates a host identifier, then commands such as \fBhostid\fR(1) and
 display or return the zone's emulated host identifier rather than the host
 machine's identifier.
 .SH SEE ALSO
-\fBhostid\fR(1), \fBzlogin\fR(1), \fBzonename\fR(1), \fBin.rlogind\fR(1M),
+\fBhostid\fR(1), \fBzlogin\fR(1), \fBzonename\fR(1),
 \fBsshd\fR(1M), \fBsysdef\fR(1M), \fBzoneadm\fR(1M), \fBzonecfg\fR(1M),
 \fBkill\fR(2), \fBpriocntl\fR(2), \fBsysinfo\fR(2), \fBgethostid\fR(3C),
 \fBgetzoneid\fR(3C), \fBucred_get\fR(3C), \fBnfs\fR(4), \fBproc\fR(4),