13888 Some #include statements in the manual refer to nonexistent files

Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Dan McDonald <danmcd@joyent.com>

8 files changed, 43 insertions, 161 deletions

diff --git a/usr/src/man/man3c/setlabel.3c b/usr/src/man/man3c/setlabel.3c
index dfb913dd52..72fcb15581 100644
--- a/usr/src/man/man3c/setlabel.3c
+++ b/usr/src/man/man3c/setlabel.3c
@@ -3,20 +3,17 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SETLABEL 3C "Dec 29, 1996"
+.TH SETLABEL 3C "June 19, 2021"
 .SH NAME
 setlabel \- define the label for \fBpfmt()\fR and \fBlfmt()\fR
 .SH SYNOPSIS
-.LP
 .nf
-#include <pfmt..h>
+#include <pfmt.h>
 
 \fBint\fR \fBsetlabel\fR(\fBconst char *\fR\fIlabel\fR);
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBsetlabel()\fR function defines the label for messages produced in
 standard format by subsequent calls to \fBlfmt\fR(3C) and \fBpfmt\fR(3C).
 .sp
@@ -27,15 +24,11 @@ length.
 .LP
 No label is defined before \fBsetlabel()\fR is called. The label should be set
 once at the beginning of a utility and remain constant. A null pointer or an
-empty string passed as argument will reset the  definition of the label.
+empty string passed as argument will reset the definition of the label.
 .SH RETURN VALUE
-.sp
-.LP
 Upon successful completion, \fBsetlabel()\fR returns \fB0\fR; otherwise, it
 returns a non-zero value.
 .SH EXAMPLES
-.sp
-.LP
 The following code (without previous call to \fBsetlabel()\fR):
 .sp
 .in +2
@@ -58,8 +51,6 @@ UX:test: ERROR: Cannot open file
 .in -2
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -74,6 +65,4 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBgetopt\fR(3C), \fBlfmt\fR(3C), \fBpfmt\fR(3C), \fBattributes\fR(5)
diff --git a/usr/src/man/man3c/uconv_u16tou32.3c b/usr/src/man/man3c/uconv_u16tou32.3c
index 3508554f60..2223625ac1 100644
--- a/usr/src/man/man3c/uconv_u16tou32.3c
+++ b/usr/src/man/man3c/uconv_u16tou32.3c
@@ -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 UCONV_U16TOU32 3C "Sep 18, 2007"
+.TH UCONV_U16TOU32 3C "June 19, 2021"
 .SH NAME
 uconv_u16tou32, uconv_u16tou8, uconv_u32tou16, uconv_u32tou8, uconv_u8tou16,
 uconv_u8tou32 \- Unicode encoding conversion functions
 .SH SYNOPSIS
-.LP
 .nf
 #include <sys/types.h>
 #include <sys/errno.h>
@@ -49,7 +48,6 @@ uconv_u8tou32 \- Unicode encoding conversion functions
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIutf16str\fR\fR
@@ -220,8 +218,6 @@ character to indicate the byte ordering if the output parameter is in
 .RE
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBuconv_u16tou32()\fR function reads the given \fIutf16str\fR in
 \fBUTF-16\fR until \fBU+0000\fR (zero) in \fIutf16str\fR is encountered as a
 character or until the number of 16-bit unsigned integers specified in
@@ -301,8 +297,6 @@ the specified number of input parameter elements at \fIutf16len\fR,
 As output parameters, \fIutf16len\fR, \fIutf32len\fR, and \fIutf8len\fR are not
 changed if conversion fails for any reason.
 .SH RETURN VALUES
-.sp
-.LP
 Upon successful conversion, the functions return \fB0\fR. Upon failure, the
 functions return one of the following \fBerrno\fR values:
 .sp
@@ -345,7 +339,6 @@ Conflicting byte-ordering option \fIflag\fR values are detected.
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRConvert a \fBUTF-16\fR string in little-endian byte ordering
 into \fBUTF-8\fR string.
 .sp
@@ -435,7 +428,7 @@ parameter.
 .nf
 #include <sys/types.h>
 #include <sys/errno.h>
-#include <sys/u8_textprep>
+#include <sys/u8_textprep.h>
 \&.
 \&.
 \&.
@@ -460,8 +453,6 @@ if (ret != 0) {
 .in -2
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -478,15 +469,11 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBattributes\fR(5), \fBuconv_u16tou32\fR(9F)
 .sp
 .LP
 The Unicode Standard (http://www.unicode.org)
 .SH NOTES
-.sp
-.LP
 Each \fBUTF-16\fR or \fBUTF-32\fR character maps to an \fBUTF-8\fR character
 that might need one to maximum of four bytes.
 .sp
diff --git a/usr/src/man/man3lib/libtsol.3lib b/usr/src/man/man3lib/libtsol.3lib
index 119e57212e..072b52d2ae 100644
--- a/usr/src/man/man3lib/libtsol.3lib
+++ b/usr/src/man/man3lib/libtsol.3lib
@@ -1,26 +1,23 @@
 '\" te
-.\" Copyright (c) 2017 Peter Tribble.
+.\" Copyright (c) 2021 Peter Tribble.
 .\" Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
 .\" 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 LIBTSOL 3LIB "Dec 3, 2017"
+.TH LIBTSOL 3LIB "June 19, 2021"
 .SH NAME
 libtsol \- Solaris Trusted Extensions library
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [\fIflag\fR...] \fIfile\fR... \fB-ltsol\fR [\fIlibrary\fR...]
-#include <tsol.h>
+#include <tsol/label.h>
 .fi
 
 .SH DESCRIPTION
-.LP
 Functions in this library provide programmatic access to Solaris Trusted
 Extensions features such as labels and Mandatory Access Policy (MAC) on systems
 that are configured with Trusted Extensions software.
 .SH INTERFACES
-.LP
 The shared object \fBlibtsol.so.2\fR provides the public interfaces that are
 defined below. See \fBIntro\fR(3) for additional information on shared object
 interfaces.
@@ -42,7 +39,6 @@ l l .
 .TE
 
 .SS "Obsolete Functions"
-.LP
 The following functions are preserved to aid porting.
 .sp
 
@@ -88,7 +84,6 @@ shared object
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -107,9 +102,7 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.LP
 \fBIntro\fR(3), \fBlibtsnet\fR(3LIB), \fBattributes\fR(5)
 .SH NOTES
-.LP
 The functionality described on this manual page is available only if the system
 has been configured with Trusted Extensions.
diff --git a/usr/src/man/man4/ufsdump.4 b/usr/src/man/man4/ufsdump.4
index e9073cb3bb..49d27c5fef 100644
--- a/usr/src/man/man4/ufsdump.4
+++ b/usr/src/man/man4/ufsdump.4
@@ -1,20 +1,9 @@
 '\" te
 .\"  Copyright (c) 1980 Regents of the University of California.  All rights reserved.  The Berkeley software License Agreement  specifies the terms and conditions for redistribution. Copyright (c) 2003, Sun Microsystems, Inc. All Rights Reserved.
-.TH UFSDUMP 4 "Apr 9, 2003"
+.TH UFSDUMP 4 "June 19, 2021"
 .SH NAME
 ufsdump, dumpdates \- incremental dump format
 .SH SYNOPSIS
-.LP
-.nf
-\fB#include <sys/types.h>\fR
-.fi
-
-.LP
-.nf
-\fB#include <sys/inode.h>\fR
-.fi
-
-.LP
 .nf
 \fB#include <protocols/dumprestore.h>\fR
 .fi
@@ -25,8 +14,6 @@ ufsdump, dumpdates \- incremental dump format
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 Tapes used by \fBufsdump\fR(1M) and \fBufsrestore\fR(1M) contain:
 .RS +4
 .TP
@@ -735,8 +722,6 @@ The date of the incremental dump in the format generated by \fBctime\fR(3C).
 entry to \fB/etc/dumpdates\fR; \fBDUMPINFMT\fR is the format to use when using
 \fBscanf\fR(3C) to read an entry from \fB/etc/dumpdates\fR.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
 
@@ -751,7 +736,5 @@ Stability Level	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBufsdump\fR(1M), \fBufsrestore\fR(1M), \fBctime\fR(3C), \fBprintf\fR(3C),
 \fBscanf\fR(3C), \fBtypes.h\fR(3HEAD), \fBattributes\fR(5),
diff --git a/usr/src/man/man7d/hid.7d b/usr/src/man/man7d/hid.7d
index e6538e34a0..6601f7997b 100644
--- a/usr/src/man/man7d/hid.7d
+++ b/usr/src/man/man7d/hid.7d
@@ -3,21 +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 HID 7D "May 13, 2017"
+.TH HID 7D "June 19, 2021"
 .SH NAME
 hid \- Human interface device (HID) class driver
 .SH SYNOPSIS
-.LP
 .nf
 \fBkeyboard@unit-address\fR
 \fBmouse@unit-address\fR
 \fBinput@unit-address:consumer_control\fR
-\fB#include <sys/hid.h>\fR
+\fB#include <sys/usb/clients/hid/hid.h>\fR
 \fBint ioctl(int fildes, int command, ... /*arg*/);\fR
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBhid\fR driver is a USBA (Solaris USB Architecture) compliant client
 driver that supports the \fIHuman Interface Device Class (HID) 1.0\fR
 specification. The Human Interface Device (HID) class encompasses devices
@@ -79,16 +77,6 @@ gets the input.
 .SH FILES
 .ne 2
 .na
-\fB\fB/kernel/drv/hid\fR\fR
-.ad
-.sp .6
-.RS 4n
-32-bit x86 ELF kernel hid module
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/kernel/drv/amd64/hid\fR\fR
 .ad
 .sp .6
@@ -109,16 +97,6 @@ gets the input.
 .sp
 .ne 2
 .na
-\fB\fB/kernel/misc/hidparser\fR\fR
-.ad
-.sp .6
-.RS 4n
-32-bit x86 ELF kernel hidparser module
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/kernel/misc/amd64/hidparser\fR\fR
 .ad
 .sp .6
@@ -137,7 +115,6 @@ gets the input.
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -152,7 +129,6 @@ Architecture	SPARC, x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
-.LP
 \fBcfgadm_usb\fR(1M), \fBattributes\fR(5), \fBusba\fR(7D), \fBvirtualkm\fR(7D)
 .sp
 .LP
@@ -244,7 +220,6 @@ The device cannot be supported by this version of the HID driver.
 .RE
 
 .SH NOTES
-.LP
 The hid driver currently supports only keyboard, mouse and audio HID control
 devices.
 .sp
diff --git a/usr/src/man/man7d/sdp.7d b/usr/src/man/man7d/sdp.7d
index ee91ffc27c..2f7411761c 100644
--- a/usr/src/man/man7d/sdp.7d
+++ b/usr/src/man/man7d/sdp.7d
@@ -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 SDP 7D "Nov 13, 2006"
+.TH SDP 7D "June 19, 2021"
 .SH NAME
 sdp \- Sockets Direct Protocol driver
 .SH SYNOPSIS
-.LP
 .nf
-#include <socket.h>
+#include <sys/socket.h>
 .fi
 
 .LP
@@ -28,8 +27,6 @@ sdp \- Sockets Direct Protocol driver
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The Sockets Direct Protocol (\fBSDP\fR) is a transport protocol layered over
 the \fIInfiniband Transport Framework\fR (\fBIBTF\fR). \fBSDP\fR is a standard
 implementation based on Annex 4 of the \fIInfiniband Architecture Specification
@@ -59,56 +56,51 @@ have their local IP or IPv6 address and \fBSDP\fR port number bound with the
 \fBSDP\fR sockets are active. A passive socket is created by calling the
 \fBlisten\fR(3SOCKET) system call after binding the socket with bind(). This
 process establishes a queueing parameter for the passive socket. Connections to
-the passive  socket can be received with the \fBaccept\fR(3SOCKET) system call.
+the passive socket can be received with the \fBaccept\fR(3SOCKET) system call.
 Active sockets use the \fBconnect\fR(3SOCKET) call after binding to initiate
 connections.
 .sp
 .LP
 In most cases, \fBSDP\fR sends data when it is presented. When outstanding
 data is not yet acknowledged, \fBSDP\fR gathers small amounts of output to be
-sent in a single  packet once an acknowledgement is received. For a small
+sent in a single packet once an acknowledgement is received. For a small
 number of clients this packetization may cause significant delays. To
-circumvent this problem,  \fBSDP\fR provided by the driver supplies
+circumvent this problem, \fBSDP\fR provided by the driver supplies
 SDP_NODELAY, a socket-level boolean option. Note that this behavior is similar
 to the TCP_NODELAY option.
 .sp
 .LP
 \fBSDP\fR provides an urgent data mechanism that can be invoked using the
-out-of-band provisions of  \fBsend\fR(3SOCKET). The out-of-band delivery
+out-of-band provisions of \fBsend\fR(3SOCKET). The out-of-band delivery
 behavior is identical to TCP. The caller may mark one byte as "urgent" with the
-MSG_OOB  flag to \fBsend\fR(3SOCKET). This sets an "urgent pointer" pointing to
+MSG_OOB flag to \fBsend\fR(3SOCKET). This sets an "urgent pointer" pointing to
 the byte in the \fBSDP\fR stream. The receiver of the stream is notified of the
-urgent data by a \fBSIGURG\fR signal. The SIOCATMARK  \fBioctl\fR(2) request
+urgent data by a \fBSIGURG\fR signal. The SIOCATMARK \fBioctl\fR(2) request
 returns a value indicating whether the stream is at the urgent mark. Because
-the system never returns data across the urgent  mark in a single \fBread\fR(2)
+the system never returns data across the urgent mark in a single \fBread\fR(2)
 call, it is possible to advance to the urgent data in a simple loop which reads
-data, testing  the  socket with the \fBSIOCATMARK\fR  ioctl() request until it
+data, testing the socket with the \fBSIOCATMARK\fR ioctl() request until it
 reaches the mark.
 .SH ADDRESS FORMATS
-.sp
-.LP
-\fBSDP\fR uses  IP/IPv6  addresses to refer to local and remote devices and
+\fBSDP\fR uses IP/IPv6 addresses to refer to local and remote devices and
 opens a reliable connected IB connection between two end points. The \fBsdp\fR
 driver supports a point-to-point connection, however broadcasting and
 multicasting are not supported.
 .SH SOCKET OPTIONS
-.sp
-.LP
 \fBSDP\fR supports setsockopt and getsockopt to set and read socket options.
 Very few socket options affect \fBSDP\fR protocol operations. Other common
-socket options are  processed but do not affect  SDP  protocol  operation. All
+socket options are processed but do not affect SDP protocol operation. All
 socket options are checked for validity. A getsockopt returns the values set or
 toggled by setsockopt. Socket options that affect protocol operations are
 SO_LINGER, SO_DEBUG, SO_REUSEADDR and SO_OOBINLINE.
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBEISCONN\fR\fR
 .ad
 .RS 28n
 A connect() operation was attempted on a socket on which a connect() operation
-had already  been performed.
+had already been performed.
 .RE
 
 .sp
@@ -137,7 +129,7 @@ because no process is listening to the port.
 \fB\fBEADDRINUSE\fR\fR
 .ad
 .RS 28n
-A bind() operation was attempted  on a socket with a network address/port pair
+A bind() operation was attempted on a socket with a network address/port pair
 that has already been bound to another socket.
 .RE
 
@@ -157,7 +149,7 @@ no network interface exists.
 \fB\fBEACCES\fR\fR
 .ad
 .RS 28n
-A bind() operation was attempted with  a reserved port number and the effective
+A bind() operation was attempted with a reserved port number and the effective
 user ID of the process was not the privileged user.
 .RE
 
@@ -171,17 +163,6 @@ The system ran out of memory for internal data structures.
 .RE
 
 .SH FILES
-.sp
-.ne 2
-.na
-\fB\fB/kernel/drv/sdp\fR\fR
-.ad
-.sp .6
-.RS 4n
-32-bit \fBELF\fR kernel module (x86).
-.RE
-
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/amd64/sdp\fR\fR
@@ -204,16 +185,6 @@ The system ran out of memory for internal data structures.
 .sp
 .ne 2
 .na
-\fB\fB/kernel/drv/sdpib\fR\fR
-.ad
-.sp .6
-.RS 4n
-32-bit \fBELF\fR kernel module (x86).
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/kernel/drv/amd64/sdpib\fR\fR
 .ad
 .sp .6
@@ -232,8 +203,6 @@ The system ran out of memory for internal data structures.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attribute:
 .sp
 
@@ -248,8 +217,6 @@ Architecture	x86, SPARC
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBread\fR(2), \fBgetsockopt\fR(3XNET), \fBsocket.h\fR(3HEAD),
 \fBaccept\fR(3SOCKET), \fBbind\fR(3SOCKET), \fBconnect\fR(3SOCKET),
 \fBsend\fR(3SOCKET), \fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man7m/connld.7m b/usr/src/man/man7m/connld.7m
index ea47583601..0dd38f1c0a 100644
--- a/usr/src/man/man7m/connld.7m
+++ b/usr/src/man/man7m/connld.7m
@@ -4,55 +4,45 @@
 .\" 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 CONNLD 7M "May 3, 2004"
+.TH CONNLD 7M "June 19, 2021"
 .SH NAME
 connld \- line discipline for unique stream connections
 .SH SYNOPSIS
-.LP
-.nf
-\fB#include </sys/steam.h>\fR
-.fi
-
-.LP
 .nf
-\fBint ioctl(\fIfd\fR,I_PUSH,"connld");\fR
+\fBint ioctl(\fIfd\fR, I_PUSH, "connld");\fR
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 \fBconnld\fR is a STREAMS-based module that provides unique connections between
-server and client processes. It can only be pushed (see  \fBstreamio\fR(7I))
+server and client processes. It can only be pushed (see \fBstreamio\fR(7I))
 onto one end of a STREAMS-based pipe that may subsequently be attached to a
-name in the file system name space with  \fBfattach\fR(3C). After the pipe end
-is attached, a new pipe is created internally when an  originating process
-attempts to  \fBopen\fR(2) or  \fBcreat\fR(2) the file system name. A file
+name in the file system name space with \fBfattach\fR(3C). After the pipe end
+is attached, a new pipe is created internally when an originating process
+attempts to \fBopen\fR(2) or \fBcreat\fR(2) the file system name. A file
 descriptor for one end of the new pipe is packaged into a message identical to
-that for the ioctl  \fBI_SENDFD\fR (see  \fBstreamio\fR(7I)) and is transmitted
-along the stream to the server process on the  other end. The originating
+that for the ioctl \fBI_SENDFD\fR (see \fBstreamio\fR(7I)) and is transmitted
+along the stream to the server process on the other end. The originating
 process is blocked until the server responds.
 .sp
 .LP
-The server responds to the  \fBI_SENDFD\fR request by accepting the file
-descriptor through the  \fBI_RECVFD\fR ioctl message. When this happens, the
+The server responds to the \fBI_SENDFD\fR request by accepting the file
+descriptor through the \fBI_RECVFD\fR ioctl message. When this happens, the
 file descriptor associated with the other end of the new pipe is transmitted to
-the originating process as the file descriptor returned  from \fBopen\fR(2) or
+the originating process as the file descriptor returned from \fBopen\fR(2) or
 \fBcreat\fR(2).
 .sp
 .LP
-If the server does not respond to the  \fBI_SENDFD\fR request, the stream that
+If the server does not respond to the \fBI_SENDFD\fR request, the stream that
 the \fBconnld\fR module is pushed on becomes uni-directional because the server
-will not be able to retrieve any data off the stream until the  \fBI_RECVFD\fR
+will not be able to retrieve any data off the stream until the \fBI_RECVFD\fR
 request is issued. If the server process exits before issuing the
 \fBI_RECVFD\fR request, the \fBopen\fR(2) or the \fBcreat\fR(2) invocation will
 fail and return -1 to the originating process.
 .sp
 .LP
 When the \fBconnld\fR module is pushed onto a pipe, it ignores messages going
-back and forth  through the pipe.
+back and forth through the pipe.
 .SH ERRORS
-.sp
-.LP
 On success, an open of \fBconnld\fR returns 0. On failure, \fBerrno\fR is set
 to the following values:
 .sp
@@ -100,7 +90,7 @@ An internal pipe could not be created.
 \fB\fBENXIO\fR \fR
 .ad
 .RS 11n
-An  \fBM_HANGUP\fR message is at the stream head of the pipe onto which
+An \fBM_HANGUP\fR message is at the stream head of the pipe onto which
 \fBconnld\fR is being pushed.
 .RE
 
@@ -123,8 +113,6 @@ A file table entry could not be allocated.
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBcreat\fR(2), \fBopen\fR(2), \fBfattach\fR(3C), \fBstreamio\fR(7I)
 .sp
 .LP
diff --git a/usr/src/man/man9f/ddi_fm_acc_err_clear.9f b/usr/src/man/man9f/ddi_fm_acc_err_clear.9f
index e475f36ea4..55e8bb5c1a 100644
--- a/usr/src/man/man9f/ddi_fm_acc_err_clear.9f
+++ b/usr/src/man/man9f/ddi_fm_acc_err_clear.9f
@@ -3,13 +3,13 @@
 .\" 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_FM_ACC_ERR_CLEAR 9F "May 10, 2007"
+.TH DDI_FM_ACC_ERR_CLEAR 9F "June 19, 2021"
 .SH NAME
 ddi_fm_acc_err_clear, ddi_fm_dma_err_clear \- clear the error status for an
 access or DMA handle
 .SH SYNOPSIS
 .nf
-#include <sys/ndifma.h>
+#include <sys/ddifm.h>
 
 \fBvoid\fR \fBddi_fm_acc_err_clear\fR(\fBddi_acc_handle_t\fR \fIacc_handle\fR,
      \fBint\fR \fIversion\fR);