--- a/usr/src/man/man1/pax.1	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man1/pax.1	Wed Sep 23 16:29:17 2020 +0000
@@ -43,11 +43,10 @@
 .\" Copyright (c) 1992, X/Open Company Limited All.  Rights Reserved.
 .\" Portions Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
 .\"
-.TH PAX 1 "Jul 16, 2008"
+.TH PAX 1 "September 22, 2020"
 .SH NAME
 pax \- portable archive interchange
 .SH SYNOPSIS
-.LP
 .nf
 \fBpax\fR [\fB-cdnv\fR] [\fB-H\fR | \fB-L\fR] [\fB-f\fR \fIarchive\fR] [\fB-o\fR \fIoptions\fR]...
      [\fB-s\fR \fIreplstr\fR]... [\fIpattern\fR]...
@@ -73,14 +72,10 @@
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBpax\fR reads, writes, and writes lists of the members of archive files and
 copies directory hierarchies. A variety of archive formats are supported. See
 the \fB-x\fR \fIformat\fR option.
 .SS "Modes of Operations"
-.sp
-.LP
 The action to be taken depends on the presence of the \fB-r\fR and \fB-w\fR
 options. The four combinations of \fB-r\fR and \fB-w\fR are referred to as the
 four modes of operation: \fBlist\fR, \fBread\fR, \fBwrite\fR, and \fBcopy\fR
@@ -203,8 +198,6 @@
 last file visited. When it detects an infinite loop, \fBpax\fR writes a
 diagnostic message to standard error and terminates.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -1079,8 +1072,6 @@
 consider a file selected unless it is newer than the file to which it is
 compared.
 .SS "List Mode Format Specifications"
-.sp
-.LP
 In \fBlist\fR mode with the \fB-o\fR \fBlistopt=\fR\fIformat\fR option, the
 format argument is applied for each selected file. \fBpax\fR appends a NEWLINE
 to the \fBlistopt\fR output for each selected file. The \fIformat\fR argument
@@ -1133,7 +1124,7 @@
 Any of the Field Name entries in \fBustar Header Block\fR and \fBOctet-Oriented
 cpio Archive Entry\fR. The implementation supports the \fBcpio\fR keywords
 without the leading \fBc_\fR in addition to the form required by \fBValues for
-cpio c_ mode Field\fR.
+cpio c_mode Field\fR.
 .RE
 .RS +4
 .TP
@@ -1229,8 +1220,6 @@
 Otherwise, the \fB%L\fR conversion specification is the equivalent of \fB%F\fR.
 .RE
 .SH OPERANDS
-.sp
-.LP
 The following operands are supported:
 .sp
 .ne 2
@@ -1263,12 +1252,8 @@
 .RE
 
 .SH OUTPUT
-.sp
-.LP
 Output formats are discussed below:
 .SS "Standard Output"
-.sp
-.LP
 In \fBwrite\fR mode, if \fB-f\fR is not specified, the standard output is the
 archive formatted according to one of the formats described below. See \fB-x\fR
 \fBformat\fR for a list of supported formats.
@@ -1330,8 +1315,6 @@
 .LP
 In \fBlist\fR mode, standard output is not buffered more than a line at a time.
 .SS "Standard Error"
-.sp
-.LP
 If \fB-v\fR is specified in \fBread\fR, \fBwrite\fR or \fBcopy\fR modes,
 \fBpax\fR writes the path names it processes to the standard error output using
 the following format:
@@ -1381,8 +1364,6 @@
 described for the \fB-o\fR \fBinvalid=\fRoption, and then processes the next
 file in the archive.
 .SS "Output Files"
-.sp
-.LP
 In \fBread\fR mode, the extracted output files are of the archived file type.
 In \fBcopy\fR mode, the copied output files are the type of the file being
 copied . In either mode, existing files in the destination hierarchy are
@@ -1391,8 +1372,6 @@
 mode, the output file named by the \fB-f\fR option-argument is a file formatted
 according to one of the specifications in IEEE Std 1003.1-2001.
 .SH ERRORS
-.sp
-.LP
 If \fBpax\fR cannot create a file or a link when reading an archive, or cannot
 find a file when writing an archive, or cannot preserve the user \fBID\fR,
 group \fBID\fR, or file mode when the \fB-p\fR option is specified, a
@@ -1410,8 +1389,6 @@
 from the read, write, execute mask set as well as incorrect modification and
 access times.
 .SH USAGE
-.sp
-.LP
 The \fB-p\fR (privileges) option was invented to reconcile differences between
 historical \fBtar\fR(1) and \fBcpio\fR(1) implementations. In particular, the
 two utilities use \fB-m\fR in diametrically opposed ways. The \fB-p\fR option
@@ -1479,22 +1456,17 @@
 See \fBlargefile\fR(5) for the description of the behavior of \fBpax\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SS "Standard Input"
-.sp
-.LP
 In \fBwrite\fR mode, the standard input is used only if no \fIfile\fR operands
 are specified. It is a text file containing a list of path names, one per line,
 without leading or trailing blanks. In \fBlist\fR and \fBread\fR modes, if
 \fB-f\fR is not specified, the standard input is an archive file. Otherwise,
 the standard input is not used.
 .SS "Input Files"
-.sp
-.LP
 The input file named by the \fIarchive\fR option-argument, or standard input
 when the archive is read from there, is a file formatted according to one of
 the formats described below. See \fBExtended Description\fR. The file
 \fB/dev/tty\fR is used to write prompts and read responses.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRCopying the Contents of the Current Directory
 .sp
 .LP
@@ -1608,8 +1580,6 @@
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBpax\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, \fBLC_TIME\fR, and \fBNLSPATH\fR.
@@ -1649,8 +1619,6 @@
 .RE
 
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -1672,8 +1640,6 @@
 
 .SH EXTENDED DESCRIPTION
 .SS "\fBpax\fR Interchange Format"
-.sp
-.LP
 A \fBpax\fR archive tape or file produced in the \fB-xpax\fR format contains a
 series of blocks. The physical layout of the archive is identical to the
 \fBustar\fR format described in \fBustar Interchange Format\fR. Each file
@@ -1730,8 +1696,6 @@
 .TE
 
 .SS "\fBpax\fR Header Block"
-.sp
-.LP
 The \fBpax\fR header block is identical to the \fBustar\fR header block
 described in \fBustar Interchange Format\fR except that two additional
 \fItypeflag\fR values are defined:
@@ -1779,8 +1743,6 @@
 created by \fBpax\fR \fB-o\fR \fBlinkdata\fR includes these data blocks with
 the hard links.
 .SS "\fBpax\fR Extended Header"
-.sp
-.LP
 A \fBpax\fR extended header contains values that are inappropriate for the
 \fBustar\fR header block because of limitations in that format: fields
 requiring a character encoding other than that described in the \fIISO/IEC 646:
@@ -2056,8 +2018,6 @@
 values; all characters within the value field are considered data for the
 field.
 .SS "\fBpax\fR Extended Header Keyword Precedence"
-.sp
-.LP
 This section describes the precedence in which the various header records and
 fields and command line options are selected to apply to a file in the archive.
 When \fBpax\fR is used in read or list modes, it determines a file attribute in
@@ -2105,8 +2065,6 @@
 Otherwise, the attribute is determined from the \fBustar\fR header block.
 .RE
 .SS "\fBpax\fR Extended Header File Times"
-.sp
-.LP
 \fBpax\fR writes an \fImtime\fR record for each file in write or copy modes if
 the file's modification time cannot be represented exactly in the \fBustar\fR
 header logical record described in \fBustar\fR Interchange Format. This can
@@ -2124,8 +2082,6 @@
 time is recovered if the file is extracted on a system whose underlying
 implementation supports the same time granularity.
 .SS "\fBustar\fR Interchange Format"
-.sp
-.LP
 A \fBustar\fR archive tape or file contains a series of logical records. Each
 logical record is a fixed-size logical record of 512 octets. Although this
 format can be thought of as being stored on 9-track industry-standard 12.7mm
@@ -2248,7 +2204,7 @@
 l l l .
 Bit Value	IEE Std 1003.1-2001 Bit	Description
 04000	S_ISUID	Set UID on execution
-02000	S_ISGID	Set GID on exectution
+02000	S_ISGID	Set GID on execution
 01000	\fIreserved\fR	Reserved for future standardization
 00400	S_IRUSR	Read permission for file owner class
 00200	S_IWUSR	Write permission for file owner class
@@ -2524,8 +2480,6 @@
 these files are used rather than the values contained within the \fIuid\fR and
 \fBgid\fR fields.
 .SS "\fBcpio\fR Interchange Format"
-.sp
-.LP
 The octet-oriented \fBcpio\fR archive format are a series of entries, each
 comprising a header that describes the file, name of the file, and contents of
 the file.
@@ -2581,8 +2535,6 @@
 .TE
 
 .SS "\fBcpio\fR Header"
-.sp
-.LP
 For each file in the archive, a header as defined previously written. The
 information in the header fields is written as streams of the \fIISO/IEC 646:
 1991\fR standard characters interpreted as octal numbers. The octal numbers are
@@ -2739,8 +2691,6 @@
 .RE
 
 .SS "\fBcpio\fR Filename"
-.sp
-.LP
 The \fIc_name\fR field contains the pathname of the file. The length of this
 field in octets is the value of \fIc_namesize\fR. If a filename is found on the
 medium that would create an invalid pathname, it is implementation-defined
@@ -2760,8 +2710,6 @@
 can choose to ignore these files as long as it produces an error indicating
 that the file is being ignored.
 .SS "\fBcpio\fR File Data"
-.sp
-.LP
 Following \fIc_name\fR, there is \fIc_filesize\fR octets of data.
 Interpretation of such data occurs in a manner dependent on the file. If
 \fIc_filesize\fR is zero, no data is contained in \fIc_filedata\fR . When
@@ -2792,8 +2740,6 @@
 does not support those flags, they can be ignored.
 .RE
 .SS "\fBcpio\fR Special Entries"
-.sp
-.LP
 FIFO special files, directories, and the trailer are recorded with
 \fIc_filesize\fR equal to zero. For other special files, \fIc_filesize\fR is
 unspecified in volume \fIIEEE Std 1003.1-200x\fR. The header for the next file
@@ -2802,8 +2748,6 @@
 the archive; the contents of octets in the last block of the archive following
 such a header are undefined.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -2820,8 +2764,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBchmod\fR(1), \fBcpio\fR(1), \fBed\fR(1), \fBprintf\fR(1), \fBtar\fR(1),
 \fBmkdir\fR(2), \fBlseek\fR(2), \fBstat\fR(2), \fBwrite\fR(2),
 \fBarchives.h\fR(3HEAD), \fBattributes\fR(5), \fBenviron\fR(5),

--- a/usr/src/man/man3dat/dat_ep_create_with_srq.3dat	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man3dat/dat_ep_create_with_srq.3dat	Wed Sep 23 16:29:17 2020 +0000
@@ -4,12 +4,11 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DAT_EP_CREATE_WITH_SRQ 3DAT "Jul 16, 2004"
+.TH DAT_EP_CREATE_WITH_SRQ 3DAT "September 22, 2020"
 .SH NAME
 dat_ep_create_with_srq \- create an instance of End Point with Shared Receive
 Queue
 .SH SYNOPSIS
-.LP
 .nf
 cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-ldat\fR [ \fIlibrary\fR\&.\|.\|. ]
 #include <\fBdat/udat.h\fR>
@@ -28,7 +27,6 @@
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIia_handle\fR\fR
@@ -109,8 +107,6 @@
 .RE
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBdat_ep_create_with_srq()\fR function creates an instance of an Endpoint
 that is using SRQ for Recv buffers is provided to the Consumer as
 \fIep_handle\fR. The value of \fIep_handle\fR is not defined if the
@@ -167,13 +163,12 @@
 have at least the Consumer requested values but might have larger values.
 Consumer can query the created Endpoint to find out the actual values for these
 attributes. Created Endpoint has the exact Consumer requested values for
-\fImax_recv_dtos\fR, \fImax_message_size\fR, \fImax_rdma_size\fR, \fImax_
-rdma_read_in\fR, and \fImax_rdma_read_out\fR. For all other attributes, except
-\fImax_recv_iov\fR that is ignored, the created Endpoint has the exact values
-requested by Consumer. If Provider cannot satisfy the Consumer requested
+\fImax_recv_dtos\fR, \fImax_message_size\fR, \fImax_rdma_size\fR,
+\fImax_rdma_read_in\fR, and \fImax_rdma_read_out\fR. For all other attributes,
+except \fImax_recv_iov\fR that is ignored, the created Endpoint has the exact
+values requested by Consumer. If Provider cannot satisfy the Consumer requested
 attribute values the operation fails.
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fBDAT_SUCCESS\fR\fR
@@ -222,8 +217,6 @@
 .RE
 
 .SH USAGE
-.sp
-.LP
 The Consumer creates an Endpoint prior to the establishment of a connection.
 The created Endpoint is in \fBDAT_EP_STATE_UNCONNECTED\fR. Consumers can do the
 following:
@@ -238,7 +231,7 @@
 2.
 Associate the Endpoint with the Pending Connection Request that does not
 have an associated local Endpoint for accepting the Pending Connection Request
-for the passive/server side of the con-nection model.
+for the passive/server side of the connection model.
 .RE
 .RS +4
 .TP
@@ -253,7 +246,7 @@
 The Consumer cannot specify a \fIrequest_evd_handle\fR (\fIrecv_evd_handle\fR)
 with Request Completion Flags (Recv Completion Flags) that do not match the
 other Endpoint Completion Flags for the DTO/RMR completion streams that use the
-same EVD. If \fIrequest_evd_handle\fR (\fIrecv_evd_ handle\fR) is used for
+same EVD. If \fIrequest_evd_handle\fR (\fIrecv_evd_handle\fR) is used for
 request (recv) completions of an Endpoint whose associated Request (Recv)
 Completion Flag attribute is \fBDAT_COMPLETION_UNSIGNALLED_FLAG\fR, the Request
 Completion Flags and Recv Completion Flags for all Endpoint completion streams
@@ -332,7 +325,7 @@
 \fBdat_ep_dup_connect\fR(3DAT), or \fBdat_cr_accept\fR(3DAT). On the Active
 side of the connection establishment, if the remnants of a previous connection
 for Transport-specific Endpoint can be hidden within the Timeout parameter, do
-so. If not, generating \fBDAT_CONNECTION_ EVENT_NON_PEER_REJECTED\fR is an
+so. If not, generating \fBDAT_CONNECTION_EVENT_NON_PEER_REJECTED\fR is an
 option. For the Passive side, generating a
 \fBDAT_CONNECTION_COMPLETION_ERROR\fR event locally, while sending a
 non-peer-reject message to the active side, is a way of handling it.
@@ -366,12 +359,10 @@
 .LP
 The Provider is not required to check for a mismatch between the maximum RDMA
 Read IOV and maximum RDMA Read outgoing attributes, but is allowed to do so. In
-the later case it is allowed to return \fBDAT_INVALID_ PARAMETER\fR when a
+the latter case it is allowed to return \fBDAT_INVALID_PARAMETER\fR when a
 mismatch is detected. Provider must allocate resources to satisfy the
 combination of these two EP attributes for local RDMA Read DTOs.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -388,8 +379,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBdat_ep_create\fR(3DAT), \fBdat_srq_create\fR(3DAT),
 \fBdat_srq_free\fR(3DAT), \fBdat_srq_query\fR(3DAT), \fBlibdat\fR(3LIB),
 \fBattributes\fR(5)

--- a/usr/src/man/man3dat/dat_lmr_sync_rdma_write.3dat	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man3dat/dat_lmr_sync_rdma_write.3dat	Wed Sep 23 16:29:17 2020 +0000
@@ -4,12 +4,11 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DAT_LMR_SYNC_RDMA_WRITE 3DAT "Jul 16, 2004"
+.TH DAT_LMR_SYNC_RDMA_WRITE 3DAT "September 22, 2020"
 .SH NAME
 dat_lmr_sync_rdma_write \- synchronize local memory with RDMA write on
 non-coherent memory
 .SH SYNOPSIS
-.LP
 .nf
 cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-ldat\fR [ \fIlibrary\fR\&.\|.\|. ]
 #include <\fBdat/udat.h\fR>
@@ -23,7 +22,6 @@
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIia_handle\fR\fR
@@ -51,8 +49,6 @@
 .RE
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBdat_lmr_sync_rdma_write()\fR function makes effects of an incoming RDMA
 Write operation visible to the Consumer. This operation guarantees consistency
 by locally invalidating the non-coherent cache whose buffer has been populated
@@ -66,7 +62,7 @@
 an incoming RDMA Write operation. The \fBdat_lmr_sync_rdma_write()\fR function
 must be called after the RDMA Write operation completes, and the memory range
 that was modified by the RDMA Write must be supplied by the caller in the
-\fIlocal_ segments\fR array. After this call returns, the Consumer may safely
+\fIlocal_segments\fR array. After this call returns, the Consumer may safely
 see the modified contents of the memory range. It is permissible to batch
 synchronizations of multiple RDMA Write operations in a single call by passing
 a \fIlocal_segments\fR array that includes all modified memory ranges. The
@@ -89,7 +85,6 @@
 undefined. If the Consumer attempts to write to a memory range without properly
 synchronizing, the contents of the memory range become undefined.
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fBDAT_SUCCESS\fR\fR
@@ -119,8 +114,6 @@
 .RE
 
 .SH USAGE
-.sp
-.LP
 Determining when an RDMA Write completes and determining which memory range was
 modified is the Consumer's responsibility. One possibility is for the RDMA
 Write initiator to post a Send DTO message after each RDMA Write that
@@ -152,8 +145,6 @@
 CPU noncoherent cache will be invalidated.
 .RE
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -170,6 +161,4 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBdat_lmr_sync_rdma_read\fR(3DAT), \fBlibdat\fR(3LIB), \fBattributes\fR(5)

--- a/usr/src/man/man3head/fenv.h.3head	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man3head/fenv.h.3head	Wed Sep 23 16:29:17 2020 +0000
@@ -43,18 +43,15 @@
 .\" Copyright (c) 2001, The IEEE and The Open Group.  All Rights Reserved.
 .\" Portions Copyright (c) 2003, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.TH FENV.H 3HEAD "Dec 15, 2003"
+.TH FENV.H 3HEAD "September 22, 2020"
 .SH NAME
 fenv.h, fenv \- floating-point environment
 .SH SYNOPSIS
-.LP
 .nf
 #include <\fBfenv.h\fR>
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The <\fBfenv.h\fR> header defines the following data types through
 \fBtypedef\fR:
 .sp
@@ -161,15 +158,13 @@
 .LP
 If part of an application tests floating-point status flags, sets
 floating-point control modes, or runs under non-default mode settings, but was
-translated with the state for the \fBFENV_ ACCESS\fR pragma off, the behavior
+translated with the state for the \fBFENV_ACCESS\fR pragma off, the behavior
 is undefined. The default state (on or off) for the pragma is
 implementation-defined. (When execution passes from a part of the application
 translated with \fBFENV_ACCESS\fR off to a part translated with
 \fBFENV_ACCESS\fR on, the state of the floating-point status flags is
 unspecified and the floating-point control modes have their default settings.)
 .SH USAGE
-.sp
-.LP
 This header is designed to support the floating-point exception status flags
 and directed-rounding control modes required by the IEC 60559: 1989 standard,
 and other similar floating-point state information. Also, it is designed to
@@ -240,8 +235,6 @@
 .in -2
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -256,8 +249,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBfeclearexcept\fR(3M), \fBfegetenv\fR(3M), \fBfegetexceptflag\fR(3M),
 \fBfegetround\fR(3M), \fBfeholdexcept\fR(3M), \fBferaiseexcept\fR(3M),
 \fBfesetenv\fR(3M), \fBfesetexceptflag\fR(3M), \fBfesetround\fR(3M),

--- a/usr/src/man/man3head/stdint.h.3head	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man3head/stdint.h.3head	Wed Sep 23 16:29:17 2020 +0000
@@ -43,18 +43,15 @@
 .\" Copyright (c) 2001, The IEEE and The Open Group.  All Rights Reserved.
 .\" Portions Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.TH STDINT.H 3HEAD "Sep 10, 2004"
+.TH STDINT.H 3HEAD "September 22, 2020"
 .SH NAME
 stdint.h, stdint \- integer types
 .SH SYNOPSIS
-.LP
 .nf
 #include <\fBstdint.h\fR>
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The <\fBstdint.h\fR> header declares sets of integer types having specified
 widths, and defines corresponding sets of macros. It also defines macros that
 specify limits of integer types corresponding to types defined in other
@@ -116,8 +113,6 @@
 implementation provides those types described as required, but need not provide
 any of the others (described as optional).
 .SS "Integer Types"
-.sp
-.LP
 When \fBtypedef\fR names differing only in the absence or presence of the
 initial \fBu\fR are defined, they denote corresponding signed and unsigned
 types as described in the ISO/IEC 9899: 1999 standard, Section 6.2.5; an
@@ -204,12 +199,12 @@
 .RS 4n
 The \fBtypedef\fR name \fBint_least\fIN\fR_t\fR designates a signed integer
 type with a width of at least \fIN\fR, such that no signed integer type with
-lesser size has at least the specified width. Thus, \fBint_least32 _t\fR
+lesser size has at least the specified width. Thus, \fBint_least32_t\fR
 denotes a signed integer type with a width of at least 32 bits.
 .sp
 The \fBtypedef\fR name \fBuint_least\fIN\fR_t\fR designates an unsigned integer
 type with a width of at least \fIN\fR, such that no unsigned integer type with
-lesser size has at least the specified width. Thus, \fBuint_ least16_t\fR
+lesser size has at least the specified width. Thus, \fBuint_least16_t\fR
 denotes an unsigned integer type with a width of at least 16 bits.
 .sp
 The following types are required:
@@ -246,7 +241,7 @@
 .sp
 The \fBtypedef\fR name \fBint_fast\fIN\fR_t\fR designates the fastest signed
 integer type with a width of at least \fIN\fR. The \fBtypedef\fR name
-\fBuint_fast\fIN\fR_ t\fR designates the fastest unsigned integer type with a
+\fBuint_fast\fIN\fR_t\fR designates the fastest unsigned integer type with a
 width of at least \fIN\fR.
 .sp
 The following types are required:
@@ -334,8 +329,6 @@
 .RE
 
 .SS "Limits of Specified-Width Integer Types"
-.sp
-.LP
 The following macros specify the minimum and maximum limits of the types
 declared in the <\fBstdint.h\fR> header. Each macro name corresponds to a
 similar type name in \fBInteger Types\fR.
@@ -686,8 +679,6 @@
 .RE
 
 .SS "Limits of Other Integer Types"
-.sp
-.LP
 The following macros specify the minimum and maximum limits of integer types
 corresponding to types defined in other standard headers.
 .sp
@@ -842,8 +833,6 @@
 an unsigned integer type, and the value of {\fBWINT_MIN\fR} is 0 and the value
 of {\fBWINT_MAX\fR} is no less than 65535.
 .SS "Macros for Integer Constant Expressions"
-.sp
-.LP
 The following macros expand to integer constant expressions suitable for
 initializing objects that have integer types corresponding to types defined in
 the <\fBstdint.h\fR> header. Each macro name corresponds to a similar type name
@@ -900,8 +889,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -916,7 +903,5 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBinttypes.h\fR(3HEAD), \fBsignal.h\fR(3HEAD), \fBstddef.h\fR(3HEAD),
 \fBwchar.h\fR(3HEAD), \fBattributes\fR(5), \fBstandards\fR(5)

--- a/usr/src/man/man3head/termios.h.3head	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man3head/termios.h.3head	Wed Sep 23 16:29:17 2020 +0000
@@ -43,22 +43,19 @@
 .\" Copyright (c) 2001, The IEEE and The Open Group.  All Rights Reserved.
 .\" Portions Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.TH TERMIOS.H 3HEAD "Dec 30, 2016"
+.TH TERMIOS.H 3HEAD "September 22, 2020"
 .SH NAME
 termios.h, termios \- define values for termios
 .SH SYNOPSIS
-.LP
 .nf
 #include <\fBtermios.h\fR>
 .fi
 
 .SH DESCRIPTION
-.LP
 The <\fBtermios.h\fR> header contains the definitions used by the terminal I/O
 interfaces. See \fBtermios\fR(3C) and \fBtermio\fR(7I) for an overview of the
 terminal interface.
 .SS "The termios Structure"
-.LP
 The following data types are defined through \fBtypedef\fR:
 .sp
 .ne 2
@@ -158,7 +155,6 @@
 .LP
 The header file provides the flags described below.
 .SS "Input Modes"
-.LP
 The \fBc_iflag\fR field describes the basic terminal input control:
 .sp
 .ne 2
@@ -269,7 +265,6 @@
 .RE
 
 .SS "Output Modes"
-.LP
 The \fBc_oflag\fR field specifies the system treatment of output:
 .sp
 .ne 2
@@ -524,9 +519,8 @@
 .RE
 
 .SS "Baud Rate Selection"
-.LP
 The input and output baud rates are stored in the \fBtermios\fR structure.
-These are the valid values for objects of type \fBspeed_ t\fR. The following
+These are the valid values for objects of type \fBspeed_t\fR. The following
 values are defined, but not all baud rates need be supported by the underlying
 hardware.
 .sp
@@ -674,7 +668,6 @@
 .RE
 
 .SS "Control Modes"
-.LP
 The \fBc_cflag\fR field describes the hardware control of the terminal; not all
 values specified are required to be supported by the underlying hardware:
 .sp
@@ -781,7 +774,6 @@
 The implementation supports the functionality associated with the symbols
 \fBCS7\fR, \fBCS8\fR, \fBCSTOPB\fR, \fBPARODD\fR, and \fBPARENB\fR.
 .SS "Local Modes"
-.LP
 The \fBc_lflag\fR field of the argument structure is used to control various
 terminal functions:
 .sp
@@ -866,7 +858,6 @@
 .RE
 
 .SS "Attribute Selection"
-.LP
 The following symbolic constants for use with \fBtcsetattr()\fR are defined:
 .sp
 .ne 2
@@ -896,7 +887,6 @@
 .RE
 
 .SS "Line Control"
-.LP
 The following symbolic constants for use with \fBtcflush()\fR are defined:
 .sp
 .ne 2
@@ -965,7 +955,6 @@
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -980,7 +969,6 @@
 .TE
 
 .SH SEE ALSO
-.LP
 \fBgetconf\fR(1), \fBcfgetispeed\fR(3C), \fBcfsetispeed\fR(3C),
 \fBconfstr\fR(3C), \fBtcdrain\fR(3C), \fBtcflow\fR(3C), \fBtcflush\fR(3C),
 \fBtcgetattr\fR(3C), \fBtcgetsid\fR(3C), \fBtcsendbreak\fR(3C),

--- a/usr/src/man/man3head/wctype.h.3head	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man3head/wctype.h.3head	Wed Sep 23 16:29:17 2020 +0000
@@ -43,18 +43,15 @@
 .\" Copyright (c) 2001, The IEEE and The Open Group.  All Rights Reserved.
 .\" Portions Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.TH WCTYPE.H 3HEAD "Sep 10, 2004"
+.TH WCTYPE.H 3HEAD "September 22, 2020"
 .SH NAME
 wctype.h, wctype \- wide-character classification and mapping utilities
 .SH SYNOPSIS
-.LP
 .nf
 #include <\fBwctype.h\fR>
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The <\fBwctype.h\fR> header defines the following types:
 .sp
 .ne 2
@@ -100,7 +97,7 @@
 .sp
 .LP
 For all functions described in this header that accept an argument of type
-\fBwint_t\fR, the value is representable as a \fBwchar _t\fR or equals the
+\fBwint_t\fR, the value is representable as a \fBwchar_t\fR or equals the
 value of \fBWEOF\fR. If this argument has any other value, the behavior is
 undefined.
 .sp
@@ -113,8 +110,6 @@
 headers <\fBctype.h\fR>, <\fBstdarg.h\fR>, <\fBstddef.h\fR>, <\fBstdio.h\fR>,
 <\fBstdlib.h\fR>, <\fBstring.h\fR>, <\fBtime.h\fR>, and <\fBwchar.h\fR>.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -129,8 +124,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBiswalpha\fR(3C), \fBiswctype\fR(3C), \fBlocale.h\fR(3HEAD),
 \fBsetlocale\fR(3C), \fBstdarg\fR(3EXT), \fBstddef.h\fR(3HEAD),
 \fBstdio.h\fR(3HEAD), \fBstdlib.h\fR(3HEAD), \fBstring.h\fR(3HEAD),

--- a/usr/src/man/man3lib/libscf.3lib	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man3lib/libscf.3lib	Wed Sep 23 16:29:17 2020 +0000
@@ -3,24 +3,19 @@
 .\" 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 LIBSCF 3LIB "Aug 28, 2007"
+.TH LIBSCF 3LIB "September 22, 2020"
 .SH NAME
 libscf \- service configuration facility library
 .SH SYNOPSIS
-.LP
 .nf
 cc [ \fIflag\fR... ] \fIfile\fR... \fB-lscf\fR [ \fIlibrary\fR... ]
 #include <\fBlibscf.h\fR>
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 Functions in this library define the interface for reading, writing, and
 manipulating service configurations.
 .SH INTERFACES
-.sp
-.LP
 The shared object \fBlibscf.so.1\fR provides the public interfaces defined
 below. See \fBIntro\fR(3) for additional information on shared object
 interfaces.
@@ -115,14 +110,14 @@
 \fBscf_tmpl_prop_visibility\fR	\fBscf_tmpl_reset_errors\fR
 \fBscf_tmpl_strerror\fR	\fBscf_tmpl_validate_fmri\fR
 \fBscf_tmpl_value_common_name\fR	\fBscf_tmpl_value_count_range_choices\fR
-\fBscf_tmpl_value_count_range_ constraints\fR	\fBscf_tmpl_value_description\fR
+\fBscf_tmpl_value_count_range_constraints\fR	\fBscf_tmpl_value_description\fR
 \fBscf_tmpl_value_in_constraint\fR	\fBscf_tmpl_value_int_range_choices\fR
-\fBscf_tmpl_value_int_range_ constraints\fR	\fBscf_tmpl_value_name_choices\fR
+\fBscf_tmpl_value_int_range_constraints\fR	\fBscf_tmpl_value_name_choices\fR
 \fBscf_tmpl_value_name_constraints\fR	\fBscf_tmpl_visibility_to_string\fR
 \fBscf_transaction_commit\fR	\fBscf_transaction_create\fR
 \fBscf_transaction_destroy\fR	\fBscf_transaction_destroy_children\fR
-\fBscf_transaction_handle\fR	\fBscf_transacion_property_change\fR
-\fBscf_transaction_property_change_ type\fR	\fBscf_transaction_property_delete\fR
+\fBscf_transaction_handle\fR	\fBscf_transaction_property_change\fR
+\fBscf_transaction_property_change_type\fR	\fBscf_transaction_property_delete\fR
 \fBscf_transaction_property_new\fR	\fBscf_transaction_reset\fR
 \fBscf_transaction_reset_all\fR	\fBscf_transaction_start\fR
 \fBscf_type_base_type\fR	\fBscf_type_to_string\fR
@@ -142,11 +137,10 @@
 \fBsmf_disable_instance\fR	\fBsmf_enable_instance\fR
 \fBsmf_get_state\fR	\fBsmf_maintain_instance\fR
 \fBsmf_refresh_instance\fR	\fBsmf_restart_instance\fR
-\fBsmf_restore_instance\fR	
+\fBsmf_restore_instance\fR
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/libscf.so.1\fR\fR
@@ -165,8 +159,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -183,6 +175,4 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBIntro\fR(3), \fBattributes\fR(5), \fBsmf\fR(5)

--- a/usr/src/man/man3nsl/rpc_gss_getcred.3nsl	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man3nsl/rpc_gss_getcred.3nsl	Wed Sep 23 16:29:17 2020 +0000
@@ -3,21 +3,18 @@
 .\" 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 RPC_GSS_GETCRED 3NSL "Feb 5, 2002"
+.TH RPC_GSS_GETCRED 3NSL "September 22, 2020"
 .SH NAME
 rpc_gss_getcred \- get credentials of client
 .SH SYNOPSIS
-.LP
 .nf
 #include <rpc/rpcsec_gss.h>
 
-\fBbool_t\fR \fBrpc_gss_getcred\fR(\fBstruct svc_req\fR \fI*req\fR, \fBrpc_gss_rawcred_ t\fR \fI**rcred\fR,
+\fBbool_t\fR \fBrpc_gss_getcred\fR(\fBstruct svc_req\fR \fI*req\fR, \fBrpc_gss_rawcred_t\fR \fI**rcred\fR,
      \fBrpc_gss_ucred\fR \fI**ucred\fR, \fBvoid\fR \fI**cookie\fR);
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBrpc_gss_getcred()\fR is used by a server to fetch the credentials of a
 client.  These credentials may either be network credentials (in the form of a
 \fBrpc_gss_rawcred_t\fR structure) or UNIX credentials.
@@ -26,8 +23,6 @@
 For more information on \fBRPCSEC_GSS\fR data types, see the
 \fBrpcsec_gss\fR(3NSL) man page.
 .SH PARAMETERS
-.sp
-.LP
 Essentially,  \fBrpc_gss_getcred()\fR passes a pointer to a request
 (\fBsvc_req\fR) as well as pointers to two credential structures and a
 user-defined cookie; if \fBrpc_gss_getcred()\fR is successful, at least one
@@ -84,13 +79,9 @@
 .RE
 
 .SH RETURN VALUES
-.sp
-.LP
 \fBrpc_gss_getcred()\fR returns  TRUE if it is successful; otherwise, use
 \fBrpc_gss_get_error()\fR to get the error associated with the failure.
 .SH ATTRIBUTES
-.sp
-.LP
 See  \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -105,8 +96,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBrpc\fR(3NSL), \fBrpc_gss_set_callback\fR(3NSL), \fBrpc_gss_set_svc_name\fR(3NSL), \fBrpcsec_gss\fR(3NSL), \fBattributes\fR(5)
 .sp
 .LP

--- a/usr/src/man/man9f/ddi_prop_create.9f	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man9f/ddi_prop_create.9f	Wed Sep 23 16:29:17 2020 +0000
@@ -3,13 +3,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 DDI_PROP_CREATE 9F "Jan 16, 2006"
+.TH DDI_PROP_CREATE 9F "September 22, 2020"
 .SH NAME
 ddi_prop_create, ddi_prop_modify, ddi_prop_remove, ddi_prop_remove_all,
 ddi_prop_undefine \- create, remove, or modify properties for leaf device
 drivers
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/conf.h>
 #include <sys/ddi.h>
@@ -42,14 +41,10 @@
 .fi
 
 .SH INTERFACE LEVEL
-.sp
-.LP
 Solaris DDI specific (Solaris DDI). The \fBddi_prop_create()\fR and
 \fBddi_prop_modify()\fR functions are obsolete. Use \fBddi_prop_update\fR(9F)
 instead of these functions.
 .SH PARAMETERS
-.sp
-.LP
 \fBddi_prop_create()\fR
 .sp
 .ne 2
@@ -247,8 +242,6 @@
 .RE
 
 .SH DESCRIPTION
-.sp
-.LP
 Device drivers have the ability to create and manage their own properties as
 well as gain access to properties that the system creates on behalf of the
 driver. A driver uses \fBddi_getproplen\fR(9F) to query whether or not a
@@ -350,8 +343,6 @@
 .RE
 
 .SH RETURN VALUES
-.sp
-.LP
 The \fBddi_prop_create()\fR function returns the following values:
 .sp
 .ne 2
@@ -384,7 +375,7 @@
 
 .sp
 .LP
-The \fBddi_prop_ undefine()\fR function returns the following values:
+The \fBddi_prop_undefine()\fR function returns the following values:
 .sp
 .ne 2
 .na
@@ -487,13 +478,10 @@
 .RE
 
 .SH CONTEXT
-.sp
-.LP
 If \fBDDI_PROP_CANSLEEP\fR is set, these functions can cannot be called from
 interrupt context. Otherwise, they can be called from user, interrupt, or
 kernel context.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRCreating a Property
 .sp
 .LP
@@ -515,8 +503,6 @@
 .in -2
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
 
@@ -533,8 +519,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBdriver.conf\fR(4), \fBattributes\fR(5), \fBattach\fR(9E),
 \fBddi_getproplen\fR(9F), \fBddi_prop_op\fR(9F), \fBddi_prop_update\fR(9F),
 \fBmakedevice\fR(9F)

--- a/usr/src/man/man9f/ldi_open_by_dev.9f	Wed Sep 23 12:07:08 2020 +0000
+++ b/usr/src/man/man9f/ldi_open_by_dev.9f	Wed Sep 23 16:29:17 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 LDI_OPEN_BY_DEV 9F "Aug 9, 2004"
+.TH LDI_OPEN_BY_DEV 9F "September 22, 2020"
 .SH NAME
 ldi_open_by_dev, ldi_open_by_name, ldi_open_by_devid, ldi_close \- open and
 close devices
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/sunldi.h>
 
@@ -30,11 +29,10 @@
 
 .LP
 .nf
-\fBint\fR \fBldi_close\fR(\fBldi_handle_t\fR \fIlh\fR, \fBint\fR \fIflag\fR, \fBcred_ t *\fR\fIcr\fR);
+\fBint\fR \fBldi_close\fR(\fBldi_handle_t\fR \fIlh\fR, \fBint\fR \fIflag\fR, \fBcred_t *\fR\fIcr\fR);
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIlh\fR\fR
@@ -197,8 +195,6 @@
 .RE
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBldi_open_by_dev()\fR, \fBldi_open_by_name()\fR and
 \fBldi_open_by_devid()\fR functions allow a caller to open a block, character,
 or streams device. Upon a successful open, a layered handle to the device is
@@ -232,8 +228,6 @@
 \fBldi_open_by_devid()\fR. After \fBldi_close()\fR returns the layered handle,
 the \fIlh\fR that was previously passed in is no longer valid.
 .SH RETURN VALUES
-.sp
-.LP
 The \fBldi_close()\fR function returns \fB0\fR for success. \fBEINVAL\fR is
 returned for invalid input parameters. Otherwise, any other error number may be
 returned by the device.
@@ -313,21 +307,15 @@
 .RE
 
 .SH CONTEXT
-.sp
-.LP
 These functions may be called from user or kernel context.
 .sp
 .LP
 These functions should not be called from a device's attach, detach, or power
 entry point. This could result in a system crash or deadlock.
 .SH SEE ALSO
-.sp
-.LP
 \fBscsi_vhci\fR(7D), \fBldi_ident_from_dev\fR(9F),
 \fBldi_ident_from_dip\fR(9F), \fBldi_ident_from_stream\fR(9F)
 .SH NOTES
-.sp
-.LP
 Use only OTYP_CHR or OTYP_BLK options when you use the \fBldi_open_by_dev()\fR
 and \fBldi_open_by_devid()\fR functions to open a device. Other flags,
 including OTYP_LYR, have been deprecated and should not be used with these

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/test/util-tests/tests/head/Makefile	Wed Sep 23 16:29:17 2020 +0000
@@ -0,0 +1,67 @@
+#
+# 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
+#
+
+include $(SRC)/cmd/Makefile.cmd
+include $(SRC)/test/Makefile.com
+
+ROOTOPTPKG = $(ROOT)/opt/util-tests/tests/head
+PROG = head_test
+DATAFILES =			\
+	5221.in			\
+	5221.out		\
+	multi.1.out		\
+	multi.4.out		\
+	rings.1.out		\
+	rings.2.out		\
+	rings.3.out		\
+	rings.5.out		\
+	rings.in		\
+	stdin-nul.1.out		\
+	stdin-nul.2.out		\
+	stdin-nul.3.out		\
+	stdin.1.out		\
+	stdin.11.out		\
+	stdin.2.out		\
+	stdin.3.out		\
+	stdin.5.out		\
+	stdin.multi.out		\
+	stdin.nonewline.out
+
+
+ROOTPROG = $(PROG:%=$(ROOTOPTPKG)/%)
+ROOTDATA = $(DATAFILES:%=$(ROOTOPTPKG)/%)
+
+$(ROOTDATA) := FILEMODE = 0444
+
+all:
+
+install: $(ROOTPROG) $(ROOTDATA)
+
+lint:
+
+clobber: clean
+
+clean:
+
+$(CMDS): $(TESTDIR)
+
+$(ROOTOPTPKG):
+	$(INS.dir)
+
+$(ROOTOPTPKG)/%: %.ksh $(ROOTOPTPKG)
+	$(INS.rename)
+
+$(ROOTOPTPKG)/%: % $(ROOTOPTPKG)
+	$(INS.file)