13890 Some manual pages miss spaces next to formatting

Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Richard Lowe <richlowe@richlowe.net>

45 files changed, 235 insertions, 679 deletions

diff --git a/usr/src/man/man1/kinit.1 b/usr/src/man/man1/kinit.1
index 59004dcd9c..e3fbbc1eb6 100644
--- a/usr/src/man/man1/kinit.1
+++ b/usr/src/man/man1/kinit.1
@@ -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 KINIT 1 "Nov 12, 2008"
+.TH KINIT 1 "June 20, 2021"
 .SH NAME
 kinit \- obtain and cache Kerberos ticket-granting ticket
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/bin/kinit\fR [\fB-ARvV\fR] [\fB-p\fR | \fB-P\fR] [\fB-f\fR | \fB-F\fR] [\fB-a\fR] [\fB-c\fR \fIcache_name\fR]
      [\fB-k\fR [\fB-t\fR \fIkeytab_file\fR]] [\fB-l\fR \fIlifetime\fR]
@@ -17,7 +16,6 @@ kinit \- obtain and cache Kerberos ticket-granting ticket
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBkinit\fR command is used to obtain and cache an initial ticket-granting
 ticket (credential) for \fIprincipal\fR. This ticket is used for authentication
 by the Kerberos system. Only users with Kerberos principals can use the
@@ -46,7 +44,6 @@ Kerberos configuration file for \fIlifetime\fR and \fIrenewable_life\fR.
 The \fBkdestroy\fR(1) command can be used to destroy any active tickets before
 you end your login session.
 .SH OPTIONS
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -306,7 +303,7 @@ Valid URI types are \fBFILE\fR, \fBDIR\fR, \fBPKCS11\fR, \fBPKCS12\fR, and
 .RS 27n
 Specifies where to find trusted X509 anchor information.
 .sp
-Valid URI types are \fBFILE\fR and \fBDIR\fR. See the\fBPKINIT URI Types\fR
+Valid URI types are \fBFILE\fR and \fBDIR\fR. See the \fBPKINIT URI Types\fR
 section for details.
 .RE
 
@@ -338,7 +335,7 @@ This option has context-specific behavior.
 \fIfile-name\fR specifies the name of a PEM-format file containing the user's
 certificate. If \fIkey-file-name\fR is not specified, the user's private key is
 expected to be in \fIfile-name\fR as well. Otherwise, \fIkey-file-name\fR is
-the name of the file  containing the private key.
+the name of the file containing the private key.
 .RE
 
 .sp
@@ -431,7 +428,6 @@ been set to \fBFILE:/tmp/my_proxy.pem\fR.
 .RE
 
 .SS "Time Formats"
-.LP
 The following absolute time formats can be used for the \fB-s\fR
 \fIstart_time\fR option. The examples are based on the date and time of July 2,
 1999, 1:35:30 p.m.
@@ -524,7 +520,6 @@ Variable	Description
 .TE
 
 .SH ENVIRONMENT VARIABLES
-.LP
 \fBkinit\fR uses the following environment variable:
 .sp
 .ne 2
@@ -565,7 +560,6 @@ Default location for the local host's configuration file. See
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -583,11 +577,9 @@ Interface Stability	See below.
 .LP
 The command arguments are Evolving. The command output is Unstable.
 .SH SEE ALSO
-.LP
 \fBkdestroy\fR(1), \fBklist\fR(1), \fBkadmin\fR(1M), \fBktkt_warnd\fR(1M),
 \fBlibpkcs11\fR(3LIB), \fBkdc.conf\fR(4), \fBkrb5.conf\fR(4),
 \fBattributes\fR(5), \fBkerberos\fR(5), \fBkrb5envvar\fR(5), \fBpam_krb5\fR(5)
 .SH NOTES
-.LP
 On success, \fBkinit\fR notifies \fBktkt_warnd\fR(1M) to alert the user when
 the initial credentials (ticket-granting ticket) are about to expire.
diff --git a/usr/src/man/man1/krb5-config.1 b/usr/src/man/man1/krb5-config.1
index cdd2889c9d..ddb90409b0 100644
--- a/usr/src/man/man1/krb5-config.1
+++ b/usr/src/man/man1/krb5-config.1
@@ -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 KRB5-CONFIG 1 "Aug 24, 2009"
+.TH KRB5-CONFIG 1 "June 20, 2021"
 .SH NAME
 krb5-config \- link against the installed Kerberos libraries
 .SH SYNOPSIS
-.LP
 .nf
 \fBkrb5-config\fR
      [\fB--all\fR | \fB--cflags\fR | \fB--exec-prefix\fR | \fB--help\fR | \fB--libs\fR \fIlibrary\fR |
@@ -15,13 +14,9 @@ krb5-config \- link against the installed Kerberos libraries
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBkrb5-config\fR identifies and displays the special flags that are needed to
 compile and link programs against the installed Kerberos libraries.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -109,7 +104,6 @@ Displays the version of the installed Kerberos implementation.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUsing the \fB--cflags\fR Option
 .sp
 .LP
@@ -126,7 +120,7 @@ The following example displays the C compiler flags needed to use
 .sp
 
 .LP
-\fBExample 2 \fRUsing the\fB--libs\fR Option
+\fBExample 2 \fRUsing the \fB--libs\fR Option
 .sp
 .LP
 The following example shows the C compiler options needed to link against
@@ -142,8 +136,6 @@ The following example shows the C compiler options needed to link against
 .sp
 
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -164,8 +156,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -180,6 +170,4 @@ Interface Stability	Volatile
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBlibgss\fR(3LIB), \fBlibkrb5\fR(3LIB), \fBattributes\fR(5)
diff --git a/usr/src/man/man1/login.1 b/usr/src/man/man1/login.1
index 601a041839..f841672f53 100644
--- a/usr/src/man/man1/login.1
+++ b/usr/src/man/man1/login.1
@@ -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 LOGIN 1 "Feb 25, 2017"
+.TH LOGIN 1 "June 20, 2021"
 .SH NAME
 login \- sign on to the system
 .SH SYNOPSIS
-.LP
 .nf
 \fBlogin\fR [\fB-p\fR] [\fB-d\fR \fIdevice\fR] [\fB-R\fR \fIrepository\fR] [\fB-s\fR \fIservice\fR]
      [\fB-t\fR \fIterminal\fR] [\fB-u\fR \fIidentity\fR] [\fB-U\fR \fIruser\fR]
@@ -17,7 +16,6 @@ login \- sign on to the system
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBlogin\fR command is used at the beginning of each terminal session to
 identify oneself to the system. \fBlogin\fR is invoked by the system when a
 connection is first established, after the previous user has terminated the
@@ -168,7 +166,6 @@ To enable remote logins by root, edit the \fB/etc/default/login\fR file by
 inserting a \fB#\fR (pound sign) before the \fBCONSOLE=/dev/console\fR entry.
 See FILES.
 .SH SECURITY
-.LP
 For accounts in name services which support automatic account locking, the
 account can be configured to be automatically locked (see \fBuser_attr\fR(4)
 and \fBpolicy.conf\fR(4)) if successive failed login attempts equals or exceeds
@@ -221,7 +218,6 @@ can be prompted for multiple passwords.
 When \fBlogin\fR is invoked through \fBrlogind\fR or \fBtelnetd\fR, the service
 name used by \fBPAM\fR is \fBrlogin\fR or \fBtelnet\fR, respectively.
 .SH OPTIONS
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -317,7 +313,6 @@ line parameter. Normally (non-Kerberos authenticated \fBrlogin\fR), the
 .RE
 
 .SH EXIT STATUS
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -638,7 +633,7 @@ Sets the initial shell file creation mode mask. See \fBumask\fR(1).
 .RS 24n
 Determines whether the \fBsyslog\fR(3C) \fBLOG_AUTH\fR facility should be used
 to log all root logins at level \fBLOG_NOTICE\fR and multiple failed login
-attempts at\fBLOG_CRIT\fR.
+attempts at \fBLOG_CRIT\fR.
 .RE
 
 .sp
@@ -698,7 +693,6 @@ before a failed login message is logged, using the \fBsyslog\fR(3C)
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -713,7 +707,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.LP
 \fBcsh\fR(1), \fBexit\fR(1), \fBksh\fR(1), \fBksh93\fR(1), \fBmail\fR(1),
 \fBmailx\fR(1), \fBnewgrp\fR(1), \fBpasswd\fR(1), \fBrlogin\fR(1),
 \fBrsh\fR(1), \fBsh\fR(1), \fBshell_builtins\fR(1), \fBtelnet\fR(1),
@@ -782,7 +775,6 @@ The machine is in the process of being shut down and logins have been disabled.
 .RE
 
 .SH WARNINGS
-.LP
 Users with a \fBUID\fR greater than 76695844 are not subject to password aging,
 and the system does not record their last login time.
 .sp
@@ -791,7 +783,6 @@ If you use the \fBCONSOLE\fR setting to disable root logins, you should arrange
 that remote command execution by root is also disabled. See \fBrsh\fR(1),
 \fBrcmd\fR(3SOCKET), and \fBhosts.equiv\fR(4) for further details.
 .SH NOTES
-.LP
 The \fBpam_unix\fR(5) module is no longer supported. Similar functionality is
 provided by \fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5),
 \fBpam_unix_session\fR(5), \fBpam_authtok_check\fR(5),
diff --git a/usr/src/man/man1/vacation.1 b/usr/src/man/man1/vacation.1
index 744de3ff18..82cb694c27 100644
--- a/usr/src/man/man1/vacation.1
+++ b/usr/src/man/man1/vacation.1
@@ -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 VACATION 1 "May 13, 2017"
+.TH VACATION 1 "June 20, 2021"
 .SH NAME
 vacation \- reply to mail automatically
 .SH SYNOPSIS
-.LP
 .nf
 \fBvacation\fR [\fB-I\fR]
 .fi
@@ -25,10 +24,8 @@ vacation \- reply to mail automatically
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBvacation\fR utility automatically replies to incoming mail.
 .SS "Installation"
-.LP
 The installation consists of an interactive program which sets up
 \fBvacation\fR's basic configuration.
 .sp
@@ -66,25 +63,20 @@ The program automatically creates \fB\&.vacation.pag\fR and
 \fB\&.vacation.dir\fR, which contain a list of senders when \fBvacation\fR is
 enabled.
 .SS "Activation and Deactivation"
-.LP
 The presence of the \fB\&.forward\fR file determines whether or not
 \fBvacation\fR is disabled or enabled. To disable \fBvacation\fR, remove the
 \fB\&.forward\fR file, or move it to a new name.
 .SS "Initialization"
-.LP
 The \fB-I\fR option clears the \fBvacation\fR log files, \fB\&.vacation.pag\fR
 and \fB\&.vacation.dir\fR, erasing the list of senders from a previous
 \fBvacation\fR session. (See OPTIONS section.)
 .SS "Additional Configuration"
-.LP
 \fBvacation\fR provides configuration options that are not part of the
 installation, these being \fB-a\fR, \fB-e\fR, \fB-f\fR, \fB-j\fR, \fB-m\fR,
 \fB-s\fR, and \fB-t\fR. (See OPTIONS section.)
 .SS "Reporting"
-.LP
 \fBvacation\fR provides a reporting option, \fB-l\fR. See \fBOPTIONS\fR.
 .SH OPTIONS
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -191,8 +183,8 @@ Changes the interval between repeat replies to the same sender. The default is
 
 .sp
 .LP
-The \fB-l\fR option is neither for initialization nor configuration., but for
-reporting. The \fB-f\fRoption can also be used in conjunction with the
+The \fB-l\fR option is neither for initialization nor configuration, but for
+reporting. The \fB-f\fR option can also be used in conjunction with
 \fB-l\fR.
 .sp
 .ne 2
@@ -205,7 +197,6 @@ of \fBvacation -I\fR, along with a date and time stamp.
 .RE
 
 .SH USAGE
-.LP
 \fB\&.vacation.msg\fR should include a header with at least a \fBSubject:\fR
 line (it should not include a \fBTo:\fR line). For example:
 .sp
@@ -214,7 +205,7 @@ line (it should not include a \fBTo:\fR line). For example:
 \fBSubject: I am on vacation
 I am on vacation until July 22.  If you have something urgent,
 please contact Joe Jones (jones@fB0).
-   	--John\fR
+	--John\fR
 .fi
 .in -2
 .sp
@@ -232,7 +223,7 @@ I am on vacation until July 22.
 Your mail regarding "$SUBJECT" will be read when I return.
 If you have something urgent, please contact
 Joe Jones (jones@fB0).
-   	--John\fR
+	--John\fR
 .fi
 .in -2
 .sp
@@ -287,7 +278,6 @@ anotherfriend@herisp.com
 .LP
 Blank lines and lines starting with "\fB#\fR" are ignored.
 .SH FILES
-.LP
 \fB~/.forward\fR
 .sp
 .LP
@@ -301,6 +291,5 @@ A list of senders is kept in the \fBdbm\fR format files \fB\&.vacation.pag\fR
 and \fB\&.vacation.dir\fR in your home directory. These files are \fBdbm\fR
 files and cannot be viewed directly with text editors.
 .SH SEE ALSO
-.LP
 \fBvi\fR(1), \fBsendmail\fR(1M), \fBgetusershell\fR(3C),
 \fBaliases\fR(4), \fBshells\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1b/lpc.1b b/usr/src/man/man1b/lpc.1b
index 5f6a570001..820d144f88 100644
--- a/usr/src/man/man1b/lpc.1b
+++ b/usr/src/man/man1b/lpc.1b
@@ -1,17 +1,15 @@
 '\" te
 .\" Copyright (c) 1983 Regents of the University of California. All rights reserved. The Berkeley software License Agreement specifies the terms and conditions for redistribution.
 .\" Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
-.TH LPC 1B "Feb 25, 2017"
+.TH LPC 1B "June 20, 2021"
 .SH NAME
 lpc \- line printer control program
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/ucb/lpc\fR [\fIcommand\fR [\fIparameter\fR...]]
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBlpc\fR utility controls the operation of local printers.
 .sp
 .LP
@@ -50,7 +48,6 @@ arguments causes it to run interactively, prompting the user for \fBlpc\fR
 commands with \fBlpc>\fR. By redirecting the standard input, \fBlpc\fR can read
 commands from a file.
 .SH USAGE
-.LP
 \fBlpc\fR commands can be typed in their entirety or abbreviated to an
 unambiguous substring. Some \fBlpc\fR commands are available to all users;
 others are available only to super-users.
@@ -134,7 +131,7 @@ names.
 .sp .6
 .RS 4n
 Turns off the print queue for \fIprinter\fR. Prevents new printer jobs from
-being entered into the print queue for \fIprinter\fRby \fBlpr\fR(1B). \fBall\fR
+being entered into the print queue for \fIprinter\fR by \fBlpr\fR(1B). \fBall\fR
 specifies that this command is performed on all locally attached printers.
 \fIprinter\fR indicates this command is performed on specific printers. Specify
 \fIprinter\fR as an atomic name. See \fBprinters.conf\fR(4) for information
@@ -247,7 +244,6 @@ conventions for atomic names.
 .RE
 
 .SH EXIT STATUS
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -304,7 +300,6 @@ LDAP version of \fB/etc/printers.conf\fR
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -319,16 +314,13 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.LP
 \fBlpq\fR(1B), \fBlpr\fR(1B), \fBlprm\fR(1B), \fBlpstat\fR(1),
 \fBlpsched\fR(1M), \fBlpshut\fR(1M), \fBsvcadm\fR(1M), \fBprinters.conf\fR(4),
 \fBattributes\fR(5)
 .SH DIAGNOSTICS
-.LP
 Use the \fBsvcs\fR(1) utility to check if \fBsvc:/application/print/server\fR
 is running. If it is not running, use \fBsvcadm enable
 svc:/application/print/server\fR to start \fBlpsched\fR. See \fBsvcadm\fR(1M).
 .SH NOTES
-.LP
 When IPP is in use, the user is prompted for a passphrase if the remote print
 service is configured to require authentication.
diff --git a/usr/src/man/man1m/cfgadm_pci.1m b/usr/src/man/man1m/cfgadm_pci.1m
index ebed12b823..f89982cbbb 100644
--- a/usr/src/man/man1m/cfgadm_pci.1m
+++ b/usr/src/man/man1m/cfgadm_pci.1m
@@ -3,12 +3,11 @@
 .\" 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 CFGADM_PCI 1M "April 9, 2016"
+.TH CFGADM_PCI 1M "June 20, 2021"
 .SH NAME
 cfgadm_pci \- PCI, CompactPCI, and PCI Express Hotplug hardware specific
 commands for cfgadm
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/sbin/cfgadm\fR [\fB-f\fR] [\fB-y\fR | \fB-n\fR] [\fB-v\fR]
      [\fB-o\fR \fIhardware_options\fR] \fB-c\fR \fIfunction\fR \fIap_id\fR [\fIap_id\fR]
@@ -39,12 +38,11 @@ commands for cfgadm
 .fi
 
 .SH DESCRIPTION
-.LP
 The PCI hardware specific library, \fB/usr/lib/cfgadm/pci.so.1\fR, provides the
 support for hot plugging PCI, CompactPCI, and PCI Express adapter cards into
 the respective hot pluggable slots in a system that is hot plug capable,
 through the \fBcfgadm\fR command (see \fBcfgadm\fR(1M)). Hot plug
-administrative models between PCI, CompactPCI, and  PCI Express remain the same
+administrative models between PCI, CompactPCI, and PCI Express remain the same
 except where noted in this document.
 .sp
 .LP
@@ -75,7 +73,6 @@ Note that the \fBap_type\fR is not the same as the information in the
 .LP
 See the \fI\fR for a detailed description of the hot plug procedure.
 .SS "PCI Express ap_id naming"
-.LP
 For attachment points located in a PCI Express hierarchy (that is, the parent
 or an ancestor is a PCI Express device), including attachment points which are
 not PCI Express devices themselves, the following naming scheme is used:
@@ -114,7 +111,7 @@ is the PCI device number in standard PCI nomenclature.
 .LP
 First, an \fIabsolute-slot-path\fR is constructed that attempts to describe the
 attachment point's topological location in more physically identifiable terms
-for the user . This \fIabsolute-slot-path\fR consists of \fIslot-path\fR
+for the user. This \fIabsolute-slot-path\fR consists of \fIslot-path\fR
 components each separated by a ":" (colon). The leaf or left-most
 \fIslot-path\fR component describes the device of the attachment point itself
 while its right adjacent \fIslot-path\fR component up to the right or top-most
@@ -167,7 +164,7 @@ Each \fIslot-id\fR consists of one of three possible forms:
 .sp
 .LP
 The precedence of which form to select flows from the lowest form number to the
-highest form number, or from top to bottowm as described above. If a form
+highest form number, or from top to bottom as described above. If a form
 cannot be successfully constructed, then the next numerically higher form is
 attempted.
 .sp
@@ -250,7 +247,7 @@ form, "slot-id form (3)", of the last \fIslot_path\fR component is used
 .LP
 Whichever final \fIap_id\fR name is used, the \fIabsolute-slot-path\fR is
 stored in the Information ("info") field which can be displayed using the
-\fB-s\fR or \fB-v\fRoptions. This information can be used to physically locate
+\fB-s\fR or \fB-v\fR options. This information can be used to physically locate
 any \fIap_id\fRs named using "ap_id form (2)" or "ap_id form (3)". The
 \fIabsolute-slot-path\fR is transformed slightly when stored in the information
 field, by the replacement of a colon (":") with forward slashes ("/") to more
@@ -261,7 +258,6 @@ right-most \fIslot-path\fR component up to the onboard host slot.
 .LP
 See the EXAMPLES section for a list of hotpluggable examples.
 .SH OPTIONS
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -410,7 +406,7 @@ attachment point's absolute slot path location, including any hardware or
 platform specific labeling information for each component in the slot path.
 Each component in the slot path will be separated by a "/" (forward slash). See
 the PCI Express ap_id naming section. For PCI Hot Plug attachment points not
-located in a PCI Express hieararchy, the \fBInformation\fR field will be the
+located in a PCI Express hierarchy, the \fBInformation\fR field will be the
 slot's system label, if any. This string will be obtained from the
 \fBslot-name\fR property of the slot's bus node. The information in the Type
 field is printed with or without the \fB-v\fR option. The occupant \fBType\fR
@@ -441,7 +437,7 @@ multi-functional device, \fBMULT\fR will get printed instead.
 .sp
 \fIboard\fR is a string representing the board type of the device. For example,
 hp is the string used for a PCI Hot Plug adapter, hs is used for a Hot Swap
-Board, nhs for a Non\(emHot Swap cPCI Board,  bhs for a Basic Hot Swap cPCI
+Board, nhs for a Non\(emHot Swap cPCI Board, bhs for a Basic Hot Swap cPCI
 Board, and fhs for a Full Hot Swap cPCI Board.
 .sp
 Most PCI cards with more than one device are not multi-function devices, but
@@ -571,7 +567,6 @@ example# \fBcfgadm -x led=active,mode=on pci0:hpc0_slot3\fR
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRPrinting out the Value of Each Slot
 .sp
 .LP
@@ -716,7 +711,7 @@ iou#0-pci#3:iobBADF.pci2       Location: iou#0-pci#3/iobBADF.pci2
 .LP
 In this example, the "iou#0-pci#[0-3]" represents the top-most hotpluggable
 slots in the system. Since the "iou#<n>-pci#<n>" form does not match any of the
-forms stated in the grammar specification section described earilier, we can
+forms stated in the grammar specification section described earlier, we can
 infer that such a name for the base component in this hotplug topology is
 derived from the platform through the "slot-names" property.
 
@@ -928,7 +923,7 @@ length limit, and the leaf \fIslot-path\fR component is not globally unique,
 The default form or "slot-id form (3)" of the leaf component
 ".../iob.pcie1"represents a PCI Express slot with device number 0, bound to
 driver instance 20 of "px_pci". Likewise, the default form of the leaf
-component ".../iob.pcie2" represents a  PCI Express slot with device number 0,
+component ".../iob.pcie2" represents a PCI Express slot with device number 0,
 bound to driver instance 21 of "px_pci"
 
 .SH FILES
@@ -942,7 +937,6 @@ Hardware specific library for PCI hot plugging.
 .RE
 
 .SH SEE ALSO
-.LP
 \fBcfgadm\fR(1M), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
 \fBattributes\fR(5)
 .sp
diff --git a/usr/src/man/man1m/datadm.1m b/usr/src/man/man1m/datadm.1m
index 929714d912..ca16dff943 100644
--- a/usr/src/man/man1m/datadm.1m
+++ b/usr/src/man/man1m/datadm.1m
@@ -3,18 +3,16 @@
 .\" 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 DATADM 1M "May 13, 2017"
+.TH DATADM 1M "June 20, 2021"
 .SH NAME
 datadm \- maintain DAT static registry file
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/bin/datadm\fR [\fB-v\fR] [\fB-u\fR] [\fB-a\fR service_provider.conf]
      [\fB-r\fR service_provider.conf]
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBdatadm\fR utility maintains the DAT static registry file,
 \fBdat.conf\fR(4).
 .sp
@@ -29,7 +27,6 @@ a system after its installation. You can use \fBdatadm\fR to update the
 interface adapters for all the service providers currently installed is
 regenerated.
 .SH OPTIONS
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -73,7 +70,6 @@ Display the DAT static registry file, \fBdat.conf\fR.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fREnumerating a Device Entry
 .sp
 .LP
@@ -115,8 +111,8 @@ each port, there are two IPoIB device instances, \fBibd0\fR and \fBibd1\fR:
 .sp
 .LP
 Running the command, \fBdatadm -a /usr/share/dat/SUNWudaplt.conf\fR appends two
-new entries (if they do not already exists]) in the
-\fB/etc/dat/dat.conf\fRfile:
+new entries (if they do not already exist) in the
+\fB/etc/dat/dat.conf\fR file:
 
 .sp
 .in +2
@@ -181,7 +177,6 @@ DAT static registry file
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -196,6 +191,5 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.LP
 \fBlibdat\fR(3LIB), \fBdat.conf\fR(4),
 \fBservice_provider.conf\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/dladm.1m b/usr/src/man/man1m/dladm.1m
index d6050c5114..c242d38ac2 100644
--- a/usr/src/man/man1m/dladm.1m
+++ b/usr/src/man/man1m/dladm.1m
@@ -44,7 +44,7 @@
 .\" Copyright 2016 Joyent, Inc.
 .\" Copyright 2020 RackTop Systems, Inc.
 .\"
-.TH DLADM 1M "May 4, 2020"
+.TH DLADM 1M "June 20, 2021"
 .SH NAME
 dladm \- administer data links
 .SH SYNOPSIS
@@ -900,7 +900,7 @@ Multiple links are included in the aggregation by specifying multiple \fB-l\fR
 options. For backward compatibility with previous versions of Solaris, the
 \fBdladm\fR command also supports the using the \fB-d\fR option (or
 \fB--dev\fR) with a device name to specify links by their underlying device
-name. The other \fB*\fR\fB-aggr\fR subcommands that take \fB-l\fRoptions also
+name. The other \fB*\fR\fB-aggr\fR subcommands that take \fB-l\fR options also
 accept \fB-d\fR.
 .RE
 
diff --git a/usr/src/man/man1m/fstyp.1m b/usr/src/man/man1m/fstyp.1m
index 3b5c623d87..14cd484cfb 100644
--- a/usr/src/man/man1m/fstyp.1m
+++ b/usr/src/man/man1m/fstyp.1m
@@ -4,18 +4,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 FSTYP 1M "Dec 19, 2007"
+.TH FSTYP 1M "June 20, 2021"
 .SH NAME
 fstyp \- determine file system type
 .SH SYNOPSIS
-.LP
 .nf
 \fBfstyp\fR [\fB-a\fR | \fB-v\fR] \fIspecial\fR [:\fIlogical-drive\fR]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBfstyp\fR allows the user to determine the file system type of unmounted file
 systems using heuristic programs.
 .sp
@@ -34,7 +31,6 @@ status is \fB2\fR. Other errors are printed in the same format.
 This command is unreliable and its results should not be used to make any
 decisions about subsequent use of a storage device or disk partition.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-a\fR\fR
@@ -150,20 +146,14 @@ superblock and varies across different \fIFSTypes\fR. See \fBufs\fR(7FS),
 .RE
 
 .SH USAGE
-.sp
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBfstyp\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH SEE ALSO
-.sp
-.LP
 \fBfsck\fR(1M), \fBmkfs_ufs\fR(1M), \fBtunefs\fR(1M), \fBattributes\fR(5),
 \fBlibfstyp\fR(3LIB), \fBlargefile\fR(5), \fBhsfs\fR(7FS), \fBufs\fR(7FS),
 \fBpcfs\fR(7FS)
 .SH NOTES
-.sp
-.LP
-The use of heuristics implies that the result of\fBfstyp\fR is not guaranteed
+The use of heuristics implies that the result of \fBfstyp\fR is not guaranteed
 to be accurate.
 .sp
 .LP
diff --git a/usr/src/man/man1m/fwflash.1m b/usr/src/man/man1m/fwflash.1m
index d81d7f7dae..eecda587a4 100644
--- a/usr/src/man/man1m/fwflash.1m
+++ b/usr/src/man/man1m/fwflash.1m
@@ -1,10 +1,11 @@
 '\" te
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
 .\" Copyright 2020 Oxide Computer Company
+.\" Copyright 2021 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 FWFLASH 1M "June 9, 2020"
+.TH FWFLASH 1M "June 20, 2021"
 .SH NAME
 fwflash \- firmware query and update utility
 .SH SYNOPSIS
@@ -47,7 +48,7 @@ The following options are supported:
 An optional parameter, valid only when used with the \fB-l\fR option. This
 option causes the command to list only devices of a specific class type.
 Currently supported classes are \fBIB\fR, \fBses\fR, \fBsd\fR, \fBufm\fR, or
-\fBALL\fR. If \fB-c\fR is not specified for the \fB-l\fRoption, the class
+\fBALL\fR. If \fB-c\fR is not specified for the \fB-l\fR option, the class
 defaults to \fBALL\fR.
 .RE
 
@@ -58,8 +59,8 @@ defaults to \fBALL\fR.
 .ad
 .sp .6
 .RS 4n
-The \fIdev_path\fR is absolute path name of the device that the user wants to
-modify with the \fB-f\fRor \fB-r\fR operation. If the device cannot be found,
+The \fIdev_path\fR is the absolute path name of the device that the user wants
+to modify with the \fB-f\fR or \fB-r\fR option. If the device cannot be found,
 the command fails. If the \fB-d\fR option is specified, then either \fB-f\fR or
 \fB-r\fR must also be specified.
 .RE
@@ -105,7 +106,7 @@ Display the command line usage message for \fBfwflash\fR.
 List the devices on a system available for firmware upgrade and display
 information specific to each device or device class.
 .sp
-For InfiniBand (IB) devices, the list operation  displays the \fBguid\fRs
+For InfiniBand (IB) devices, the list operation displays the \fBguid\fRs
 (Globally Unique Identifier) currently set for the HCA, as well as the current
 firmware revision installed. There are four separate \fBguid\fRs on the HCA;
 two of them can be set with the same value.
@@ -152,7 +153,7 @@ Display \fBfwflash\fR version information and exit.
 .ad
 .sp .6
 .RS 4n
-Valid only when a flash read (\fB-r\fR) or write (\fB-f\fR) operation is
+Valid only when a flash read (\fB-r\fR) or write (\fB-f\fR) option is
 specified. This option causes \fBfwflash\fR not to prompt for confirmation
 during operation and operate non-interactively. Note that there is no option
 that allows you to forcibly flash an incompatible firmware image onto a device.
@@ -162,8 +163,8 @@ that allows you to forcibly flash an incompatible firmware image onto a device.
 \fBExample 1 \fREntering Command Without Arguments
 .sp
 .LP
-The following command shows \fBfwflash\fR when the command is entered without
-arguments.
+The following command shows \fBfwflash\fR output when the command is entered
+without arguments.
 
 .sp
 .in +2
diff --git a/usr/src/man/man1m/ikecert.1m b/usr/src/man/man1m/ikecert.1m
index 601cb47f68..da2a53cd08 100644
--- a/usr/src/man/man1m/ikecert.1m
+++ b/usr/src/man/man1m/ikecert.1m
@@ -3,12 +3,11 @@
 .\" 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 IKECERT 1M "April 9, 2016"
+.TH IKECERT 1M "June 20, 2021"
 .SH NAME
 ikecert \- manipulates the machine's on-filesystem public-key certificate
 databases
 .SH SYNOPSIS
-.LP
 .nf
 \fBikecert\fR certlocal
      [\fB-a\fR | \fB-e\fR | \fB-h\fR | \fB-k\fR | \fB-l\fR | \fB-r\fR | \fB-U\fR | \fB-C\fR | \fB-L\fR]
@@ -35,7 +34,6 @@ databases
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBikecert\fR command manipulates the machine's on-filesystem public-key
 certificate databases. See the "Files" section, below.
 .sp
@@ -72,7 +70,6 @@ repository.
 The only supported PKCS#11 library and hardware is the Sun Cryptographic
 Accelerator 4000.
 .SH OPTIONS
-.LP
 Except for \fBtokens\fR, each subcommand requires one option, possibly followed
 by one or more option-specific arguments.
 .sp
@@ -234,7 +231,7 @@ matches in the database is extracted. See \fBNOTES\fR, below, for details on
 When specified with the \fBcertlocal\fR subcommand, this option generates a IKE
 public/private key pair and adds it into the local ID database. It also
 generates a certificate request and sends that to standard output. For details
-on the above options see  for details on the \fIdname\fR argument and see
+on the above options see for details on the \fIdname\fR argument and see
 ALTERNATIVE NAMES for details on the \fIaltname\fR argument(s) to this command.
 .sp
 If \fB-T\fR is specified, the hardware token will generate the pair of keys.
@@ -331,7 +328,7 @@ The list displays the identity string of the certificates, as well as, the
 private key if in the key database. The \fB-v\fR switches the output to a
 verbose mode where the entire certificate is printed.
 .sp
-If the matching ceritifcate is on a hardware token, the token ID is also
+If the matching certificate is on a hardware token, the token ID is also
 listed.
 .RE
 
@@ -346,7 +343,7 @@ When specified with the \fBcertrldb\fR subcommand, this option lists the CRLs
 in the IKE database along with any certificates that reside in the database and
 match the Issuer Name. \fBcertspec\fR can be used to specify to list a specific
 CRL. The \fB-v\fR option switches the output to a verbose mode where the entire
-certificate is printed. See \fBNOTES\fR, below, for details on\fBcertspec\fR
+certificate is printed. See \fBNOTES\fR, below, for details on \fBcertspec\fR
 patterns.
 .RE
 
@@ -541,7 +538,6 @@ token with \fBikeadm\fR(1M) once \fBin.iked\fR(1M) is running.
 .RE
 
 .SH PARAMETERS
-.LP
 The following parameters are supported:
 .sp
 .ne 2
@@ -726,7 +722,6 @@ instance.
 .RE
 
 .SH SECURITY
-.LP
 This command can save private keys of a public-private key pair into a file.
 Any exposure of a private key may lead to compromise if the key is somehow
 obtained by an adversary.
@@ -748,7 +743,6 @@ Refer to the afterword by Matt Blaze in Bruce Schneier's \fIApplied
 Cryptography: Protocols, Algorithms, and Source Code in C\fR for additional
 information.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRGenerating a Self-Signed Certificate
 .sp
 .LP
@@ -809,7 +803,6 @@ example# \fB# ikecert certlocal -kc -m 1024 -t rsa-md5 -T vca0-keystore \e
 .sp
 
 .SH EXIT STATUS
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -874,7 +867,6 @@ Consulted for the pathname of a PKCS#11 library.
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -889,7 +881,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.LP
 \fBikeadm\fR(1M), \fBin.iked\fR(1M), \fBgetdate\fR(3C), \fBike.config\fR(4),
 \fBattributes\fR(5), \fBpkcs11_softtoken\fR(5)
 .sp
@@ -901,7 +892,6 @@ Code in C\fR. Second Edition. John Wiley & Sons. New York, NY. 1996.
 RSA Labs, PKCS#11 v2.11: \fICryptographic Token Interface Standards\fR,
 November 2001.
 .SH NOTES
-.LP
 The following is the validity date and time syntax when the \fB-F\fR or
 \fB-S\fR flags are used:
 .sp
diff --git a/usr/src/man/man1m/in.rlogind.1m b/usr/src/man/man1m/in.rlogind.1m
index 7a952fa7c5..fdddcee08d 100644
--- a/usr/src/man/man1m/in.rlogind.1m
+++ b/usr/src/man/man1m/in.rlogind.1m
@@ -4,19 +4,16 @@
 .\" 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 IN.RLOGIND 1M "Oct 29, 2015"
+.TH IN.RLOGIND 1M "June 20, 2021"
 .SH NAME
 in.rlogind, rlogind \- remote login server
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/sbin/in.rlogind\fR [\fB-k5eExXciPp\fR] [\fB-s\fR \fItos\fR] [\fB-S\fR \fIkeytab\fR]
      [\fB-M\fR \fIrealm\fR]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBin.rlogind\fR is the server for the \fBrlogin\fR(1) program.  The server
 provides a remote login facility with authentication based on Kerberos V5 or
 privileged port numbers.
@@ -104,8 +101,6 @@ interrupt signals to the remote programs. The login process propagates the
 client terminal's baud rate and terminal type, as found in the environment
 variable, \fBTERM\fR.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -212,7 +207,7 @@ Sets the \fBIP\fR \fBTOS\fR option.
 \fB\fB-S\fR \fIkeytab\fR\fR
 .ad
 .RS 13n
-Sets the \fBKRB5\fR keytab file to use. The\fB/etc/krb5/krb5.keytab\fR file is
+Sets the \fBKRB5\fR keytab file to use. The \fB/etc/krb5/krb5.keytab\fR file is
 used by default.
 .RE
 
@@ -235,8 +230,6 @@ Same as \fB-e\fR, for backwards compatibility.
 .RE
 
 .SH USAGE
-.sp
-.LP
 \fBrlogind\fR and \fBin.rlogind\fR are IPv6-enabled. See \fBip6\fR(7P).
 \fBIPv6\fR is not currently supported with Kerberos V5 authentication.
 .sp
@@ -254,8 +247,6 @@ svc:/network/login:eklogin (rlogin with kerberos and encryption)
 .sp
 
 .SH SECURITY
-.sp
-.LP
 \fBin.rlogind\fR uses \fBpam\fR(3PAM) for authentication, account management,
 and session management. The \fBPAM\fR configuration policy, listed through
 \fB/etc/pam.conf\fR, specifies the modules to be used for \fBin.rlogind\fR.
@@ -272,11 +263,11 @@ rlogin	auth sufficient	pam_rhosts_auth.so.1
 rlogin	auth requisite	pam_authtok_get.so.1
 rlogin	auth required	pam_dhkeys.so.1
 rlogin	auth required	pam_unix_auth.so.1
-		
+
 rlogin	account required	pam_unix_roles.so.1
 rlogin	account required	pam_unix_projects.so.1
 rlogin	account required	pam_unix_account.so.1
-		
+
 rlogin	session required	pam_unix_session.so.1
 .TE
 
@@ -304,8 +295,6 @@ type the password. The \fIsufficient\fR flag indicates that authentication
 through the \fBpam_rhosts_auth.so.1\fR module is sufficient to authenticate the
 user. Only if this authentication fails is the next authentication module used.
 .SH SEE ALSO
-.sp
-.LP
 \fBlogin\fR(1), \fBsvcs\fR(1), \fBrlogin\fR(1),
 \fBin.rshd\fR(1M), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBkadmin\fR(1M),
 \fBsvcadm\fR(1M), \fBpam\fR(3PAM), \fBhosts\fR(4), \fBhosts.equiv\fR(4),
@@ -318,8 +307,6 @@ user. Only if this authentication fails is the next authentication module used.
 .LP
 \fI\fR
 .SH DIAGNOSTICS
-.sp
-.LP
 All diagnostic messages are returned on the connection associated with the
 \fBstderr\fR, after which any network connections are closed. An error is
 indicated by a leading byte with a value of 1.
@@ -354,8 +341,6 @@ The user's login shell could not be started.
 .RE
 
 .SH NOTES
-.sp
-.LP
 The authentication procedure used here assumes the integrity of each client
 machine and the connecting medium.  This is insecure, but it is useful in an
 ``open'' environment.
diff --git a/usr/src/man/man1m/in.rshd.1m b/usr/src/man/man1m/in.rshd.1m
index d1bd3d70cf..50ac4db395 100644
--- a/usr/src/man/man1m/in.rshd.1m
+++ b/usr/src/man/man1m/in.rshd.1m
@@ -4,19 +4,16 @@
 .\" 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 IN.RSHD 1M "Oct 29, 2015"
+.TH IN.RSHD 1M "June 20, 2021"
 .SH NAME
 in.rshd, rshd \- remote shell server
 .SH SYNOPSIS
-.LP
 .nf
 \fBin.rshd\fR [\fB-k5eciU\fR] [\fB-s\fR \fItos\fR] [\fB-S\fR \fIkeytab\fR] [\fB-M\fR \fIrealm\fR]
      [\fB-L\fR \fIenv_var\fR] \fIhost.port\fR
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBin.rshd\fR is the server for the \fBrsh\fR(1) program. The server provides
 remote execution facilities with authentication based on Kerberos V5 or
 privileged port numbers.
@@ -135,8 +132,6 @@ passed to the normal login shell of the user. The \fBPATH\fR variable is set to
 \fBin.rshd\fR.
 .RE
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -225,7 +220,7 @@ Sets the \fBIP\fR \fBTOS\fR option.
 \fB\fB-S\fR \fIkeytab\fR\fR
 .ad
 .RS 14n
-Sets the \fBKRB5\fR keytab file to use. The\fB/etc/krb5/krb5.keytab\fR file is
+Sets the \fBKRB5\fR keytab file to use. The \fB/etc/krb5/krb5.keytab\fR file is
 used by default.
 .RE
 
@@ -240,8 +235,6 @@ Refuses connections that cannot be mapped to a name through the
 .RE
 
 .SH USAGE
-.sp
-.LP
 \fBrshd\fR and \fBin.rshd\fR are IPv6-enabled. See \fBip6\fR(7P). \fBIPv6\fR is
 not currently supported with Kerberos V5 authentication.
 .sp
@@ -257,8 +250,6 @@ svc:/network/shell:kshell (rshd with kerberos (ipv4 only))
 .sp
 
 .SH SECURITY
-.sp
-.LP
 \fBin.rshd\fR uses \fBpam\fR(3PAM) for authentication, account management, and
 session management. The \fBPAM\fR configuration policy, listed through
 \fB/etc/pam.conf\fR, specifies the modules to be used for \fBin.rshd\fR. Here
@@ -292,8 +283,6 @@ If there are no entries for the \fBrsh\fR service, then the entries for the
 \fBpam\fR(3PAM). For Kerberized \fBrsh\fR service, the appropriate \fBPAM\fR
 service name is \fBkrsh\fR.
 .SH FILES
-.sp
-.LP
 \fB/etc/hosts.equiv\fR
 .sp
 .ne 2
@@ -314,8 +303,6 @@ Kerberos configuration file.
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBrsh\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(1M),
 \fBinetd\fR(1M), \fBkadmin\fR(1M), \fBsvcadm\fR(1M), \fBpam\fR(3PAM),
 \fBgetnameinfo\fR(3SOCKET), \fBhosts\fR(4), \fBkrb5.conf\fR(4),
@@ -328,8 +315,6 @@ Kerberos configuration file.
 .LP
 \fI\fR
 .SH DIAGNOSTICS
-.sp
-.LP
 The following diagnostic messages are returned on the connection associated
 with \fBstderr\fR, after which any network connections are closed. An error is
 indicated by a leading byte with a value of 1 in step 8 above (\fB0\fR is
@@ -417,8 +402,6 @@ A \fIfork\fR by the server failed.
 .RE
 
 .SH NOTES
-.sp
-.LP
 The authentication procedure used here assumes the integrity of each client
 machine and the connecting medium. This is insecure, but it is useful in an
 "open" environment.
diff --git a/usr/src/man/man1m/in.telnetd.1m b/usr/src/man/man1m/in.telnetd.1m
index ba6d80c2dc..c233dccf49 100644
--- a/usr/src/man/man1m/in.telnetd.1m
+++ b/usr/src/man/man1m/in.telnetd.1m
@@ -4,18 +4,16 @@
 .\" 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 IN.TELNETD 1M "Oct 29, 2015"
+.TH IN.TELNETD 1M "June 20, 2021"
 .SH NAME
 in.telnetd, telnetd \- DARPA TELNET protocol server
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/sbin/in.telnetd\fR [\fB-a\fR \fIauthmode\fR] [\fB-EXUh\fR] [\fB-s\fR \fItos\fR]
      [\fB-S\fR \fIkeytab\fR] [\fB-M\fR \fIrealm\fR]
 .fi
 
 .SH DESCRIPTION
-.LP
 \fBin.telnetd\fR is a server that supports the \fBDARPA\fR standard
 \fBTELNET\fR virtual terminal protocol. \fBin.telnetd\fR is normally invoked in
 the internet server (see \fBinetd\fR(1M)), for requests to connect to the
@@ -93,7 +91,6 @@ BANNER=""
 .in -2
 
 .SH OPTIONS
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -192,7 +189,7 @@ Sets the \fBIP\fR \fBTOS\fR option.
 \fB\fB-S\fR \fIkeytab\fR\fR
 .ad
 .RS 15n
-Sets the \fBKRB5\fR keytab file to use. The\fB/etc/krb5/krb5.keytab\fR file is
+Sets the \fBKRB5\fR keytab file to use. The \fB/etc/krb5/krb5.keytab\fR file is
 used by default.
 .RE
 
@@ -216,10 +213,8 @@ Disables Kerberos V5 authentication support negotiation.
 .RE
 
 .SH USAGE
-.LP
 \fBtelnetd\fR and \fBin.telnetd\fR are IPv6-enabled. See \fBip6\fR(7P).
 .SH SECURITY
-.LP
 \fBin.telnetd\fR can authenticate using Kerberos V5 authentication,
 \fBpam\fR(3PAM), or both. By default, the telnet server will accept valid
 Kerberos V5 authentication credentials from a \fBtelnet\fR client that supports
@@ -294,7 +289,6 @@ For a Kerberized telnet service, the correct \fBPAM\fR service name is
 .RE
 
 .SH SEE ALSO
-.LP
 \fBlogin\fR(1), \fBsvcs\fR(1), \fBtelnet\fR(1),
 \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBkadmin\fR(1M), \fBsvcadm\fR(1M),
 \fBpam\fR(3PAM), \fBgetnameinfo\fR(3SOCKET), \fBissue\fR(4),
@@ -355,7 +349,6 @@ Ts'o, T., \fITelnet Data Encryption Option, RFC 2946\fR. September 2000.
 Ts'o, T., \fITelnet Encryption: DES 64 bit Cipher Feedback, RFC 2952\fR.
 September 2000.
 .SH NOTES
-.LP
 Some \fBTELNET\fR commands are only partially implemented.
 .sp
 .LP
diff --git a/usr/src/man/man1m/kdb5_ldap_util.1m b/usr/src/man/man1m/kdb5_ldap_util.1m
index 8beb8c03a0..0e8923241c 100644
--- a/usr/src/man/man1m/kdb5_ldap_util.1m
+++ b/usr/src/man/man1m/kdb5_ldap_util.1m
@@ -4,34 +4,27 @@
 .\" 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 KDB5_LDAP_UTIL 1M "Aug 28, 2007"
+.TH KDB5_LDAP_UTIL 1M "June 20, 2021"
 .SH NAME
 kdb5_ldap_util \- Kerberos configuration utility
 .SH SYNOPSIS
-.LP
 .nf
 \fBkdb5_ldap_util\fR  [\fB-D\fR \fIuser_dn\fR [\fB-w\fR \fIpasswd\fR]] [\fB-H\fR \fIldap_uri\fR] \fIcommand\fR
      [\fIcommand_options\fR]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBkdb5_ldap_util\fR utility allows an administrator to manage realms,
 Kerberos services, and ticket policies. The utility offers a set of general
 options, described under OPTIONS, and a set of commands, which, in turn, have
 their own options. Commands and their options are described in their own
 subsections, below.
 .SH OPTIONS
-.sp
-.LP
 \fBkdb5_ldap_util\fR has a small set of general options that apply to the
 \fBkdb5_ldap_util\fR utility itself and a larger number of options that apply
 to specific commands. A number of these command-specific options apply to
 multiple commands and are described in their own section, below.
 .SS "General Options"
-.sp
-.LP
 The following general options are supported:
 .sp
 .ne 2
@@ -65,8 +58,6 @@ Specifies the password of \fIuser_dn\fR. This option is not recommended.
 .RE
 
 .SS "Common Command-specific Options"
-.sp
-.LP
 The following options apply to a number of \fBkdb5_ldap_util\fR commands.
 .sp
 .ne 2
@@ -134,13 +125,9 @@ Specifies the Kerberos realm of the database; by default the realm returned by
 .RE
 
 .SH \fBkdb5_ldap_util\fR COMMANDS
-.sp
-.LP
 The \fBkdb5_ldap_util\fR utility comprises a set of commands, each with its own
 set of options. These commands are described in the following subsections.
 .SS "The \fBcreate\fR Command"
-.sp
-.LP
 The \fBcreate\fR command creates a realm in a directory. The command has the
 following syntax:
 .sp
@@ -292,8 +279,6 @@ these flags.
 .RE
 
 .SS "The \fBmodify\fR Command"
-.sp
-.LP
 The \fBmodify\fR command modifies the attributes of a realm. The command has
 the following syntax:
 .sp
@@ -388,8 +373,6 @@ these flags.
 .RE
 
 .SS "The \fBview\fR Command"
-.sp
-.LP
 The \fBview\fR command displays the attributes of a realm. The command has the
 following syntax:
 .sp
@@ -414,8 +397,6 @@ See "Common Command-specific Options," above.
 .RE
 
 .SS "The \fBdestroy\fR Command"
-.sp
-.LP
 The \fBdestroy\fR command destroys a realm, including the master key stash
 file. The command has the following syntax:
 .sp
@@ -450,8 +431,6 @@ See "Common Command-specific Options," above.
 .RE
 
 .SS "The \fBlist\fR Command"
-.sp
-.LP
 The \fBlist\fR command displays the names of realms. The command has the
 following syntax:
 .sp
@@ -466,8 +445,6 @@ list
 .LP
 The \fBlist\fR command has no options.
 .SS "The \fBstashsrvpw\fR Command"
-.sp
-.LP
 The \fBstashsrvpw\fR command enables you to store the password for service
 object in a  file so that a KDC and Administration server can use it to
 authenticate to the LDAP server. The command has the following syntax:
@@ -512,8 +489,6 @@ to be stored in file.
 .RE
 
 .SS "The \fBcreate_policy\fR Command"
-.sp
-.LP
 The \fBcreate_policy\fR command creates a ticket policy in a directory. The
 command has the following syntax:
 .sp
@@ -586,8 +561,6 @@ Specifies the name of the ticket policy.
 .RE
 
 .SS "The \fBmodify_policy\fR Command"
-.sp
-.LP
 The \fBmodify_policy\fR command modifies the attributes of a ticket policy. The
 command has the following syntax:
 .sp
@@ -608,8 +581,6 @@ modify_policy \e
 The \fBmodify_policy\fR command has the same options and argument as those for
 the \fBcreate_policy\fR command.
 .SS "The \fBview_policy\fR Command"
-.sp
-.LP
 The \fBview_policy\fR command displays the attributes of a ticket policy. The
 command has the following syntax:
 .sp
@@ -644,8 +615,6 @@ Specifies the name of the ticket policy.
 .RE
 
 .SS "The \fBdestroy_policy\fR Command"
-.sp
-.LP
 The \fBdestroy_policy\fR command destroys an existing ticket policy. The
 command has the following syntax:
 .sp
@@ -692,8 +661,6 @@ Specifies the name of the ticket policy.
 .RE
 
 .SS "The \fBlist_policy\fR Command"
-.sp
-.LP
 The \fBlist_policy\fR command lists the ticket policies in the default or a
 specified realm. The command has the following syntax:
 .sp
@@ -718,8 +685,6 @@ See "Common Command-specific Options," above.
 .RE
 
 .SH TICKET FLAGS
-.sp
-.LP
 A number of \fBkdb5_ldap_util\fR commands have \fBticket_flag\fR options. These
 flags are described as follows:
 .sp
@@ -876,7 +841,6 @@ flag.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUsing \fBcreate\fR
 .sp
 .LP
@@ -892,7 +856,7 @@ Initializing database for realm 'ATHENA.MIT.EDU'
 You will be prompted for the database Master Password.
 It is important that you NOT FORGET this password.
 Enter KDC database master key: \fImaster key entered\fR
-Re-enter KDC database master key to verify: \fImaster key re-entered\fRjjjjjj
+Re-enter KDC database master key to verify: \fImaster key re-entered\fR
 .fi
 .in -2
 .sp
@@ -1196,8 +1160,6 @@ cn=service-pwd,o=org
 .sp
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -1212,6 +1174,4 @@ Interface Stability	Volatile
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBkinit\fR(1), \fBkadmin\fR(1M), \fBkdc.conf\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/logadm.1m b/usr/src/man/man1m/logadm.1m
index a69172a64f..cd9d95933c 100644
--- a/usr/src/man/man1m/logadm.1m
+++ b/usr/src/man/man1m/logadm.1m
@@ -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 LOGADM 1M "May 23, 2007"
+.TH LOGADM 1M "June 20, 2021"
 .SH NAME
 logadm \- manage endlessly growing log files
 .SH SYNOPSIS
-.LP
 .nf
 \fBlogadm\fR
 .fi
@@ -18,8 +17,6 @@ logadm \- manage endlessly growing log files
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBlogadm\fR is a general log rotation tool that is suitable for running from
 \fBcron\fR(1M).
 .sp
@@ -106,16 +103,14 @@ owner, group ID, and permissions match the original file.
 .LP
 Three options control when old log files are expired: \fB-A\fR age \fB-C\fR
 count \fB-S\fR size. These options expire the oldest log files until a
-particular condition or conditions are met. For example, the combination
-\fB\fR\fB-C\fR \fB5\fR and the \fB\fR\fB-S\fR \fB10m\fR options expires old log
-files until there are no more than 5 of the \fBand\fR their combined disk usage
+particular condition or conditions are met. For example, the combination of the
+\fB\fR\fB-C\fR \fB5\fR and \fB\fR\fB-S\fR \fB10m\fR options expires old log
+files until there are no more than 5 of them \fBand\fR their combined disk usage
 is no more than 10 megabytes. If none of these options are specified, the
 default expiration is \fB\fR\fB-C\fR \fB10\fR which keeps ten old log files. If
 no files are to be expired, use \fB\fR\fB-C\fR \fB0\fR to prevent expiration by
 default.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -224,7 +219,7 @@ expire it.
 after \fIcmd\fR completes. If the old log file is not removed or renamed by the
 \fIcmd\fR, \fBlogadm\fR considers it for expiration the next time that it runs
 on the specified log file. If present, the keyword \fB$file\fR is expanded in
-the specified \fIcmd\fRto the name of the file being expired.
+the specified \fIcmd\fR to the name of the file being expired.
 .sp
 This option is useful for tasks such as mailing old log files to
 administrators, or copying old log files to long term storage.
@@ -698,8 +693,6 @@ suffix of \fB\&.gz\fR.
 .RE
 
 .SH OPERANDS
-.sp
-.LP
 The following operands are supported:
 .sp
 .ne 2
@@ -714,7 +707,6 @@ is the same as the actual log file name.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRRotating a File and Keeping Previous Versions
 .sp
 .LP
@@ -873,7 +865,6 @@ logadm -w apache /var/apache/logs/*_log
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/logadm.conf\fR\fR
@@ -884,8 +875,6 @@ configuration file for \fBlogadm\fR command
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -900,14 +889,10 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBchgrp\fR(1), \fBchmod\fR(1), \fBchown\fR(1), \fBcsh\fR(1), \fBgzip\fR(1),
 \fBcron\fR(1M), \fBctime\fR(3C), \fBstrftime\fR(3C), \fBlogadm.conf\fR(4),
 \fBattributes\fR(5)
 .SH NOTES
-.sp
-.LP
 When \fBlogadm\fR applies expire conditions (supplied by the \fB-A\fR,
 \fB-C\fR, and \fB-S\fR options), it deletes files, the oldest first, until the
 conditions are satisfied. If the template used for naming the old logs
diff --git a/usr/src/man/man1m/lpadmin.1m b/usr/src/man/man1m/lpadmin.1m
index c509eafe2e..006d0994cf 100644
--- a/usr/src/man/man1m/lpadmin.1m
+++ b/usr/src/man/man1m/lpadmin.1m
@@ -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 LPADMIN 1M "May 13, 2017"
+.TH LPADMIN 1M "June 20, 2021"
 .SH NAME
 lpadmin \- configure the LP print service
 .SH SYNOPSIS
-.LP
 .nf
 \fBlpadmin\fR \fB-p\fR \fIprinter\fR {\fIoptions\fR}
 .fi
@@ -29,13 +28,11 @@ lpadmin \- configure the LP print service
 .fi
 
 .SH DESCRIPTION
-.LP
 \fBlpadmin\fR configures the LP print service by defining printers and devices.
 It is used to add and change printers, to remove printers from service, to set
 or change the system default destination, to define alerts for printer faults,
 and to mount print wheels.
 .SH OPTIONS
-.LP
 The \fBlpadmin\fR command has options for:
 .RS +4
 .TP
@@ -81,7 +78,6 @@ one,two,three
 .in -2
 
 .SS "Adding or Changing a Printer"
-.LP
 The first form of the \fBlpadmin\fR command (\fBlpadmin\fR \fB-p\fR
 \fIprinter\fR {\fIoptions\fR}) configures a new printer or changes the
 configuration of an existing printer. It also starts the print scheduler.
@@ -687,7 +683,7 @@ are generally of the format:
 
 In either case, \fIserver\fR specifies the hostname or IP address of the remote
 print server, \fIqueue\fR specifies the name of the print queue on the remote
-print server, and the optional \fB#Solaris\fRspecifies that the remote print
+print server, and the optional \fB#Solaris\fR specifies that the remote print
 server is a Solaris server when \fBlpd\fR URI format is being used.
 .sp
 For example:
@@ -714,7 +710,7 @@ In an environment where the nodename is variable, print queues are invalidated
 when the nodename changes. Using \fBlocalhost\fR as the \fIsystem-name\fR
 allows print queues to be maintained across changing nodenames. The
 \fIsystem-name\fR, as used by the print service, is only set to \fBlocalhost\fR
-when explicitely set with this option; by default, \fBlpadmin\fR sets
+when explicitly set with this option; by default, \fBlpadmin\fR sets
 \fIsystem-name\fR to \fInodename\fR. For example, if you want to configure a
 new printer on the local system, and want it called \fIprinter3\fR:
 .sp
@@ -893,7 +889,6 @@ See the \fBsmbspool\fR man page for details.
 .RE
 
 .SS "Removing a Printer Destination"
-.LP
 The \fB-x\fR \fIdest\fR option removes the destination \fIdest\fR (a printer or
 a class), from the \fBLP\fR print service. If \fIdest\fR is a printer and is
 the only member of a class, then the class is deleted, too. If \fIdest\fR is
@@ -903,7 +898,6 @@ local printers and the scheduler is still running, the scheduler is shut down.
 .LP
 No other \fIoptions\fR are allowed with \fB-x\fR.
 .SS "Setting/Changing the System Default Destination"
-.LP
 The \fB-d\fR [\fIdest\fR] option makes \fIdest\fR (an existing printer or
 class) the new system default destination. If \fIdest\fR is not supplied, then
 there is no system default destination. No other \fIoptions\fR are allowed with
@@ -952,7 +946,7 @@ terminals, one is arbitrarily chosen.
 Do not send messages for the current condition. An administrator can use this
 option to temporarily stop receiving further messages about a known problem.
 Once the \fIprint-wheel\fR has been mounted and subsequently unmounted,
-messages are sent againwhen the number of print requests reaches the threshold
+messages are sent again when the number of print requests reaches the threshold
 specified by the \fB-Q\fR option.
 .RE
 
@@ -1029,14 +1023,12 @@ anyone submits a print request for the print wheel when it is not mounted.
 .RE
 
 .SH PREDEFINED OPTIONS USED WITH THE \fB-o\fR OPTION
-.LP
 A number of options, described below, are predefined for use with \fB-o\fR.
 These options are used for adjusting printer capabilities, adjusting printer
 port characteristics, configuring network printers, and controlling the use of
 banner. The \fB-o\fR also supports an arbitrary \fB\fIkeyword\fR=\fIvalue\fR\fR
 format, which is referred to below as an undefined option.
 .SS "Adjusting Printer Capabilities"
-.LP
 The \fBlength\fR, \fBwidth\fR, \fBcpi\fR, and \fBlpi\fR parameters can be used
 in conjunction with the \fB-o\fR option to adjust printer capabilities. The
 format of the parameters and their values is as follows:
@@ -1082,7 +1074,6 @@ lpadmin -p \fIprintername\fR -o lpi=\fR
 .sp
 
 .SS "Adjusting Printer Port Characteristics"
-.LP
 You use the \fBstty\fR keyword in conjunction with the o option to adjust
 printer port characteristics. The general form of the \fBstty\fR portion of the
 command is:
@@ -1126,7 +1117,6 @@ The default can be reset by:
 .sp
 
 .SS "Configuring Network Printers"
-.LP
 The \fBdest\fR, \fBprotocol\fR, \fBbsdctrl\fR, and \fBtimeout\fR parameters are
 used in conjunction with the \fB-o\fR option to configure network printers. The
 format of these keywords and their assigned values is as follows:
@@ -1169,7 +1159,6 @@ lpadmin -p \fIprintername\fR -o timeout=
 .sp
 
 .SS "Controlling the Use of the Banner Page"
-.LP
 Use the following commands to control the use of the banner page:
 .sp
 .in +2
@@ -1200,7 +1189,6 @@ The fourth command (\fB-o\fR \fBbanner=never\fR) causes a banner page never to
 be printed, even if a user specifies \fBlp\fR \fB-o\fR \fBbanner\fR. The root
 user can override this command.
 .SS "Undefined Options"
-.LP
 The \fB-o\fR option supports the use of arbitrary, user-defined options with
 the following format:
 .sp
@@ -1237,7 +1225,6 @@ Sets boolean values \fBfoo=true | foo=false\fR.
 .RE
 
 .SH EXAMPLES
-.LP
 In the following examples, \fIprtr\fR can be any name up to 14 characters and
 can be the same name as the \fBping\fR(1M) name.
 .LP
@@ -1278,7 +1265,6 @@ example# \fBaccept \fIprtr\fR\fR
 .sp
 
 .SH EXIT STATUS
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -1335,7 +1321,6 @@ System printer configuration database
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -1350,7 +1335,6 @@ Interface Stability	Obsolete
 .TE
 
 .SH SEE ALSO
-.LP
 \fBenable\fR(1), \fBlp\fR(1), \fBlpstat\fR(1), \fBmail\fR(1), \fBstty\fR(1),
 \fBaccept\fR(1M), \fBlpforms\fR(1M), \fBlpsched\fR(1M), \fBlpsystem\fR(1M),
 \fBping\fR(1M), \fBdial\fR(3NSL), \fBterminfo\fR(4), \fBattributes\fR(5)
@@ -1358,7 +1342,6 @@ Interface Stability	Obsolete
 .LP
 \fI\fR
 .SH NOTES
-.LP
 When using lpadmin to provide access to a remote printer, remote configuration
 data is stored in \fB/etc/printers.conf\fR. This data includes a \fBbsdaddr\fR
 and a \fBprinter-uri-supported\fR attribute. The data in this file can be
diff --git a/usr/src/man/man1m/smrsh.1m b/usr/src/man/man1m/smrsh.1m
index 40e3b5f8cb..190965a880 100644
--- a/usr/src/man/man1m/smrsh.1m
+++ b/usr/src/man/man1m/smrsh.1m
@@ -23,7 +23,7 @@
 .\" 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 "May 23, 2021"
+.TH SMRSH 1M "June 20, 2021"
 .SH NAME
 smrsh \- restricted shell for sendmail
 .SH SYNOPSIS
@@ -51,7 +51,7 @@ acceptable commands. It also rejects any commands with the characters: \fB,\fR,
 Initial pathnames on programs are stripped, so forwarding to
 \fB/usr/ucb/vacation\fR, \fB/usr/bin/vacation\fR,
 \fB/home/server/mydir/bin/vacation\fR, and \fBvacation\fR all actually forward
-to\fB/var/adm/sm.bin/vacation\fR.
+to \fB/var/adm/sm.bin/vacation\fR.
 .sp
 .LP
 System administrators should be conservative about populating
diff --git a/usr/src/man/man1m/syslogd.1m b/usr/src/man/man1m/syslogd.1m
index 9e1c58e64f..42e34de642 100644
--- a/usr/src/man/man1m/syslogd.1m
+++ b/usr/src/man/man1m/syslogd.1m
@@ -4,19 +4,16 @@
 .\" 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 SYSLOGD 1M "Oct 17, 2013"
+.TH SYSLOGD 1M "June 20, 2021"
 .SH NAME
 syslogd \- log system messages
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/sbin/syslogd\fR [\fB-d\fR] [\fB-f\fR \fIconfigfile\fR] [\fB-m\fR \fImarkinterval\fR]
      [\fB-p\fR \fIpath\fR] [\fB-t\fR | \fB-T\fR]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBsyslogd\fR reads and forwards system messages to the appropriate log files
 or users, depending upon the priority of a message and the system facility from
 which it originates. The configuration file \fB/etc/syslog.conf\fR (see
@@ -99,8 +96,6 @@ equivalent to the \fB-t\fR command-line option. The default value for
 .RE
 
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -168,7 +163,6 @@ messages. See \fBEXAMPLES\fR.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fR\fBsyslogd\fR Output Without Message ID Generation Enabled
 .sp
 .LP
@@ -189,7 +183,7 @@ Sep 29 21:41:18 cathy unix: alloc /: file system full
 .LP
 The following example shows the output from \fBsyslogd\fR when message \fBID\fR
 generation \fBis\fR enabled. The message \fBID\fR is displayed when writing to
-log file\fB/var/adm/messages\fR.
+log file \fB/var/adm/messages\fR.
 
 .sp
 .in +2
@@ -233,7 +227,6 @@ systems.
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/syslog.conf\fR\fR
@@ -305,14 +298,10 @@ Network services for each transport
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBlogger\fR(1), \fBsvcs\fR(1), \fBmsgid\fR(1M), \fBsvcadm\fR(1M),
 \fBsvccfg\fR(1M), \fBsyslog\fR(3C), \fBsyslog.conf\fR(4), \fBattributes\fR(5),
 \fBsignal.h\fR(3HEAD), \fBsmf\fR(5), \fBlog\fR(7D)
 .SH NOTES
-.sp
-.LP
 The \fBmark\fR message is a system time stamp, and so it is only defined for
 the system on which \fBsyslogd\fR is running. It can not be forwarded to other
 systems.
diff --git a/usr/src/man/man2/mmapobj.2 b/usr/src/man/man2/mmapobj.2
index a8b2a25120..dd5a8a55fc 100644
--- a/usr/src/man/man2/mmapobj.2
+++ b/usr/src/man/man2/mmapobj.2
@@ -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 MMAPOBJ 2 "Dec 1, 2008"
+.TH MMAPOBJ 2 "June 20, 2021"
 .SH NAME
 mmapobj \- map a file object in the appropriate manner
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/mman.h>
 
@@ -17,7 +16,6 @@ mmapobj \- map a file object in the appropriate manner
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIfd\fR\fR
@@ -97,8 +95,6 @@ request. Only the \fBMMOBJ_PADDING\fR request uses this argument. If
 .RE
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBmmapobj()\fR function establishes a set of mappings between a process's
 address space and a file.  By default, \fBmmapobj()\fR maps the whole file as a
 single, private, read-only mapping.  The \fBMMOBJ_INTERPRET\fR flag instructs
@@ -207,8 +203,6 @@ also include any non-file data that are required to provide \fBNOBITS\fR data
 \fImr_msize\fR bytes of memory but only \fImr_msize\fR bytes will be available
 to the caller of \fBmmapobj()\fR.
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful completion, 0 is returned and \fIelements\fR contains the
 number of program headers that are mapped for \fIfd\fR. The data describing
 these elements are copied to storage such that the first \fIelements\fR members
@@ -218,8 +212,6 @@ of the storage array contain valid mapping data.
 On failure, -1 is returned and \fBerrno\fR is set to indicate the error. No
 data is copied to storage.
 .SH ERRORS
-.sp
-.LP
 The \fBmmapobj()\fR function will fail if:
 .sp
 .ne 2
@@ -290,7 +282,7 @@ address.
 .RS 14n
 The \fIflags\fR argument contains an invalid flag.
 .sp
-\fBMMOBJ_PADDING\fR was not specified in \fIflags\fRand \fIarg\fR was non-null.
+\fBMMOBJ_PADDING\fR was not specified in \fIflags\fR and \fIarg\fR was non-null.
 .RE
 
 .sp
@@ -341,8 +333,6 @@ object.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -359,8 +349,6 @@ MT-Level	Async-Signal-Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBld.so.1\fR(1), \fBfcntl\fR(2), \fBmemcntl\fR(2), \fBmmap\fR(2),
 \fBmprotect\fR(2), \fBmunmap\fR(2), \fBelf\fR(3ELF), \fBmadvise\fR(3C),
 \fBmlockall\fR(3C), \fBmsync\fR(3C), \fBa.out\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man3c/addsev.3c b/usr/src/man/man3c/addsev.3c
index b5cdb16a68..8708b51da9 100644
--- a/usr/src/man/man3c/addsev.3c
+++ b/usr/src/man/man3c/addsev.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 ADDSEV 3C "Dec 29, 1996"
+.TH ADDSEV 3C "June 20, 2021"
 .SH NAME
 addsev \- define additional severities
 .SH SYNOPSIS
-.LP
 .nf
 #include <pfmt.h>
 
@@ -15,8 +14,6 @@ addsev \- define additional severities
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBaddsev()\fR function defines additional severities for use in subsequent
 calls to \fBpfmt\fR(3C) or \fBlfmt\fR(3C). It associates an integer value
 \fIint_val\fR in the range [5-255] with a character \fIstring\fR, overwriting
@@ -27,19 +24,14 @@ If \fIint_val\fR is OR-ed with the \fIflags\fR argument passed to subsequent
 calls to \fBpfmt()\fR or \fBlfmt()\fR, \fIstring\fR will be used as severity.
 Passing a null \fIstring\fR removes the severity.
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful completion, \fBaddsev()\fR returns \fB0\fR.  Otherwise it
-returns\fB\(mi1\fR\&.
+returns \fB\(mi1\fR\&.
 .SH USAGE
-.sp
-.LP
 Only the standard severities are automatically displayed for the locale in
 effect at runtime. An application must provide the means for displaying
 locale-specific versions of add-on severities. Add-on severities are only
 effective within the applications defining them.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRExample of \fBaddsev()\fR function.
 .sp
 .LP
@@ -69,8 +61,6 @@ APPL: PANIC: Cannot locate database
 .in -2
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -85,6 +75,4 @@ MT-Level	MT-safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBgettxt\fR(3C), \fBlfmt\fR(3C), \fBpfmt\fR(3C), \fBattributes\fR(5)
diff --git a/usr/src/man/man3c/drand48.3c b/usr/src/man/man3c/drand48.3c
index 92d303b1d4..a91e5a8877 100644
--- a/usr/src/man/man3c/drand48.3c
+++ b/usr/src/man/man3c/drand48.3c
@@ -4,12 +4,11 @@
 .\" 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 DRAND48 3C "Feb 11, 2015"
+.TH DRAND48 3C "June 20, 2021"
 .SH NAME
 drand48, erand48, lrand48, nrand48, mrand48, jrand48, srand48, seed48, lcong48
 \- generate uniformly distributed pseudo-random numbers
 .SH SYNOPSIS
-.LP
 .nf
 #include <stdlib.h>
 
@@ -57,7 +56,6 @@ drand48, erand48, lrand48, nrand48, mrand48, jrand48, srand48, seed48, lcong48
 .fi
 
 .SH DESCRIPTION
-.LP
 This family of functions generates pseudo-random numbers using the well-known
 linear congruential algorithm and 48-bit integer arithmetic.
 .sp
@@ -68,11 +66,11 @@ double-precision floating-point values uniformly distributed over the interval
 .sp
 .LP
 Functions \fBlrand48()\fR and \fBnrand48()\fR return non-negative long integers
-uniformly distributed over the interval [0, 2  ^31 ].
+uniformly distributed over the interval [0, 2^31].
 .sp
 .LP
 Functions \fBmrand48()\fR and \fBjrand48()\fR return signed long integers
-uniformly distributed over the interval [-2 ^31  , 2 ^31  ].
+uniformly distributed over the interval [-2^31, 2^31].
 .sp
 .LP
 Functions \fBsrand48()\fR, \fBseed48()\fR, and \fBlcong48()\fR are
@@ -93,8 +91,8 @@ X(n+1)= (aX (n)+c)(mod m) n>=0.
 .sp
 .LP
 The parameter \fIm\fR = 2^48; hence 48-bit integer arithmetic is performed.
-Unless \fBlcong48()\fR has been invoked, the multiplier value \fIa\fRand the
-addend value \fIc\fRare given by
+Unless \fBlcong48()\fR has been invoked, the multiplier value \fIa\fR and the
+addend value \fIc\fR are given by
 .br
 .in +2
 \fIa\fR = 5DEECE66D(16) = 273673163155(8)
@@ -153,7 +151,6 @@ addend values, \fIa\fR and \fIc\fR, specified above.
 .LP
 For a more powerful random number generator, see \fBarc4random\fR(3C).
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -170,5 +167,4 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.LP
 \fBarc4random\fR(3C), \fBrand\fR(3C), \fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3c/getwchar.3c b/usr/src/man/man3c/getwchar.3c
index d2f150ae2b..e9c48c1231 100644
--- a/usr/src/man/man3c/getwchar.3c
+++ b/usr/src/man/man3c/getwchar.3c
@@ -44,11 +44,10 @@
 .\" Portions Copyright (c) 2002, Sun Microsystems, Inc.  All Rights Reserved
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"
-.TH GETWCHAR 3C "Jul 24, 2002"
+.TH GETWCHAR 3C "June 20, 2021"
 .SH NAME
 getwchar \- get wide character from stdin stream
 .SH SYNOPSIS
-.LP
 .nf
 #include <wchar.h>
 
@@ -62,24 +61,19 @@ getwchar \- get wide character from stdin stream
 \fBwint_t\fR \fBgetwchar_l\fR(locale_t loc)
 .fi
 .SH DESCRIPTION
-.LP
 The \fBgetwchar()\fR function is equivalent to \fBgetwc\fR(\fBstdin\fR).
 .LP
-The\fBgetwchar_l()\fR function is equivalent to \fBgetwc\fR(\fBstdin\fR, \fIloc\fR).
+The \fBgetwchar_l()\fR function is equivalent to \fBgetwc\fR(\fBstdin\fR, \fIloc\fR).
 .SH RETURN VALUES
-.LP
 Refer to \fBfgetwc\fR(3C).
 .SH ERRORS
-.LP
 Refer to \fBfgetwc\fR(3C).
 .SH USAGE
-.LP
 If the \fBwint_t\fR value returned by \fBgetwchar()\fR is stored into a
 variable of type \fBwchar_t\fR and then compared against the \fBwint_t\fR macro
 \fBWEOF\fR, the comparison may never succeed because \fBwchar_t\fR is defined
 as unsigned.
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .TS
 box;
@@ -96,5 +90,4 @@ MT-Level	MT-Safe
 The \fBgetwchar()\fR function is Standard.  The \fBgetwchar_l()\fR function
 is Uncommitted.
 .SH SEE ALSO
-.LP
 \fBfgetwc\fR(3C), \fBgetwc\fR(3C), \fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3c_db/td_thr_get_info.3c_db b/usr/src/man/man3c_db/td_thr_get_info.3c_db
index e0847529f6..69b5615548 100644
--- a/usr/src/man/man3c_db/td_thr_get_info.3c_db
+++ b/usr/src/man/man3c_db/td_thr_get_info.3c_db
@@ -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 TD_THR_GET_INFO 3C_DB "Oct 20, 1998"
+.TH TD_THR_GET_INFO 3C_DB "June 20, 2021"
 .SH NAME
 td_thr_get_info \- get thread information in libc_db library of interfaces
 .SH SYNOPSIS
-.LP
 .nf
 cc [ \fIflag\fR... ] \fIfile\fR... -lc_db [ \fIlibrary\fR... ]
 #include <proc_service.h>
@@ -17,10 +16,8 @@ cc [ \fIflag\fR... ] \fIfile\fR... -lc_db [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBtd_thr_get_info()\fR function fills in the \fBtd_thrinfo_t\fR structure
-*\fIti_p\fR with values for the thread identified by  \fIth_p\fR.
+*\fIti_p\fR with values for the thread identified by \fIth_p\fR.
 .sp
 .LP
 The \fBtd_thrinfo_t\fR structure contains the following fields:
@@ -129,7 +126,7 @@ The \fBlibc_db\fR library cannot determine the state of the thread.
 \fB\fBTD_THR_STOPPED\fR \fR
 .ad
 .RS 26n
-The thread has been stopped by a call to  \fBthr_suspend\fR(3C).
+The thread has been stopped by a call to \fBthr_suspend\fR(3C).
 .RE
 
 .sp
@@ -147,7 +144,7 @@ The thread is runnable, but it is not currently assigned to an \fBLWP\fR.
 \fB\fBTD_THR_ACTIVE\fR \fR
 .ad
 .RS 26n
-The thread is currently executing on an  \fBLWP\fR.
+The thread is currently executing on an \fBLWP\fR.
 .RE
 
 .sp
@@ -175,7 +172,7 @@ The thread is not currently runnable.
 \fB\fBTD_THR_STOPPED_ASLEEP\fR \fR
 .ad
 .RS 26n
-The thread is both blocked by  \fBTD_THR_SLEEP\fR and stopped by a call to
+The thread is both blocked by \fBTD_THR_SLEEP\fR and stopped by a call to
 \fBtd_thr_dbsuspend\fR(3C_DB).
 .RE
 
@@ -212,8 +209,8 @@ The \fBti_pri\fR member is the thread's priority as it would be returned by
 .sp
 .LP
 The \fBti_lid\fR member is the ID of the \fBLWP\fR executing this thread, or
-the ID of the  \fBLWP\fR that last executed this thread, if this thread is not
-currently assigned to an\fBLWP\fR.
+the ID of the \fBLWP\fR that last executed this thread, if this thread is not
+currently assigned to an \fBLWP\fR.
 .sp
 .LP
 The \fBti_sigmask\fR member is this thread's signal mask. See
@@ -235,7 +232,6 @@ regular priority.
 .LP
 The \fBti_events\fR member is the bitmap of events enabled for this thread.
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fBTD_OK\fR\fR
@@ -272,8 +268,6 @@ The call did not complete successfully.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for description of the following attributes:
 .sp
 
@@ -288,8 +282,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBlibc_db\fR(3LIB), \fBtd_ta_thr_iter\fR(3C_DB),
 \fBtd_thr_dbsuspend\fR(3C_DB), \fBthr_create\fR(3C), \fBthr_getprio\fR(3C),
 \fBthr_join\fR(3C), \fBthr_sigsetmask\fR(3C), \fBthr_suspend\fR(3C),
diff --git a/usr/src/man/man3gss/gss_display_status.3gss b/usr/src/man/man3gss/gss_display_status.3gss
index d4cd0193ef..a5a521879b 100644
--- a/usr/src/man/man3gss/gss_display_status.3gss
+++ b/usr/src/man/man3gss/gss_display_status.3gss
@@ -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 GSS_DISPLAY_STATUS 3GSS "Jan 14, 2003"
+.TH GSS_DISPLAY_STATUS 3GSS "June 20, 2021"
 .SH NAME
 gss_display_status \- convert a GSS-API status code to text
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [ \fIflag\fR... ] \fIfile\fR... \fB-lgss\fR  [ \fIlibrary\fR... ]
 #include <gssapi/gssapi.h>
@@ -19,8 +18,6 @@ gss_display_status \- convert a GSS-API status code to text
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBgss_display_status()\fR function enables an application to obtain a
 textual representation of a \fBGSS-API\fR status code for display to the user
 or for logging purposes.  Because some status values may indicate multiple
@@ -36,14 +33,12 @@ will return a non-zero value in this parameter if there are further messages to
 extract.
 .sp
 .LP
-The \fImessage_context\fR parameter contains all state information required  by
+The \fImessage_context\fR parameter contains all state information required by
 \fBgss_display_status()\fR to extract further messages from the
 \fIstatus_value\fR.  If a non-zero value is returned in this parameter, the
 application is not required to call \fBgss_display_status()\fR again unless
 subsequent messages are desired.
 .SH PARAMETERS
-.sp
-.LP
 The parameter descriptions for \fBgss_display_status()\fR follow:
 .sp
 .ne 2
@@ -95,7 +90,7 @@ Should be initialized to zero prior to the first call. On return from
 that additional messages may be extracted from the status code by means of
 subsequent calls to \fBgss_display_status()\fR, passing the same
 \fIstatus_value\fR, \fIstatus_type\fR, \fImech_type\fR, and
-\fImessage_context\fRparameters.
+\fImessage_context\fR parameters.
 .RE
 
 .sp
@@ -110,8 +105,6 @@ parameter must be freed by the application after use with a call to
 .RE
 
 .SH ERRORS
-.sp
-.LP
 The \fBgss_display_status()\fR function may return the following status codes:
 .sp
 .ne 2
@@ -154,9 +147,7 @@ of the \fIminor_status\fR parameter details the error condition.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5)  for descriptions of the following attributes:
+See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -170,8 +161,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBgss_acquire_cred\fR(3GSS), \fBgss_release_buffer\fR(3GSS),
 \fBattributes\fR(5)
 .sp
diff --git a/usr/src/man/man3ldap/ldap_entry2text.3ldap b/usr/src/man/man3ldap/ldap_entry2text.3ldap
index 81e54e3006..bc67cfb587 100644
--- a/usr/src/man/man3ldap/ldap_entry2text.3ldap
+++ b/usr/src/man/man3ldap/ldap_entry2text.3ldap
@@ -4,13 +4,12 @@
 .\" 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 LDAP_ENTRY2TEXT 3LDAP "Jan 27, 2002"
+.TH LDAP_ENTRY2TEXT 3LDAP "June 20, 2021"
 .SH NAME
 ldap_entry2text, ldap_entry2text_search, ldap_entry2html,
 ldap_entry2html_search, ldap_vals2html, ldap_vals2text \- LDAP entry display
 functions
 .SH SYNOPSIS
-.LP
 .nf
 cc[ \fIflag\fR... ] \fIfile\fR... -lldap[ \fIlibrary\fR... ]
 #include <lber.h>
@@ -78,8 +77,6 @@ cc[ \fIflag\fR... ] \fIfile\fR... -lldap[ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 These functions use the LDAP display template functions (see
 \fBldap_disptmpl\fR(3LDAP) and \fBldaptemplates.conf\fR(4)) to produce a
 plain text or an HyperText Markup Language (HTML) display of an entry or a set
@@ -152,13 +149,13 @@ HTML document.
 .sp
 .LP
 \fBldap_entry2text_search()\fR is similar to \fBldap_entry2text\fR, and all of
-the like-named parameters have the same meaning except as noted below.   If
+the like-named parameters have the same meaning except as noted below.  If
 \fIbase\fR is not \fINULL\fR, it is the search base to use when executing
 search actions.  If it is \fINULL\fR, search action template items are ignored.
 If \fIentry\fR is not \fINULL\fR, it should contain the \fIobjectClass\fR
 attribute values for the entry to be displayed.  If \fIentry\fR is \fINULL\fR,
-\fIdn\fR must not be \fINULL\fR, and  \fBldap_entry2text_search\fR will
-retrieve the  \fBobjectClass\fR values itself by calling \fBldap_search_s.\fR
+\fIdn\fR must not be \fINULL\fR, and \fBldap_entry2text_search\fR will
+retrieve the \fBobjectClass\fR values itself by calling \fBldap_search_s.\fR
 \fBldap_entry2text_search\fR will determine the appropriate display template to
 use by calling \fBldap_oc2template\fR, and will call \fBldap_search_s\fR to
 retrieve any attribute values to be displayed.  The \fItmpllist\fR parameter is
@@ -178,7 +175,7 @@ string shown next to the values (usually a friendly form of an LDAP attribute
 name). \fIlabelwidth\fR specifies the label margin, which is the number of
 blank spaces displayed to the left of the values. If zero is passed, a default
 label width is used. \fIsyntaxid\fR is a display template attribute syntax
-identifier (see  \fBldap_disptmpl\fR(3LDAP) for a list of the pre-defined
+identifier (see \fBldap_disptmpl\fR(3LDAP) for a list of the pre-defined
 \fBLDAP_SYN_...\fR values).
 .sp
 .LP
@@ -187,7 +184,7 @@ behaves exactly like ldap_entry2text(3LDAP), except for the formatted output
 and the addition of two parameters. \fIurlprefix\fR is the starting text to use
 when constructing an LDAP URL.  The default is the string \fIldap:///\fR The
 second additional parameter, \fIbase,\fR the search base to use when executing
-search actions.  If it is  \fINULL\fR, search action template items are
+search actions.  If it is \fINULL\fR, search action template items are
 ignored.
 .sp
 .LP
@@ -198,22 +195,16 @@ when constructing an LDAP URL.  The default is the string \fIldap:///\fR
 .sp
 .LP
 \fBldap_vals2html\fR behaves exactly like
-\fBldap_vals2text\fR,\fBexcept\fRHTML\fBoutput\fRis and one additional
+\fBldap_vals2text\fR, except HTML output is produced and one additional
 parameter is required. \fIurlprefix\fR is the starting text to use when
 constructing an LDAP URL. The default is the string \fIldap:///\fR
 .SH ERRORS
-.sp
-.LP
 These functions all return an LDAP error code. \fBLDAP_SUCCESS\fR is returned
 if no error occurs. See \fBldap_error\fR(3LDAP) for details. The \fIld_errno\fR
 field of the \fIld\fR parameter is also set to indicate the error.
 .SH FILES
-.sp
-.LP
 \fBETCDIR/ldaptemplates.conf\fR
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
 
@@ -227,7 +218,5 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBldap\fR(3LDAP), \fBldap_disptmpl\fR(3LDAP), \fBldaptemplates.conf\fR(4) ,
 \fBattributes\fR(5)
diff --git a/usr/src/man/man3m/fex_set_log.3m b/usr/src/man/man3m/fex_set_log.3m
index 13f774228f..80ff310d3d 100644
--- a/usr/src/man/man3m/fex_set_log.3m
+++ b/usr/src/man/man3m/fex_set_log.3m
@@ -3,12 +3,11 @@
 .\" 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 FEX_SET_LOG 3M "Jul 12, 2006" "SunOS 5.11" "Mathematical Library Functions"
+.TH FEX_SET_LOG 3M "June 20, 2021" "SunOS 5.11" "Mathematical Library Functions"
 .SH NAME
 fex_set_log, fex_get_log, fex_set_log_depth, fex_get_log_depth, fex_log_entry
 \- log retrospective diagnostics for floating point exceptions
 .SH SYNOPSIS
-.LP
 .nf
 c99 [ \fIflag\fR... ] \fIfile\fR... -lm [ \fIlibrary\fR... ]
 #include <fenv.h>
@@ -37,8 +36,6 @@ c99 [ \fIflag\fR... ] \fIfile\fR... -lm [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBfex_set_log()\fR function enables logging of retrospective diagnostic
 messages regarding floating point exceptions to the file specified by \fIfp\fR.
 If \fIfp\fR is \fINULL\fR, logging is disabled.  When a program starts, logging
@@ -47,7 +44,7 @@ is initially disabled.
 .LP
 The occurrence of any of the twelve exceptions listed in
 \fBfex_set_handling\fR(3M) constitutes an event that can be logged.  To prevent
-the log from becoming exhorbitantly long, the logging mechanism eliminates
+the log from becoming exorbitantly long, the logging mechanism eliminates
 redundant entries by two methods.  First, each exception is associated with a
 \fIsite\fR in the program.  The site is identified by the address of the
 instruction that caused the exception together with a stack trace.  Only the
@@ -81,12 +78,12 @@ stack trace are followed by the names of the corresponding symbols.
 The \fBfex_get_log()\fR function returns the current log file.
 .sp
 .LP
-The \fBfex_set_log_depth()\fR sets the maximum depth of the stack trace
+The \fBfex_set_log_depth()\fR function sets the maximum depth of the stack trace
 recorded with each exception to \fIdepth\fR stack frames.  The default depth is
 100.
 .sp
 .LP
-The\fBfex_get_log_depth()\fR function returns the current maximum stack trace
+The \fBfex_get_log_depth()\fR function returns the current maximum stack trace
 depth.
 .sp
 .LP
@@ -98,15 +95,11 @@ requested from a given site will be logged.  For the purpose of a user-supplied
 entry, the site is defined only by the stack trace, which begins with the
 function that called \fBfex_log_entry()\fR.
 .SH RETURN VALUES
-.sp
-.LP
 The \fBfex_set_log()\fR function returns a non-zero value if logging is enabled
 or disabled accordingly and returns 0 otherwise.  The \fBfex_set_log_depth()\fR
 returns a non-zero value if the requested stack trace depth is established
 (regardless of whether logging is enabled) and returns 0 otherwise.
 .SH EXAMPLES
-.sp
-.LP
 The following example demonstrates the output generated when a floating point
 overflow occurs in \fBsscanf\fR(3C).
 .sp
@@ -156,8 +149,6 @@ n, nonstop mode
 Recompiling the program or running it on another system can produce different
 text addresses from those shown above.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -174,16 +165,12 @@ MT-Level	MT-Safe (see NOTES)
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBfeclearexcept\fR(3M), \fBfegetenv\fR(3M), \fBferaiseexcept\fR(3M),
 \fBfeupdateenv\fR(3M), \fBfex_set_handling\fR(3M), \fBattributes\fR(5)
 .sp
 .LP
 \fINumerical Computation Guide\fR
 .SH NOTES
-.sp
-.LP
 All threads in a process share the same log file.  Each call to
 \fBfex_set_log()\fR preempts the previous one.
 .sp
@@ -192,7 +179,7 @@ In addition to the log file itself, two additional file descriptors are used
 during the creation of a log entry in order to obtain symbol names from the
 executable and any shared objects it uses.  These file descriptors are
 relinquished once the log entry is written.  If the file descriptors cannot be
-allocated, symbols names are omitted from the stack trace.
+allocated, symbol names are omitted from the stack trace.
 .sp
 .LP
 The functions described on this page automatically install and deinstall
diff --git a/usr/src/man/man3m/modf.3m b/usr/src/man/man3m/modf.3m
index 6cf1b7a46e..3a830d64e6 100644
--- a/usr/src/man/man3m/modf.3m
+++ b/usr/src/man/man3m/modf.3m
@@ -44,11 +44,10 @@
 .\" Copyright (c) 2001, The IEEE and The Open Group.  All Rights Reserved.
 .\" Portions Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.TH MODF 3M "Jul 12, 2006" "SunOS 5.11" "Mathematical Library Functions"
+.TH MODF 3M "June 20, 2021" "SunOS 5.11" "Mathematical Library Functions"
 .SH NAME
 modf, modff, modfl \- decompose floating-point number
 .SH SYNOPSIS
-.LP
 .nf
 c99 [ \fIflag\fR... ] \fIfile\fR... \fB-lm\fR [ \fIlibrary\fR... ]
 #include <math.h>
@@ -67,16 +66,12 @@ c99 [ \fIflag\fR... ] \fIfile\fR... \fB-lm\fR [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 These functions break the argument \fIx\fR into integral and fractional parts,
 each of which has the same sign as the argument. It stores the integral part as
 a \fBdouble\fR for the \fBmodf()\fR function, a float for the \fBmodff()\fR
-function, or a long double for the\fBmodfl()\fR function in the object pointed
+function, or a long double for the \fBmodfl()\fR function in the object pointed
 to by \fIiptr\fR.
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful completion, these functions return the signed fractional part
 of \fIx\fR.
 .sp
@@ -86,12 +81,8 @@ If \fIx\fR is NaN, a NaN is returned and *\fIiptr\fR is set to NaN.
 .LP
 If \fIx\fR is \(+-Inf, \(+-0 is returned and *\fIiptr\fR is set to \(+-Inf.
 .SH ERRORS
-.sp
-.LP
 No errors are defined.
 .SH USAGE
-.sp
-.LP
 These functions compute the function result and *\fIiptr\fR such that:
 .sp
 .in +2
@@ -102,8 +93,6 @@ x == a+*iptr ;
 .in -2
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -121,7 +110,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBfrexp\fR(3M), \fBisnan\fR(3M), \fBldexp\fR(3M), \fBattributes\fR(5),
 \fBstandards\fR(5)
diff --git a/usr/src/man/man3pam/pam_sm_open_session.3pam b/usr/src/man/man3pam/pam_sm_open_session.3pam
index 85d76caeaf..10d1814374 100644
--- a/usr/src/man/man3pam/pam_sm_open_session.3pam
+++ b/usr/src/man/man3pam/pam_sm_open_session.3pam
@@ -3,12 +3,11 @@
 .\" 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 PAM_SM_OPEN_SESSION 3PAM "Oct 13, 1998"
+.TH PAM_SM_OPEN_SESSION 3PAM "June 20, 2021"
 .SH NAME
 pam_sm_open_session, pam_sm_close_session \- service provider implementation
 for pam_open_session and pam_close_session
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [ \fIflag\fR ... ]  \fIfile\fR ... \fB-lpam\fR [ \fIlibrary\fR ... ]
 #include <security/pam_appl.h>
@@ -27,17 +26,15 @@ for pam_open_session and pam_close_session
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 In response to a call to \fBpam_open_session\fR(3PAM) and
-\fBpam_close_session\fR(3PAM), the  \fBPAM\fR framework calls
+\fBpam_close_session\fR(3PAM), the \fBPAM\fR framework calls
 \fBpam_sm_open_session()\fR and \fBpam_sm_close_session()\fR, respectively from
 the modules listed in the \fBpam.conf\fR(4) file.  The session management
 provider supplies the back-end functionality for this interface function.
 .sp
 .LP
 The \fBpam_sm_open_session()\fR function is called to initiate session
-management. The\fBpam_sm_close_session()\fR function is invoked when a session
+management. The \fBpam_sm_close_session()\fR function is invoked when a session
 has terminated. The argument \fIpamh\fR is an authentication handle. The
 following flag may be set in the \fIflags\fR field:
 .sp
@@ -57,9 +54,7 @@ options, which are interpreted and processed by the session management service.
 If an unknown option is passed in, an error should be logged through
 \fBsyslog\fR(3C) and the option ignored.
 .SH RETURN VALUES
-.sp
-.LP
-Upon successful completion,  \fBPAM_SUCCESS\fR should be returned. The
+Upon successful completion, \fBPAM_SUCCESS\fR should be returned. The
 following values may also be returned upon error:
 .sp
 .ne 2
@@ -76,13 +71,11 @@ Cannot make or remove an entry for the specified session.
 \fB\fBPAM_IGNORE\fR\fR
 .ad
 .RS 19n
-Ignore underlying session module regardless of whether the control  flag is
+Ignore underlying session module regardless of whether the control flag is
 \fIrequired\fR, \fIoptional\fR or \fIsufficient\fR.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for description of the following attributes:
 .sp
 
@@ -99,12 +92,8 @@ MT-Level	MT-Safe with exceptions
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBpam\fR(3PAM), \fBpam_open_session\fR(3PAM), \fBsyslog\fR(3C),
 \fBlibpam\fR(3LIB), \fBpam.conf\fR(4), \fBattributes\fR(5)
 .SH NOTES
-.sp
-.LP
-The interfaces in  \fBlibpam\fR are MT-Safe only if each thread within the
-multithreaded application uses its own  \fBPAM\fR handle.
+The interfaces in \fBlibpam\fR are MT-Safe only if each thread within the
+multithreaded application uses its own \fBPAM\fR handle.
diff --git a/usr/src/man/man3sasl/sasl_set_alloc.3sasl b/usr/src/man/man3sasl/sasl_set_alloc.3sasl
index b22e71edf3..15ec8dd522 100644
--- a/usr/src/man/man3sasl/sasl_set_alloc.3sasl
+++ b/usr/src/man/man3sasl/sasl_set_alloc.3sasl
@@ -5,11 +5,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 SASL_SET_ALLOC 3SASL "Oct 22, 2003"
+.TH SASL_SET_ALLOC 3SASL "June 20, 2021"
 .SH NAME
 sasl_set_alloc \- set the memory allocation functions used by the SASL library
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
 #include <sasl/sasl.h>
@@ -19,12 +18,9 @@ sasl_set_alloc \- set the memory allocation functions used by the SASL library
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 Use the \fBsasl_set_alloc()\fR interface to set the memory allocation routines
 that the SASL library and plug-ins will use.
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIc\fR\fR
@@ -48,7 +44,7 @@ A pointer to a \fBfree()\fR function
 \fB\fIm\fR\fR
 .ad
 .RS 5n
-A pointer to a\fBmalloc()\fR function
+A pointer to a \fBmalloc()\fR function
 .RE
 
 .sp
@@ -61,12 +57,8 @@ A pointer to a \fBrealloc()\fR function
 .RE
 
 .SH RETURN VALUES
-.sp
-.LP
 \fBsasl_set_alloc()\fR has no return values.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -83,11 +75,7 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBattributes\fR(5)
 .SH NOTES
-.sp
-.LP
 While most of \fBlibsasl\fR is MT-Safe, \fBsasl_set_*\fR modifies the global
 state and should be considered Unsafe.
diff --git a/usr/src/man/man3sasl/sasl_version.3sasl b/usr/src/man/man3sasl/sasl_version.3sasl
index 0c11f0ea47..397d16c8dd 100644
--- a/usr/src/man/man3sasl/sasl_version.3sasl
+++ b/usr/src/man/man3sasl/sasl_version.3sasl
@@ -5,11 +5,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 SASL_VERSION 3SASL "Oct 14, 2003"
+.TH SASL_VERSION 3SASL "June 20, 2021"
 .SH NAME
 sasl_version \- get SASL library version information
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
 #include <sasl/sasl.h>
@@ -18,19 +17,16 @@ sasl_version \- get SASL library version information
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 Use the \fBsasl_version()\fR interface to obtain the version of the SASL
 library.
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIimplementation\fR\fR
 .ad
 .RS 18n
 A vendor-defined string that describes the implementation. The value of
-\fIimplementation\fRreturned is \fBSun SASL\fR.
+\fIimplementation\fR returned is \fBSun SASL\fR.
 .RE
 
 .sp
@@ -43,12 +39,8 @@ A vendor-defined represetation of the version number.
 .RE
 
 .SH RETURN VALUES
-.sp
-.LP
 The \fBsasl_version()\fR interface has no return values.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -65,6 +57,4 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBattributes\fR(5)
diff --git a/usr/src/man/man3scf/scf_simple_prop_get.3scf b/usr/src/man/man3scf/scf_simple_prop_get.3scf
index 5726bf8f13..1fdcc0e29f 100644
--- a/usr/src/man/man3scf/scf_simple_prop_get.3scf
+++ b/usr/src/man/man3scf/scf_simple_prop_get.3scf
@@ -3,7 +3,7 @@
 .\" 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 SCF_SIMPLE_PROP_GET 3SCF "Nov 7, 2007"
+.TH SCF_SIMPLE_PROP_GET 3SCF "June 20, 2021"
 .SH NAME
 scf_simple_prop_get, scf_simple_prop_free, scf_simple_app_props_get,
 scf_simple_app_props_free, scf_simple_app_props_next,
@@ -15,7 +15,6 @@ scf_simple_prop_next_ustring, scf_simple_prop_next_opaque,
 scf_simple_prop_next_reset \- simplified property read interface to Service
 Configuration Facility
 .SH SYNOPSIS
-.LP
 .nf
 cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lscf\fR [ \fIlibrary\fR\&.\|.\|. ]
 #include <libscf.h>
@@ -116,8 +115,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lscf\fR [ \fIlibrary\fR\&.\|.
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The simplified read interface to the Service Configuration Facility deals with
 properties and blocks of properties.
 .sp
@@ -182,7 +179,7 @@ reference into the \fBscf_simple_app_props_t\fR, its lifetime extends only
 until that structure is freed.
 .sp
 .LP
-The\fBscf_simple_app_props_search()\fR function queries for an exact match on a
+The \fBscf_simple_app_props_search()\fR function queries for an exact match on a
 property in a property group. It takes an apps prop object, a property group
 name, and a property name, and returns a property pointer. Because the property
 is a reference into the \fBscf_simple_app_props_t\fR, its lifetime extends only
@@ -230,8 +227,6 @@ The \fBscf_simple_prop_next_reset()\fR function resets iteration on a property,
 so that a call to one of the \fBscf_simple_prop_next_*()\fR functions returns
 the first value in the property.
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful completion, \fBscf_simple_prop_get()\fR returns a pointer to an
 allocated \fBscf_simple_prop_t\fR. Otherwise, it returns \fINULL\fR.
 .sp
@@ -269,8 +264,6 @@ return a pointer to the next value in the property. After all values have been
 returned, NULL is returned and \fBSCF_ERROR_NONE\fR is set. On failure,
 \fINULL\fR is returned and the appropriate error value is set.
 .SH ERRORS
-.sp
-.LP
 The \fBscf_simple_prop_get()\fR and \fBscf_simple_app_props_get()\fR functions
 will fail if:
 .sp
@@ -405,7 +398,6 @@ The requested type does not match the property type.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRSimple Property Get
 .sp
 .in +2
@@ -514,8 +506,6 @@ scf_simple_app_props_free(appprops);
 .in -2
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -532,6 +522,4 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBlibscf\fR(3LIB), \fBscf_error\fR(3SCF), \fBattributes\fR(5)
diff --git a/usr/src/man/man3slp/slp_api.3slp b/usr/src/man/man3slp/slp_api.3slp
index 0724784449..b8975ab55d 100644
--- a/usr/src/man/man3slp/slp_api.3slp
+++ b/usr/src/man/man3slp/slp_api.3slp
@@ -3,25 +3,22 @@
 .\" 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 SLP_API 3SLP "Jan 16, 2003"
+.TH SLP_API 3SLP "June 20, 2021"
 .SH NAME
 slp_api \- Service Location Protocol Application Programming Interface
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-l\fRslp  [ \fIlibrary\fR ... ]
 #include <slp.h>
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-The \fBslp_api\fR is a C  language  binding  that  maps directly into the
-Service  Location Protocol ("\fBSLP\fR") defined  by  \fIRFC 2614\fR. This
-implementation requires minimal overhead. With  the exception  of the
-\fBSLPDereg()\fR and \fBSLPDelAttrs()\fR functions,  which  map into  different
-uses  of  the  \fBSLP\fR deregister  request, there is  one C  language
-function  per protocol  request.   Parameters are for the most part character
+The \fBslp_api\fR is a C language binding that maps directly into the
+Service Location Protocol ("\fBSLP\fR") defined by \fIRFC 2614\fR. This
+implementation requires minimal overhead. With the exception of the
+\fBSLPDereg()\fR and \fBSLPDelAttrs()\fR functions, which map into different
+uses of the \fBSLP\fR deregister request, there is one C language
+function per protocol request.   Parameters are for the most part character
 buffers.  Memory management is kept simple because the client allocates most
 memory and client callback functions are required to copy incoming parameters
 into memory allocated by the client code. Any memory returned directly from the
@@ -43,15 +40,13 @@ non-\fINULL\fR. Some parameters may have other restrictions.  If any parameter
 fails to satisfy the restrictions on its value, the operation returns a
 \fBPARAMETER_BAD\fR error.
 .SS "Syntax for String Parameters"
-.sp
-.LP
 Query strings, attribute registration lists, attribute deregistration lists,
 scope lists, and attribute selection lists follow the syntax described in
 \fIRFC 2608\fR. The \fBAPI\fR reflects the strings passed from clients directly
-into protocol  requests, and reflects out strings returned from protocol
+into protocol requests, and reflects out strings returned from protocol
 replies directly to clients. As a consequence, clients are responsible for
 formatting request strings, including escaping and converting opaque values to
-escaped byte-encoded strings. Similarly, on output, clients are required  to
+escaped byte-encoded strings. Similarly, on output, clients are required to
 unescape strings and convert escaped string-encoded opaques to binary. The
 \fBSLPEscape()\fR and \fBSLPUnescape()\fR functions can be used for escaping
 \fBSLP\fR reserved characters, but they perform no opaque processing.
@@ -65,8 +60,6 @@ consists of a backslash followed by the two hexadecimal digits encoding the
 byte. An example is "\fB\e2c\fR" for the byte \fB0x2c\fR. Clients handle opaque
 processing themselves, since the algorithm is relatively simple and uniform.
 .SS "System Properties"
-.sp
-.LP
 The system properties established in \fBslp.conf\fR(4), the configuration file,
 are accessible through the \fBSLPGetProperty()\fR and \fBSLPSetProperty()\fR
 functions. The \fBSLPSetProperty()\fR function modifies properties only in the
@@ -75,7 +68,7 @@ property is used and, as with parsing the configuration file, are logged at the
 \fBLOG_INFO\fR priority. Program execution continues without interruption by
 substituting the default for the erroneous parameter. In general, individual
 agents should rarely be required to override these properties, since they
-reflect properties of the \fBSLP\fR network that are not  of concern to
+reflect properties of the \fBSLP\fR network that are not of concern to
 individual agents. If changes are required, system administrators should modify
 the configuration file.
 .sp
@@ -83,8 +76,6 @@ the configuration file.
 Properties are global to the process, affecting all threads and all handles
 created with \fBSLPOpen()\fR.
 .SS "Memory Management"
-.sp
-.LP
 The only \fBAPI\fR functions that return memory specifically requiring
 deallocation on the part of the client are \fBSLPParseSrvURL()\fR,
 \fBSLPFindScope()\fR, \fBSLPEscape()\fR, and \fBSLPUnescape()\fR. Free this
@@ -97,8 +88,6 @@ retained by the client code. Otherwise, crashes are possible. Clients must copy
 data out of the callback parameters. No other use of the memory in callback
 parameters is allowed.
 .SS "Asynchronous and Incremental Return Semantics"
-.sp
-.LP
 If a handle parameter to an \fBAPI\fR function is opened asynchronously, the
 \fBAPI\fR function calls on the handle to check the other parameters, opens the
 appropriate operation, and returns immediately. If an error occurs in the
@@ -112,7 +101,7 @@ occurred during the operation.
 The callback function is called whenever the \fBAPI\fR library has results to
 report. The callback code is required to check the error code parameter before
 looking at the other parameters. If the error code is not \fBSLP_OK\fR, the
-other parameters  may be \fINULL\fR or otherwise invalid. The \fBAPI\fR library
+other parameters may be \fINULL\fR or otherwise invalid. The \fBAPI\fR library
 can terminate any outstanding operation on which an error occurs. The callback
 code can similarly indicate that the operation should be terminated by passing
 back \fBSLP_FALSE\fR to indicate that it is not interested in receiving more
@@ -172,19 +161,14 @@ replies has been collected and returned.
 .RE
 
 .SS "Configuration Files"
-.sp
-.LP
 The \fBAPI\fR library reads \fBslp.conf\fR(4), the default configuration file,
 to obtain the operating parameters. You can specify the location of this file
 with the \fBSLP_CONF_FILE\fR environment variable. If you do not set this
 variable, or the file it refers to is invalid, the \fBAPI\fR will use the
 default configuration file at \fB/etc/inet/slp.conf\fR instead.
 .SS "Data Structures"
-.sp
-.LP
 The data structures used by the \fBSLP\fR \fBAPI\fR are as follows:
 .SS "The URL Lifetime Type"
-.sp
 .in +2
 .nf
 typedef enum {
@@ -196,14 +180,13 @@ typedef enum {
 
 .sp
 .LP
-The enumeration \fBSLPURLLifetime\fR  contains  \fBURL\fR  lifetime values, in
+The enumeration \fBSLPURLLifetime\fR contains \fBURL\fR lifetime values, in
 seconds, that are frequently used. \fBSLP_LIFETIME_DEFAULT\fR is 3 hours, while
-\fBSLP_LIFETIME_MAXIMUM\fR is  18 hours, which corresponds to the maximum size
+\fBSLP_LIFETIME_MAXIMUM\fR is 18 hours, which corresponds to the maximum size
 of the \fBlifetime\fR field in \fBSLP\fR messages. Note that on registration
 \fBSLP_LIFETIME_MAXIMUM\fR causes the advertisement to be continually
 reregistered until the process exits.
 .SS "The SLPBoolean Type"
-.sp
 .in +2
 .nf
 typedef enum {
@@ -217,7 +200,6 @@ typedef enum {
 .LP
 The enumeration \fBSLPBoolean\fR is used as a Boolean flag.
 .SS "The Service URL Structure"
-.sp
 .in +2
 .nf
 typedef struct srvurl {
@@ -291,7 +273,6 @@ differentiation of the service.
 .RE
 
 .SS "The SLPHandle"
-.sp
 .in +2
 .nf
 typedef void* SLPHandle;
@@ -304,8 +285,6 @@ The \fBSLPHandle\fR type is returned by \fBSLPOpen()\fR and is a parameter to
 all \fBSLP\fR functions. It serves as a handle for all resources allocated on
 behalf of the process by the \fBSLP\fR library. The type is opaque.
 .SS "Callbacks"
-.sp
-.LP
 Include a function pointer to a callback function specific to a particular
 \fBAPI\fR operation in the parameter list when the \fBAPI\fR function is
 invoked. The callback function is called with the results of the operation in
@@ -327,7 +306,6 @@ should continue processing the operation. If the value returned from the
 callback is \fBSLP_TRUE\fR, asynchronous operations are terminated. Synchronous
 operations ignore the return since the operation is already complete.
 .SS "\fBSLPRegReport()\fR"
-.sp
 .in +2
 .nf
 typedef void SLPRegReport(SLPHandle hSLP,
@@ -347,7 +325,7 @@ callback has the following parameters:
 \fB\fIhSLP\fR\fR
 .ad
 .RS 12n
-The\fBSLPHandle()\fR used to initiate the operation.
+The \fBSLPHandle()\fR used to initiate the operation.
 .RE
 
 .sp
@@ -370,7 +348,6 @@ function, starting the operation. It may be \fINULL\fR.
 .RE
 
 .SS "\fBSLPSrvTypeCallback()\fR"
-.sp
 .in +2
 .nf
 typedef SLPBoolean SLPSrvTypeCallback(SLPHandle hSLP,
@@ -423,12 +400,11 @@ terminate the outstanding operation.
 \fB\fIpvCookie\fR\fR
 .ad
 .RS 14n
-emory passed down from the client code that called the original \fBAPI\fR
+Memory passed down from the client code that called the original \fBAPI\fR
 function, starting the operation. It can be \fINULL\fR.
 .RE
 
 .SS "SLPSrvURLCallback"
-.sp
 .in +2
 .nf
 typedef SLPBoolean SLPSrvURLCallback(SLPHandle hSLP,
@@ -496,7 +472,6 @@ function, starting the operation. It can be \fINULL\fR.
 .RE
 
 .SS "SLPAttrCallback"
-.sp
 .in +2
 .nf
 typedef SLPBoolean SLPAttrCallback(SLPHandle hSLP,
@@ -575,8 +550,6 @@ function, starting the operation. It can be \fINULL\fR.
 .RE
 
 .SH ERRORS
-.sp
-.LP
 An interface that is part of the \fBSLP\fR \fBAPI\fR may return one of the
 following values.
 .sp
@@ -741,7 +714,7 @@ If the network cannot initialize properly, this error is returned.
 \fB\fBSLP_MEMORY_ALLOC_FAILED\fR\fR
 .ad
 .RS 30n
-If the \fBAPI\fR fails to allocate memory, the operationis aborted and returns
+If the \fBAPI\fR fails to allocate memory, the operation is aborted and returns
 this.
 .RE
 
@@ -751,7 +724,7 @@ this.
 \fB\fBSLP_PARAMETER_BAD\fR\fR
 .ad
 .RS 30n
-If a parameter passed into an interface is bad, this  error is returned.
+If a parameter passed into an interface is bad, this error is returned.
 .RE
 
 .sp
@@ -787,7 +760,6 @@ If an attempt is made to do so, this error is returned from the called
 .RE
 
 .SH LIST OF ROUTINES
-.sp
 .ne 2
 .na
 \fB\fBSLPOpen()\fR\fR
@@ -941,12 +913,8 @@ free memory
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 When \fBSLP_CONF_FILE\fR is set, use this file for configuration.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -963,8 +931,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBslpd\fR(1M), \fBslp.conf\fR(4), \fBslpd.reg\fR(4), \fBattributes\fR(5)
 .sp
 .LP
diff --git a/usr/src/man/man3tnf/libtnfctl.3tnf b/usr/src/man/man3tnf/libtnfctl.3tnf
index bd02d743ee..ac1a673b98 100644
--- a/usr/src/man/man3tnf/libtnfctl.3tnf
+++ b/usr/src/man/man3tnf/libtnfctl.3tnf
@@ -3,20 +3,17 @@
 .\" 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 LIBTNFCTL 3TNF "Mar 1, 2004"
+.TH LIBTNFCTL 3TNF "June 20, 2021"
 .SH NAME
 libtnfctl \- library for TNF probe control in a process or the kernel
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-ltnfctl\fR [ \fIlibrary\fR ... ]
 #include <tnf/tnfctl.h>
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-The \fBlibtnfctl\fR library provides an  \fBAPI\fR to control  \fBTNF\fR
+The \fBlibtnfctl\fR library provides an \fBAPI\fR to control \fBTNF\fR
 ("Trace Normal Form") probes within a process or the kernel. See
 \fBtracing\fR(3TNF) for an overview of the Solaris tracing architecture. The
 client of \fBlibtnfctl\fR controls probes in one of four modes:
@@ -36,7 +33,7 @@ own probes.
 \fBdirect mode\fR
 .ad
 .RS 17n
-The target is a separate process; a client can either  \fBexec\fR(2) a program
+The target is a separate process; a client can either \fBexec\fR(2) a program
 or attach to a running process for probe control. The \fBlibtnfctl\fR library
 uses \fBproc\fR(4) on the target process for probe and process control in this
 mode, and additionally provides basic process control features.
@@ -49,7 +46,7 @@ mode, and additionally provides basic process control features.
 .ad
 .RS 17n
 The target is a separate process, but the controlling process is already using
-\fBproc\fR(4) to control the target, and hence  \fBlibtnfctl\fR cannot use
+\fBproc\fR(4) to control the target, and hence \fBlibtnfctl\fR cannot use
 those interfaces directly.  Use this mode to control probes from within a
 debugger. In this mode, the client must provide a set of functions that
 \fBlibtnfctl\fR can use to query and update the target process.
@@ -94,10 +91,10 @@ These interfaces create handles in the specified modes:
 .TS
 l l l l l
 l l l l l .
-\fBtnfctl_internal_open()\fR	INT			
-\fBtnfctl_exec_open()\fR		D		
-\fBtnfctl_pid_open()\fR		D		
-\fBtnfctl_indirect_open()\fR			IND	
+\fBtnfctl_internal_open()\fR	INT
+\fBtnfctl_exec_open()\fR		D
+\fBtnfctl_pid_open()\fR		D
+\fBtnfctl_indirect_open()\fR			IND
 \fBtnfctl_kernel_open()\fR				K
 .TE
 
@@ -110,9 +107,9 @@ These interfaces are used with the specified modes:
 .TS
 l l l l l
 l l l l l .
-\fBtnfctl_continue()\fR		D		
-\fBtnfctl_probe_connect()\fR	INT	D	IND	
-\fBtnfctl_probe_disconnect_all ()\fR	INT	D	IND	
+\fBtnfctl_continue()\fR		D
+\fBtnfctl_probe_connect()\fR	INT	D	IND
+\fBtnfctl_probe_disconnect_all ()\fR	INT	D	IND
 \fBtnfctl_trace_attrs_get()\fR	INT	D	IND	K
 \fBtnfctl_buffer_alloc()\fR	INT	D	IND	K
 \fBtnfctl_register_funcs()\fR	INT	D	IND	K
@@ -166,7 +163,7 @@ opportunity to do one-time processing for each probe.
 .LP
 The \fBtnfctl_check_libs()\fR function is used primarily in indirect mode to
 check whether any new probes have appeared, that is, they have been made
-available by  \fBdlopen\fR(3C), or have disappeared, that is, they have
+available by \fBdlopen\fR(3C), or have disappeared, that is, they have
 disassociated from the process by \fBdlclose\fR(3C).
 .sp
 .LP
@@ -189,10 +186,10 @@ status of a probe, such as whether it is currently enabled.
 .sp
 .LP
 The \fBtnfctl_trace_attrs_get()\fR function returns information about the
-tracing session, such as the  size of the trace buffer or trace file.
+tracing session, such as the size of the trace buffer or trace file.
 .sp
 .LP
-The \fBtnfctl_strerror()\fR function maps a  \fBtnfctl\fR error code to a
+The \fBtnfctl_strerror()\fR function maps a \fBtnfctl\fR error code to a
 string, for reporting purposes.
 .sp
 .LP
@@ -213,13 +210,9 @@ cluttering up the kernel's trace buffer.
 The \fBtnfctl_buffer_dealloc()\fR function deallocates the kernel's internal
 trace buffer.
 .SH RETURN VALUES
-.sp
-.LP
-Upon successful completion, these functions return\fBTNFCTL_ERR_NONE\fR.
+Upon successful completion, these functions return \fBTNFCTL_ERR_NONE\fR.
 .SH ERRORS
-.sp
-.LP
-The error codes for  \fBlibtnfctl\fR are:
+The error codes for \fBlibtnfctl\fR are:
 .sp
 .ne 2
 .na
@@ -419,8 +412,6 @@ Error code reserved for user.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -435,8 +426,6 @@ MT Level	MT-Safe with exceptions
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBprex\fR(1), \fBexec\fR(2), \fBdlclose\fR(3C), \fBdlopen\fR(3C),
 \fBTNF_PROBE\fR(3TNF), \fBtnfctl_buffer_alloc\fR(3TNF),
 \fBtnfctl_buffer_dealloc\fR(3TNF), \fBtnfctl_check_libs\fR(3TNF),
@@ -457,11 +446,9 @@ MT Level	MT-Safe with exceptions
 .LP
 \fILinker and Libraries Guide\fR
 .SH NOTES
-.sp
-.LP
-This  \fBAPI\fR is MT-Safe.  Multiple threads may concurrently operate on
+This \fBAPI\fR is MT-Safe.  Multiple threads may concurrently operate on
 independent \fBtnfctl\fR handles, which is the typical behavior expected.  The
 \fBlibtnfctl\fR library does not support multiple threads operating on the same
 \fBtnfctl\fR handle.  If this is desired, it is the client's responsibility to
-implement  locking to ensure that two threads that use the same \fBtnfctl\fR
+implement locking to ensure that two threads that use the same \fBtnfctl\fR
 handle are not simultaneously in a \fBlibtnfctl\fR interface.
diff --git a/usr/src/man/man4/NISLDAPmapping.4 b/usr/src/man/man4/NISLDAPmapping.4
index e0aacf05eb..e1b30af0e0 100644
--- a/usr/src/man/man4/NISLDAPmapping.4
+++ b/usr/src/man/man4/NISLDAPmapping.4
@@ -3,7 +3,7 @@
 .\" 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 NISLDAPMAPPING 4 "September 12, 2020"
+.TH NISLDAPMAPPING 4 "June 20, 2021"
 .SH NAME
 NISLDAPmapping \- mapping file used by the NIS server components
 .SH SYNOPSIS
@@ -33,7 +33,7 @@ customize your \fBNISLDAPmapping\fR file as you require.
 .sp
 .LP
 Each attribute defined below can be specified
-in\fB/var/yp/NISLDAPmappingLDAP\fR or as an LDAP attribute. If both are
+in \fB/var/yp/NISLDAPmapping\fR or as an LDAP attribute. If both are
 specified, then the attribute in \fB/var/yp/NISLDAPmapping\fR (including empty
 values) takes precedence.
 .sp
@@ -700,7 +700,7 @@ below, including examples of complex attribute to field conversions.
 .ad
 .sp .6
 .RS 4n
- Specifies how an LDAP attribute value is derived from a NIS entriy field
+ Specifies how an LDAP attribute value is derived from a NIS entry field
 value.
 .sp
 The syntax for the \fBnisLDAPattributeFromField\fR attribute is as follows:
diff --git a/usr/src/man/man4/power.conf.4 b/usr/src/man/man4/power.conf.4
index 0fdb2be5ad..56f841fe23 100644
--- a/usr/src/man/man4/power.conf.4
+++ b/usr/src/man/man4/power.conf.4
@@ -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 POWER.CONF 4 "May 13, 2017"
+.TH POWER.CONF 4 "June 20, 2021"
 .SH NAME
 power.conf \- Power Management configuration information file
 .SH SYNOPSIS
-.LP
 .nf
 \fB/etc/power.conf\fR
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBpower.conf\fR file is used by the Power Management configuration program
 \fBpmconfig\fR(1M), to initialize the settings for Power Management. If you
 make changes to this file, you must run \fBpmconfig\fR(1M) manually for the
@@ -30,7 +28,6 @@ power when the device is idle.
 All entries in the \fBpower.conf\fR file are processed in the order that they
 occur in the file.
 .SS "Automatic Device Power Management"
-.LP
 Devices with drivers that use the automatic device Power Management interfaces
 are automatically power managed if the \fBautopm\fR entry is enabled. The
 \fBautopm\fR entry is described near the end of this section. The
@@ -198,7 +195,7 @@ device-thresholds \fI/pci@f0000/xfb@0 (0) (3m 5m 15m)\fR
 .LP
 would set the \fIthreshold\fR time for the \fBMonitor\fR component of the
 specific \fBxfb\fR card to go from \fBOn\fR to \fBStandby in\fR 15 minutes, the
-\fIthreshold\fR for \fBMonitor\fR to go from \fBStandby\fR to \fBSuspend\fRin 5
+\fIthreshold\fR for \fBMonitor\fR to go from \fBStandby\fR to \fBSuspend\fR in 5
 minutes, and the \fIthreshold\fR for \fBMonitor\fR to go from \fBSuspend\fR to
 \fBOff\fR in 3 minutes. The threshold for \fBFrame Buffer\fR to go from
 \fBOn\fR to \fBOff\fR is 0 seconds.
@@ -451,7 +448,6 @@ Once every device is at its lowest possible power state, additional power
 savings can be obtained by putting the system into a sleep state (if the
 platform hardware is capable of doing so).
 .SS "S3 Support"
-.LP
 Because of reliability problems encountered in BIOS implementations of X86
 systems not produced by Sun Microsystems, by default, only X86 workstation
 products produced by Sun are considered to support S3 (suspend to RAM). To
@@ -483,7 +479,6 @@ The system does not support entry into S3 state.
 .RE
 
 .SS "Automatic Entry Into S3"
-.LP
 If supported by your platform, an autoS3 entry can be used to enable or disable
 automatic entry into the S3 state. When in the S3 state, the power button,
 keyboard and mouse activity or network traffic (depending upon the capabilities
@@ -528,7 +523,6 @@ The system does not automatically enter the S3 state.
 .RE
 
 .SS "System Power Management"
-.LP
 The system Power Management entries control Power Management of the entire
 system using the suspend-resume feature. When the system is suspended, the
 complete current state is saved on the disk before power is removed. On reboot,
@@ -725,7 +719,6 @@ been locked down. It is recommended that statefile be placed on a file system
 with at least 10 Mbytes of free space. In case there is no statefile entry at
 boot time, an appropriate new entry is automatically created by the system.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRDisabling Automatic Device Power Management
 .sp
 .LP
@@ -755,7 +748,6 @@ autopm disable
 Then run \fBpmconfig\fR or reboot. See \fBpmconfig\fR(1M) for more information.
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -766,11 +758,10 @@ c | c
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Interface stability 	Committed
+Interface stability	Committed
 .TE
 
 .SH SEE ALSO
-.LP
 \fBpmconfig\fR(1M), \fBpowerd\fR(1M), \fBuadmin\fR(2),
 \fBlibdevinfo\fR(3LIB), \fBattributes\fR(5), \fBcpr\fR(7), \fBldterm\fR(7M),
 \fBpm\fR(7D), \fBpm-components\fR(9P), \fBremovable-media\fR(9P)
@@ -778,7 +769,6 @@ Interface stability 	Committed
 .LP
 \fIWriting Device Drivers\fR
 .SH NOTES
-.LP
 SPARC desktop models first shipped after October 1, 1995 and before July 1,
 1999 comply with the United States Environmental Protection Agency's \fIEnergy
 Star Memorandum of Understanding #2\fR guidelines and have \fBautoshutdown\fR
diff --git a/usr/src/man/man4/terminfo.4 b/usr/src/man/man4/terminfo.4
index cadbccc0ef..1666d8e3f9 100644
--- a/usr/src/man/man4/terminfo.4
+++ b/usr/src/man/man4/terminfo.4
@@ -4,7 +4,7 @@
 .\" 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 TERMINFO 4 "December 28, 2020"
+.TH TERMINFO 4 "June 20, 2021"
 .SH NAME
 terminfo \- terminal and printer capability database
 .SH SYNOPSIS
@@ -56,15 +56,15 @@ escaped by using a backslash. Each device entry has the following format:
 .LP
 The first line, commonly referred to as the header line, must begin in column
 one and must contain at least two aliases separated by vertical bars. The last
-field in the header line must be the  long name of the device and it may
+field in the header line must be the long name of the device and it may
 contain any string. Alias names must be unique in the \fBterminfo\fR database
-and they must conform to system file naming  conventions. See \fBtic\fR(1M).
+and they must conform to system file naming conventions. See \fBtic\fR(1M).
 They cannot, for example, contain white space or slashes.
 .sp
 .LP
 Every device must be assigned a name, such as "vt100". Device names (except the
 long name) should be chosen using the following conventions. The name should
-not contain hyphens because hyphens are  reserved for use when adding suffixes
+not contain hyphens because hyphens are reserved for use when adding suffixes
 that indicate special modes.
 .sp
 .LP
@@ -107,7 +107,7 @@ The \fBterminfo\fR reference manual page is organized in two sections:
 \fBPART 2: PRINTER CAPABILITIES\fR
 .RE
 .SS "PART 1: DEVICE CAPABILITIES"
-Capabilities in \fBterminfo\fR are of three types:  Boolean capabilities (which
+Capabilities in \fBterminfo\fR are of three types: Boolean capabilities (which
 show that a device has or does not have a particular feature), numeric
 capabilities (which quantify particular features of a device), and string
 capabilities (which provide sequences that can be used to perform particular
@@ -942,7 +942,7 @@ complex entries in the \fBterminfo\fR file as of this writing.
 
 .SS "Types of Capabilities in the Sample Entry"
 The sample entry shows the formats for the three types of \fBterminfo\fR
-capabilities listed:  Boolean, numeric, and string. All capabilities specified
+capabilities listed: Boolean, numeric, and string. All capabilities specified
 in the \fBterminfo\fR source file must be followed by commas, including the
 last capability in the source file. In \fBterminfo\fR source files,
 capabilities are referenced by their capability names (as shown in the previous
@@ -964,7 +964,7 @@ sequence) are listed by a two- to five-character capname, an `=', and a string
 ended by the next occurrence of a comma. A delay in milliseconds may appear
 anywhere in such a capability, preceded by \fB$\fR and enclosed in angle
 brackets, as in \fBel=\eEK$<3>\fR. Padding characters are supplied by
-\fBtput\fR. The delay can be any of the following:  a number, a number followed
+\fBtput\fR. The delay can be any of the following: a number, a number followed
 by an asterisk, such as \fB5*\fR, a number followed by a slash, such as
 \fB5/\fR, or a number followed by both, such as \fB5*/\fR. A `\fB*\fR\fB\&'\fR
 shows that the padding required is proportional to the number of lines affected
@@ -1240,7 +1240,7 @@ push strlen(pop)
 .ad
 .sp .6
 .RS 4n
-arithmetic (\fB%m\fR is mod):  push(pop integer2 op pop integer1)
+arithmetic (\fB%m\fR is mod): push(pop integer2 op pop integer1)
 .RE
 
 .sp
@@ -1250,7 +1250,7 @@ arithmetic (\fB%m\fR is mod):  push(pop integer2 op pop integer1)
 .ad
 .sp .6
 .RS 4n
-bit operations:  push(pop integer2 op pop integer1)
+bit operations: push(pop integer2 op pop integer1)
 .RE
 
 .sp
@@ -1260,7 +1260,7 @@ bit operations:  push(pop integer2 op pop integer1)
 .ad
 .sp .6
 .RS 4n
-logical operations:  push(pop integer2 op pop integer1)
+logical operations: push(pop integer2 op pop integer1)
 .RE
 
 .sp
@@ -1270,7 +1270,7 @@ logical operations:  push(pop integer2 op pop integer1)
 .ad
 .sp .6
 .RS 4n
-logical operations:  and, or
+logical operations: and, or
 .RE
 
 .sp
@@ -1280,7 +1280,7 @@ logical operations:  and, or
 .ad
 .sp .6
 .RS 4n
-unary operations:  push(op pop)
+unary operations: push(op pop)
 .RE
 
 .sp
@@ -1828,7 +1828,7 @@ Now write down the characters left to right, as in
 In addition, \fBterminfo\fR allows you to define multiple character sets. See
 Section 2-5 for details.
 .SS "Section 1-13: Color Manipulation"
-Let us define two methods of color manipulation:  the Tektronix method and the
+Let us define two methods of color manipulation: the Tektronix method and the
 HP method. The Tektronix method uses a set of N predefined colors (usually 8)
 from which a user can select "current" foreground and background colors. Thus a
 terminal can support up to N colors mixed into N*N color-pairs to be displayed
@@ -1844,7 +1844,7 @@ and color-pairs that can be displayed on the screen at the same time. If a
 terminal can change the definition of a color (for example, the Tektronix 4100
 and 4200 series terminals), this should be specified with \fBccc\fR (can change
 color). To change the definition of a color (Tektronix 4200 method), use
-\fBinitc\fR (initialize color). It requires four arguments:  color number
+\fBinitc\fR (initialize color). It requires four arguments: color number
 (ranging from 0 to \fBcolors\fR\(mi1) and three RGB (red, green, and blue)
 values or three HLS colors (Hue, Lightness, Saturation). Ranges of RGB and HLS
 values are terminal dependent.
@@ -1863,9 +1863,9 @@ different from RGB and HLS, a mapping to either RGB or HLS must be developed.
 .LP
 To set current foreground or background to a given color, use \fBsetaf\fR (set
 ANSI foreground) and \fBsetab\fR (set ANSI background). They require one
-parameter:  the number of the color. To initialize a color-pair (HP method),
-use \fBinitp\fR (initialize pair). It requires seven parameters:  the number of
-a color-pair (range=0 to \fBpairs\fR\(mi1), and six RGB values:  three for the
+parameter: the number of the color. To initialize a color-pair (HP method),
+use \fBinitp\fR (initialize pair). It requires seven parameters: the number of
+a color-pair (range=0 to \fBpairs\fR\(mi1), and six RGB values: three for the
 foreground followed by three for the background. (Each of these groups of three
 should be in the order RGB.) When \fBinitc\fR or \fBinitp\fR are used, RGB or
 HLS arguments should be in the order "red, green, blue" or "hue, lightness,
@@ -2209,8 +2209,8 @@ Using any of the control sequences in these strings will imply a change in some
 of the values of \fBorc\fR, \fBorhi\fR, \fBorl\fR, and \fBorvi\fR. Also, the
 distance moved when a wide character is printed, \fBwidcs\fR, changes in
 relation to \fBorc\fR. The distance moved when a character is printed in micro
-mode, \fBmcs\fR, changes similarly, with one exception:  if the distance is 0
-or 1, then no change is assumed (see items marked with  * in the following
+mode, \fBmcs\fR, changes similarly, with one exception: if the distance is 0
+or 1, then no change is assumed (see items marked with * in the following
 table).
 .sp
 .LP
@@ -2336,7 +2336,7 @@ mode.
 .LP
 The movement made when a character is printed in the rightmost position varies
 among printers. Some make no movement, some move to the beginning of the next
-line, others move to the beginning of the same line. \fBterminfo\fRhas boolean
+line, others move to the beginning of the same line. \fBterminfo\fR has boolean
 capabilities for describing all three cases.
 .sp
 .in +2
@@ -2425,7 +2425,7 @@ Miscellaneous Motion Strings
 .sp
 
 .SS "Margins"
-\fBterminfo\fR provides two strings for setting margins on terminals:  one for
+\fBterminfo\fR provides two strings for setting margins on terminals: one for
 the left and one for the right margin. Printers, however, have two additional
 margins, for the top and bottom margins of each page. Furthermore, some
 printers require not using motion strings to move the current position to a
@@ -2912,6 +2912,6 @@ The most effective way to prepare a terminal description is by imitating the
 description of a similar terminal in \fBterminfo\fR and to build up a
 description gradually, using partial descriptions with a screen oriented
 editor, such as \fBvi\fR, to check that they are correct. To easily test a new
-terminal description the environment variable \fBTERMINFO\fR  can be set to the
+terminal description the environment variable \fBTERMINFO\fR can be set to the
 pathname of a directory containing the compiled description, and programs will
 look there rather than in \fB/usr/share/lib/terminfo\fR.
diff --git a/usr/src/man/man4/tnf_kernel_probes.4 b/usr/src/man/man4/tnf_kernel_probes.4
index b7c84e1e41..12ab068ccb 100644
--- a/usr/src/man/man4/tnf_kernel_probes.4
+++ b/usr/src/man/man4/tnf_kernel_probes.4
@@ -3,7 +3,7 @@
 .\" 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 TNF_KERNEL_PROBES 4 "May 16, 2020"
+.TH TNF_KERNEL_PROBES 4 "June 20, 2021"
 .SH NAME
 tnf_kernel_probes \- TNF kernel probes
 .SH DESCRIPTION
@@ -438,7 +438,7 @@ Pagein start event.  This event signals the initiation of pagein I/O.
 .sp
 .ne 2
 .na
-\fB\fIvnode\fRand\fIoffset\fR\fR
+\fB\fIvnode\fR and \fIoffset\fR\fR
 .ad
 .RS 18n
 Identifies the file and offset to be paged in.
diff --git a/usr/src/man/man7d/hxge.7d b/usr/src/man/man7d/hxge.7d
index 23cbc8c5ce..2574c00391 100644
--- a/usr/src/man/man7d/hxge.7d
+++ b/usr/src/man/man7d/hxge.7d
@@ -3,18 +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 HXGE 7D "Feb 10, 2007"
+.TH HXGE 7D "June 20, 2021"
 .SH NAME
 hxge \- Sun Blade 10 Gigabit Ethernet network driver
 .SH SYNOPSIS
-.LP
 .nf
 /dev/hxge*
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBhxge\fR Gigabit Ethernet driver is a multi-threaded, loadable, clonable,
 GLD-based STREAMS driver supporting the Data Link Provider Interface,
 \fBdlpi\fR(7P), on the Sun Blade Shared 10Gb Ethernet Interface.
@@ -29,14 +26,12 @@ The \fBhxge\fR driver functions include chip initialization, frame transmit and
 receive, flow classification, multicast and promiscuous support and error
 recovery and reporting in the blade domain.
 .SH APPLICATION PROGRAMMING INTERFACE
-.sp
-.LP
-The cloning character-special device, \fB/dev/hxge\fR, is used  to access Sun
+The cloning character-special device, \fB/dev/hxge\fR, is used to access Sun
 Blade Shared 10Gb Ethernet Interface devices installed within the system.
 .sp
 .LP
 The \fBhxge\fR driver is managed by the \fBdladm\fR(1M) command line utility,
-which allows VLANs to be defined on top of \fBhxge\fR  instances and for
+which allows VLANs to be defined on top of \fBhxge\fR instances and for
 \fBhxge\fR instances to be aggregated. See \fBdladm\fR(1M) for more details.
 .sp
 .LP
@@ -45,7 +40,7 @@ with a particular device (PPA). The PPA ID is interpreted as an unsigned
 integer data type and indicates the corresponding device instance (unit)
 number. The driver returns an error (DL_ERROR_ACK) if the PPA field value does
 not correspond to a valid device instance number for the system. The device is
-initialized  on  first  attach and de-initialized (stopped) at last detach
+initialized on first attach and de-initialized (stopped) at last detach
 .sp
 .LP
 The values returned by the driver in the DL_INFO_ACK primitive in response to a
@@ -103,8 +98,6 @@ defined 4 byte header.
 Once in the DL_ATTACHED state, you must send a DL_BIND_REQ to associate a
 particular Service Access Point (SAP) with the stream.
 .SH CONFIGURATION
-.sp
-.LP
 The link speed and mode are fixed at 10 Gbps full-duplex.
 .sp
 .LP
@@ -131,8 +124,8 @@ You can also use the \fBndd\fR(1M) command to configure the \fBhxge\fR driver
 at runtime to discard any classes of traffic.
 .sp
 .LP
-The \fBhxge\fRdriver supports the self-healing functionality of Solaris OS. By
-default it is configured to      DDI_FM_EREPORT_CAPABLE | DDI_FM_ERRCB_CAPABLE.
+The \fBhxge\fR driver supports self-healing functionality, see \fBfmd\fR(1M). By
+default it is configured to DDI_FM_EREPORT_CAPABLE | DDI_FM_ERRCB_CAPABLE.
 You configure the \fBhxge\fR driver by defining the fm-capable property in
 \fBhxge.conf\fR to other capabilities or to 0x0 to disable it entirely.
 .sp
@@ -144,7 +137,6 @@ command.
 The \fBhxge\fR driver also reports various hardware and software statistics
 data. You can view these statistics using the \fBkstat\fR(1M) command.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/hxge*\fR\fR
@@ -156,15 +148,6 @@ Special character device.
 .sp
 .ne 2
 .na
-\fB\fB/kernel/drv/hxge\fR\fR
-.ad
-.RS 28n
-32-bit device driver (x86).
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/kernel/drv/sparcv9/hxge\fR\fR
 .ad
 .RS 28n
@@ -190,8 +173,6 @@ Configuration file.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -206,10 +187,8 @@ Architecture	SPARC, x86
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBdladm\fR(1M), \fBifconfig\fR(1M), \fBkstat\fR(1M), \fBndd\fR(1M),
-\fBnetstat\fR(1M), \fBdriver.conf\fR(4), \fBattributes\fR(5),
+\fBdladm\fR(1M), \fBfmd\fR(1M), \fBifconfig\fR(1M), \fBkstat\fR(1M),
+\fBndd\fR(1M), \fBnetstat\fR(1M), \fBdriver.conf\fR(4), \fBattributes\fR(5),
 \fBstreamio\fR(7I), \fBdlpi\fR(7P)
 .sp
 .LP
diff --git a/usr/src/man/man7fs/pcfs.7fs b/usr/src/man/man7fs/pcfs.7fs
index 519b073650..cd92220c57 100644
--- a/usr/src/man/man7fs/pcfs.7fs
+++ b/usr/src/man/man7fs/pcfs.7fs
@@ -3,7 +3,7 @@
 .\" 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 PCFS 7FS "Nov 6, 2007"
+.TH PCFS 7FS "June 20, 2021"
 .SH NAME
 pcfs \- FAT formatted file system
 .SH SYNOPSIS
@@ -99,7 +99,7 @@ if the following line is in your \fB/etc/vfstab\fR file:
 .sp
 .in +2
 .nf
-\fIdevice-special\fR - \fIdirectory-name\fRpcfs \(mi no rw
+\fIdevice-special\fR - \fIdirectory-name\fR pcfs \(mi no rw
 .fi
 .in -2
 
@@ -131,7 +131,7 @@ if the following line is in your \fB/etc/vfstab\fR file:
 .sp
 .in +2
 .nf
-\fIdevice-special\fR:\fIlogical_drive\fR \fB\(mi\fR \fIdirectory-name\fR \fBpcfs \(mi no rw\fR
+\fIdevice-special\fR:\fIlogical_drive\fR \fB\(mi\fR \fIdirectory-name\fR pcfs \(mi no rw
 .fi
 .in -2
 
@@ -404,16 +404,25 @@ result in the more descriptive short names:
 \fB\fB/usr/lib/fs/pcfs/mount\fR\fR
 .ad
 .RS 26n
-\fBpcfs\fR \fBmount\fR command
+\fBpcfs\fR \fBmount\fR command.
 .RE
 
 .sp
 .ne 2
 .na
-\fB\fB/usr/kernel/fs/pcfs\fR\fR
+\fB\fB/usr/kernel/fs/amd64/pcfs\fR\fR
 .ad
 .RS 26n
-32-bit kernel module
+64-bit kernel module (x86).
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fB/usr/kernel/fs/sparcv9/pcfs\fR\fR
+.ad
+.RS 26n
+64-bit kernel module (SPARC).
 .RE
 
 .SH ENVIRONMENT VARIABLES
diff --git a/usr/src/man/man7fs/udfs.7fs b/usr/src/man/man7fs/udfs.7fs
index 18d3e947a6..cd0733bbc7 100644
--- a/usr/src/man/man7fs/udfs.7fs
+++ b/usr/src/man/man7fs/udfs.7fs
@@ -4,30 +4,26 @@
 .\" 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 UDFS 7FS "Mar 29, 1999"
+.TH UDFS 7FS "June 20, 2021"
 .SH NAME
 udfs \- universal disk format file system
 .SH DESCRIPTION
-.sp
-.LP
 The \fBudfs\fR file system is a file system type that allows user access to
 files on Universal Disk Format (UDF) disks from within the Solaris operating
-environment. Once mounted,  a \fBudfs\fR file system provides standard Solaris
+environment. Once mounted, a \fBudfs\fR file system provides standard Solaris
 file system operations and semantics. That is, users can read files, write
-files,  and list files in a directory on a UDF device and applications can use
+files, and list files in a directory on a UDF device and applications can use
 standard UNIX system calls on these files and directories.
 .sp
 .LP
 Because \fBudfs\fR is a platform-independent file system, the same media can be
 written to and read from by any operating system or vendor.
 .SS "Mounting File Systems"
-.sp
-.LP
 \fBudfs\fR file systems are mounted using:
 .sp
 .in +2
 .nf
-mount\fB-F\fR udfs -o rw/ro device-special
+mount -F udfs -o rw/ro device-special
 .fi
 .in -2
 .sp
@@ -58,20 +54,16 @@ file:
 
 .sp
 .LP
-The \fBudfs\fR file system provides read-only support for ROM,  RAM,  and
-sequentially-recordable media and  read-write  support on RAM media.
+The \fBudfs\fR file system provides read-only support for ROM, RAM, and
+sequentially-recordable media and read-write support on RAM media.
 .sp
 .LP
 The \fBudfs\fR file system also supports regular files, directories, and
 symbolic links, as well as device nodes such as block, character, FIFO, and
 Socket.
 .SH SEE ALSO
-.sp
-.LP
 \fBmount\fR(1M), \fBmount_udfs\fR(1M), \fBvfstab\fR(4)
 .SH NOTES
-.sp
-.LP
 Invalid characters such as "\fINULL\fR" and "\fB/\fR" and invalid file names
 such as "\fB\&.\fR" and "\fB\&..\fR" will be translated according to the
 following rule:
diff --git a/usr/src/man/man7m/ldterm.7m b/usr/src/man/man7m/ldterm.7m
index 409ee23762..cdeaf893e5 100644
--- a/usr/src/man/man7m/ldterm.7m
+++ b/usr/src/man/man7m/ldterm.7m
@@ -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 LDTERM 7M "Jun 7, 1999"
+.TH LDTERM 7M "June 20, 2021"
 .SH NAME
 ldterm \- standard STREAMS terminal line discipline module
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/stream.h>
 .fi
@@ -24,8 +23,6 @@ int ioctl(\fIfd\fR,I_PUSH,"ldterm");
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBldterm\fR STREAMS module provides most of the \fBtermio\fR(7I) terminal
 interface.  The \fBvis \fRmodule does not perform the low-level device control
 functions specified by flags in the \fBc_cflag\fR word of the
@@ -47,8 +44,6 @@ codesets.
 The remainder of this section describes the processing of various \fBSTREAMS\fR
 messages on the read- and write-side.
 .SS "Read-side Behavior"
-.sp
-.LP
 Various types of STREAMS messages are processed as follows:
 .sp
 .ne 2
@@ -91,8 +86,6 @@ downstream.
 .LP
 All other messages are passed upstream unchanged.
 .SS "Write-side Behavior"
-.sp
-.LP
 Various types of \fBSTREAMS\fR messages are processed as follows:
 .sp
 .ne 2
@@ -178,8 +171,6 @@ are augmented if necessary, and the message is passed upstream.
 .LP
 All other messages are passed downstream unchanged.
 .SH IOCTLS
-.sp
-.LP
 \fBThe \fR\fBldterm module\fR  processes the following \fBTRANSPARENT\fR
 ioctls. All others are passed downstream.
 .sp
@@ -264,9 +255,9 @@ This call takes a pointer to an \fBeucioc\fR structure, and uses it to set the
 \fBEUC\fR line discipline's local definition for the code set widths to be used
 for subsequent operations. Within the stream, the line discipline may
 optionally notify other modules of this setting using \fBM_CTL\fR messages.
-When this call is received and the \fBeucioc\fRstructure contains valid data,
+When this call is received and the \fBeucioc\fR structure contains valid data,
 the line discipline changes into \fBEUC \fRhandling mode once the
-\fBeucioc\fRdata is completely transferred to an internal data structure.
+\fBeucioc\fR data is completely transferred to an internal data structure.
 .RE
 
 .sp
@@ -283,8 +274,6 @@ is meaningless.
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBtermios\fR(3C), \fBconsole\fR(7D), \fBtermio\fR(7I)
 .sp
 .LP
diff --git a/usr/src/man/man9f/ddi_prop_create.9f b/usr/src/man/man9f/ddi_prop_create.9f
index 884f83f390..f248a0610c 100644
--- a/usr/src/man/man9f/ddi_prop_create.9f
+++ b/usr/src/man/man9f/ddi_prop_create.9f
@@ -3,7 +3,7 @@
 .\" 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_PROP_CREATE 9F "September 22, 2020"
+.TH DDI_PROP_CREATE 9F "June 20, 2021"
 .SH NAME
 ddi_prop_create, ddi_prop_modify, ddi_prop_remove, ddi_prop_remove_all,
 ddi_prop_undefine \- create, remove, or modify properties for leaf device
@@ -328,7 +328,7 @@ is subject to the same memory allocation constraints as
 .RS 25n
 \fBddi_prop_remove()\fR unlinks a property from the device's property list. If
 \fBddi_prop_remove()\fR finds the property (an exact match of both
-\fIname\fRand \fIdev\fR), it unlinks the property, frees its memory, and
+\fIname\fR and \fIdev\fR), it unlinks the property, frees its memory, and
 returns \fBDDI_PROP_SUCCESS,\fR otherwise, it returns \fBDDI_PROP_NOT_FOUND\fR.
 .RE
 
diff --git a/usr/src/man/man9f/dupb.9f b/usr/src/man/man9f/dupb.9f
index 5a87c63ec5..15abe35d32 100644
--- a/usr/src/man/man9f/dupb.9f
+++ b/usr/src/man/man9f/dupb.9f
@@ -5,11 +5,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 DUPB 9F "Mar 22, 2002"
+.TH DUPB 9F "June 20, 2021"
 .SH NAME
 dupb \- duplicate a message block descriptor
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/stream.h>
 
@@ -19,55 +18,45 @@ dupb \- duplicate a message block descriptor
 .fi
 
 .SH INTERFACE LEVEL
-.sp
-.LP
 Architecture independent level 1 (DDI/DKI).
 .SH DESCRIPTION
+\fBdupb()\fR creates a new \fBmblk_t\fR structure (see \fBmsgb\fR(9S)) to
+reference the message block pointed to by \fIbp\fR.
 .sp
 .LP
-\fBdupb()\fR creates a new  \fBmblk_t\fR structure (see \fBmsgb\fR(9S)) to
-reference the message block pointed to by  \fIbp\fR.
-.sp
-.LP
-Unlike  \fBcopyb\fR(9F), \fBdupb()\fR does not copy the information in the
-\fBdblk_t\fR structure (see \fBdatab\fR(9S)), but creates a new  \fBmblk_t\fR
-structure to point to it. The reference count in the  \fBdblk_t\fR structure
+Unlike \fBcopyb\fR(9F), \fBdupb()\fR does not copy the information in the
+\fBdblk_t\fR structure (see \fBdatab\fR(9S)), but creates a new \fBmblk_t\fR
+structure to point to it. The reference count in the \fBdblk_t\fR structure
 (\fBdb_ref\fR) is incremented.  The new \fBmblk_t\fR structure contains the
-same information as the original.  Note that \fBb_rptr\fRand \fBb_wptr\fR are
+same information as the original.  Note that \fBb_rptr\fR and \fBb_wptr\fR are
 copied from the \fIbp\fR.
 .sp
 Printed copy or docs.sun.com shows a figure that shows a new mblk_t structure
 created, with the original and new bp both pointing to the dblk_t structure,
 and db_ref incremented by one
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIbp\fR \fR
 .ad
 .RS 7n
 Pointer to the message block to be duplicated. \fBmblk_t\fR is an instance of
-the  \fBmsgb\fR(9S) structure.
+the \fBmsgb\fR(9S) structure.
 .RE
 
 .SH RETURN VALUES
-.sp
-.LP
-If successful,  \fBdupb()\fR returns a pointer to the new message block. A
-\fINULL\fR pointer is returned if  \fBdupb()\fR cannot allocate a new message
+If successful, \fBdupb()\fR returns a pointer to the new message block. A
+\fINULL\fR pointer is returned if \fBdupb()\fR cannot allocate a new message
 block descriptor or if the \fBdb_ref\fR field of the data block structure (see
 \fBdatab\fR(9S)) has reached a maximum value (\fB255\fR).
 .SH CONTEXT
-.sp
-.LP
 \fBdupb()\fR can be called from user, kernel, or interrupt context.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUsing \fBdupb()\fR
 .sp
 .LP
-This  \fBsrv\fR(9E) (service) routine adds a header to  all  \fBM_DATA\fR
-messages before passing them along.   \fBdupb\fR is used instead of
+This \fBsrv\fR(9E) (service) routine adds a header to all \fBM_DATA\fR
+messages before passing them along.  \fBdupb\fR is used instead of
 \fBcopyb\fR(9F) because the contents of the header block are not changed.
 
 .sp
@@ -76,16 +65,16 @@ For each message on the queue, if it is a priority message, pass it along
 immediately (lines 10-11). Otherwise, if it is anything other than an
 \fBM_DATA\fR message (line 12), and if it can be sent along (line 13), then do
 so (line 14). Otherwise, put the message back on the queue and return (lines
-16-17). For all  \fBM_DATA\fR messages, first check to see if the stream is
+16-17). For all \fBM_DATA\fR messages, first check to see if the stream is
 flow-controlled (line 20). If it is, put the message back on the queue and
 return (lines 37-38).  If it is not, the header block is duplicated (line 21).
 
 .sp
 .LP
 \fBdupb()\fR can fail either due to lack of resources or because the message
-block has already been duplicated 255 times.  In order to handle the  latter
+block has already been duplicated 255 times.  In order to handle the latter
 case, the example calls \fBcopyb\fR(9F) (line 22).  If \fBcopyb\fR(9F) fails,
-it is due to buffer allocation failure.  In this case,  \fBqbufcall\fR(9F) is
+it is due to buffer allocation failure.  In this case, \fBqbufcall\fR(9F) is
 used to initiate a callback (lines 30-31) if one is not already pending (lines
 26-27).
 
@@ -93,13 +82,13 @@ used to initiate a callback (lines 30-31) if one is not already pending (lines
 .LP
 The callback function, \fBxxxcallback()\fR, clears the recorded
 \fBqbufcall\fR(9F) callback id and schedules the service procedure (lines
-49-50).  Note  that the close routine,  \fBxxxclose()\fR, must cancel any
-outstanding  \fBqbufcall\fR(9F) callback requests (lines 58-59).
+49-50).  Note that the close routine, \fBxxxclose()\fR, must cancel any
+outstanding \fBqbufcall\fR(9F) callback requests (lines 58-59).
 
 .sp
 .LP
-If  \fBdupb()\fR or  \fBcopyb\fR(9F) succeed, link the  \fBM_DATA\fR message to
-the new message block (line 34)  and pass it along (line 35).
+If \fBdupb()\fR or \fBcopyb\fR(9F) succeed, link the \fBM_DATA\fR message to
+the new message block (line 34) and pass it along (line 35).
 
 .sp
 .in +2
@@ -171,8 +160,6 @@ the new message block (line 34)  and pass it along (line 35).
 .in -2
 
 .SH SEE ALSO
-.sp
-.LP
 \fBsrv\fR(9E), \fBcopyb\fR(9F), \fBqbufcall\fR(9F), \fBdatab\fR(9S),
 \fBmsgb\fR(9S)
 .sp
diff --git a/usr/src/man/man9p/size.9p b/usr/src/man/man9p/size.9p
index 74aa9cff8d..331e15439a 100644
--- a/usr/src/man/man9p/size.9p
+++ b/usr/src/man/man9p/size.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 SIZE 9P "Jan 23, 2008"
+.TH SIZE 9P "June 20, 2021"
 .SH NAME
 size, Nblock, blksize, device-nblocks, device-blksize \- device size properties
 .SH DESCRIPTION
-.sp
-.LP
 A driver can communicate size information to the system by the values
 associated with following properties. Size information falls into two
 categories: device size associated with a \fBdev_info_t\fR node, and minor node
@@ -23,7 +21,7 @@ device size property names:
 .ad
 .RS 18n
 An \fBint64_t\fR property representing device size in
-\fBdevice-blksize\fRblocks.
+\fBdevice-blksize\fR blocks.
 .RE
 
 .sp
@@ -98,8 +96,6 @@ The DDI property interfaces deal in signed numbers. All Size(9P) values should
 be considered unsigned. It is the responsibility of the code dealing with the
 property value to ensure that an unsigned interpretation occurs.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -114,8 +110,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 attach(9E), detach(9E), prop_op(9E), ddi_create_minor_node(9F),
 inquiry-vendor-id(9P)
 .sp