13830 Manual errors in SEE ALSO section
Reviewed by: Matt Fiddaman <illumos@m.fiddaman.uk>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
diff --git a/usr/src/man/man1/sum.1 b/usr/src/man/man1/sum.1
index f05fba6..256472c 100644
--- a/usr/src/man/man1/sum.1
+++ b/usr/src/man/man1/sum.1
@@ -44,24 +44,20 @@
 .\" Copyright (c) 1992, X/Open Company Limited  All Rights Reserved
 .\" Portions Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.TH SUM 1 "Aug 11, 2009"
+.TH SUM 1 "May 23, 2021"
 .SH NAME
 sum \- print checksum and block count for a file
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/bin/sum\fR [-abBchHlLpPrRstTw] [-x method] [\fIfile\fR...]
 .fi
 
 .SS "ksh93"
-.LP
 .nf
 sum [-abBchHlLpPrRstTw] [-x method] [\fIfile\fR...]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBsum\fR utility and ksh93 built-in command list the checksum, and for
 most methods the block count, for each file argument. The standard input is
 read if there are no file arguments.
@@ -108,8 +104,6 @@
 .RE
 
 .SH OPTIONS
-.sp
-.LP
 The following options are supported for \fB/usr/bin/sum\fR:
 .sp
 .ne 2
@@ -668,8 +662,6 @@
 .RE
 
 .SH OPERANDS
-.sp
-.LP
 The following operands are supported:
 .sp
 .ne 2
@@ -681,19 +673,13 @@
 .RE
 
 .SH USAGE
-.sp
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBsum\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of  \fBsum\fR: \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and
 \fBNLSPATH\fR.
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned.
 .sp
 .ne 2
@@ -714,8 +700,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -730,21 +714,16 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBcksum\fR(1), \fBgetconf\fR(1), \fBksh93\fR(1), \fBsum\fR(1B), \fBwc\fR(1),
-\fBzip\fR(1) , \fBlibmd\fR(3LIB), \fBattributes\fR(5), \fBenviron\fR(5),
+\fBcksum\fR(1), \fBdigest\fR(1), \fBgetconf\fR(1), \fBksh93\fR(1),
+\fBsum\fR(1B), \fBwc\fR(1),
+\fBzip\fR(1), \fBlibmd\fR(3LIB), \fBattributes\fR(5), \fBenviron\fR(5),
 \fBlargefile\fR(5)
 .SH DIAGNOSTICS
-.sp
-.LP
 \fBRead error\fR is indistinguishable from end of file on most devices. Check
 the block count.
 .SH NOTES
-.sp
-.LP
 Portable applications should use \fBcksum\fR(1). The default algorithm for this
 command is defined in the POSIX standard and is identical across platforms.
 .sp
 .LP
-\fBsum\fR and \fBusr/ucb/sum\fR (see \fBsum\fR(1B)) return different checksums.
+\fBsum\fR and \fB/usr/ucb/sum\fR (see \fBsum\fR(1B)) return different checksums.
diff --git a/usr/src/man/man1/uniq.1 b/usr/src/man/man1/uniq.1
index 0dd9a80..74d9908 100644
--- a/usr/src/man/man1/uniq.1
+++ b/usr/src/man/man1/uniq.1
@@ -45,12 +45,11 @@
 .\" Portions Copyright (c) 1982-2007 AT&T Knowledge Ventures
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
 .\"
-.TH UNIQ 1 "Mar 13, 2008"
+.TH UNIQ 1 "May 23, 2021"
 .SH NAME
 uniq \- report or filter out repeated lines in a file
 .SH SYNOPSIS
 .SS "/usr/bin/uniq"
-.LP
 .nf
 \fB/usr/bin/uniq\fR [\fB-c\fR | \fB-d\fR | \fB-u\fR] [\fB-f\fR \fIfields\fR] [\fB-s\fR \fIchar\fR]
      [\fIinput_file\fR [\fIoutput_file\fR]]
@@ -62,7 +61,6 @@
 .fi
 
 .SS "ksh93"
-.LP
 .nf
 \fBuniq\fR [\fB-cdiu\fR] [\fB-D\fR[\fIdelimit\fR]] [\fB-f\fR \fIfields\fR] [\fB-s\fR \fIchars\fR] [\fB-w\fR \fIchars\fR]
      [\fIinput_file\fR [\fIoutput_file\fR]]
@@ -75,8 +73,6 @@
 
 .SH DESCRIPTION
 .SS "/usr/bin/uniq"
-.sp
-.LP
 The \fBuniq\fR utility reads an input file comparing adjacent lines and writes
 one copy of each input line on the output. The second and succeeding copies of
 repeated adjacent input lines are not written.
@@ -84,8 +80,6 @@
 .LP
 Repeated lines in the input are not detected if they are not adjacent.
 .SS "ksh93"
-.sp
-.LP
 The \fBuniq\fR built-in in \fBksh93\fR is associated with the \fB/bin\fR or
 \fB/usr/bin path\fR. It is invoked when \fBuniq\fR is executed without a
 pathname prefix and the pathname search finds a \fB/bin/uniq\fR or
@@ -103,8 +97,6 @@
 the current offset.
 .SH OPTIONS
 .SS "/usr/bin/uniq"
-.sp
-.LP
 The following options are supported by \fB/usr/bin/uniq\fR:
 .sp
 .ne 2
@@ -187,8 +179,6 @@
 .RE
 
 .SS "ksh93"
-.sp
-.LP
 The following options are supported by the \fBuniq\fR built-in command is
 \fBksh93\fR:
 .sp
@@ -353,8 +343,6 @@
 .RE
 
 .SH OPERANDS
-.sp
-.LP
 The following operands are supported:
 .sp
 .ne 2
@@ -378,7 +366,6 @@
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUsing the \fBuniq\fR Command
 .sp
 .LP
@@ -442,14 +429,10 @@
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBuniq\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -470,13 +453,8 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .SS "/usr/bin/uniq"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -491,9 +469,6 @@
 .TE
 
 .SS "ksh93"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -508,7 +483,5 @@
 The \fBksh93\fR built-in binding to \fB/bin\fR and \fB/usr/bin\fR is Volatile.
 The built-in interfaces are Uncommitted.
 .SH SEE ALSO
-.sp
-.LP
-\fBcomm\fR(1), \fBksh93\fR(1), , \fBpcat\fR(1), \fBsort\fR(1),
-\fBuncompress\fR(1), \fBattributes\fR(5), \fBenviron\fR(5), \fBstandards\fR(5)
+\fBcomm\fR(1), \fBksh93\fR(1), \fBsort\fR(1),
+\fBattributes\fR(5), \fBenviron\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man1m/smrsh.1m b/usr/src/man/man1m/smrsh.1m
index e245fc3..40e3b5f 100644
--- a/usr/src/man/man1m/smrsh.1m
+++ b/usr/src/man/man1m/smrsh.1m
@@ -23,18 +23,15 @@
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT,    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF    USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON    ANY THEORY OF LIABILITY, WHETHER
 .\" IN CONTRACT, STRICT LIABILITY, OR TORT    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 .\" Copyright (c) 2009, Sun Microsystems, Inc.  All Rights Reserved.
-.TH SMRSH 1M "Nov 6, 1998"
+.TH SMRSH 1M "May 23, 2021"
 .SH NAME
 smrsh \- restricted shell for sendmail
 .SH SYNOPSIS
-.LP
 .nf
 \fBsmrsh\fR \fB-c\fR \fIcommand\fR
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBsmrsh\fR program is intended as a replacement for the \fBsh\fR command
 in the \fBprog\fR mailer in \fBsendmail\fR(1M) configuration files. The
 \fBsmrsh\fR program sharply limits commands that can be run using the
@@ -65,8 +62,6 @@
 directory (using the \fB#!\fR syntax); it simply disallows the execution of
 arbitrary programs.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -78,7 +73,6 @@
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/adm/sm.bin\fR\fR
@@ -88,6 +82,4 @@
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBsendmail\fR(1M), , \fBattributes\fR(5)
+\fBsendmail\fR(1M), \fBattributes\fR(5)
diff --git a/usr/src/man/man3c/isastream.3c b/usr/src/man/man3c/isastream.3c
index dbb864e..2dbcaa4 100644
--- a/usr/src/man/man3c/isastream.3c
+++ b/usr/src/man/man3c/isastream.3c
@@ -3,11 +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 ISASTREAM 3C "Jul 24, 2002"
+.TH ISASTREAM 3C "May 23, 2021"
 .SH NAME
 isastream \- test a file descriptor
 .SH SYNOPSIS
-.LP
 .nf
 #include <stropts.h>
 
@@ -15,19 +14,13 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-The  \fBisastream()\fR function determines if a file descriptor represents a
+The \fBisastream()\fR function determines if a file descriptor represents a
 STREAMS file. The \fIfildes\fR argument refers to an open file descriptor.
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful completion, \fBisastream()\fR returns \fB1\fR if \fIfildes\fR
 represents a STREAMS file, and \fB0\fR if it does not.  Otherwise, \fB\(mi1\fR
 is return and \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
-.LP
 The \fBisastream()\fR function will fail if:
 .sp
 .ne 2
@@ -39,8 +32,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -57,9 +48,7 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBattributes\fR(5), , \fBstandards\fR(5), \fBstreamio\fR(7I)
+\fBattributes\fR(5), \fBstandards\fR(5), \fBstreamio\fR(7I)
 .sp
 .LP
 \fISTREAMS Programming Guide\fR
diff --git a/usr/src/man/man3pool/pool_error.3pool b/usr/src/man/man3pool/pool_error.3pool
index a5c1f36..783c6b3 100644
--- a/usr/src/man/man3pool/pool_error.3pool
+++ b/usr/src/man/man3pool/pool_error.3pool
@@ -3,11 +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 POOL_ERROR 3POOL "Sep 23, 2003"
+.TH POOL_ERROR 3POOL "May 23, 2021"
 .SH NAME
 pool_error, pool_strerror \- error interface to resource pools library
 .SH SYNOPSIS
-.LP
 .nf
 cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lpool\fR [ \fIlibrary\fR\&.\|.\|. ]
 #include <pool.h>
@@ -21,8 +20,6 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBpool_error()\fR function returns the error value of the last failure
 recorded by the invocation of one of the functions of the resource pool
 configuration library, \fBlibpool\fR.
@@ -34,8 +31,6 @@
 .LP
 The following error codes can be returned by \fBpool_error()\fR:
 .SH RETURN VALUES
-.sp
-.LP
 The \fBpool_error()\fR function returns the current pool error value for the
 calling thread from among the following:
 .sp
@@ -138,8 +133,6 @@
 corresponding string, \(mi1 is returned and \fBerrno\fR is set to indicate the
 error.
 .SH ERRORS
-.sp
-.LP
 The \fBpool_strerror()\fR function will fail if:
 .sp
 .ne 2
@@ -151,8 +144,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -171,6 +162,4 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBerrno\fR(3C), \fBlibpool\fR(3LIB), pool_error(3POOL), \fBattributes\fR(5)
+\fBerrno\fR(3C), \fBlibpool\fR(3LIB), \fBattributes\fR(5)
diff --git a/usr/src/man/man5/ad.5 b/usr/src/man/man5/ad.5
index 7f87737..a614a55 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 @@
 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 @@
 .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 9d7ce16..0f9780a 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 @@
 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 @@
 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,11 +71,4 @@
 .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),
-\fBnative\fR(5), \fBprivileges\fR(5), \fBzones\fR(5), \fBlx_systrace\fR(7D),
-\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 d860f3b..8badc27 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 @@
 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 @@
 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),
diff --git a/usr/src/man/man7d/scsa2usb.7d b/usr/src/man/man7d/scsa2usb.7d
index 7a14176..e52a46f 100644
--- a/usr/src/man/man7d/scsa2usb.7d
+++ b/usr/src/man/man7d/scsa2usb.7d
@@ -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 SCSA2USB 7D "May 13, 2017"
+.TH SCSA2USB 7D "May 23, 2021"
 .SH NAME
 scsa2usb \- SCSI to USB bridge driver
 .SH SYNOPSIS
-.LP
 .nf
 \fBstorage@unit-address\fR
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBscsa2usb\fR driver is a \fBUSBA\fR (Solaris USB architecture) compliant
 nexus driver that supports the \fIUSB Mass Storage Bulk Only Transport
 Specification 1.0\fR and \fIUSB Control/Bulk/Interrupt (CBI) Transport
@@ -103,7 +101,6 @@
 Alternatively, you can disable automatic handling of a device as described in
 the following subsection.
 .SS "Using Volume Management"
-.LP
 Disk storage devices are managed by Volume Manager. Software that manages
 removable media creates a device nickname that can be listed with
 \fBeject\fR(1) or \fBrmmount\fR(1). A device that is not mounted automatically
@@ -130,7 +127,6 @@
 inserting a entry for a removable device in \fB/etc/vfstab\fR. In this entry,
 you must set the \fBmount at boot\fR field to \fBno\fR. See \fBvfstab\fR(4).
 .SS "Using \fBmount\fR and \fBumount\fR"
-.LP
 Use \fBmount\fR(1M) to explicitly mount the device and \fBumount\fR(1M) to
 unmount the device. Use \fBeject\fR(1) to eject the media. After you have
 explicitly mounted a removable device, you cannot use a nickname as an argument
@@ -142,20 +138,16 @@
 file system, then kill all applications accessing the device. Next, hot remove
 the device. A storage device can be hot inserted at any time.
 .SH DEVICE SPECIAL FILES
-.LP
 Disk block special file names are located in \fB/dev/dsk\fR, while raw file
 names are located in \fB/dev/rdsk\fR. Tape raw file names are located in
 \fB/dev/rmt\fR. Input/output requests to the devices must follow the same
 restrictions as those for SCSI disks or tapes. Refer to \fBsd\fR(7D) or
 \fBst\fR(7D).
 .SH IOCTLS
-.LP
 Refer to \fBdkio\fR(7I) and \fBcdio\fR(7I).
 .SH ERRORS
-.LP
 Refer to \fBsd\fR(7D) for disks or \fBst\fR(7D) for tapes.
 .SH FILES
-.LP
 The device special files for the USB mass storage device are created like those
 for a \fBSCSI\fR disk or SCSI tape. Refer to \fBsd\fR(7D) or \fBst\fR(7D).
 .sp
@@ -191,7 +183,7 @@
 .sp
 .ne 2
 .na
-\fB\fB/dev/rmt/[0- 127][l,m,h,u,c][b][n]\fR\fR
+\fB\fB/dev/rmt/[0-127][l,m,h,u,c][b][n]\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -232,16 +224,6 @@
 .sp
 .ne 2
 .na
-\fB\fB/kernel/drv/scsa2usb\fR\fR
-.ad
-.sp .6
-.RS 4n
-32-bit x86 ELF kernel module
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/kernel/drv/amd64/scsa2usb\fR\fR
 .ad
 .sp .6
@@ -270,7 +252,6 @@
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -285,7 +266,6 @@
 .TE
 
 .SH SEE ALSO
-.LP
 \fBcdrw\fR(1), \fBeject\fR(1), \fBrmformat\fR(1), \fBrmmount\fR(1),
 \fBcfgadm_scsi\fR(1M), \fBcfgadm_usb\fR(1M), \fBfdisk\fR(1M), \fBmount\fR(1M),
 \fBumount\fR(1M),
@@ -320,12 +300,11 @@
 SCSI Specification \fIT10/995D Revision 11a\fR \(em March 1997
 .sp
 .LP
-SCSI Specification\fIT10/1236-D Revision 20\fR \(em July 2001
+SCSI Specification \fIT10/1236-D Revision 20\fR \(em July 2001
 .sp
 .LP
-SCSI Specification\fIT10/1416-D Revision 23\fR \(em May 2005
+SCSI Specification \fIT10/1416-D Revision 23\fR \(em May 2005
 .SH DIAGNOSTICS
-.LP
 Refer to \fBsd\fR(7D) and \fBst\fR(7D).
 .sp
 .LP
@@ -451,7 +430,6 @@
 .RE
 
 .SH NOTES
-.LP
 The Zip 100 drive does not comply with \fIUniversal Serial Bus Specification
 1.0\fR and cannot be power managed. Power Management support for Zip 100 has
 been disabled.
diff --git a/usr/src/man/man7d/ufm.7d b/usr/src/man/man7d/ufm.7d
index 60fdfa9..ea3b7fa 100644
--- a/usr/src/man/man7d/ufm.7d
+++ b/usr/src/man/man7d/ufm.7d
@@ -12,7 +12,7 @@
 .\" Copyright 2019 Joyent, Inc.
 .\" Copyright 2020 Oxide Computer Company
 .\"
-.Dd June 9, 2020
+.Dd May 23, 2021
 .Dt UFM 7D
 .Os
 .Sh NAME
@@ -307,6 +307,6 @@
 .Sy Evolving
 .Sh SEE ALSO
 .Xr ddi_ufm 9E ,
-.Xr ddi_ufm_image 9E ,
-.Xr ddi_ufm_slot 9E ,
-.Xr ddi_ufm 9F
+.Xr ddi_ufm 9F ,
+.Xr ddi_ufm_image 9F ,
+.Xr ddi_ufm_slot 9F
diff --git a/usr/src/man/man9f/ddi_devid_compare.9f b/usr/src/man/man9f/ddi_devid_compare.9f
index 085d455..dec1f16 100644
--- a/usr/src/man/man9f/ddi_devid_compare.9f
+++ b/usr/src/man/man9f/ddi_devid_compare.9f
@@ -3,14 +3,13 @@
 .\" 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 DDI_DEVID_COMPARE 9F "May 21, 2009"
+.TH DDI_DEVID_COMPARE 9F "May 23, 2021"
 .SH NAME
 ddi_devid_compare, ddi_devid_free, ddi_devid_init, ddi_devid_register,
 ddi_devid_sizeof, ddi_devid_str_decode, ddi_devid_str_encode,
 ddi_devid_str_free, ddi_devid_get, ddi_devid_unregister, ddi_devid_valid \-
 kernel interfaces for device ids
 .SH SYNOPSIS
-.LP
 .nf
 \fBint\fR \fBddi_devid_compare\fR(\fBddi_devid_t\fR \fIdevid1\fR, \fBddi_devid_t\fR \fIdevid2\fR);
 .fi
@@ -68,7 +67,6 @@
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIdevid\fR\fR
@@ -201,12 +199,8 @@
 .RE
 
 .SH INTERFACE LEVEL
-.sp
-.LP
 Solaris DDI specific (Solaris DDI).
 .SH DESCRIPTION
-.sp
-.LP
 The following routines are used to provide unique identifiers, device
 \fBID\fRs, for devices. Specifically, kernel modules use these interfaces to
 identify and locate devices, independent of the device's physical connection or
@@ -301,8 +295,6 @@
 the \fBddi_devid\fR functions (the \fBddi_devid_str_encode()\fR function return
 value and the returned \fIretminor_name\fR argument).
 .SH RETURN VALUES
-.sp
-.LP
 \fBddi_devid_init()\fR returns the following values:
 .sp
 .ne 2
@@ -526,13 +518,9 @@
 .RE
 
 .SH CONTEXT
-.sp
-.LP
 These functions can be called from a user or kernel context.
 .SH SEE ALSO
-.sp
-.LP
-\fBdevid_get\fR(3DEVID), , \fBlibdevid\fR(3LIB), \fBattributes\fR(5),
+\fBdevid_get\fR(3DEVID), \fBlibdevid\fR(3LIB), \fBattributes\fR(5),
 \fBattach\fR(9E), \fBdetach\fR(9E), \fBkmem_free\fR(9F)
 .sp
 .LP
diff --git a/usr/src/man/man9p/pm-components.9p b/usr/src/man/man9p/pm-components.9p
index caaf137..c080397 100644
--- a/usr/src/man/man9p/pm-components.9p
+++ b/usr/src/man/man9p/pm-components.9p
@@ -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 PM-COMPONENTS 9P "Jan 6, 2004"
+.TH PM-COMPONENTS 9P "May 23, 2021"
 .SH NAME
 pm-components \- Power Management device property
 .SH DESCRIPTION
-.sp
-.LP
 A device is power manageable if the power consumption of the device can be
 reduced when it is idle. In general, a power manageable device consists of a
 number of power manageable hardware units called components. Each component is
@@ -79,8 +77,6 @@
 value of 0 is used, it must be the first one listed for that component. A power
 level value of 0 has a special meaning (off) to the Power Management framework.
 .SH EXAMPLES
-.sp
-.LP
 An example of a \fBpm-components\fR entry from the \fB\&.conf\fR file of a
 driver which implements a single power managed component consisting of a disk
 spindle motor is shown below. This is component 0 and it supports 2 power
@@ -130,7 +126,7 @@
 .in +2
 .nf
 pm-components="NAME=Frame Buffer", "0=Off"
- 	"1=Suspend", "2=Standby", "3=On",
+	"1=Suspend", "2=Standby", "3=On",
 		"NAME=Monitor", "0=Off", "1=Suspend", "2=Standby,"
 		"3=On;
 .fi
@@ -138,8 +134,6 @@
 .sp
 
 .SH ATTRIBUTES
-.sp
-.LP
 See attributes(5) for descriptions of the following attributes:
 .sp
 
@@ -154,10 +148,8 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBpower.conf\fR(4), \fBpm\fR(7D), \fBattach\fR(9E), \fBdetach\fR(9E),
-\fBddi_prop_update_string_array\fR(9F) \fBpm_busy_component\fR(9F),
+\fBddi_prop_update_string_array\fR(9F), \fBpm_busy_component\fR(9F),
 \fBpm_idle_component\fR(9F)
 .sp
 .LP