[illumos-gate merge]

commit 3d18edb258701d7742038769889039e5f6147839
    13291 utimes.2: typos utimens and fBstat
commit 7ba1e3a8176db2382c00142e35683aa5917d6ae7
    13289 manpage typos pthrad and mtuex
commit 73849e1abc744e793539f9a6a32f1efd052bfe7a
    13293 multiple typos in tss.3c
commit d59f56478a070381dd4ff329ad617788788bf84f
    13292 NAME section in some man pages missing a comma
commit e3522c16ecc36b92b1a4b1c7f114205270965e69
    13229 scadm: this 'if' clause does not guard...
commit ab1c26a6b072b5f88b50bd1182266a249664df5b
    13228 envd: this 'if' clause does not guard...
commit 06fee912be69e798e3d620364017ffad51c650ed
    13290 man: missing symlinks
commit c72d926233e1335d5c1752f6ac1d5851d0d91857
    13288 man3proc: typos and missing symlink
commit 7b34a9a5df26271af0da06974fc361c468cd48d3
    13281 bump crypto tests timeout

23 files changed, 65 insertions, 64 deletions

diff --git a/usr/src/cmd/picl/plugins/sun4u/chicago/envd/piclenvsetup.c b/usr/src/cmd/picl/plugins/sun4u/chicago/envd/piclenvsetup.c
index 5b3cbf2bdd..3a3ac7e164 100644
--- a/usr/src/cmd/picl/plugins/sun4u/chicago/envd/piclenvsetup.c
+++ b/usr/src/cmd/picl/plugins/sun4u/chicago/envd/piclenvsetup.c
@@ -401,9 +401,11 @@ add_sensor_nodes_and_props()
 		 */
 		err = ptree_get_node_by_path(snodep->parent_path, &nodeh);
 		if (err != PICL_SUCCESS) {
-		if (env_debug)
-			envd_log(LOG_ERR, "failed to get_node_by_path %s\n",
-			    snodep->parent_path);
+			if (env_debug) {
+				envd_log(LOG_ERR,
+				    "failed to get_node_by_path %s\n",
+				    snodep->parent_path);
+			}
 			continue;
 		}
 		sensorp = snodep->sensorp;
diff --git a/usr/src/cmd/scadm/sparc/mpxu/common/show.c b/usr/src/cmd/scadm/sparc/mpxu/common/show.c
index 18c2dbbf5a..40a45cf25a 100644
--- a/usr/src/cmd/scadm/sparc/mpxu/common/show.c
+++ b/usr/src/cmd/scadm/sparc/mpxu/common/show.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * show.c: support for scadm show <variable> option (to show the value of
  * a service processor NV variable)
@@ -107,9 +105,10 @@ ADM_Process_show_network()
 		    gettext("SC network configuration is:"),
 		    netParams->ipMode);
 #endif
-	if (strcmp(netParams->ipMode, "dhcp") == 0)
-		(void) printf("%s %s\r\n", gettext("DHCP server:"),
-		    netParams->ipDHCPServer);
+		if (strcmp(netParams->ipMode, "dhcp") == 0) {
+			(void) printf("%s %s\r\n", gettext("DHCP server:"),
+			    netParams->ipDHCPServer);
+		}
 		(void) printf("%s %s\r\n", gettext("IP Address:"),
 		    netParams->ipAddr);
 		(void) printf("%s %s\r\n", gettext("Gateway address:"),
diff --git a/usr/src/man/man2/utimes.2 b/usr/src/man/man2/utimes.2
index 404fea7180..1c13f99971 100644
--- a/usr/src/man/man2/utimes.2
+++ b/usr/src/man/man2/utimes.2
@@ -45,9 +45,9 @@
 .\" Copyright (c) 2014, Joyent, Inc.
 .\" Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
 .\"
-.TH UTIMES 2 "Sep 06, 2020"
+.TH UTIMES 2 "November 8, 2020"
 .SH NAME
-utimes, lutimes, futimes, futimesat, utimens, utimensat \- set file access and modification times
+utimes, lutimes, futimes, futimesat, futimens, utimensat \- set file access and modification times
 .SH SYNOPSIS
 .nf
 #include <sys/time.h>
@@ -307,5 +307,5 @@ Standard	See below.
 .LP
 For \fButimes()\fR, \fButimensat()\fR and \fBfutimensat()\fR, see \fBstandards\fR(5).
 .SH SEE ALSO
-fBstat\fR(2), \fButime\fR(2), \fBattributes\fR(5),
+\fBstat\fR(2), \fButime\fR(2), \fBattributes\fR(5),
 \fBfsattr\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3c/Makefile b/usr/src/man/man3c/Makefile
index 193b5e8e59..ea7b4d4834 100644
--- a/usr/src/man/man3c/Makefile
+++ b/usr/src/man/man3c/Makefile
@@ -952,6 +952,7 @@ MANLINKS=	FD_CLR.3c				\
 		iswalnum_l.3c				\
 		iswalpha_l.3c				\
 		iswascii.3c				\
+		iswascii_l.3c				\
 		iswblank.3c				\
 		iswblank_l.3c				\
 		iswcntrl.3c				\
@@ -1964,6 +1965,7 @@ iswalnum.3c				:= LINKSRC = iswalpha.3c
 iswalnum_l.3c				:= LINKSRC = iswalpha.3c
 iswalpha_l.3c				:= LINKSRC = iswalpha.3c
 iswascii.3c				:= LINKSRC = iswalpha.3c
+iswascii_l.3c				:= LINKSRC = iswalpha.3c
 iswblank.3c				:= LINKSRC = iswalpha.3c
 iswblank_l.3c				:= LINKSRC = iswalpha.3c
 iswcntrl.3c				:= LINKSRC = iswalpha.3c
diff --git a/usr/src/man/man3c/ctype.3c b/usr/src/man/man3c/ctype.3c
index c804e9d022..f1fec492aa 100644
--- a/usr/src/man/man3c/ctype.3c
+++ b/usr/src/man/man3c/ctype.3c
@@ -46,14 +46,13 @@
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\" Copyright 2016 Joyent, Inc.
 .\"
-.TH CTYPE 3C "Mar 14, 2016"
+.TH CTYPE 3C "November 8, 2020"
 .SH NAME
 ctype, isalpha, isalnum, isascii, isblank, iscntrl, isdigit, islower,
 isprint, isspace, isupper, ispunct, isgraph, isxdigit, isalpha_l,
 isalnum_l, isblank_l, iscntrl_l, isdigit_l, islower_l, isprint_l,
-isspace_l, isupper_l, ispunct_l, isgraph_l isxdigit_l \- character handling
+isspace_l, isupper_l, ispunct_l, isgraph_l, isxdigit_l \- character handling
 .SH SYNOPSIS
-.LP
 .nf
 #include <ctype.h>
 
@@ -156,7 +155,6 @@ isspace_l, isupper_l, ispunct_l, isgraph_l isxdigit_l \- character handling
 \fBint\fR \fBisxdigit_l\fR(\fBint\fR \fIc\fR, \fBlocale_t\fR \fIloc\fR);
 .fi
 .SH DESCRIPTION
-.LP
 These functions classify character-coded integer values. Each is a
 predicate returning non-zero for true, \fB0\fR for false. The behavior
 of these macros, except \fBisascii()\fR, is affected by the current
@@ -330,13 +328,11 @@ are included.
 .RE
 
 .SH RETURN VALUES
-.LP
 If the argument to any of the character handling macros is not in the domain of
 the function, the result is undefined. Otherwise, the macro or function returns
 non-zero if the classification is \fBTRUE\fR and \fB0\fR if the classification
 is \fBFALSE\fR.
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .TS
 box;
@@ -352,7 +348,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.LP
 \fBnewlocale\fR(3C), \fBsetlocale\fR(3C), \fBuselocale\fR(3C),
 \fBstdio\fR(3C), \fBascii\fR(5), \fBenviron\fR(5),
 \fBstandards\fR(5)
diff --git a/usr/src/man/man3c/pthread_attr_get_np.3c b/usr/src/man/man3c/pthread_attr_get_np.3c
index d6f4571d0d..9da50ab171 100644
--- a/usr/src/man/man3c/pthread_attr_get_np.3c
+++ b/usr/src/man/man3c/pthread_attr_get_np.3c
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2016 Joyent, Inc.
 .\"
-.Dd Feb 07, 2015
+.Dd November 8, 2020
 .Dt PTHREAD_ATTR_GET_NP 3C
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@ will be filled in with the current attributes for the thread.
 The attributes should be allocated by a call to
 .Xr pthread_attr_init 3C
 prior to calling the
-.Fn pthrad_attr_get_np
+.Fn pthread_attr_get_np
 function.
 When
 .Fa attr
diff --git a/usr/src/man/man3c/pthread_mutexattr_getrobust.3c b/usr/src/man/man3c/pthread_mutexattr_getrobust.3c
index 85b2b335c9..f06d2856f5 100644
--- a/usr/src/man/man3c/pthread_mutexattr_getrobust.3c
+++ b/usr/src/man/man3c/pthread_mutexattr_getrobust.3c
@@ -11,12 +11,12 @@
 .\"
 .\" Copyright (c) 2014, Joyent, Inc.
 .\"
-.Dd "Dec 22, 2014"
+.Dd "November 8, 2020"
 .Dt PTHREAD_MUTEXATTR_GETROBUST 3C
 .Os
 .Sh NAME
 .Nm pthread_mutexattr_getrobust ,
-.Nm pthrad_mutexattr_setrobust
+.Nm pthread_mutexattr_setrobust
 .Nd get and set the mutex robust attribute
 .Sh SYNOPSIS
 .In pthread.h
@@ -34,7 +34,7 @@
 The
 .Fn pthread_mutexattr_getrobust
 and
-.Fn pthread_mtuexattr_setrobust
+.Fn pthread_mutexattr_setrobust
 functions obtain and set a mutex's
 .Em robust
 attribute, putting it in, or obtaining it from
diff --git a/usr/src/man/man3c/strftime.3c b/usr/src/man/man3c/strftime.3c
index 269213fed4..3345563543 100644
--- a/usr/src/man/man3c/strftime.3c
+++ b/usr/src/man/man3c/strftime.3c
@@ -46,11 +46,10 @@
 .\" Copyright (c) 2014 Gary Mills
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"
-.TH STRFTIME 3C "Mar 30, 2019"
+.TH STRFTIME 3C "November 8, 2020"
 .SH NAME
-strftime, strftime_l cftime, ascftime \- convert date and time to string
+strftime, strftime_l, cftime, ascftime \- convert date and time to string
 .SH SYNOPSIS
-.LP
 .nf
 #include <time.h>
 
@@ -75,7 +74,6 @@ strftime, strftime_l cftime, ascftime \- convert date and time to string
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBstrftime()\fR, \fBstrftime_l()\fR, \fBascftime()\fR, and \fBcftime()\fR
 functions place
 bytes into the array pointed to by \fIs\fR as controlled by the string pointed
@@ -517,7 +515,6 @@ with a Sunday for \fB%U\fR or a Monday for \fB%W\fR. Week number 0 contains
 those days before the first Sunday or Monday in January for \fB%U\fR and
 \fB%W\fR, respectively.
 .SS "Modified Conversion Specifications"
-.LP
 Some conversion specifications can be modified by the \fBE\fR and \fBO\fR
 modifiers to indicate that an alternate format or specification should be used
 rather than the one normally used by the unmodified conversion specification.
@@ -718,15 +715,12 @@ the locale's alternate numeric symbols.
 .RE
 
 .SS "Selecting the Output Language"
-.LP
 These routines produce output that is formatted according to the \fBLC_TIME\fR
 locale category.  They use either the current locale, or in the case of
 \fBstrftime_l()\fR, the locale supplied by \fIloc\fR.
 .SS "Time Zone"
-.LP
 Local time zone information is used as though \fBtzset\fR(3C) were called.
 .SH RETURN VALUES
-.LP
 These functions return the
 number of characters placed into the array pointed to by \fIs\fR, not including
 the terminating null character. If the total number of resulting characters
@@ -734,7 +728,6 @@ including the terminating null character is more than \fImaxsize\fR,
 \fBstrftime()\fR returns \fB0\fR and the contents of the array are
 indeterminate.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRAn example of the \fBstrftime()\fR function.
 .LP
 The following example illustrates the use of \fBstrftime()\fR for the
@@ -748,7 +741,6 @@ Thursday, August 28, 1986 at 12:44:36.
 .LP
 This results in \fIstr\fR containing "Thursday Aug 28 240".
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .TS
 box;
@@ -771,13 +763,11 @@ The \fBstrftime()\fR and \fBstrftime_l()\fR functions are Standard.
 .LP
 For \fBstrftime()\fR and \fBstrftime_l()\fR, see \fBstandards\fR(5).
 .SH SEE ALSO
-.LP
 \fBdate\fR(1), \fBctime\fR(3C), \fBmktime\fR(3C),
 \fBnewlocale\fR(3C), \fBsetlocale\fR(3C), \fBstrptime\fR(3C), \fBtzset\fR(3C),
 \fBuselocale\fR(3C), \fBTIMEZONE\fR(4), \fBzoneinfo\fR(4),
 \fBattributes\fR(5), \fBenviron\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.LP
 The conversion specification for \fB%V\fR was changed in the Solaris 7 release.
 This change was based on the public review draft of the ISO C9x standard at
 that time. Previously, the specification stated that if the week containing 1
diff --git a/usr/src/man/man3c/tss.3c b/usr/src/man/man3c/tss.3c
index 9f8fde3912..6ee8cc588c 100644
--- a/usr/src/man/man3c/tss.3c
+++ b/usr/src/man/man3c/tss.3c
@@ -11,13 +11,13 @@
 .\"
 .\" Copyright 2016 Joyent, Inc.
 .\"
-.Dd "Jan 11, 2015"
+.Dd "November 8, 2020"
 .Dt TSS 3C
 .Os
 .Sh NAME
 .Nm tss ,
 .Nm tss_create ,
-.Nm tss_destroy ,
+.Nm tss_delete ,
 .Nm tss_get ,
 .Nm tss_set
 .Nd thread-specific storage
@@ -47,7 +47,7 @@ The
 .Sy tss
 family of functions create, get, set, and destroy thread-specific
 storage.
-.Ss Creating and Destorying Thread-Specific Storage
+.Ss Creating and Destroying Thread-Specific Storage
 The
 .Fn tss_create
 function creates a new thread-specific data key.
@@ -58,7 +58,7 @@ and
 .Fn tss_set
 functions.
 A given key persists until
-.Fn tss_destroy
+.Fn tss_delete
 is called.
 .Pp
 When a key is created, the value
@@ -81,17 +81,17 @@ When the destructor is run due to a thread exiting, all signals will be blocked.
 .Pp
 The
 .Fn tss_delete
-function deletes the key identify by
+function deletes the key identified by
 .Fa key
 from the global name-space.
 When a key is deleted, no registered destructor is called, it is up to the
 calling program to free any storage that was associated with
 .Fa key
 across all threads.
-Because of this propety, it is legal to call
+Because of this property, it is legal to call
 .Fn tss_delete
 from inside a destructor.
-Any destructors that had been assocaited with
+Any destructors that had been associated with
 .Fa key
 will no longer be called when a thread terminates.
 .Ss Obtaining Values
@@ -110,7 +110,7 @@ The
 .Fn tss_set
 function sets the value of the key
 .Fa key
-for the callling thread to
+for the calling thread to
 .Fa value ,
 which may be obtained by subsequent calls to
 .Fa tss_get .
diff --git a/usr/src/man/man3c/wcscoll.3c b/usr/src/man/man3c/wcscoll.3c
index 419fc49c46..6fb30aaba1 100644
--- a/usr/src/man/man3c/wcscoll.3c
+++ b/usr/src/man/man3c/wcscoll.3c
@@ -44,11 +44,10 @@
 .\" Portions Copyright (c) 2002, Sun Microsystems, Inc.  All Rights Reserved
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"
-.TH WCSCOLL 3C "April 9, 2016"
+.TH WCSCOLL 3C "November 8, 2020"
 .SH NAME
-wcscoll, wcscoll_l wscoll \- wide character string comparison using collating information
+wcscoll, wcscoll_l, wscoll \- wide character string comparison using collating information
 .SH SYNOPSIS
-.LP
 .nf
 #include <wchar.h>
 
@@ -63,7 +62,6 @@ wcscoll, wcscoll_l wscoll \- wide character string comparison using collating in
 \fBint\fR \fBwscoll\fR(\fBconst wchar_t *\fR\fIws1\fR, \fBconst wchar_t *\fR\fIws2\fR);
 .fi
 .SH DESCRIPTION
-.LP
 The \fBwcscoll()\fR, \fBwcscoll_l()\fR, and \fBwscoll()\fR functions compare
 the wide character
 string pointed to by \fIws1\fR to the wide character string pointed to by
@@ -80,7 +78,6 @@ The function \fBwcsoll_l()\fR behaves identically to \fBwcsoll\fR(), except
 instead of operating in the current locale, it operates in the locale
 specified by \fIloc\fR.
 .SH RETURN VALUES
-.LP
 Upon successful completion, these functions return an
 integer greater than, equal to, or less than 0, depending upon whether the wide
 character string pointed to by \fIws1\fR is greater than, equal to, or less
@@ -89,7 +86,6 @@ interpreted as appropriate to the current locale, or the locale
 specified by \fIloc\fR. On error,
 they set \fBerrno\fR, but no return value is reserved to indicate an error.
 .SH ERRORS
-.LP
 The \fBwcscoll()\fR, \fBwcscoll_l()\fR and \fBwscoll()\fR functions may fail if:
 .sp
 .ne 2
@@ -101,11 +97,9 @@ The \fIws1\fR or \fIws2\fR arguments contain wide character codes outside the
 domain of the collating sequence.
 .RE
 .SH USAGE
-.LP
 The \fBwcsxfrm\fR(3C) and \fBwcscmp\fR(3C) functions should be used for sorting
 large lists, or when performing many comparisons on the same strings.
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .TS
 box;
@@ -124,7 +118,6 @@ MT-Level	MT-Safe
 The \fBwcscoll()\fR and \fBwcscoll_l()\fR functions are Standard.
 The \fBwscoll()\fR function is Committed.
 .SH SEE ALSO
-.LP
 \fBnewlocale\fR(3C), \fBsetlocale\fR(3C), \fBuselocale\fR(3C),
 \fBwcscmp\fR(3C), \fBwcsxfrm\fR(3C), \fBattributes\fR(5),
 \fBstandards\fR(5)
diff --git a/usr/src/man/man3devid/Makefile b/usr/src/man/man3devid/Makefile
index 621a296363..d3b0c22576 100644
--- a/usr/src/man/man3devid/Makefile
+++ b/usr/src/man/man3devid/Makefile
@@ -16,9 +16,9 @@
 
 include		$(SRC)/Makefile.master
 
-MANSECT= 	3devid
+MANSECT=	3devid
 
-MANFILES= 	devid_get.3devid
+MANFILES=	devid_get.3devid
 
 MANLINKS=	devid_compare.3devid		\
 		devid_deviceid_to_nmlist.3devid	\
@@ -29,6 +29,7 @@ MANLINKS=	devid_compare.3devid		\
 		devid_str_decode.3devid		\
 		devid_str_encode.3devid		\
 		devid_str_free.3devid		\
+		devid_str_from_path.3devid	\
 		devid_valid.3devid
 
 devid_compare.3devid		:= LINKSRC = devid_get.3devid
@@ -40,6 +41,7 @@ devid_sizeof.3devid		:= LINKSRC = devid_get.3devid
 devid_str_decode.3devid		:= LINKSRC = devid_get.3devid
 devid_str_encode.3devid		:= LINKSRC = devid_get.3devid
 devid_str_free.3devid		:= LINKSRC = devid_get.3devid
+devid_str_from_path.3devid	:= LINKSRC = devid_get.3devid
 devid_valid.3devid		:= LINKSRC = devid_get.3devid
 
 .KEEP_STATE:
diff --git a/usr/src/man/man3ofmt/Makefile b/usr/src/man/man3ofmt/Makefile
index f1d66dc4f8..b7162b7d36 100644
--- a/usr/src/man/man3ofmt/Makefile
+++ b/usr/src/man/man3ofmt/Makefile
@@ -22,6 +22,8 @@ MANFILES=	ofmt.3ofmt
 MANLINKS=	ofmt_close.3ofmt \
 		ofmt_open.3ofmt \
 		ofmt_print.3ofmt \
+		ofmt_print_header.3ofmt \
+		ofmt_set_fs.3ofmt \
 		ofmt_strerror.3ofmt \
 		ofmt_update_winsize.3ofmt
 
diff --git a/usr/src/man/man3proc/Makefile b/usr/src/man/man3proc/Makefile
index 1986a27ead..422bc9a517 100644
--- a/usr/src/man/man3proc/Makefile
+++ b/usr/src/man/man3proc/Makefile
@@ -215,6 +215,7 @@ MANLINKS=					\
 		Pobjname_resolved.3proc		\
 		Ppriv_free.3proc		\
 		Pputareg.3proc			\
+		Psecflags_free.3proc		\
 		pr_fstat.3proc			\
 		pr_fstat64.3proc		\
 		pr_getrlimit64.3proc		\
@@ -364,6 +365,8 @@ Ppriv_free.3proc		:= LINKSRC = Ppriv.3proc
 
 Pread_string.3proc		:= LINKSRC = Pread.3proc
 
+Psecflags_free.3proc		:= LINKSRC = Psecflags.3proc
+
 Punsetflags.3proc		:= LINKSRC = Psetflags.3proc
 
 Psetsysexit.3proc		:= LINKSRC = Psetsysentry.3proc
diff --git a/usr/src/man/man3proc/Pcontent.3proc b/usr/src/man/man3proc/Pcontent.3proc
index 5ea261d53f..88d1708b6b 100644
--- a/usr/src/man/man3proc/Pcontent.3proc
+++ b/usr/src/man/man3proc/Pcontent.3proc
@@ -11,11 +11,11 @@
 .\"
 .\" Copyright 2015 Joyent, Inc.
 .\"
-.Dd May 11, 2016
+.Dd November 8, 2020
 .Dt PCONTENT 3PROC
 .Os
 .Sh NAME
-.Nm Pconent
+.Nm Pcontent
 .Nd obtain process content types available
 .Sh LIBRARY
 .Lb libproc
diff --git a/usr/src/man/man3proc/proc_get_status.3proc b/usr/src/man/man3proc/proc_get_status.3proc
index 45393a76bc..7a9321f6e0 100644
--- a/usr/src/man/man3proc/proc_get_status.3proc
+++ b/usr/src/man/man3proc/proc_get_status.3proc
@@ -11,23 +11,23 @@
 .\"
 .\" Copyright 2015 Joyent, Inc.
 .\"
-.Dd May 11, 2016
+.Dd November 8, 2020
 .Dt PROC_GET_STATUS 3PROC
 .Os
 .Sh NAME
-.Nm proc_get_pstatus
+.Nm proc_get_status
 .Nd get process status information
 .Sh SYNOPSIS
 .Lb libproc
 .In libproc.h
 .Ft int
-.Fo proc_get_pstatus
+.Fo proc_get_status
 .Fa "pid_t pid"
 .Fa "pstatus_t *psp"
 .Fc
 .Sh DESCRIPTION
 The
-.Fn proc_get_pstatus
+.Fn proc_get_status
 function is a convenient way to read the /proc status file for the
 process
 .Fa pid .
@@ -39,7 +39,7 @@ structure may be found in
 .Xr proc 4 .
 .Sh RETURN VALUES
 Upon successful completion, the
-.Fn proc_get_pstatus
+.Fn proc_get_status
 function returns
 .Sy 0 .
 Otherwise,
diff --git a/usr/src/man/man3proc/proc_unctrl_psinfo.3proc b/usr/src/man/man3proc/proc_unctrl_psinfo.3proc
index 0ad264a4e8..3df63004bb 100644
--- a/usr/src/man/man3proc/proc_unctrl_psinfo.3proc
+++ b/usr/src/man/man3proc/proc_unctrl_psinfo.3proc
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2015 Joyent, Inc.
 .\"
-.Dd May 11, 2016
+.Dd November 8, 2020
 .Dt PROC_UNCTRL_PSINFO 3PROC
 .Os
 .Sh NAME
@@ -26,7 +26,7 @@
 .Fc
 .Sh DESCRIPTION
 The
-.Fn proc_uncctrl_psinfo
+.Fn proc_unctrl_psinfo
 function walks the process arguments of the
 .Fa psp
 structure (the
diff --git a/usr/src/man/man9s/Makefile b/usr/src/man/man9s/Makefile
index 6ef0e91166..d70a69691b 100644
--- a/usr/src/man/man9s/Makefile
+++ b/usr/src/man/man9s/Makefile
@@ -105,6 +105,7 @@ MANLINKS=	dblk.9s				\
 		mac_register_t.9s		\
 		mblk.9s				\
 		usb_ep_ss_comp_descr_t.9s	\
+		usb_ep_xdescr_t.9s		\
 		usb_bulk_req_t.9s		\
 		usb_bulk_request.9s		\
 		usb_ctrl_req_t.9s		\
diff --git a/usr/src/pkg/manifests/driver-usb.mf b/usr/src/pkg/manifests/driver-usb.mf
index d0d9f372db..2c68957489 100644
--- a/usr/src/pkg/manifests/driver-usb.mf
+++ b/usr/src/pkg/manifests/driver-usb.mf
@@ -267,6 +267,7 @@ link path=usr/share/man/man9s/usb_ctrl_req_t.9s target=usb_ctrl_req.9s
 link path=usr/share/man/man9s/usb_ctrl_request.9s target=usb_ctrl_req.9s
 link path=usr/share/man/man9s/usb_ep_ss_comp_descr_t.9s \
     target=usb_ep_ss_comp_descr.9s
+link path=usr/share/man/man9s/usb_ep_xdescr_t.9s target=usb_ep_xdescr.9s
 link path=usr/share/man/man9s/usb_intr_req_t.9s target=usb_intr_req.9s
 link path=usr/share/man/man9s/usb_intr_request.9s target=usb_intr_req.9s
 link path=usr/share/man/man9s/usb_isoc_req_t.9s target=usb_isoc_req.9s
diff --git a/usr/src/pkg/manifests/system-library.man3c.inc b/usr/src/pkg/manifests/system-library.man3c.inc
index 100b5db173..f892d1551e 100644
--- a/usr/src/pkg/manifests/system-library.man3c.inc
+++ b/usr/src/pkg/manifests/system-library.man3c.inc
@@ -952,6 +952,7 @@ link path=usr/share/man/man3c/iswalnum.3c target=iswalpha.3c
 link path=usr/share/man/man3c/iswalnum_l.3c target=iswalpha.3c
 link path=usr/share/man/man3c/iswalpha_l.3c target=iswalpha.3c
 link path=usr/share/man/man3c/iswascii.3c target=iswalpha.3c
+link path=usr/share/man/man3c/iswascii_l.3c target=iswalpha.3c
 link path=usr/share/man/man3c/iswblank.3c target=iswalpha.3c
 link path=usr/share/man/man3c/iswblank_l.3c target=iswalpha.3c
 link path=usr/share/man/man3c/iswcntrl.3c target=iswalpha.3c
diff --git a/usr/src/pkg/manifests/system-library.man3devid.inc b/usr/src/pkg/manifests/system-library.man3devid.inc
index b85cfc1d85..7228298095 100644
--- a/usr/src/pkg/manifests/system-library.man3devid.inc
+++ b/usr/src/pkg/manifests/system-library.man3devid.inc
@@ -30,4 +30,6 @@ link path=usr/share/man/man3devid/devid_str_encode.3devid \
     target=devid_get.3devid
 link path=usr/share/man/man3devid/devid_str_free.3devid \
     target=devid_get.3devid
+link path=usr/share/man/man3devid/devid_str_from_path.3devid \
+    target=devid_get.3devid
 link path=usr/share/man/man3devid/devid_valid.3devid target=devid_get.3devid
diff --git a/usr/src/pkg/manifests/system-library.man3ofmt.inc b/usr/src/pkg/manifests/system-library.man3ofmt.inc
index f9e49c3c26..37419e8761 100644
--- a/usr/src/pkg/manifests/system-library.man3ofmt.inc
+++ b/usr/src/pkg/manifests/system-library.man3ofmt.inc
@@ -17,5 +17,7 @@ file path=usr/share/man/man3ofmt/ofmt.3ofmt
 link path=usr/share/man/man3ofmt/ofmt_close.3ofmt target=ofmt.3ofmt
 link path=usr/share/man/man3ofmt/ofmt_open.3ofmt target=ofmt.3ofmt
 link path=usr/share/man/man3ofmt/ofmt_print.3ofmt target=ofmt.3ofmt
+link path=usr/share/man/man3ofmt/ofmt_print_header.3ofmt target=ofmt.3ofmt
+link path=usr/share/man/man3ofmt/ofmt_set_fs.3ofmt target=ofmt.3ofmt
 link path=usr/share/man/man3ofmt/ofmt_strerror.3ofmt target=ofmt.3ofmt
 link path=usr/share/man/man3ofmt/ofmt_update_winsize.3ofmt target=ofmt.3ofmt
diff --git a/usr/src/pkg/manifests/system-library.man3proc.inc b/usr/src/pkg/manifests/system-library.man3proc.inc
index c8509f5273..66edc6e142 100644
--- a/usr/src/pkg/manifests/system-library.man3proc.inc
+++ b/usr/src/pkg/manifests/system-library.man3proc.inc
@@ -216,6 +216,7 @@ link path=usr/share/man/man3proc/Pobjname_resolved.3proc target=Pobjname.3proc
 link path=usr/share/man/man3proc/Ppriv_free.3proc target=Ppriv.3proc
 link path=usr/share/man/man3proc/Pputareg.3proc target=Pgetareg.3proc
 link path=usr/share/man/man3proc/Pread_string.3proc target=Pread.3proc
+link path=usr/share/man/man3proc/Psecflags_free.3proc target=Psecflags.3proc
 link path=usr/share/man/man3proc/Psetsysexit.3proc target=Psetsysentry.3proc
 link path=usr/share/man/man3proc/Pstop.3proc target=Pstopstatus.3proc
 link path=usr/share/man/man3proc/Psymbol_iter_by_addr.3proc \
diff --git a/usr/src/test/crypto-tests/runfiles/default.run b/usr/src/test/crypto-tests/runfiles/default.run
index 7a8f913e43..bfda2b5eae 100644
--- a/usr/src/test/crypto-tests/runfiles/default.run
+++ b/usr/src/test/crypto-tests/runfiles/default.run
@@ -19,7 +19,12 @@
 pre =
 verbose = False
 quiet = False
-timeout = 60
+#
+# Unfortunately, if the tpm based PKCS11 library is present, libtspi will make
+# socket calls left and right that take a bit to timeout which induce latency
+# into every test case. Bump the timeout until this is no longer a problem.
+#
+timeout = 250
 post =
 outputdir = /var/tmp/test_results