[illumos-gate merge]

commit 0a554e9f2c0d440dc40a97fae2d18f1d428ca786
    13404 man page spelling errors
commit 9f76c6ed5b6ee0cc0bf631daca15ac3dc5fc70c4
    13400 zfs-tests: implicit conversion from 'enum dmu_objset_type' to 'enum lzc_dataset_type'
commit ef96fc31fc4f4306719704352d5c3e33573c039f
    13399 zfs: error: implicit conversion from 'boolean_t' to 'ds_hold_flags_t'
commit 56870e8c76c2675bcef1fcee5d519585ce9c768e
    13393 cheetah: case value '47616' not in enumerated type
commit 8247326397b1a16f37e70cf13f5b7a4f50d06712
    13403 zfs: symbol 'g_zfs' is multiply-defined
commit 436b964b19ef06803ad9165542d80d9d731d6486
    13402 zpool: symbol 'g_zfs' is multiply-defined
commit 99308ed0417a2b8ab73c5856a8a5345ce2a7aea7
    13396 PoolsExecption typo in resource pools javadoc
commit 1575b751c16622553e958c1e5c45e59c86b15c6e
    13392 px: case value '3' not in enumerated type
commit 9b0429a10eec9313ec782d8421272aff70adbfdc
    13339 Add support for Hygon Dhyana Family 18h processor
commit d20422bd742384b77102bb3bd09e0dc4b7372e50
    13351 loader: vbe_find_mode_xydm() is using wrong safety and iteration is buggy
commit 174b8e455f9a6974e69fa4e28792580acde0892d
    13311 uptime(1) dazed and confused for a minute after boot
commit f816551bb187d104fbf2757703d7a5d2189a3a18
    13401 eeprom: 'lv' may be used uninitialized in this function
commit 5e96da73c99d9d17ff5a58b793fff2ab6dcadf25
    13391 fm: build errors with gcc 7 on SPARC
commit 58b55f701e285559e4799354996fd284238ed0d4
    13398 libstand: xdrproc_t should return bool
commit c6a28d7650029501a356f7b75b2a10a5c4430cef
    13394 fhc: case value '4294967295' not in enumerated type
commit 58d4b16fe601073f2408de78e3db7e9bfa9abfd2
    13355 remove topo module warning gags
commit 1473b8d60e902819558a8b0e8a257eb0d754c3c3
    13388 ZFS list bookmark not working on zvols
commit 4bba12ca5cd6f92aaf0d4c0d19d05528110bc095
    13368 libbe_py should support temporary BE activation
commit a92282e44f968185a6bba094d1e5fece2da819cf
    13376 fm: variable may be used uninitialized
commit 8b1df8bf71b7b62e7e4d46fe6b457d4d6447b2b8
    13367 beadm activate -t should not promote new BE datasets
commit 9704bf7fb82e71b685e194a967937ff03843e73a
    13317 Decrease contention on dn_struct_rwlock
commit 88a08813800ed7ba7c927986421cee437f7f2233
    13363 ctfconvert could support more granular ignore for missing debug data
commit 3dd4cd56e7843e01a8ab147a0d102cd4f6d732c1
    13342 ctfconvert could encode _Float128 for 32-bit objects
commit 73197b540cc5f0434c409b68ca9e1a514a6ce91b
    13336 ctfconvert should be able to unconditionally attempt conversion
commit dd4422524768709a579a2a93a10c78a88a6b0ecb
    13280 CTF: provide option to truncate and continue

Conflicts & other fixes (with help from Jason King <jbk@joyent.com>):
    usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c
    usr/src/lib/libctf/common/ctf_convert.c
    usr/src/lib/libctf/common/ctf_lib.c
    usr/src/lib/libctf/common/libctf.h
    usr/src/lib/libproc/common/Psymtab.c
    usr/src/man/man1/ld.so.1.1
    usr/src/man/man4/process.4

8 files changed, 16 insertions, 107 deletions

diff --git a/usr/src/man/man1/ar.1 b/usr/src/man/man1/ar.1
index f783fea190..5a2ff989f2 100644
--- a/usr/src/man/man1/ar.1
+++ b/usr/src/man/man1/ar.1
@@ -44,11 +44,10 @@
 .\" Portions Copyright (c) 1992, X/Open Company Limited  All Rights Reserved
 .\" Copyright (c) 2009, Sun Microsystems, Inc.  All Rights Reserved.
 .\"
-.TH AR 1 "Sep 10, 2013"
+.TH AR 1 "December 28, 2020"
 .SH NAME
 ar \- maintain portable archive or library
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/bin/ar\fR \fB-d\fR [\fB-Vv\fR] \fIarchive\fR \fIfile\fR...
 .fi
@@ -119,8 +118,6 @@ ar \- maintain portable archive or library
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBar\fR utility maintains groups of files combined into a single archive
 file. Its main use is to create and update library files. However, it can be
 used for any similar purpose. The magic string and the file headers used by
@@ -140,8 +137,6 @@ accessible to the user. Whenever the \fBar\fR command is used to create or
 update the contents of such an archive, the symbol table is rebuilt. The
 \fB-s\fR option described below forces the symbol table to be rebuilt.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -200,7 +195,7 @@ Deletes one or more \fIfile\fRs from \fIarchive\fR.
 .ad
 .RS 6n
 Positions new \fIfile\fRs in \fIarchive\fR before the file named by the
-\fIposname\fR operand. This option is quivalent to \fB-b\fR.
+\fIposname\fR operand. This option is equivalent to \fB-b\fR.
 .RE
 
 .sp
@@ -331,8 +326,6 @@ Prints its version number on standard error.
 .RE
 
 .SS "\fB/usr/xpg4/bin/ar\fR"
-.sp
-.LP
 The following options are supported for \fB/usr/xpg4/bin/ar\fR:
 .sp
 .ne 2
@@ -360,8 +353,6 @@ is being extracted, the results are undefined. The modification time of each
 .RE
 
 .SH OPERANDS
-.sp
-.LP
 The following operands are supported:
 .sp
 .ne 2
@@ -396,8 +387,6 @@ options \fB-m\fR and \fB-r\fR.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBar\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, \fBLC_TIME\fR, and \fBNLSPATH\fR.
@@ -423,8 +412,6 @@ timezone is used.
 .RE
 
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -445,13 +432,8 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .SS "\fB/usr/bin/ar\fR"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -462,9 +444,6 @@ Interface Stability	Committed
 .TE
 
 .SS "\fB/usr/xpg4/bin/ar\fR"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -477,14 +456,10 @@ Standard	See \fBstandards\fR(5).
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBbasename\fR(1), \fBcpio\fR(1), \fBld\fR(1), \fBlorder\fR(1), \fBstrip\fR(1),
 \fBtar\fR(1), \fBar.h\fR(3HEAD), \fBa.out\fR(4), \fBattributes\fR(5),
 \fBenviron\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.sp
-.LP
 If the same file is mentioned twice in an argument list, it may be put in the
 archive twice.
 .sp
diff --git a/usr/src/man/man1/ctfdump.1 b/usr/src/man/man1/ctfdump.1
index b80c856eaf..8d63b2a0a5 100644
--- a/usr/src/man/man1/ctfdump.1
+++ b/usr/src/man/man1/ctfdump.1
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2018, Joyent, Inc.
 .\"
-.Dd Oct 2, 2018
+.Dd December 28, 2020
 .Dt CTFDUMP 1
 .Os
 .Sh NAME
@@ -141,7 +141,7 @@ container.
 .Bd -filled -compact
 Dump the type information contained in the
 .Sy CTF
-conatiner.
+container.
 .Ed
 .It Fl u Ar outfile
 .Bd -filled -compact
diff --git a/usr/src/man/man1/demangle.1 b/usr/src/man/man1/demangle.1
index ca2dbef35a..20037f6721 100644
--- a/usr/src/man/man1/demangle.1
+++ b/usr/src/man/man1/demangle.1
@@ -15,7 +15,7 @@
 .\"
 .\" Copyright 2020 Joyent, Inc.
 .\"
-.Dd March  3, 2020
+.Dd December 28, 2020
 .Dt DEMANGLE 1
 .Os
 .Sh NAME
@@ -63,7 +63,7 @@ is output unchanged.
 In the second method,
 .Nm
 reads standard in, and whenever it encounters a potential symbol, it will
-attempt to replace the symbol in stdandard out with the demangled version.
+attempt to replace the symbol in standard out with the demangled version.
 If the symbol cannot be demangled, it is output unchanged.
 .Pp
 For either method, if an error other than attempting to demangle an non-mangled
diff --git a/usr/src/man/man1/lari.1 b/usr/src/man/man1/lari.1
index 39e4ff3531..ae51c87363 100644
--- a/usr/src/man/man1/lari.1
+++ b/usr/src/man/man1/lari.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 LARI 1 "Nov 28, 2007"
+.TH LARI 1 "December 28, 2020"
 .SH NAME
 lari \- link analysis of runtime interfaces
 .SH SYNOPSIS
-.LP
 .nf
 \fBlari\fR [\fB-bCDsVv\fR] [\fB-a\fR | \fB-i\fR | \fB-o\fR] \fIfile\fR | \fIdirectory\fR...
 .fi
@@ -18,8 +17,6 @@ lari \- link analysis of runtime interfaces
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBlari\fR utility analyzes the interface requirements of dynamic \fBELF\fR
 objects. Two basic modes of operation are available. The first mode displays
 runtime interface information. The second mode generates interface definitions.
@@ -99,8 +96,6 @@ associated \fImapfile\fR directives. See the \fILinker and Libraries Guide\fR
 for more details on using \fImapfiles\fR to version objects. An initial version
 of these \fImapfiles\fR can be created by \fBlari\fR.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported.
 .sp
 .ne 2
@@ -295,7 +290,7 @@ This symbol definition has been directly bound to.
 .ad
 .RS 11n
 This symbol definition provides for an interposer.  An object that explicitly
-identifies itself as an interposor defines all global symbols as interposers.
+identifies itself as an interposer defines all global symbols as interposers.
 See the \fB-z\fR \fBinterpose\fR option of \fBld\fR(1), and the
 \fBLD_PRELOAD\fR variable of \fBld.so.1\fR(1). Individual symbols within a
 dynamic executable can be defined as interposers by using the \fBINTERPOSE\fR
@@ -391,8 +386,6 @@ See the \fILinker and Libraries Guide\fR for more details of these symbol
 classifications.
 .SH EXTENDED DESCRIPTION
 .SS "Interesting Information"
-.sp
-.LP
 By default, or specifically using the \fB-i\fR option, \fBlari\fR filters any
 runtime interface information to present interesting events. This filtering is
 carried out mainly to reduce the amount of information that can be generated
@@ -473,8 +466,6 @@ explicitly established, instances can exist that are unexpected and surprising.
 Directly bound symbols, and symbols with protected visibility, are output as
 interesting information.
 .SS "Overhead Information"
-.sp
-.LP
 When using the \fB-o\fR option, \fBlari\fR displays symbol definitions that
 might be considered overhead.
 .sp
@@ -555,7 +546,6 @@ bindings of this type require relocation processing at application start up,
 rather than the deferred relocation processing used when calling functions
 directly. Use of this address also requires an indirection at runtime.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRAnalyzing a case of multiple bindings
 .sp
 .LP
@@ -649,7 +639,6 @@ foo.so {
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB$TMPDIR/lari.dbg.\fIfile\fR\fR\fR
@@ -659,8 +648,6 @@ Binding output produced by \fBldd\fR(1).
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -678,8 +665,6 @@ Interface Stability	See below.
 .LP
 The human readable output is Uncommitted. The options are Committed.
 .SH SEE ALSO
-.sp
-.LP
 \fBld\fR(1), \fBldd\fR(1), \fBld.so.1\fR(1), \fBdlopen\fR(3C), \fBdlsym\fR(3C),
 \fBattributes\fR(5)
 .sp
diff --git a/usr/src/man/man1/ld.so.1.1 b/usr/src/man/man1/ld.so.1.1
index 19afbbf3d6..40145e65b9 100644
--- a/usr/src/man/man1/ld.so.1.1
+++ b/usr/src/man/man1/ld.so.1.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 LD.SO.1 1 "May 8, 2014"
+.TH LD.SO.1 1 "December 28, 2020"
 .SH NAME
 ld.so.1 \- runtime linker for dynamic objects
 .SH SYNOPSIS
-.LP
 .nf
 \fB/lib/ld.so.1\fR
 .fi
@@ -19,8 +18,6 @@ ld.so.1 \- runtime linker for dynamic objects
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 Dynamic applications consist of one or more dynamic objects. A dynamic
 application is typically a dynamic executable and one or more shared object
 dependencies. As part of the initialization and execution of a dynamic
@@ -40,7 +37,7 @@ link-editor is the name of the runtime linker, \fBld.so.1\fR.
 During the process of executing a dynamic executable, the kernel maps the file,
 and locates the required interpreter. See \fBexec\fR(2) and \fBmmapobj\fR(2).
 The kernel maps in, and transfers control to, this interpreter. Sufficient
-information is passed to the interpretor to allow the interpreter to continue
+information is passed to the interpreter to allow the interpreter to continue
 to bind, and then execute the application.
 .sp
 .LP
@@ -143,8 +140,6 @@ runpath is specified when the dynamic object is constructed using the \fB-R\fR
 option to \fBld\fR(1). The environment variable \fBLD_LIBRARY_PATH\fR can be
 used to indicate directories to be searched before the default directories.
 .SS "Command Line Usage"
-.sp
-.LP
 Typically, the runtime linker is invoked indirectly through executing a dynamic
 executable that declares the runtime linker as its interpreter. The runtime
 linker can also be executed directly from the command line. This mechanism is
@@ -168,8 +163,6 @@ VARIABLES.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 Each environment variable can be specified with a \fB_32\fR or \fB_64\fR
 suffix. This makes the environment variable specific, respectively, to 32-bit
 or 64-bit processes. This environment variable overrides any non-suffixed
@@ -598,8 +591,6 @@ Notice that environment variable names beginning with the
 characters '\fBLD_\fR' are reserved for possible future enhancements to \fBld\fR(1) and
 \fBld.so.1\fR.
 .SH SECURITY
-.sp
-.LP
 Secure processes have some restrictions applied to the evaluation of their
 dependencies and runpaths to prevent malicious dependency substitution or
 symbol interposition.
@@ -671,7 +662,6 @@ When creating a secure process, relative path names should \fBnot\fR be used to
 express dependencies, or to construct \fBdlopen\fR(3C) path names. This
 restriction should be applied to the application and to \fBall\fR dependencies.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUsing LD_FLAGS to group environment variable information
 .sp
 .LP
@@ -702,7 +692,6 @@ example% \fBLD_FLAGS_64=library_path=/lib/one/64,preload=foo.so\fR
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/lib/ld.so.1\fR\fR
@@ -803,8 +792,6 @@ Default configuration file for 64-bit applications.
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBcrle\fR(1), \fBgprof\fR(1), \fBlari\fR(1), \fBld\fR(1), \fBldd\fR(1),
 \fBexec\fR(2), \fBissetugid\fR(2), \fBmmapobj\fR(2), \fBprofil\fR(2),
 \fBdladdr\fR(3C), \fBdlclose\fR(3C), \fBdldump\fR(3C), \fBdlerror\fR(3C),
@@ -814,8 +801,6 @@ Default configuration file for 64-bit applications.
 .LP
 \fILinker and Libraries Guide\fR
 .SH NOTES
-.sp
-.LP
 Care should be exercised when using \fBLD_PROFILE\fR in combination with other
 process monitoring techniques, such as users of \fBproc\fR(4). Multiple process
 monitoring techniques can result in deadlock conditions that leave the profile
diff --git a/usr/src/man/man1/pktool.1 b/usr/src/man/man1/pktool.1
index 491d7c6493..52869c4106 100644
--- a/usr/src/man/man1/pktool.1
+++ b/usr/src/man/man1/pktool.1
@@ -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 PKTOOL 1 "Mar 23, 2009"
+.TH PKTOOL 1 "December 28, 2020"
 .SH NAME
 pktool \- manage certificates and keys
 .SH SYNOPSIS
-.LP
 .nf
 \fBpktool\fR [\fB-f\fR \fIoption_file\fR] [\fB-i\fR] \fIsubcommand\fR \fIsubcommand_options\fR ...
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBpktool\fR command allows users to manage the certificates and keys on
 multiple keystores including PKCS#11 tokens (that is, Cryptographic Framework),
 Netscape Security Services (NSS) tokens, and standard file based keystore for
@@ -26,8 +23,6 @@ Revocation List (CRL). \fBpktool\fR does not provide support for creating CRLs,
 signing CRLs, or exporting CRLs. The CRL support for the PKCS#11 keystore is
 file-based.
 .SH OPTIONS
-.sp
-.LP
 The following command options are supported:
 .sp
 .ne 2
@@ -97,8 +92,6 @@ The resulting \fBsubject-DN\fR is:
 .RE
 
 .SH SUBCOMMANDS
-.sp
-.LP
 The following subcommands are supported:
 .sp
 .ne 2
@@ -719,8 +712,6 @@ synonym for \fB-?\fR.
 .RE
 
 .SH USAGE
-.sp
-.LP
 The \fBpktool\fR subcommands support the following options:
 .sp
 .ne 2
@@ -887,7 +878,7 @@ For the \fBgencert\fR and \fBgencsr\fR subcommands, the valid private key types
 are: \fBrsa\fR, or \fBdsa\fR. The default key type is \fBrsa\fR.
 .sp
 For the \fBgenkey\fR subcommand, the valid symmetric key types are: \fBaes\fR,
-\fBarcfou\fRr, \fBdes\fR, \fB3des\fR, or \fBgeneric\fR. The default key type is
+\fBarcfour\fR, \fBdes\fR, \fB3des\fR, or \fBgeneric\fR. The default key type is
 \fBaes\fR.
 .sp
 .in +2
@@ -1249,7 +1240,6 @@ command line option has a higher priority than the environment variable.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRGenerating a Self-Signed Certificate
 .sp
 .LP
@@ -1301,8 +1291,6 @@ file into the keystore indicated in the command:
 .sp
 
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -1323,8 +1311,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -1339,8 +1325,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBattributes\fR(5), \fBpkcs11_softtoken\fR(5)
 .sp
 .LP
diff --git a/usr/src/man/man1/print.1 b/usr/src/man/man1/print.1
index 3aefc897c8..d872fa475d 100644
--- a/usr/src/man/man1/print.1
+++ b/usr/src/man/man1/print.1
@@ -5,38 +5,32 @@
 .\" 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 PRINT 1 "Mar 27, 2008"
+.TH PRINT 1 "December 28, 2020"
 .SH NAME
 print \- shell built-in function to output characters to the screen or window
 .SH SYNOPSIS
 .SS "ksh"
-.LP
 .nf
 \fBprint\fR [\fB-Rnprsu\fR [\fIn\fR]] [\fIarg\fR]...
 .fi
 
 .SS "ksh93"
-.LP
 .nf
 \fBprint\fR [\fB-Renprs\fR] [\fB-f\fR \fIformat\fR] [\fB-u\fR \fIfd\fR] [\fIstring\fR...]
 .fi
 
 .SH DESCRIPTION
 .SS "ksh"
-.sp
-.LP
 The shell output mechanism. When no options are specified, or when an option
 followed by \fB\&'\fR a \fB\(mi\fR is specified, or when just \fB-\fR is
 specified, the arguments are printed on standard output as described by
 \fBecho\fR(1).
 .SS "ksh93"
-.sp
-.LP
 By default, \fBprint\fR writes each string operand to standard output and
 appends a NEWLINE character.
 .sp
 .LP
-Unless, the \fB-r\fR, \fB-R\fR, or \fB-f\fR option is speciifed, each \fB\e\fR
+Unless, the \fB-r\fR, \fB-R\fR, or \fB-f\fR option is specified, each \fB\e\fR
 character in each string operand is processed specially as follows:
 .sp
 .ne 2
@@ -132,8 +126,6 @@ The 8-bit character whose \fBASCII\fR code is the \fB1\fR-, \fB2\fR-, or
 
 .SH OPTIONS
 .SS "ksh"
-.sp
-.LP
 The following options are supported by \fBksh\fR:
 .sp
 .ne 2
@@ -185,8 +177,6 @@ placed. The default is 1.
 .RE
 
 .SS "ksh93"
-.sp
-.LP
 The following options are supported by \fBksh93\fR:
 .sp
 .ne 2
@@ -271,8 +261,6 @@ default value is \fB1\fR.
 .RE
 
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -293,7 +281,5 @@ Output file is not open for writing.
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBecho\fR(1), \fBksh\fR(1), \fBksh93\fR(1), \fBprintf\fR(1),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1/tnfdump.1 b/usr/src/man/man1/tnfdump.1
index 77cfb22b6b..6093cf7dc4 100644
--- a/usr/src/man/man1/tnfdump.1
+++ b/usr/src/man/man1/tnfdump.1
@@ -3,24 +3,21 @@
 .\" 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 TNFDUMP 1 "Jan 22, 2001"
+.TH TNFDUMP 1 "December 28, 2020"
 .SH NAME
 tnfdump \- convert binary TNF file to ASCII
 .SH SYNOPSIS
-.LP
 .nf
 \fBtnfdump\fR [\fB-r\fR] [\fB-x\fR] \fItnf_file\fR...
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBtnfdump\fR utility converts the specified binary \fBTNF\fR trace files
 to \fBASCII\fR. The \fBASCII\fR output can be used to  do performance analysis.
 The default mode (without the \fB-r\fR option) prints all the event records
 (that were generated by \fBTNF_PROBE\fR(3TNF)) and the event descriptor records
 only. It also orders the events by time.
 .SH OPTIONS
-.LP
 The following option is supported:
 .sp
 .ne 2
@@ -29,7 +26,7 @@ The following option is supported:
 .ad
 .RS 6n
 Does a raw conversion of \fBTNF\fR to \fBASCII\fR. The output is a literal
-transalation of the binary \fBTNF\fR file and includes all the records in the
+translation of the binary \fBTNF\fR file and includes all the records in the
 file. This output is  useful only if you have a good understanding of
 \fBTNF\fR. A sample output is listed in EXAMPLES below.
 .RE
@@ -45,10 +42,8 @@ instead of decimal format.
 .RE
 
 .SH RETURN VALUES
-.LP
 \fBtnfdump\fR returns \fB0\fR on successful exit.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRConverting a file into ASCII
 .sp
 .LP
@@ -345,6 +340,5 @@ unsigned arguments. Their values are printed in hexadecimal when requested by
 option \fB-x\fR.
 
 .SH SEE ALSO
-.LP
 \fBprex\fR(1), \fBgethrtime\fR(3C), \fBTNF_DECLARE_RECORD\fR(3TNF),
 \fBTNF_PROBE\fR(3TNF), \fBtnf_process_disable\fR(3TNF), \fBattributes\fR(5)