changeset 25414:0f57022d4b01

[illumos-gate merge] commit a9e414682948591ec63d5ab2cd11ba55603b59fa 6782 head can't handle embedded nul characters 13150 head -v doesn't work with a single file commit 37337afa1f0c469ab4b7343cf92da8c884b39b8b 13127 libc: for statement not indented commit ae41a23c315570b85d6bf190d7cc51e1bcb161c8 13181 Cleanup cat(1) man page commit 89abd63ca1d1795943e51095a12ea5ce6e035e88 13131 libc: _fgetwc_unlocked_l() warn: was '== &fp->_state' instead of '=' commit c64c5389d6d65f1a8915fd0ff67288100f518172 13141 Man page formatting runs words together commit a7f55c951e21deb266649b41baa71501d3382f4d 13140 Typos in the manual Conflicts: usr/src/test/util-tests/tests/Makefile
author Jerry Jelinek <jerry.jelinek@joyent.com>
date Wed, 23 Sep 2020 12:07:08 +0000
parents 88eb026c932e (current diff) c82a295850fb (diff)
children ec9b87658b7e
files exception_lists/copyright usr/src/cmd/head/head.c usr/src/man/man1/head.1 usr/src/man/man1m/ccidadm.1m usr/src/pkg/manifests/system-test-utiltest.mf usr/src/test/util-tests/runfiles/default.run usr/src/test/util-tests/tests/Makefile usr/src/test/util-tests/tests/head/stdin.2.out usr/src/test/util-tests/tests/head/stdin.3.out
diffstat 52 files changed, 372 insertions(+), 466 deletions(-) [+]
line wrap: on
line diff
--- a/exception_lists/copyright	Tue Sep 22 11:40:29 2020 +0000
+++ b/exception_lists/copyright	Wed Sep 23 12:07:08 2020 +0000
@@ -417,6 +417,8 @@
 usr/src/test/util-tests/tests/libsff/*.out
 usr/src/test/util-tests/tests/grep_xpg4/files/gout*
 usr/src/test/util-tests/tests/grep_xpg4/files/test*
+usr/src/test/util-tests/tests/head/*.in
+usr/src/test/util-tests/tests/head/*.out
 usr/src/test/util-tests/tests/libsff/*.out
 usr/src/test/zfs-tests/tests/functional/history/*Z
 usr/src/test/zfs-tests/tests/functional/history/*txt
--- a/usr/src/cmd/head/head.c	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/cmd/head/head.c	Wed Sep 23 12:07:08 2020 +0000
@@ -25,7 +25,7 @@
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
@@ -38,6 +38,7 @@
  */
 /*
  * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
+ * Copyright 2020 Oxide Computer Company
  */
 
 
@@ -47,6 +48,7 @@
 #include <locale.h>
 #include <string.h>
 #include <ctype.h>
+#include <err.h>
 
 #define	DEF_LINE_COUNT	10
 
@@ -70,6 +72,7 @@
 	int	isline = 1;
 	int	error = 0;
 	int	quiet = 0;
+	int	verbose = 0;
 
 	(void) setlocale(LC_ALL, "");
 #if !defined(TEXT_DOMAIN)	/* Should be defined by cc -D */
@@ -122,9 +125,11 @@
 			break;
 		case 'q':
 			quiet = 1;
+			verbose = 0;
 			break;
 		case 'v':
 			quiet = 0;
+			verbose = 1;
 			break;
 		default:
 			Usage();
@@ -154,8 +159,13 @@
 			if (around)
 				(void) putchar('\n');
 
-			if (fileCount > 1)
-				(void) printf("==> %s <==\n", argv[optind]);
+			if (fileCount > 1 || verbose != 0) {
+				const char *file = argv[optind];
+				if (file == NULL) {
+					file = "standard input";
+				}
+				(void) printf("==> %s <==\n", file);
+			}
 		}
 
 		if (argv[optind] != NULL)
@@ -176,27 +186,34 @@
 	char lbuf[BUFSIZ];
 	size_t len;
 
-	while (cnt > 0 && fgets(lbuf, sizeof (lbuf), input) != 0) {
-		len = strlen(lbuf);
+	while (cnt > 0) {
+		len = fread(lbuf, sizeof (char), sizeof (lbuf) / sizeof (char),
+		    input);
+		if (len == 0) {
+			return;
+		}
+
 		if (isline) {
-			(void) printf("%s", lbuf);
-			/*
-			 * only count as a line if buffer read ends with newline
-			 */
-			if (len > 0) {
-				if (lbuf[len - 1] == '\n') {
-					(void) fflush(stdout);
+			size_t i;
+			for (i = 0; i < len; i++) {
+				if (lbuf[i] == '\n') {
 					cnt--;
+					if (cnt == 0) {
+						i++;
+						break;
+					}
 				}
 			}
+			len = i;
 		} else {
 			if (len > cnt) {
-				lbuf[cnt] = '\0';
 				len = cnt;
 			}
-			(void) printf("%s", lbuf);
 			cnt -= len;
-			(void) fflush(stdout);
+		}
+
+		if (fwrite(lbuf, sizeof (char), len, stdout) != len) {
+			err(EXIT_FAILURE, "failed to write to stdout");
 		}
 	}
 }
--- a/usr/src/lib/libc/port/gen/getutx.c	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/lib/libc/port/gen/getutx.c	Wed Sep 23 12:07:08 2020 +0000
@@ -25,7 +25,7 @@
  */
 
 /*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
@@ -475,7 +475,7 @@
  * to the /etc/utmp file.
  */
 
-#define	UTMP_UPDATE 	"/usr/lib/utmp_update"
+#define	UTMP_UPDATE	"/usr/lib/utmp_update"
 #define	STRSZ	64	/* Size of char buffer for argument strings */
 
 static struct utmpx *
@@ -1054,7 +1054,7 @@
 				 */
 				saveid[i] = 0;
 				while (!isalnum(saveid[i]))
-				saveid[i]++;
+					saveid[i]++;
 				copyid[i] = ++saveid[i];
 			}
 		}
--- a/usr/src/lib/libc/port/locale/fgetwc.c	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/lib/libc/port/locale/fgetwc.c	Wed Sep 23 12:07:08 2020 +0000
@@ -59,7 +59,8 @@
 		/* Fast path for single-byte encodings. */
 		return ((wint_t)c);
 	}
-	if ((statep = _getmbstate(fp)) == NULL) {
+	statep = _getmbstate(fp);
+	if (statep == NULL) {
 		fp->_flag = _IOERR;
 		errno = EBADF;
 		return (WEOF);
--- a/usr/src/man/man1/cat.1	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1/cat.1	Wed Sep 23 12:07:08 2020 +0000
@@ -45,26 +45,22 @@
 .\" Portions Copyright (c) 1982-2007 AT&T Knowledge Ventures
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
 .\"
-.TH CAT 1 "Apr 8, 2008"
+.TH CAT 1 "Sep 19, 2020"
 .SH NAME
 cat \- concatenate and display files
 .SH SYNOPSIS
 .SS "\fB/usr/bin/cat\fR"
-.LP
 .nf
 \fB/usr/bin/cat\fR [\fB-nbsuvet\fR] [\fIfile\fR...]
 .fi
 
 .SS "\fBksh93\fR"
-.LP
 .nf
 \fBcat\fR [\fB-bdenstuvABDEST\fR] [\fIfile\fR...]
 .fi
 
 .SH DESCRIPTION
 .SS "\fB/usr/bin/cat\fR"
-.sp
-.LP
 The \fBcat\fR utility reads each \fIfile\fR in sequence and writes it on the
 standard output. Thus:
 .sp
@@ -92,8 +88,6 @@
 \fIfile3\fR. If no input file is given, \fBcat\fR reads from the standard input
 file.
 .SS "\fBksh93\fR"
-.sp
-.LP
 The \fBcat\fR built-in in \fBksh93\fR is associated with the \fB/bin\fR and
 \fB/usr/bin\fR paths. It is invoked when \fBcat\fR is executed without a
 pathname prefix and the pathname search finds a \fB/bin/cat\fR or
@@ -102,8 +96,6 @@
 copies from standard input starting at the current location.
 .SH OPTIONS
 .SS "\fB/usr/bin/cat\fR"
-.sp
-.LP
 The following options are supported by \fB/usr/bin/cat\fR:
 .sp
 .ne 2
@@ -184,8 +176,6 @@
 The \fB-e\fR and \fB-t\fR options are ignored if the \fB-v\fR option is not
 specified.
 .SS "\fBksh93\fR"
-.sp
-.LP
 \fBksh93\fR \fBcat\fR supports the following options:
 .sp
 .ne 2
@@ -323,8 +313,6 @@
 .RE
 
 .SH OPERANDS
-.sp
-.LP
 The following operand is supported:
 .sp
 .ne 2
@@ -340,12 +328,9 @@
 .RE
 
 .SH USAGE
-.sp
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBcat\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRConcatenating a File
 .sp
 .LP
@@ -393,11 +378,6 @@
 
 .sp
 .LP
-when standard input is a terminal, gets two arbitrary pieces of input from the
-terminal with a single invocation of \fBcat\fR.
-
-.sp
-.LP
 If standard input is a regular file,
 
 .sp
@@ -415,7 +395,7 @@
 .sp
 .in +2
 .nf
-\fBcat start - middle /dev/null end > file\fR
+example% \fBcat start - middle /dev/null end > file\fR
 .fi
 .in -2
 .sp
@@ -424,18 +404,14 @@
 .LP
 because the entire contents of the file would be consumed by \fBcat\fR the
 first time \fB\|\(mi\|\fR was used as a \fIfile\fR operand and an end-of-file
-condition would be detected immediately when \fB\|\(mi\|\fRwas referenced the
+condition would be detected immediately when \fB\|\(mi\|\fR was referenced the
 second time.
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBcat\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -456,13 +432,9 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .SS "\fB/usr/bin/cat\fR"
-.sp
 
-.sp
 .TS
 box;
 c | c
@@ -477,9 +449,7 @@
 .TE
 
 .SS "\fBksh93\fR"
-.sp
 
-.sp
 .TS
 box;
 c | c
@@ -494,13 +464,9 @@
 The \fBksh93\fR built-in binding to \fB/bin\fR and \fB/usr/bin\fR is Volatile.
 The built-in interfaces are Uncommitted.
 .SH SEE ALSO
-.sp
-.LP
 \fBtouch\fR(1), \fBattributes\fR(5), \fBenviron\fR(5), \fBlargefile\fR(5),
 \fBstandards\fR(5)
 .SH NOTES
-.sp
-.LP
 Redirecting the output of \fBcat\fR onto one of the files being read causes the
 loss of the data originally in the file being read. For example,
 .sp
--- a/usr/src/man/man1/head.1	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1/head.1	Wed Sep 23 12:07:08 2020 +0000
@@ -46,26 +46,22 @@
 .\" Portions Copyright (c) 2007, Sun Microsystems, Inc. All Rights Reserved
 .\" Portions Copyright (c) 2013, Joyent, Inc. All Rights Reserved
 .\"
-.TH HEAD 1 "Mar 4, 2013"
+.TH HEAD 1 "Sep 12, 2020"
 .SH NAME
 head \- display first few lines of files
 .SH SYNOPSIS
 .SS "/usr/bin/head"
-.LP
 .nf
-\fB/usr/bin/head\fR [\fB-q\fR] [\fB-v\fR] [\fB-number\fR ] [ \fB-n\fR \fInumber\fR ] [ \fB-c\fR \fInumber\fR] [\fIfilename\fR]...
+\fB/usr/bin/head\fR [\fB-q\fR] [\fB-v\fR] [\fB-\fR\fInumber\fR ] [ \fB-n\fR \fInumber\fR ] [ \fB-c\fR \fInumber\fR] [\fIfilename\fR]...
 .fi
 
 .SS "ksh93"
-.LP
 .nf
 \fBhead\fR [\fB-qv\fR] [\fB-n\fR \fIlines\fR] [\fB-c\fR \fIchars\fR] [\fB-s\fR \fIskip\fR] [\fIfilename\fR]...
 .fi
 
 .SH DESCRIPTION
 .SS "/usr/bin/head"
-.sp
-.LP
 The \fBhead\fR utility copies the first \fInumber\fR of lines of each
 \fIfilename\fR to the standard output. If no \fIfilename\fR is given,
 \fBhead\fR copies lines from the standard input. The default value of
@@ -93,8 +89,6 @@
 .sp
 
 .SS "ksh93"
-.sp
-.LP
 The \fBhead\fR built-in in \fBksh93\fR is associated with the \fB/bin\fR and
 \fB/usr/bin\fR paths. It is invoked when \fBhead\fR is executed without a
 pathname prefix and the pathname search finds a \fB/bin/head\fR or
@@ -145,8 +139,6 @@
 For backwards compatibility, \fB-number\fR is equivalent to \fB-n\fR number.
 .SH OPTIONS
 .SS "/usr/bin/head"
-.sp
-.LP
 The following options are supported by \fB/usr/bin/head\fR:
 .sp
 .ne 2
@@ -195,7 +187,8 @@
 \fB-v\fR
 .ad
 .RS 13n
-\fBhead\fR will always print a header in between each specified file.
+\fBhead\fR will always print a header before each file, even if only one
+file is specified.
 .RE
 
 .sp
@@ -203,8 +196,6 @@
 If no options are specified, \fBhead\fR acts as if \fB-n\fR \fB10\fR had been
 specified.
 .SS "ksh93"
-.sp
-.LP
 The following options are supported by the head built-in command in
 \fBksh93\fR:
 .sp
@@ -273,8 +264,6 @@
 .RE
 
 .SH OPERANDS
-.sp
-.LP
 The following operand is supported:
 .sp
 .ne 2
@@ -287,12 +276,9 @@
 .RE
 
 .SH USAGE
-.sp
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBhead\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRWriting the First Ten Lines of All Files
 .sp
 .LP
@@ -308,14 +294,10 @@
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBhead\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -336,13 +318,9 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .SS "/usr/bin/head"
-.sp
 
-.sp
 .TS
 box;
 c | c
@@ -357,9 +335,7 @@
 .TE
 
 .SS "ksh93"
-.sp
 
-.sp
 .TS
 box;
 c | c
@@ -374,7 +350,5 @@
 The \fBksh93\fR built-in binding to \fB/bin\fR and \fB/usr/bin\fR is Volatile.
 The built-in interfaces are Uncommitted.
 .SH SEE ALSO
-.sp
-.LP
 \fBcat\fR(1), \fBksh93\fR(1), \fBmore\fR(1), \fBpg\fR(1), \fBtail\fR(1),
 \fBattributes\fR(5), \fBenviron\fR(5), \fBlargefile\fR(5), \fBstandards\fR(5)
--- a/usr/src/man/man1/limit.1	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1/limit.1	Wed Sep 23 12:07:08 2020 +0000
@@ -44,18 +44,16 @@
 .\" Portions Copyright (c) 1982-2007 AT&T Knowledge Ventures
 .\" Copyright (c) 2007, Sun Microsystems, Inc. All Rights Reserved
 .\"
-.TH LIMIT 1 "Nov 2, 2007"
+.TH LIMIT 1 "September 12, 2020"
 .SH NAME
 limit, ulimit, unlimit \- set or get limitations on the system resources
 available to the current shell and its descendents
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/bin/ulimit\fR [\fB-f\fR] [\fIblocks\fR]
 .fi
 
 .SS "sh"
-.LP
 .nf
 \fBulimit\fR [\fB-\fR [HS] [a | cdfnstv]]
 .fi
@@ -66,7 +64,6 @@
 .fi
 
 .SS "csh"
-.LP
 .nf
 \fBlimit\fR [\fB-h\fR] [\fIresource\fR [\fIlimit\fR]]
 .fi
@@ -77,27 +74,21 @@
 .fi
 
 .SS "ksh"
-.LP
 .nf
 \fBulimit\fR [\fB-HSacdfnstv\fR] [\fIlimit\fR]
 .fi
 
 .SS "ksh93"
-.LP
 .nf
 \fBulimit\fR [\fB-HSacdfmnpstv\fR] [\fIlimit\fR]
 .fi
 
 .SH DESCRIPTION
 .SS "/usr/bin/ulimit"
-.sp
-.LP
 The \fBulimit\fR utility sets or reports the file-size writing limit imposed on
 files written by the shell and its child processes (files of any size can be
 read). Only a process with appropriate privileges can increase the limit.
 .SS "sh"
-.sp
-.LP
 The Bourne shell built-in function, \fBulimit\fR, prints or sets hard or soft
 resource limits. These limits are described in \fBgetrlimit\fR(2).
 .sp
@@ -107,7 +98,7 @@
 limits.
 .sp
 .LP
-If \fIlimit\fR is present, \fBulimit\fR sets the specified limit to\fIlimit\fR.
+If \fIlimit\fR is present, \fBulimit\fR sets the specified limit to \fIlimit\fR.
 The string \fBunlimited\fR requests that the current limit, if any, be removed.
 Any user can set a soft limit to any value less than or equal to the hard
 limit. Any user can lower a hard limit. Only a user with appropriate privileges
@@ -185,8 +176,6 @@
 .RE
 
 .SS "csh"
-.sp
-.LP
 The C-shell built-in function, \fBlimit\fR, limits the consumption by the
 current process or any process it spawns, each not to exceed \fIlimit\fR on the
 specified \fIresource\fR. The string \fBunlimited\fR requests that the current
@@ -328,8 +317,6 @@
 .RE
 
 .SS "ksh"
-.sp
-.LP
 The Korn shell built-in function, \fBulimit\fR, sets or displays a resource
 limit. The available resources limits are listed below. Many systems do not
 contain one or more of these limits. The limit for a specified resource is set
@@ -421,15 +408,11 @@
 .LP
 If no option is specified, \fB-f\fR is assumed.
 .SS "Per-Shell Memory Parameters"
-.sp
-.LP
 The \fBheapsize\fR, \fBdatasize\fR, and \fBstacksize\fR parameters are not
 system tunables. The only controls for these are hard limits, set in a shell
 startup file, or system-wide soft limits, which, for the current version of the
 Solaris OS, is 2^64bytes.
 .SS "ksh93"
-.sp
-.LP
 \fBulimit\fR sets or displays resource limits. These limits apply to the
 current process and to each child process created after the resource limit has
 been set. If \fIlimit\fR is specified, the resource limit is set, otherwise,
@@ -681,8 +664,6 @@
 .RE
 
 .SH OPTIONS
-.sp
-.LP
 The following option is supported by \fB/usr/bin/ulimit\fR:
 .sp
 .ne 2
@@ -695,8 +676,6 @@
 .RE
 
 .SH OPERANDS
-.sp
-.LP
 The following operand is supported by \fB/usr/bin/ulimit\fR:
 .sp
 .ne 2
@@ -709,7 +688,6 @@
 
 .SH EXAMPLES
 .SS "/usr/bin/ulimit"
-.LP
 \fBExample 1 \fRLimiting the Stack Size
 .sp
 .LP
@@ -732,7 +710,6 @@
 .sp
 
 .SS "sh/ksh"
-.LP
 \fBExample 2 \fRLimiting the Number of File Descriptors
 .sp
 .LP
@@ -755,7 +732,6 @@
 .sp
 
 .SS "csh"
-.LP
 \fBExample 3 \fRLimiting the Core Dump File Size
 .sp
 .LP
@@ -800,14 +776,10 @@
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBulimit\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned by \fBulimit\fR:
 .sp
 .ne 2
@@ -828,13 +800,8 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .SS "/usr/bin/ulimit, csh, ksh, sh"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -847,9 +814,6 @@
 .TE
 
 .SS "ksh93"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -860,8 +824,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBbc\fR(1), \fBcsh\fR(1), \fBksh\fR(1), \fBksh93\fR(1), \fBsh\fR(1),
 \fBdf\fR(1M), \fBsu\fR(1M), \fBswap\fR(1M), \fBsysdef\fR(1M),
 \fBgetrlimit\fR(2), \fBattributes\fR(5), \fBenviron\fR(5), \fBstandards\fR(5)
--- a/usr/src/man/man1/rcp.1	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1/rcp.1	Wed Sep 23 12:07:08 2020 +0000
@@ -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 RCP 1 "Dec 23, 2008"
+.TH RCP 1 "September 12, 2020"
 .SH NAME
 rcp \- remote file copy
 .SH SYNOPSIS
-.LP
 .nf
 \fBrcp\fR [\fB-p\fR] [\fB-a\fR] [\fB-K\fR] [\fB-x\fR] [\fB-PN\fR | \fB-PO\fR] [\fB-k\fR \fIrealm\fR] \fIfilename1\fR \fIfilename2\fR
 .fi
@@ -19,8 +18,6 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBrcp\fR command copies files between machines. Each \fIfilename\fR or
 \fIdirectory\fR argument is either a remote file name of the form:
 .sp
@@ -107,8 +104,6 @@
 host resides. File names that are not full path names are interpreted relative
 to the home directory of the user named \fIusername\fR, on the remote host.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -163,7 +158,7 @@
 .ad
 .RS 12n
 Explicitly requests new (\fB-PN\fR) or old (\fB-PO\fR) version of the Kerberos
-"\fBrcmd\fR" protocol. The new protocol avoids many security problems prevalant
+"\fBrcmd\fR" protocol. The new protocol avoids many security problems prevalent
 in the old one and is regarded much more secure, but is not interoperable with
 older (MIT/SEAM) servers. The new protocol is used by default, unless
 explicitly specified using these options or through \fBkrb5.conf\fR(4). If
@@ -194,8 +189,6 @@
 .RE
 
 .SH USAGE
-.sp
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBrcp\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .sp
@@ -208,7 +201,7 @@
 authorization list in a file \fB\&.k5login\fR in their home directory. Each
 line in this file should contain a Kerberos principal name of the form
 \fIprincipal\fR/\fIinstance\fR@\fIrealm\fR. If there is a \fB~/.k5login\fR
-file, then access is granted to the account if and only if the originater user
+file, then access is granted to the account if and only if the originating user
 is authenticated to one of the principals named in the \fB~/.k5login\fR file.
 Otherwise, the originating user is granted access to the account if and only if
 the authenticated principal name of the user can be mapped to the local account
@@ -216,8 +209,6 @@
 mapping rules. The \fB\&.k5login\fR file (for access control) comes into play
 only when Kerberos authentication is being done.
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -241,8 +232,6 @@
 .LP
 See the NOTES section for caveats on the exit code.
 .SH FILES
-.sp
-.LP
 \fB$HOME/.profile\fR
 .sp
 .ne 2
@@ -263,8 +252,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -279,15 +266,11 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBcpio\fR(1), \fBftp\fR(1), \fBrlogin\fR(1), \fBrsh\fR(1), \fBsetfacl\fR(1),
 \fBtar\fR(1), \fBtar\fR(1), \fBin.rshd\fR(1M), \fBhosts.equiv\fR(4),
 \fBkrb5.conf\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5),
 \fBkrb5_auth_rules\fR(5), \fBinet\fR(7P), \fBinet6\fR(7P), \fBip6\fR(7P)
 .SH NOTES
-.sp
-.LP
 \fBrcp\fR is meant to copy between different hosts. Attempting to \fBrcp\fR a
 file onto itself, as with:
 .sp
--- a/usr/src/man/man1/rdist.1	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1/rdist.1	Wed Sep 23 12:07:08 2020 +0000
@@ -1,11 +1,10 @@
 '\" te
 .\" Copyright (c) 1985 Regents of the University of California. All rights reserved. The Berkeley software License Agreement specifies the terms and conditions for redistribution.
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
-.TH RDIST 1 "Dec 23, 2008"
+.TH RDIST 1 "September 12, 2020"
 .SH NAME
 rdist \- remote file distribution program
 .SH SYNOPSIS
-.LP
 .nf
 \fBrdist\fR [\fB-b\fR] [\fB-D\fR] [\fB-h\fR] [\fB-i\fR] [\fB-n\fR] [\fB-q\fR] [\fB-R\fR] [\fB-a\fR] [\fB-K\fR] [\fB-x\fR]
      [\fB-PN\fR | \fB-PO\fR] [\fB-k\fR \fIrealm\fR] [\fB-v\fR] [\fB-w\fR] [\fB-y\fR]
@@ -20,8 +19,6 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBrdist\fR utility maintains copies of files on multiple hosts. It
 preserves the owner, group, mode, and modification time of the master copies,
 and can update programs that are executing. (\fBrdist\fR does not propagate
@@ -62,8 +59,6 @@
 \fB\&.rhosts\fR file in the home directory. See \fBhosts.equiv\fR(4) for more
 information.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -218,7 +213,7 @@
 .sp .6
 .RS 4n
 Explicitly requests new (\fB-PN\fR) or old (\fB-PO\fR) version of the Kerberos
-"\fBrcmd\fR" protocol. The new protocol avoids many security problems prevalant
+"\fBrcmd\fR" protocol. The new protocol avoids many security problems prevalent
 in the old one and is regarded much more secure, but is not interoperable with
 older (MIT/SEAM) servers. The new protocol is used by default, unless
 explicitly specified using these options or through \fBkrb5.conf\fR(4). If
@@ -303,19 +298,13 @@
 
 .SH USAGE
 .SS "White Space Characters"
-.sp
-.LP
 NEWLINE, TAB, and SPACE characters are all treated as white space; a mapping
 continues across input lines until the start of the next mapping: either a
 single \fIfilename\fR followed by a `\fB->\fR' or the opening parenthesis of a
 filename list.
 .SS "Comments"
-.sp
-.LP
 Comments begin with \fB#\fR and end with a NEWLINE.
 .SS "Distfiles"
-.sp
-.LP
 The distfile contains a sequence of entries that specify the files to be
 copied, the destination files to be copied, the destination hosts, and what
 operations to perform to do the updating. Each entry has one of the following
@@ -346,8 +335,6 @@
 Typically, only \fBnotify\fR is used with the '\fB::\fR' format of the command
 line.
 .SS "Macros"
-.sp
-.LP
 \fBrdist\fR has a limited macro facility. Macros are only expanded in filename
 or hostname lists, and in the argument lists of certain primitives. Macros
 cannot be used to stand for primitives or their options, or the `\fB->\fR' or
@@ -377,13 +364,11 @@
 although (as with \fBmake\fR(1S)) the braces can be omitted if the macro name
 consists of just one character.
 .SS "Kerberos Access-Control file"
-.sp
-.LP
 For the kerberized \fBrdist\fR session, each user might have a private
 authorization list in a file \fB\&.k5login\fR in their home directory. Each
 line in this file should contain a Kerberos principal name of the form
 \fIprincipal\fR/\fIinstance\fR@\fIrealm\fR. If there is a \fB~/.k5login\fR
-file, then access is granted to the account if and only if the originater user
+file, then access is granted to the account if and only if the originating user
 is authenticated to one of the principals named in the \fB~/.k5login\fR file.
 Otherwise, the originating user is granted access to the account if and only if
 the authenticated principal name of the user can be mapped to the local account
@@ -391,8 +376,6 @@
 mapping rules. The \fB\&.k5login\fR file (for access control) comes into play
 only when Kerberos authentication is being done.
 .SS "Metacharacters"
-.sp
-.LP
 The shell meta-characters: \fB[\fR, \fB]\fR, \fB{\fR, \fB}\fR, \fB*\fR and
 \fB?\fR are recognized and expanded (on the local host only) just as they are
 with \fBcsh\fR(1). Metacharacters can be escaped by prepending a backslash.
@@ -401,15 +384,11 @@
 The \fB~\fR character is also expanded in the same way as with \fBcsh\fR;
 however, it is expanded separately on the local and destination hosts.
 .SS "Filenames"
-.sp
-.LP
 File names that do not begin with `\fB\|/\|\fR\&' or `\fB\|~\|\fR\&' are taken
 to be relative to user's home directory on each destination host; they are
 \fInot\fR relative to the current working directory. Multiple file names must
 be enclosed within parentheses.
 .SS "Primitives"
-.sp
-.LP
 The following primitives can be used to specify actions \fBrdist\fR is to take
 when updating remote copies of each file.
 .sp
@@ -430,7 +409,7 @@
 .sp
 The options for \fBinstall\fR have the same semantics as their command line
 counterparts, but are limited in scope to a particular map. The login name used
-on the destination host is the same as the local host unless the destination
+on the destination host is the same as on the local host unless the destination
 name is of the format \fIlogin@host\fR. In that case, the update is performed
 under the username \fIlogin\fR.
 .RE
@@ -494,12 +473,9 @@
 .RE
 
 .SS "IPv6"
-.sp
-.LP
 The \fBrdist\fR command is IPv6-enabled. See \fBip6\fR(7P). \fBIPv6\fR is not
 currently supported with Kerberos V5 authentication.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRA Sample distfile
 .sp
 .LP
@@ -529,7 +505,6 @@
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB~/.rhosts\fR\fR
@@ -544,7 +519,7 @@
 \fB\fB/etc/host.equiv\fR\fR
 .ad
 .RS 23n
-system trusted hosts and users
+System trusted hosts and users
 .RE
 
 .sp
@@ -575,26 +550,18 @@
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBcsh\fR(1), \fBed\fR(1), \fBmake\fR(1S), \fBsh\fR(1), \fBin.rshd\fR(1M),
 \fBstat\fR(2), \fBhosts.equiv\fR(4), \fBkrb5.conf\fR(4), \fBattributes\fR(5),
 \fBkrb5_auth_rules\fR(5), \fBip6\fR(7P)
 .SH DIAGNOSTICS
-.sp
-.LP
 A complaint about mismatch of \fBrdist\fR version numbers might really stem
 from some problem with starting your shell, for example, you are in too many
 groups.
 .SH WARNINGS
-.sp
-.LP
 The super-user does not have its accustomed access privileges on \fBNFS\fR
 mounted file systems. Using \fBrdist\fR to copy to such a file system might
 fail, or the copies might be owned by user "nobody".
 .SH BUGS
-.sp
-.LP
 Source files must reside or be mounted on the local host.
 .sp
 .LP
--- a/usr/src/man/man1/rlogin.1	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1/rlogin.1	Wed Sep 23 12:07:08 2020 +0000
@@ -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 RLOGIN 1 "Dec 23, 2008"
+.TH RLOGIN 1 "September 12, 2020"
 .SH NAME
 rlogin \- remote login
 .SH SYNOPSIS
-.LP
 .nf
 \fBrlogin\fR [\fB-8EL\fR] [\fB-e\fIc\fR\fR ] [\fB-A\fR] [\fB-K\fR] [\fB-x\fR] [\fB-PN\fR | \fB-PO\fR] [\fB-f\fR | \fB-F\fR] [\fB-a\fR]
      [\fB-l\fR \fIusername\fR] [\fB-k\fR \fIrealm\fR] \fIhostname\fR
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBrlogin\fR utility establishes a remote login session from your terminal
 to the remote machine named \fIhostname\fR. The user can choose to kerberize
 the rlogin session using Kerberos V5 and also protect the data being
@@ -55,8 +52,6 @@
 Control-S and Control-Q and flushing of input and output on interrupts are
 handled properly.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -190,7 +185,7 @@
 .RS 15n
 Explicitly requests the new (\fB-PN\fR) or old (\fB-PO\fR) version of the
 Kerberos `\fBrcmd\fR' protocol. The new protocol avoids many security problems
-prevalant in the old one and is considered much more secure, but is not
+prevalent in the old one and is considered much more secure, but is not
 interoperable with older (MIT/SEAM) servers. The new protocol is used by
 default, unless explicitly specified using these options or by using
 \fBkrb5.conf\fR(4). If Kerberos authorization fails when using the old
@@ -210,8 +205,6 @@
 .RE
 
 .SS "Escape Sequences"
-.sp
-.LP
 Lines that you type which start with the tilde character (\fB~\fR) are "escape
 sequences." The escape character can be changed using the \fB-e\fR option.
 .sp
@@ -246,7 +239,6 @@
 .RE
 
 .SH OPERANDS
-.sp
 .ne 2
 .na
 \fB\fIhostname\fR\fR
@@ -256,8 +248,6 @@
 .RE
 
 .SH USAGE
-.sp
-.LP
 For the kerberized rlogin session, each user can have a private authorization
 list in a file, \fB\&.k5login\fR, in his home directory. Each line in this file
 should contain a Kerberos principal name of the form
@@ -276,7 +266,7 @@
 shares user names. Users with the same user name on both the local and remote
 machine can \fBrlogin\fR from the machines listed in the remote machine's
 \fB/etc/hosts.equiv\fR file without supplying a password. Individual users
-camayn set up a similar private equivalence list with the file \fB\&.rhosts\fR
+may set up a similar private equivalence list with the file \fB\&.rhosts\fR
 in their home directories. Each line in this file contains two names, that is,
 a host name and a user name, separated by a space. An entry in a remote user's
 \fB\&.rhosts\fR file permits the user named \fIusername\fR who is logged into
@@ -293,7 +283,6 @@
 For security reasons, the \fB\&.rhosts\fR file must be owned by either the
 remote user or by root.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/passwd\fR\fR
@@ -366,16 +355,12 @@
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBrsh\fR(1), \fBstty\fR(1), \fBtty\fR(1), \fBin.rlogind\fR(1M),
 \fBhosts\fR(4), \fBhosts.equiv\fR(4), \fBkrb5.conf\fR(4), \fBnologin\fR(4),
 \fBattributes\fR(5), \fBkrb5_auth_rules\fR(5)
 .SH DIAGNOSTICS
-.sp
-.LP
 The following message indicates that the machine is in the process of being
-shutdown and logins have been disabled:
+shut down and logins have been disabled:
 .sp
 .in +2
 .nf
@@ -385,8 +370,6 @@
 .sp
 
 .SH NOTES
-.sp
-.LP
 When a system is listed in \fBhosts.equiv\fR, its security must be as good as
 local security. One insecure system listed in \fBhosts.equiv\fR can compromise
 the security of the entire system.
--- a/usr/src/man/man1/rsh.1	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1/rsh.1	Wed Sep 23 12:07:08 2020 +0000
@@ -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 RSH 1 "Dec 23, 2008"
+.TH RSH 1 "September 12, 2020"
 .SH NAME
 rsh, remsh, remote_shell \- remote shell
 .SH SYNOPSIS
-.LP
 .nf
 \fBrsh\fR [\fB-n\fR] [\fB-a\fR] [\fB-K\fR] [\fB-PN\fR | \fB-PO\fR] [\fB-x\fR] [\fB-f\fR | \fB-F\fR] [\fB-l\fR \fIusername\fR]
      [\fB-k\fR \fIrealm\fR] \fIhostname\fR \fIcommand\fR
@@ -39,8 +38,6 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBrsh\fR utility connects to the specified \fIhostname\fR and executes the
 specified \fIcommand\fR. \fBrsh\fR copies its standard input to the remote
 command, the standard output of the remote command to its standard output, and
@@ -86,8 +83,6 @@
 The command is sent unencrypted to the remote system. All subsequent network
 session traffic is encrypted. See \fB-x\fR.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -189,7 +184,7 @@
 .ad
 .RS 15n
 Explicitly request new (\fB-PN\fR) or old (\fB-PO\fR) version of the Kerberos
-"\fBrcmd\fR" protocol. The new protocol avoids many security problems prevalant
+"\fBrcmd\fR" protocol. The new protocol avoids many security problems prevalent
 in the old one and is regarded much more secure, but is not interoperable with
 older (MIT/SEAM) servers. The new protocol is used by default, unless
 explicitly specified using these options or through \fBkrb5.conf\fR(4). If
@@ -212,8 +207,6 @@
 The type of remote shell (\fBsh\fR, \fBrsh\fR, or other) is determined by the
 user's entry in the file \fB/etc/passwd\fR on the remote system.
 .SH OPERANDS
-.sp
-.LP
 The following operand is supported:
 .sp
 .ne 2
@@ -225,8 +218,6 @@
 .RE
 
 .SH USAGE
-.sp
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBrsh\fR and
 \fBremsh\fR when encountering files greater than or equal to 2 Gbyte ( 2^31
 bytes).
@@ -262,7 +253,7 @@
 authorization list in a file \fB\&.k5login\fR in their home directory. Each
 line in this file should contain a Kerberos principal name of the form
 \fIprincipal\fR/\fIinstance\fR@\fIrealm\fR. If there is a \fB~/.k5login\fR
-file, then access is granted to the account if and only if the originater user
+file, then access is granted to the account if and only if the originating user
 is authenticated to one of the principals named in the \fB~/.k5login\fR file.
 Otherwise, the originating user is granted access to the account if and only if
 the authenticated principal name of the user can be mapped to the local account
@@ -295,7 +286,6 @@
 \fBrsh\fR does not prompt for a password if access is denied on the remote
 machine unless the \fIcommand\fR argument is omitted.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUsing rsh to Append Files
 .sp
 .LP
@@ -326,8 +316,6 @@
 .sp
 
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -348,7 +336,6 @@
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/hosts\fR\fR
@@ -394,8 +381,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -410,15 +395,11 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBon\fR(1), \fBrlogin\fR(1), \fBssh\fR(1), \fBtelnet\fR(1), \fBvi\fR(1),
+\fBrlogin\fR(1), \fBssh\fR(1), \fBtelnet\fR(1), \fBvi\fR(1),
 \fBin.rshd\fR(1M), \fBhosts\fR(4), \fBhosts.equiv\fR(4), \fBkrb5.conf\fR(4),
 \fBattributes\fR(5), \fBkrb5_auth_rules\fR(5), \fBlargefile\fR(5),
 \fBip6\fR(7P)
 .SH NOTES
-.sp
-.LP
 When a system is listed in \fBhosts.equiv\fR, its security must be as good as
 local security. One insecure system listed in \fBhosts.equiv\fR can compromise
 the security of the entire system.
--- a/usr/src/man/man1m/ccidadm.1m	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1m/ccidadm.1m	Wed Sep 23 12:07:08 2020 +0000
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2019 Joyent, Inc.
 .\"
-.Dd December 17, 2019
+.Dd September 12, 2020
 .Dt CCIDADM 1M
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Pp
 The information returned by the hardware is printed by
 .Nm
-in a human-readable form were applicable.
+in a human-readable form where applicable.
 .Sh ARGUMENTS
 .Nm
 expects the following kinds of arguments:
--- a/usr/src/man/man1m/cfgadm.1m	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1m/cfgadm.1m	Wed Sep 23 12:07:08 2020 +0000
@@ -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 CFGADM 1M "Oct 25, 2004"
+.TH CFGADM 1M "September 12, 2020"
 .SH NAME
 cfgadm \- configuration administration
 .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...
@@ -37,8 +36,6 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBcfgadm\fR command provides configuration administration operations on
 dynamically reconfigurable hardware resources. These operations include
 displaying status, (\fB-l\fR), initiating testing, (\fB-t\fR), invoking
@@ -100,7 +97,7 @@
 of an occupant in the \fBconfigured\fR state are represented by normal Solaris
 data structures and thus some or all of those hardware resources can be in use
 by Solaris. All occupants provide both the \fBconfigured\fR and
-\fBunconfigured\fR states,
+\fBunconfigured\fR states.
 .sp
 .LP
 An attachment point can be in one of five conditions: \fBunknown\fR, \fBok\fR,
@@ -169,12 +166,12 @@
 .LP
 For example, consider a base attachment point, which represents a \fBSCSI
 HBA\fR, with the physical \fBap_id\fR
-\fB/devices/sbus@1f,0/SUNW,fas@e,8800000:scsi\fR and logical \fBap_id c0\fR . A
+\fB/devices/sbus@1f,0/SUNW,fas@e,8800000:scsi\fR and logical \fBap_id c0\fR. A
 disk attached to this \fBSCSI HBA\fR could be represented by a dynamic
 attachment point with logical \fBap_id\fR \fBc0::dsk/c0t0d0\fR where \fBc0\fR
 is the base component and \fBdsk/c0t0d0\fR is the hardware specific dynamic
 component. Similarly the physical \fBap_id\fR for this dynamic attachment point
-would be: \fB/devices/sbus@1f,0/SUNW,fas@e,8800000:scsi::dsk/c0t0d0\fR
+would be: \fB/devices/sbus@1f,0/SUNW,fas@e,8800000:scsi::dsk/c0t0d0\fR.
 .sp
 .LP
 An \fIap_type\fR is a partial form of a logical \fBap_id\fR that can be
@@ -210,8 +207,6 @@
 The arguments for this command conform to the \fBgetopt\fR(3C) and
 \fBgetsubopt\fR(3C) syntax convention.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -550,13 +545,10 @@
 .RE
 
 .SH USAGE
-.sp
-.LP
 The required privileges to use this command are hardware dependent. Typically,
 a default system configuration restricts all but the list option to the
 superuser.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRListing Attachment Points in the Device Tree
 .sp
 .LP
@@ -726,8 +718,6 @@
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBcfgadm\fR: \fBLC_TIME\fR, \fBLC_MESSAGES\fR,
 \fBNLSPATH\fR and \fBTZ\fR.
@@ -763,8 +753,6 @@
 .RE
 
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -803,8 +791,6 @@
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBcfgadm_fp\fR(1M), \fBcfgadm_ib\fR(1M),
 \fBcfgadm_pci\fR(1M), \fBcfgadm_sbd\fR(1M), \fBcfgadm_scsi\fR(1M),
 \fBcfgadm_usb\fR(1M), \fBifconfig\fR(1M), \fBmount\fR(1M), \fBprtdiag\fR(1M),
@@ -812,14 +798,12 @@
 \fBgetopt\fR(3C), \fBgetsubopt\fR(3C), \fBisatty\fR(3C), \fBattributes\fR(5),
 \fBenviron\fR(5)
 .SH DIAGNOSTICS
-.sp
-.LP
 Diagnostic messages appear on the standard error output. Other than options and
 usage errors, the following are diagnostic messages produced by this utility:
 .sp
 .in +2
 .nf
-cfgadm: Configuration administration not supported on\fIap_id\fR
+cfgadm: Configuration administration not supported on \fIap_id\fR
 .fi
 .in -2
 .sp
@@ -835,7 +819,7 @@
 .sp
 .in +2
 .nf
-cfgadm: \fIap_id\fRis ambiguous
+cfgadm: \fIap_id\fR is ambiguous
 .fi
 .in -2
 .sp
@@ -901,8 +885,6 @@
 See \fBconfig_admin\fR(3CFGADM) for additional details regarding error
 messages.
 .SH NOTES
-.sp
-.LP
 Hardware resources enter the unconfigured pool in a hardware specific manner.
 This can occur at various times such as: system initialization or as a result
 of an unconfigure operation. An occupant that is in the \fBunconfigured\fR
@@ -916,7 +898,7 @@
 output, the \fB-s\fR option must be used to select the fields required. The
 \fB-s\fR option can also be used to suppress the column headings. The following
 fields always produce parsable output: \fBap_id\fR, \fBphysid\fR,
-\fBr_state\fR, \fBo_state\fR, \fBcondition\fR, \fBbusy\fR \fBstatus_time_p\fR,
+\fBr_state\fR, \fBo_state\fR, \fBcondition\fR, \fBbusy\fR, \fBstatus_time_p\fR,
 \fBclass\fR, and \fBtype\fR. Parsable output never has white-space characters
 embedded in the field value.
 .sp
--- a/usr/src/man/man1m/in.ndpd.1m	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1m/in.ndpd.1m	Wed Sep 23 12:07:08 2020 +0000
@@ -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 IN.NDPD 1M "Sep 02, 2015"
+.TH IN.NDPD 1M "September 12, 2020"
 .SH NAME
 in.ndpd \- daemon for IPv6 autoconfiguration
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/lib/inet/in.ndpd\fR [\fB-adt\fR] [\fB-f\fR \fIconfig_file\fR]
 .fi
 
 .SH DESCRIPTION
-.LP
 \fBin.ndpd\fR provides both the host and router autoconfiguration components of
 Neighbor Discovery for IPv6 and Stateless and Stateful Address
 Autoconfiguration for IPv6. In particular, \fBin.ndpd\fR implements:
@@ -148,9 +146,9 @@
 can only be used for communication with nodes on the same link.
 .sp
 .LP
-For information on how to enable IPv6 address autoconfiguration, see \fI\fR
+For information on how to enable IPv6 address autoconfiguration, see
+\fISystem Administration Guide: IP Services\fR.
 .SH OPTIONS
-.LP
 Supported options and equivalent SMF service properties are listed below. SMF
 service properties are set using a command of the form:
 .sp
@@ -215,7 +213,7 @@
 .ad
 .sp .6
 .RS 4n
-Turn on tracing (printing) of all sent and received packets to\fBstdout\fR.
+Turn on tracing (printing) of all sent and received packets to \fBstdout\fR.
 When set, the program runs in the foreground and stays attached to the
 controlling terminal. As such, this option cannot be run under the SMF.
 .RE
@@ -232,7 +230,6 @@
 .RE
 
 .SH SEE ALSO
-.LP
 \fBdhcpagent\fR(1M), \fBifconfig\fR(1M), \fBndp\fR(1M), \fBrouteadm\fR(1M),
 \fBsvcadm\fR(1M), \fBndpd.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5),
 \fBicmp6\fR(7P), \fBip6\fR(7P), \fBndp\fR(7P)
@@ -249,11 +246,9 @@
 Narten, T., and Draves, R. \fIRFC 3041, Privacy Extensions for Stateless
 Address Autoconfiguration in IPv6\fR. The Internet Society. January 2001.
 .SH DIAGNOSTICS
-.LP
 Receipt of a \fBSIGHUP\fR signal will make \fBin.ndpd\fR restart and reread
 \fB/etc/inet/ndpd.conf\fR.
 .SH NOTES
-.LP
 The \fBin.ndpd\fR daemon service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifier:
 .sp
--- a/usr/src/man/man1m/mpathadm.1m	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man1m/mpathadm.1m	Wed Sep 23 12:07:08 2020 +0000
@@ -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 MPATHADM 1M "May 4, 2009"
+.TH MPATHADM 1M "September 12, 2020"
 .SH NAME
 mpathadm \- multipath discovery and administration
 .SH SYNOPSIS
-.LP
 .nf
 \fBmpathadm\fR \fIsubcommand\fR \fIdirect-object\fR [\fIoptions\fR] [\fIoperand\fR]
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBmpathadm\fR command enables multipathing discovery and management. The
 \fBmpathadm\fR command is implemented as a set of subcommands, many with their
 own options, that are described in the section for that subcommand. Options not
 associated with a particular subcommand are described under OPTIONS. The
 \fBmpathadm\fR subcommands operate on a \fIdirect-object\fR. These are
 described in this section for each subcommand. The \fIdirect-objects\fR,
-\fIinitiator-port\fR, \fItarget-port\fR, and\fIlogical-unit\fR in the
+\fIinitiator-port\fR, \fItarget-port\fR, and \fIlogical-unit\fR in the
 subcommands are consistent with SCSI standard definitions.
 .sp
 .LP
@@ -95,8 +92,6 @@
 The \fBmpathadm\fR subcommands operate on a \fIdirect-object\fR. These are
 described in this section for each subcommand.
 .SS "list Subcommand"
-.sp
-.LP
 The syntax for the \fBlist\fR subcommand is:
 .sp
 .in +2
@@ -171,8 +166,6 @@
 .RE
 
 .SS "\fBshow\fR Subcommand"
-.sp
-.LP
 The syntax for the \fBshow\fR subcommand is:
 .sp
 .in +2
@@ -225,8 +218,6 @@
 .RE
 
 .SS "\fBmodify\fR Subcommand"
-.sp
-.LP
 The syntax for the \fBmodify\fR subcommand is:
 .sp
 .in +2
@@ -329,8 +320,6 @@
 .RE
 
 .SS "\fBenable\fR Subcommand"
-.sp
-.LP
 The syntax for the \fBenable\fR subcommand is:
 .sp
 .in +2
@@ -360,8 +349,6 @@
 .RE
 
 .SS "\fBdisable\fR Subcommand"
-.sp
-.LP
 The syntax for the \fBdisable\fR subcommand is:
 .sp
 .in +2
@@ -391,8 +378,6 @@
 .RE
 
 .SS "\fBfailover\fR Subcommand"
-.sp
-.LP
 The syntax for the \fBfailover\fR subcommand is:
 .sp
 .in +2
@@ -419,8 +404,6 @@
 .RE
 
 .SS "\fBoverride\fR Subcommand"
-.sp
-.LP
 The syntax for the \fBoverride\fR subcommand is:
 .sp
 .in +2
@@ -500,8 +483,6 @@
 .RE
 
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -535,7 +516,6 @@
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRObtaining a List of Multipathing Support
 .sp
 .LP
@@ -652,7 +632,7 @@
 	Asymmetric: yes
 	Current Load Balance: round-robin
 	Logical Unit Group ID: NA
-	Aauto Failback: on
+	Auto Failback: on
 	Auto Probing: NA
 
 Paths:
@@ -713,8 +693,6 @@
 .sp
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -729,7 +707,5 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBstmsboot\fR(1M), \fBlibMPAPI\fR(3LIB), \fBexec_attr\fR(4),
 \fBattributes\fR(5)
--- a/usr/src/man/man2/_lwp_cond_wait.2	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man2/_lwp_cond_wait.2	Wed Sep 23 12:07:08 2020 +0000
@@ -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 _LWP_COND_WAIT 2 "Apr 13, 2001"
+.TH _LWP_COND_WAIT 2 "September 12, 2020"
 .SH NAME
 _lwp_cond_wait, _lwp_cond_timedwait, _lwp_cond_reltimedwait \- wait on a
 condition variable
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/lwp.h>
 
@@ -28,8 +27,6 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 These functions are used to wait for the occurrence of a condition represented
 by an LWP condition variable. LWP condition variables must be initialized to 0
 before use.
@@ -61,13 +58,9 @@
 \fB_lwp_cond_reltimedwait()\fR functions always return with the mutex locked
 and owned by the calling lightweight process.
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful completion, \fB0\fR is returned. A non-zero value indicates an
 error.
 .SH ERRORS
-.sp
-.LP
 If any of the following conditions are detected, \fB_lwp_cond_wait()\fR,
 \fB_lwp_cond_timedwait()\fR, and \fB_lwp_cond_reltimedwait()\fR fail and return
 the corresponding value:
@@ -115,11 +108,10 @@
 \fB\fBETIME\fR\fR
 .ad
 .RS 9n
-The time specified in\fIabstime\fR or \fIreltime\fR has passed.
+The time specified in \fIabstime\fR or \fIreltime\fR has passed.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUse the \fB_lwp_cond_wait()\fR function in a loop testing some
 condition.
 .sp
@@ -164,7 +156,7 @@
         if (err == ETIME) {
                 /* timeout, do something */
                 break;
-        SENDwhom}
+        }
 }
 (void) _lwp_mutex_unlock(&m);
 .fi
@@ -206,7 +198,5 @@
 .in -2
 
 .SH SEE ALSO
-.sp
-.LP
 \fB_lwp_cond_broadcast\fR(2), \fB_lwp_cond_signal\fR(2), \fB_lwp_kill\fR(2),
 \fB_lwp_mutex_lock\fR(2), \fBfork\fR(2), \fBkill\fR(2)
--- a/usr/src/man/man3c_db/td_thr_setsigpending.3c_db	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man3c_db/td_thr_setsigpending.3c_db	Wed Sep 23 12:07:08 2020 +0000
@@ -3,18 +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 TD_THR_SETSIGPENDING 3C_DB "Oct 20, 1998"
+.TH TD_THR_SETSIGPENDING 3C_DB "September 12, 2020"
 .SH NAME
 td_thr_setsigpending, td_thr_sigsetmask \- manage thread signals for libc_db
 .SH SYNOPSIS
-.LP
 .nf
 cc [ \fIflag\fR... ] \fIfile\fR... -lc_db [ \fIlibrary\fR... ]
 #include <proc_service.h>
 #include <thread_db.h>
 
-\fBtd_err_e\fR \fBtd_thr_setsigpending\fR(\fBconst td_thrhandle_t *\fR \fIth_p\fR, \fBconst uchar_ t\fR \fIti_sigpending_flag\fR,
-     \fBconst sigset_t\fR \fIti_sigmask\fR;);
+\fBtd_err_e\fR \fBtd_thr_setsigpending\fR(\fBconst td_thrhandle_t *\fR \fIth_p\fR, \fBconst uchar_t\fR \fIti_sigpending_flag\fR,
+     \fBconst sigset_t\fR \fIti_sigmask\fR);
 .fi
 
 .LP
@@ -23,8 +22,6 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBtd_thr_setsigpending()\fR and \fBtd_thr_setsigmask()\fR functions affect
 the signal state of the thread identified by \fIth_p\fR.
 .sp
@@ -66,10 +63,9 @@
 .RS +4
 .TP
 4.
-set the new signal mask with\fBtd_thr_sigsetmask()\fR.
+set the new signal mask with \fBtd_thr_sigsetmask()\fR.
 .RE
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fBTD_OK\fR\fR
@@ -106,8 +102,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for description of the following attributes:
 .sp
 
@@ -122,7 +116,5 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBlibc_db\fR(3LIB), \fBtd_thr_dbsuspend\fR(3C_DB),
 \fBtd_thr_get_info\fR(3C_DB), \fBattributes\fR(5)
--- a/usr/src/man/man3nvpair/nvlist_lookup_boolean.3nvpair	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man3nvpair/nvlist_lookup_boolean.3nvpair	Wed Sep 23 12:07:08 2020 +0000
@@ -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 NVLIST_LOOKUP_BOOLEAN 3NVPAIR "Aug 1, 2008"
+.TH NVLIST_LOOKUP_BOOLEAN 3NVPAIR "September 12, 2020"
 .SH NAME
 nvlist_lookup_boolean, nvlist_lookup_boolean_value, nvlist_lookup_byte,
 nvlist_lookup_int8, nvlist_lookup_uint8, nvlist_lookup_int16,
@@ -17,7 +17,6 @@
 nvlist_lookup_nvlist_array, nvlist_lookup_string_array, nvlist_lookup_pairs \-
 match name and type indicated by the interface name and retrieve data value
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [ \fIflag\fR... ] \fIfile\fR... \fB-lnvpair\fR [ \fIlibrary\fR... ]
 #include <libnvpair.h>
@@ -181,7 +180,6 @@
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fInvl\fR\fR
@@ -230,14 +228,12 @@
 \fB\fBNV_FLAG_NOENTOK\fR\fR
 .ad
 .RS 19n
-The retrival function will not fail if no matching name-value pair is found.
+The retrieval function will not fail if no matching name-value pair is found.
 .RE
 
 .RE
 
 .SH DESCRIPTION
-.sp
-.LP
 These functions find the \fBnvpair\fR (name-value pair) that matches the name
 and type as indicated by the interface name. If one is found, \fInelem\fR and
 \fIval\fR are modified to contain the number of elements in value and the
@@ -313,12 +309,8 @@
 When using \fBNV_FLAG_NOENTOK\fR and no matching name-value pair is found, the
 memory pointed to by \fIval\fR and \fInelem\fR is left untouched.
 .SH RETURN VALUES
-.sp
-.LP
 These functions return 0 on success and an error value on failure.
 .SH ERRORS
-.sp
-.LP
 These functions will fail if:
 .sp
 .ne 2
@@ -335,7 +327,7 @@
 \fB\fBENOENT\fR\fR
 .ad
 .RS 11n
-No matching name-value pair is found
+No matching name-value pair is found.
 .RE
 
 .sp
@@ -348,8 +340,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5)  for descriptions of the following attributes:
 .sp
 
@@ -366,7 +356,5 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBlibnvpair\fR(3LIB), \fBnvlist_alloc\fR(3NVPAIR), \fBnvpair_type\fR(3NVPAIR),
 \fBattributes\fR(5)
--- a/usr/src/man/man3picltree/libpicltree.3picltree	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man3picltree/libpicltree.3picltree	Wed Sep 23 12:07:08 2020 +0000
@@ -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 LIBPICLTREE 3PICLTREE "May 16, 2020"
+.TH LIBPICLTREE 3PICLTREE "September 12, 2020"
 .SH NAME
 libpicltree \- PTree and Plug-in Registration interface library
 .SH SYNOPSIS
@@ -135,10 +135,10 @@
 For all volatile properties, the 'size' of the property must be specified to be
 the maximum possible size of the value. The maximum size of the value cannot
 exceed \fBPICL_PROPSIZE_MAX\fR. This allows a client to allocate a sufficiently
-large buffer before retrieving a volatile property's value
+large buffer before retrieving a volatile property's value.
 .SS "Plug-in Modules"
 Plug-in modules are shared objects that are located in well-known directories
-for the daemon to locate and load them. Plug-in modules are located in the one
+for the daemon to locate and load them. Plug-in modules are located in one
 of the following plug-in directories depending on the platform-specific nature
 of the data they collect and publish.
 .sp
--- a/usr/src/man/man3proc/ps_lgetregs.3proc	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man3proc/ps_lgetregs.3proc	Wed Sep 23 12:07:08 2020 +0000
@@ -3,17 +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 PS_LGETREGS 3PROC "Jan 30, 1998"
+.TH PS_LGETREGS 3PROC "September 12, 2020"
 .SH NAME
 ps_lgetregs, ps_lsetregs, ps_lgetfpregs, ps_lsetfpregs, ps_lgetxregsize,
 ps_lgetxregs, ps_lsetxregs \- routines that access the target process register
 in libthread_db
 .SH SYNOPSIS
-.LP
 .nf
 #include <proc_service.h>
 
-\fB ps_err_e\fR \fBps_lgetregs\fR(\fBstruct ps_prochandle *\fR\fIph\fR, \fBlwpid_t\fR \fIlid\fR,
+\fBps_err_e\fR \fBps_lgetregs\fR(\fBstruct ps_prochandle *\fR\fIph\fR, \fBlwpid_t\fR \fIlid\fR,
      \fBprgregset_t\fR \fIgregset\fR);
 .fi
 
@@ -54,7 +53,6 @@
 .fi
 
 .SH DESCRIPTION
-.LP
 \fBps_lgetregs()\fR, \fBps_lsetregs()\fR, \fBps_lgetfpregs()\fR,
 \fBps_lsetfpregs()\fR, \fBps_lgetxregsize()\fR, \fBps_lgetxregs()\fR,
 \fBps_lsetxregs()\fR read and write register sets from lightweight processes
@@ -63,8 +61,7 @@
 \fIlid\fR, and \fBps_lsetregs()\fR sets them. \fBps_lgetfpregs()\fR gets the
 \fBLWP\fR's floating point register set, while \fBps_lsetfpregs()\fR sets it.
 .SS "SPARC Only"
-.LP
-\fBps_lgetxregsize()\fR,\fBps_lgetxregs()\fR, and\fBps_lsetxregs()\fR are
+\fBps_lgetxregsize()\fR, \fBps_lgetxregs()\fR, and \fBps_lsetxregs()\fR are
 SPARC-specific. They do not need to be defined by a controlling process on
 non-SPARC architecture. \fBps_lgetxregsize()\fR returns in
 \fB*\fR\fIxregsize\fR the size of the architecture-dependent extra state
@@ -108,7 +105,6 @@
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for description of the following attributes:
 .sp
 
@@ -123,6 +119,5 @@
 .TE
 
 .SH SEE ALSO
-.LP
 \fBlibc_db\fR(3LIB), \fBproc_service\fR(3PROC), \fBattributes\fR(5),
 \fBthreads\fR(5)
--- a/usr/src/man/man3scf/scf_value_create.3scf	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man3scf/scf_value_create.3scf	Wed Sep 23 12:07:08 2020 +0000
@@ -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_VALUE_CREATE 3SCF "May 28, 2009"
+.TH SCF_VALUE_CREATE 3SCF "September 12, 2020"
 .SH NAME
 scf_value_create, scf_value_handle, scf_value_reset, scf_value_destroy,
 scf_value_type, scf_value_base_type, scf_value_is_type, scf_type_base_type,
@@ -15,7 +15,6 @@
 scf_value_set_ustring, scf_value_set_opaque \- manipulate values in the Service
 Configuration Facility
 .SH SYNOPSIS
-.LP
 .nf
 cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lscf\fR [ \fIlibrary\fR\&.\|.\|. ]
 #include <libscf.h>
@@ -152,8 +151,6 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBscf_value_create()\fR function creates a new, reset \fBscf_value_t\fR
 that holds a single typed value. The value can be used only with the handle
 specified by \fIh\fR and objects associated with \fIh\fR.
@@ -229,8 +226,6 @@
 The \fBscf_value_set_*()\fR functions will succeed on \fBscf_value_t\fR objects
 that have already been set.
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful completion, \fBscf_value_create()\fR returns a new, reset
 \fBscf_value_t\fR. Otherwise, it returns \fINULL\fR.
 .sp
@@ -264,8 +259,6 @@
 Upon successful completion, \fBscf_value_get_opaque()\fR returns the number of
 bytes written. Otherwise, it returns -1.
 .SH ERRORS
-.sp
-.LP
 The \fBscf_value_create()\fR function will fail if:
 .sp
 .ne 2
@@ -364,7 +357,7 @@
 \fBscf_value_get_boolean()\fR, \fBscf_value_get_count()\fR,
 \fBscf_value_get_integer()\fR, \fBscf_value_get_time()\fR,
 \fBscf_value_get_astring()\fR, \fBscf_value_get_ustring()\fR,
-\fBscf_value_get_as_string()\fR, and\fBscf_value_get_as_string_typed()\fR
+\fBscf_value_get_as_string()\fR, and \fBscf_value_get_as_string_typed()\fR
 functions will fail if:
 .sp
 .ne 2
@@ -395,8 +388,6 @@
 .LP
 The \fBscf_error\fR(3SCF) function can be used to retrieve the error value.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -413,7 +404,5 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBlibscf\fR(3LIB), \fBscf_entry_add_value\fR(3SCF), \fBscf_error\fR(3SCF),
 \fBattributes\fR(5)
--- a/usr/src/man/man4/NISLDAPmapping.4	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man4/NISLDAPmapping.4	Wed Sep 23 12:07:08 2020 +0000
@@ -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 NISLDAPMAPPING 4 "Feb 25, 2017"
+.TH NISLDAPMAPPING 4 "September 12, 2020"
 .SH NAME
 NISLDAPmapping \- mapping file used by the NIS server components
 .SH SYNOPSIS
-.LP
 .nf
 \fB/var/yp/NISLDAPmapping\fR
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBNISLDAPmapping\fR file specifies the mapping between NIS map entries and
 equivalent Directory Information Tree (DIT) entries.
 .sp
@@ -50,7 +48,6 @@
 attribute name, at least one white space character, and an attribute value.
 .SH EXTENDED DESCRIPTION
 .SS "File Syntax"
-.LP
 Repeated fields, with separator characters, are described by the following
 syntax:
 .sp
@@ -85,9 +82,8 @@
 .RE
 
 .SS "Attributes"
-.LP
 Attributes generally apply to one more more NIS maps. Map names can be
-specified either on their own,that is in \fBpasswd.byname\fR, in which case
+specified either on their own, that is in \fBpasswd.byname\fR, in which case
 they apply to all domains, or for individual NIS domains, for example, in
 \fBpasswd.byname,example.sun.uk\fR. Where a map is mentioned in more than one
 attribute, both versions are applied. If any parts of the attributes are in
@@ -208,7 +204,7 @@
 .sp
 If the \fBfieldvaluestring\fR contains white space or commas, it must either be
 surrounded by double quotes, or the special characters must be escaped.
-Wildcards are allowed in the \fBfieldvaluestring\fR. See Wildcards
+Wildcards are allowed in the \fBfieldvaluestring\fR. See Wildcards.
 .sp
 To associate the \fBpasswd.byname\fR and \fBpasswd.byuid\fR maps with the
 \fBpasswd databaseId\fR:
@@ -257,7 +253,7 @@
 The lower limit for the initial \fBTTL\fR (in seconds) for data read from LDAP
 when the \fBypserv\fR starts. If the \fBinitialTTLhi\fR also is specified, the
 actual \fBinitialTTL\fR will be randomly selected from the interval
-\fBinitialTTLlo\fR to \fBinitialTTLhi\fR , inclusive. Leaving the field empty
+\fBinitialTTLlo\fR to \fBinitialTTLhi\fR, inclusive. Leaving the field empty
 yields the default value of 1800 seconds.
 .RE
 
@@ -267,7 +263,7 @@
 \fB\fBinitialTTLhi\fR\fR
 .ad
 .RS 16n
-The upper limit for the initial TTL. If left empty, defaults to 5400.
+The upper limit for the initial TTL. If left empty, defaults to 5400 seconds.
 .RE
 
 .sp
@@ -436,7 +432,7 @@
 .fi
 .in -2
 
-\fBformatString\fR may contains a list of \fB%s\fR and \fB%a\fR elements each
+\fBformatString\fR may contain a list of \fB%s\fR and \fB%a\fR elements each
 of which represents a single named field or a list of repeated fields. A
 \fB%a\fR field is interpreted as an IPv4 address or an IPv6 address in
 preferred format. If an IPv6 address in non preferred format is found, then it
@@ -456,7 +452,7 @@
 \fB\fBrf_key\fR\fR
 .ad
 .RS 18n
-The DBM key value
+The DBM key value.
 .RE
 
 .sp
@@ -620,7 +616,7 @@
 a given NIS map. If this attribute is not present then the default comment
 character \fB#\fR is used.
 .sp
-To specify that a map uses a asterix to mark the start of comments.
+To specify that a map uses an asterisk to mark the start of comments.
 .sp
 .in +2
 .nf
@@ -741,7 +737,6 @@
 .RE
 
 .SS "Field and Attribute Conversion Syntax"
-.LP
 The general format of a \fBfieldattrspec\fR is:
 .sp
 .in +2
@@ -998,7 +993,7 @@
 attribute values in the mapping rules requires a lookup to find those values.
 Obviously, this adds to the time required to perform the modification. Also,
 there is a window between the time when a value is retrieved and then slightly
-later stored back. If the values have changed in the mean time, the change may
+later stored back. If the values have changed in the meantime, the change may
 be overwritten.
 .sp
 .LP
@@ -1010,7 +1005,6 @@
 retrieval or assignment of entry or field values, the extent to which the other
 \fBfieldattrspec\fR rules are evaluated is unspecified.
 .SS "Wildcards"
-.LP
 Where wildcard support is available, it is of the following limited form:
 .sp
 .ne 2
@@ -1273,7 +1267,6 @@
 This results in the field values \fBmyName\fR is set to \fBfoo\fR, and
 \fBmyAliases\fR is set to \fBfoo1 foo2\fR.
 .SS "Assignments"
-.LP
 The assignment syntax, also found at Field and Attribute Conversion Syntax, is
 as follows:
 .sp
@@ -1365,7 +1358,7 @@
 If a multi-valued \fBRHS\fR is assigned to a single-valued \fBLHS\fR, the
 \fBLHS\fR value will be the first of the \fBRHS\fR values. If the \fBRHS\fR is
 an attribute list, the first attribute is the first one returned by the LDAP
-server when queried. Otherwise, the definition of "first"is implementation
+server when queried. Otherwise, the definition of "first" is implementation
 dependent.
 .sp
 .LP
@@ -1385,7 +1378,6 @@
 assigned to the first entity of the list, the second value to the second
 entity, and so on. Excess values or entities are silently ignored.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRAssigning an Attribute Value to a Field
 .sp
 .LP
@@ -1477,7 +1469,6 @@
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -1488,11 +1479,10 @@
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Interface Stability 	Obsolete
+Interface Stability	Obsolete
 .TE
 
 .SH SEE ALSO
-.LP
 \fBinityp2l\fR(1M), \fBmakedbm\fR(1M), \fBypserv\fR(1M),
 \fBber_printf\fR(3LDAP), \fBsprintf\fR(3C), \fBsscanf\fR(3C),
 \fBypserv\fR(4), \fBattributes\fR(5)
--- a/usr/src/man/man7d/audio810.7d	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man7d/audio810.7d	Wed Sep 23 12:07:08 2020 +0000
@@ -3,17 +3,14 @@
 .\" 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 AUDIO810 7D "May 13, 2009"
+.TH AUDIO810 7D "September 12, 2020"
 .SH NAME
 audio810 \- Intel ICH series, nVidia nForce series and AMD 8111 audio core
 support
 .SH DESCRIPTION
-.sp
-.LP
 The \fBaudio810\fR driver provides support for AC 97 audio controllers embedded
 in Intel ICH, nVidia nForce, and AMD 8111 chips.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/audio810\fR\fR
@@ -41,8 +38,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for a descriptions of the following attributes:
 .sp
 
@@ -59,8 +54,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBioctl\fR(2), \fBattributes\fR(5), \fBaudio\fR(7I), \fBmixer\fR(7I),
 \fBstreamio\fR(7I)
 .sp
@@ -71,16 +64,12 @@
 .LP
 \fIALC655 Specification\fR \(em Realtek Inc.
 .SH NOTES
-.sp
-.LP
 Some laptops (including Sony VAIO, among others), have their on-board amplifier
 powered down by default, meaning that audio is suppressed even if hardware and
 the \fBaudio810\fR driver are working normally. To correct this, set the
 \fBac97-invert-amp=1\fR property in the \fB/kernel/drv/audio810.conf\fR to
 power-up the amplifier.
 .SH DIAGNOSTICS
-.sp
-.LP
 In addition to being logged, the following messages may appear on the system
 console:
 .sp
@@ -108,7 +97,7 @@
 \fB\fBrecord-interrupts too high\fR\fR
 .ad
 .RS 30n
-The interrupt rate set in\fBaudio810.conf\fR is set too high. It has been
+The interrupt rate set in \fBaudio810.conf\fR is set too high. It has been
 reset to the rate specified in the message. Update \fBaudio810.conf\fR to a
 lower interrupt rate.
 .RE
--- a/usr/src/man/man7d/sd.7d	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man7d/sd.7d	Wed Sep 23 12:07:08 2020 +0000
@@ -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 SD 7D "Jan 10, 2020"
+.TH SD 7D "September 12, 2020"
 .SH NAME
 sd \- SCSI disk and ATAPI/SCSI CD-ROM device driver
 .SH SYNOPSIS
@@ -222,7 +222,7 @@
 .RS 27n
 The default value is 1, which causes partition IO statistics to be maintained.
 Set this value to zero to prevent the driver from recording partition
-statistics. This slightly reduces the CPU overhead for IO, mimimizes the amount
+statistics. This slightly reduces the CPU overhead for IO, minimizes the amount
 of \fBsar\fR(1) data collected and makes these statistics unavailable for
 reporting by \fBiostat\fR(1M) even though the \fB-p\fR/\fB-P\fR option is
 specified. Regardless of this setting, disk IO statistics are always
--- a/usr/src/man/man7d/ssd.7d	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man7d/ssd.7d	Wed Sep 23 12:07:08 2020 +0000
@@ -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 SSD 7D "Aug 9, 2008"
+.TH SSD 7D "September 12, 2020"
 .SH NAME
 ssd \- Fibre Channel Arbitrated Loop disk device driver
 .SH SYNOPSIS
-.LP
 .nf
 \fBssd@\fR\fIport\fR\fB,\fR\fItarget\fR\fB:\fR\fIpartition\fR
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
  The \fBssd\fR driver supports Fibre Channel disk devices.
 .sp
 .LP
@@ -51,8 +48,6 @@
 hard errors, soft errors and transport errors. Other data may be implemented as
 required.
 .SH DEVICE STATISTICS SUPPORT
-.sp
-.LP
 The device maintains I/O statistics for the device and for partitions allocated
 for that device. For each device/partition, the  driver accumulates reads,
 writes, bytes read, and bytes written. The driver also initiates hi-resolution
@@ -64,11 +59,8 @@
 reporting. \fBssd\fR and \fBsd\fR(7D) per-partition statistics are  enabled by
 default but may be disabled in their configuration files.
 .SH IOCTLS
-.sp
-.LP
 Refer to  \fBdkio\fR(7I).
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBEACCES\fR\fR
@@ -142,8 +134,6 @@
 .RE
 
 .SH CONFIGURATION
-.sp
-.LP
 You configure the \fBssd\fR driver by defining  properties in the
 \fBssd.conf\fR file. The \fBssd\fR driver supports the following properties:
 .sp
@@ -154,7 +144,7 @@
 .RS 27n
 The default value is 1, which causes partition IO statistics to be maintained.
 Set this value to zero to prevent the driver from recording partition
-statistics. This slightly reduces the CPU overhead for IO, mimimizes the amount
+statistics. This slightly reduces the CPU overhead for IO, minimizes the amount
 of \fBsar\fR(1) data collected and makes these statistics unavailable for
 reporting by \fBiostat\fR(1M) even though the \fB-p\fR/\fB-P\fR option is
 specified.  Regardless of this setting, disk IO statistics are always
@@ -169,7 +159,7 @@
 .sp
 .in +2
 .nf
-ssd-config-list = 	<duplet> [, <duplet> ]* ;
+ssd-config-list =	<duplet> [, <duplet> ]* ;
 
 where
 
@@ -196,7 +186,6 @@
 .in -2
 
 .SH EXAMPLES
-.sp
 .in +2
 .nf
 The following is an example of a global ssd-config-list property:
@@ -208,7 +197,6 @@
 .in -2
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fBssd.conf\fR
@@ -272,8 +260,6 @@
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBsar\fR(1), \fBformat\fR(1M), \fBiostat\fR(1M), \fBioctl\fR(2),
 \fBlseek\fR(2), \fBopen\fR(2), \fBread\fR(2), \fBwrite\fR(2),
 \fBscsi\fR(4), \fBdriver.conf\fR(4), \fBcdio\fR(7I), \fBdkio\fR(7I)
@@ -287,7 +273,6 @@
 .LP
 \fIFibre Channel - Private Loop SCSI Direct Attach (FC-PLDA)\fR
 .SH DIAGNOSTICS
-.sp
 .in +2
 .nf
 Error for command '<command name>' Error Level: Fatal Requested Block <n>,
--- a/usr/src/man/man9f/inb.9f	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man9f/inb.9f	Wed Sep 23 12:07:08 2020 +0000
@@ -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 INB 9F "Oct 24, 2012"
+.TH INB 9F "September 12, 2020"
 .SH NAME
 inb, inw, inl, repinsb, repinsw, repinsd \- read from an I/O port
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
@@ -45,15 +44,12 @@
 .fi
 
 .SH INTERFACE LEVEL
-.sp
-.LP
 The functions described here are obsolete. For the \fBinb()\fR, \fBinw()\fR,
 and \fBinl()\fR functions, use, respectively, \fBddi_get8\fR(9F),
 \fBddi_get16\fR(9F), and \fBddi_get32\fR(9F) instead. For \fBrepinsb()\fR,
-\fBrepinsw()\fR, and\fBrepinsl()\fR, use, respectively, \fBddi_rep_get8\fR(9F),
+\fBrepinsw()\fR, and \fBrepinsl()\fR, use, respectively, \fBddi_rep_get8\fR(9F),
 \fBddi_rep_get16\fR(9F), and \fBddi_rep_get32\fR(9F) instead.
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIport\fR\fR
@@ -81,8 +77,6 @@
 .RE
 
 .SH DESCRIPTION
-.sp
-.LP
 These routines read data of various sizes from the I/O port with the address
 specified by \fIport\fR.
 .sp
@@ -97,17 +91,11 @@
 data; the buffer must be long enough to hold count values of the requested
 size.
 .SH RETURN VALUES
-.sp
-.LP
 The \fBinb()\fR, \fBinw()\fR, and \fBinl()\fR functions return the value that
 was read from the I/O port.
 .SH CONTEXT
-.sp
-.LP
 These functions may be called from user, interrupt, or kernel context.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -124,8 +112,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBisa\fR(4), \fBattributes\fR(5), \fBddi_get8\fR(9F), \fBddi_get16\fR(9F),
 \fBddi_get32\fR(9F), \fBddi_rep_get8\fR(9F), \fBddi_rep_get16\fR(9F),
 \fBddi_rep_get32\fR(9F), \fBoutb\fR(9F)
--- a/usr/src/man/man9f/nvlist_lookup_boolean.9f	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man9f/nvlist_lookup_boolean.9f	Wed Sep 23 12:07:08 2020 +0000
@@ -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 NVLIST_LOOKUP_BOOLEAN 9F "May 20, 2006"
+.TH NVLIST_LOOKUP_BOOLEAN 9F "September 12, 2020"
 .SH NAME
 nvlist_lookup_boolean, nvlist_lookup_boolean_value, nvlist_lookup_byte,
 nvlist_lookup_int8, nvlist_lookup_int16, nvlist_lookup_int32,
@@ -17,7 +17,6 @@
 nvlist_lookup_nvlist_array, nvlist_lookup_pairs \- match name and type
 indicated by the interface name and retrieve data value
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/nvpair.h>
 
@@ -174,11 +173,8 @@
 .fi
 
 .SH INTERFACE LEVEL
-.sp
-.LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fInvl\fR\fR
@@ -227,14 +223,12 @@
 \fBNV_FLAG_NOENTOK\fR
 .ad
 .RS 19n
-The retrival function will not fail if no matching name-value pair is found.
+The retrieval function will not fail if no matching name-value pair is found.
 .RE
 
 .RE
 
 .SH DESCRIPTION
-.sp
-.LP
 These functions find the \fBnvpair\fR that matches the name and type as
 indicated by the interface name. If one is found, \fInelem\fR and \fIval\fR are
 modified to contain the number of elements in value and the starting address of
@@ -312,8 +306,6 @@
 .LP
 These functions return \fB0\fR on success and an error value on failure.
 .SH ERRORS
-.sp
-.LP
 These functions fail under the following conditions.
 .sp
 .ne 2
@@ -321,7 +313,7 @@
 \fB\fB0\fR\fR
 .ad
 .RS 11n
-Success
+Success.
 .RE
 
 .sp
@@ -330,7 +322,7 @@
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 11n
-Invalid argument
+Invalid argument.
 .RE
 
 .sp
@@ -339,7 +331,7 @@
 \fB\fBENOENT\fR\fR
 .ad
 .RS 11n
-No matching name-value pair found
+No matching name-value pair found.
 .RE
 
 .sp
@@ -348,16 +340,12 @@
 \fB\fBENOTSUP\fR\fR
 .ad
 .RS 11n
-Encode/decode method not supported
+Encode/decode method not supported.
 .RE
 
 .SH CONTEXT
-.sp
-.LP
 These functions can be called from user, interrupt, or kernel context.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -372,8 +360,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBnvlist_alloc\fR(9F), \fBnvpair_type\fR(9F)
 .sp
 .LP
--- a/usr/src/man/man9f/taskq.9f	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man9f/taskq.9f	Wed Sep 23 12:07:08 2020 +0000
@@ -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 TASKQ 9F "Jul 25, 2015"
+.TH TASKQ 9F "September 12, 2020"
 .SH NAME
 taskq, ddi_taskq_create, ddi_taskq_destroy, ddi_taskq_dispatch, ddi_taskq_wait,
 ddi_taskq_suspend, taskq_suspended, ddi_taskq_resume \- Kernel task queue
 operations
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/sunddi.h>
 
@@ -50,7 +49,6 @@
 .fi
 
 .SH INTERFACE LEVEL
-.LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
 .ne 2
@@ -166,7 +164,6 @@
 .RE
 
 .SH DESCRIPTION
-.LP
 A kernel task queue is a mechanism for general-purpose asynchronous task
 scheduling that enables tasks to be performed at a later time by another
 thread. There are several reasons why you may utilize asynchronous task
@@ -244,7 +241,6 @@
 .LP
 The \fBddi_taskq_resume()\fR function resumes task queue execution.
 .SH RETURN VALUES
-.LP
 The \fBddi_taskq_create()\fR function creates an opaque handle that is used for
 all other \fBtaskq\fR operations. It returns a \fBtaskq\fR pointer on success
 and NULL on failure.
@@ -257,9 +253,8 @@
 The \fBddi_taskq_suspended()\fR function returns \fBB_TRUE\fR if \fBtaskq\fR is
 suspended. Otherwise \fBB_FALSE\fR is returned.
 .SH CONTEXT
-.LP
 All functions may be called from the user or kernel contexts.
 .sp
 .LP
-Addtionally, the \fBddi_taskq_dispatch\fR function may be called from the
+Additionally, the \fBddi_taskq_dispatch\fR function may be called from the
 interrupt context only if the DDI_NOSLEEP flag is set.
--- a/usr/src/man/man9s/ddi_dma_attr.9s	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/man/man9s/ddi_dma_attr.9s	Wed Sep 23 12:07:08 2020 +0000
@@ -3,28 +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 DDI_DMA_ATTR 9S "Feb 12, 2009"
+.TH DDI_DMA_ATTR 9S "September 12, 2020"
 .SH NAME
 ddi_dma_attr \- DMA attributes structure
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/ddidmareq.h>
 .fi
 
 .SH INTERFACE LEVEL
-.sp
-.LP
 Solaris DDI specific (Solaris DDI)
 .SH DESCRIPTION
-.sp
-.LP
 A \fBddi_dma_attr_t\fR structure describes device- and \fBDMA\fR
 engine-specific attributes necessary to allocate \fBDMA\fR resources for a
 device. The driver might have to extend the attributes with bus-specific
 information, depending on the bus to which the device is connected.
 .SH STRUCTURE MEMBERS
-.sp
 .in +2
 .nf
 uint_t      dma_attr_version;      /* version number */
@@ -116,7 +110,7 @@
 .ad
 .RS 7n
 Device \fBDMA\fR engine is not constrained by the size, for example,
-with\fBDMA\fR chaining.
+with \fBDMA\fR chaining.
 .RE
 
 .sp
@@ -226,7 +220,6 @@
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRInitializing the \fBddi_dma_attr_t\fR Structure
 .sp
 .LP
@@ -310,8 +303,6 @@
 .in -2
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -326,8 +317,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBattributes\fR(5), \fBddi_dma_addr_bind_handle\fR(9F),
 \fBddi_dma_alloc_handle\fR(9F), \fBddi_dma_buf_bind_handle\fR(9F),
 \fBddi_dma_burstsizes\fR(9F), \fBddi_dma_mem_alloc\fR(9F),
--- a/usr/src/pkg/manifests/system-test-utiltest.mf	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/pkg/manifests/system-test-utiltest.mf	Wed Sep 23 12:07:08 2020 +0000
@@ -59,6 +59,7 @@
 dir path=opt/util-tests/tests/files/make_a/c
 dir path=opt/util-tests/tests/files/make_l
 dir path=opt/util-tests/tests/find
+dir path=opt/util-tests/tests/head
 dir path=opt/util-tests/tests/libcustr
 dir path=opt/util-tests/tests/libnvpair_json
 dir path=opt/util-tests/tests/libsff
@@ -1530,6 +1531,26 @@
 file path=opt/util-tests/tests/files/make_a/make.rules mode=0444
 file path=opt/util-tests/tests/find/findtest mode=0555
 file path=opt/util-tests/tests/grep_test mode=0555
+file path=opt/util-tests/tests/head/5221.in mode=0444
+file path=opt/util-tests/tests/head/5221.out mode=0444
+file path=opt/util-tests/tests/head/head_test mode=0555
+file path=opt/util-tests/tests/head/multi.1.out mode=0444
+file path=opt/util-tests/tests/head/multi.4.out mode=0444
+file path=opt/util-tests/tests/head/rings.1.out mode=0444
+file path=opt/util-tests/tests/head/rings.2.out mode=0444
+file path=opt/util-tests/tests/head/rings.3.out mode=0444
+file path=opt/util-tests/tests/head/rings.5.out mode=0444
+file path=opt/util-tests/tests/head/rings.in mode=0444
+file path=opt/util-tests/tests/head/stdin-nul.1.out mode=0444
+file path=opt/util-tests/tests/head/stdin-nul.2.out mode=0444
+file path=opt/util-tests/tests/head/stdin-nul.3.out mode=0444
+file path=opt/util-tests/tests/head/stdin.1.out mode=0444
+file path=opt/util-tests/tests/head/stdin.11.out mode=0444
+file path=opt/util-tests/tests/head/stdin.2.out mode=0444
+file path=opt/util-tests/tests/head/stdin.3.out mode=0444
+file path=opt/util-tests/tests/head/stdin.5.out mode=0444
+file path=opt/util-tests/tests/head/stdin.multi.out mode=0444
+file path=opt/util-tests/tests/head/stdin.nonewline.out mode=0444
 file path=opt/util-tests/tests/iconv_test mode=0555
 file path=opt/util-tests/tests/libcustr/custr_remove mode=0555
 file path=opt/util-tests/tests/libcustr/custr_trunc mode=0555
--- a/usr/src/test/util-tests/runfiles/default.run	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/test/util-tests/runfiles/default.run	Wed Sep 23 12:07:08 2020 +0000
@@ -68,6 +68,7 @@
 [/opt/util-tests/tests/date_test]
 [/opt/util-tests/tests/chown_test]
 [/opt/util-tests/tests/make_test]
+[/opt/util-tests/tests/head/head_test]
 
 [/opt/util-tests/tests/demangle]
 tests = ['afl-fast', 'gcc-libstdc++', 'llvm-stdcxxabi']
--- a/usr/src/test/util-tests/tests/Makefile	Tue Sep 22 11:40:29 2020 +0000
+++ b/usr/src/test/util-tests/tests/Makefile	Wed Sep 23 12:07:08 2020 +0000
@@ -20,6 +20,6 @@
 
 SUBDIRS = date dis dladm iconv libnvpair_json libsff printf xargs grep_xpg4
 SUBDIRS += demangle mergeq workq chown ctf smbios libjedec awk make sleep
-SUBDIRS += bunyan libcustr find mdb sed
+SUBDIRS += bunyan libcustr find mdb sed head
 
 include $(SRC)/test/Makefile.com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/5221.in	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,1 @@
+5221 head shouldn't reuse stdin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/5221.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,9 @@
+==> 5221.in <==
+5221 head shouldn't reuse stdin
+
+==> /dev/stdin <==
+Old
+Bill Joy
+Bug
+
+Lasts Forever
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/head_test.ksh	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,122 @@
+#!/usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2020 Oxide Computer Company
+#
+
+HEAD=${HEAD:=/usr/bin/head}
+TMPFILE=/tmp/head_test.out.$$
+TMPINPUT=/tmp/head_test.in.$$
+
+test_fail() {
+	echo "$*"
+	((failures++))
+}
+
+test_one() {
+	typeset desc="$1"
+	shift
+	typeset input="$1"
+	shift
+	typeset output="$1"
+	shift
+
+	printf "Running %s: " "$desc"
+	if [[ "$input" == "-" ]]; then
+		$HEAD $* > $TMPFILE
+	else
+		printf "$input" | $HEAD $* > $TMPFILE
+	fi
+
+	if [[ $? -ne 0 ]]; then
+		test_fail "head exited non-zero"
+		return
+	fi
+
+	if [[ ! -f "$output" ]]; then
+		test_fail "missing expeced output file $output"
+		return
+	fi
+
+	if ! diff $output $TMPFILE >/dev/null 2>/dev/null; then
+		test_fail "output mismatch"
+		return
+	fi
+
+	printf "passed\n"
+}
+
+if ! cd $(dirname $0); then
+	printf "failed to reach test directory!\n" 1>&2
+	exit 1
+fi
+
+test_one "simple stdin 1" "a\n\n\nb\n" stdin.1.out
+test_one "simple stdin 2 -n 1" "a\n\n\nb\n" stdin.2.out "-n 1"
+test_one "simple stdin 3 -n 3" "a\n\n\nb\n" stdin.3.out "-n 3"
+test_one "simple stdin 4 -n 10000" "a\n\n\nb\n" stdin.1.out "-n 10000"
+test_one "simple stdin 5 -c 1" "a\n\n\nb\n" stdin.5.out "-c 1"
+test_one "simple stdin 6 -c 230" "a\n\n\nb\n" stdin.1.out "-c 230"
+test_one "simple stdin 7 -n 3 -q" "a\n\n\nb\n" stdin.3.out "-n 3" "-q"
+test_one "simple stdin 8 -" "a\n\n\nb\n" stdin.2.out "-1"
+test_one "simple stdin 9 -23" "a\n\n\nb\n" stdin.1.out "-23"
+test_one "simple stdin 10 -q" "a\n\n\nb\n" stdin.1.out "-q"
+#
+# Note, different implementations have different behaviours when -v is specified
+# and there is only standard input. This verifies our current choice.
+#
+test_one "simple stdin 11 -v" "a\n\n\nb\n" stdin.11.out "-v"
+test_one "stdin nul 1" "hello\0regression\n" stdin-nul.1.out
+test_one "stdin nul 2 -c 1" "hello\0regression\n" stdin-nul.2.out "-c 1"
+test_one "stdin nul 3" "this\0\nwas\0an\0\n\nunfortunate\0buf\0\n" \
+    stdin-nul.3.out
+
+test_one "5221 regression" "Old\nBill Joy\nBug\n\nLasts Forever\n" 5221.out \
+    5221.in /dev/stdin
+test_one "/dev/stdin repeated" "Hello\n" stdin.multi.out /dev/stdin /dev/stdin
+test_one "no newline -n 3" "Why do you need newlines?" stdin.nonewline.out \
+    "-n 3"
+
+test_one "simple file 1" - rings.1.out rings.in
+test_one "simple file 2 -c 30" - rings.2.out "-c 30" rings.in
+test_one "simple file 3 -n 7" - rings.3.out "-n 7" rings.in
+test_one "simple file 4 -50" - rings.in "-50" rings.in
+test_one "simple file 5 -v" - rings.5.out "-v" rings.in
+test_one "multi file 1 -n 5 -q" - multi.1.out "-n 5" "-q" rings.in \
+    rings.in rings.in
+test_one "multi file 2 -n 5 -q -v" - multi.1.out "-n 5" "-q" "-v" "-q" \
+    rings.in rings.in rings.in
+test_one "multi file 3 -n 5 -q -v -q" - multi.1.out "-n 5" "-q" "-v" "-q" \
+    rings.in rings.in rings.in
+test_one "multi file 4 -c 100" - multi.4.out "-c 100" rings.in rings.in
+
+#
+# Construct a file larger than 8k in size without a new line to verify that we
+# will do multiple reads beyond the first.
+#
+rm -f $TMPINPUT
+for ((i = 0; i < 10000; i++)); do
+	printf "Lorem ipsum" >> $TMPINPUT
+done
+test_one "large input" - $TMPINPUT $TMPINPUT
+
+rm $TMPFILE $TMPINPUT
+
+if [[ "$failures" -ne 0 ]]; then
+	printf "%u tests failed\n" "$failures" 2>&1
+	exit 1
+fi
+
+printf "All tests passed successfully\n"
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/multi.1.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,15 @@
+
+
+Three Rings for the Elven-kings under the sky,
+  Seven for the Dwarf-lords in their halls of stone,
+Nine for Mortal Men doomed to die,
+
+
+Three Rings for the Elven-kings under the sky,
+  Seven for the Dwarf-lords in their halls of stone,
+Nine for Mortal Men doomed to die,
+
+
+Three Rings for the Elven-kings under the sky,
+  Seven for the Dwarf-lords in their halls of stone,
+Nine for Mortal Men doomed to die,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/multi.4.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,10 @@
+==> rings.in <==
+
+
+Three Rings for the Elven-kings under the sky,
+  Seven for the Dwarf-lords in their halls of stone
+==> rings.in <==
+
+
+Three Rings for the Elven-kings under the sky,
+  Seven for the Dwarf-lords in their halls of stone
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/rings.1.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,10 @@
+
+
+Three Rings for the Elven-kings under the sky,
+  Seven for the Dwarf-lords in their halls of stone,
+Nine for Mortal Men doomed to die,
+  One for the Dark Lord on his dark throne,
+In the Land of Mordor where the Shadows lie,
+  One Ring to rule them all, one Ring to find them,
+  One Ring to bring them all and in the darkness bind them
+In the Land of Mordor where the Shadows lie
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/rings.2.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,3 @@
+
+
+Three Rings for the Elven-ki
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/rings.3.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,7 @@
+
+
+Three Rings for the Elven-kings under the sky,
+  Seven for the Dwarf-lords in their halls of stone,
+Nine for Mortal Men doomed to die,
+  One for the Dark Lord on his dark throne,
+In the Land of Mordor where the Shadows lie,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/rings.5.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,11 @@
+==> rings.in <==
+
+
+Three Rings for the Elven-kings under the sky,
+  Seven for the Dwarf-lords in their halls of stone,
+Nine for Mortal Men doomed to die,
+  One for the Dark Lord on his dark throne,
+In the Land of Mordor where the Shadows lie,
+  One Ring to rule them all, one Ring to find them,
+  One Ring to bring them all and in the darkness bind them
+In the Land of Mordor where the Shadows lie
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/rings.in	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,13 @@
+
+
+Three Rings for the Elven-kings under the sky,
+  Seven for the Dwarf-lords in their halls of stone,
+Nine for Mortal Men doomed to die,
+  One for the Dark Lord on his dark throne,
+In the Land of Mordor where the Shadows lie,
+  One Ring to rule them all, one Ring to find them,
+  One Ring to bring them all and in the darkness bind them
+In the Land of Mordor where the Shadows lie
+
+
+- J.R.R. Tolkien, The Lord of the Rings, Epigraph
Binary file usr/src/test/util-tests/tests/head/stdin-nul.1.out has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/stdin-nul.2.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,1 @@
+h
\ No newline at end of file
Binary file usr/src/test/util-tests/tests/head/stdin-nul.3.out has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/stdin.1.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,4 @@
+a
+
+
+b
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/stdin.11.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,5 @@
+==> standard input <==
+a
+
+
+b
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/stdin.2.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,1 @@
+a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/stdin.3.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,3 @@
+a
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/stdin.5.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,1 @@
+a
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/stdin.multi.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,4 @@
+==> /dev/stdin <==
+Hello
+
+==> /dev/stdin <==
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/stdin.nonewline.out	Wed Sep 23 12:07:08 2020 +0000
@@ -0,0 +1,1 @@
+Why do you need newlines?
\ No newline at end of file