8212 manpages contain obsolete references

6019 sleep can't be infinite
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Reviewed by: Alexander Pyhalov <alp@rsu.ru>
Approved by: Robert Mustacchi <rm@joyent.com>

108 files changed, 654 insertions, 2363 deletions

diff --git a/usr/src/man/man1/Intro.1 b/usr/src/man/man1/Intro.1
index 9512d0a4e2..72236e4926 100644
--- a/usr/src/man/man1/Intro.1
+++ b/usr/src/man/man1/Intro.1
@@ -4,11 +4,10 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH INTRO 1 "Nov 18, 2008"
+.TH INTRO 1 "May 13, 2017"
 .SH NAME
 Intro, intro \- introduction to commands and application programs
 .SH DESCRIPTION
-.sp
 .LP
 This section describes, in alphabetical order, commands available with this
 operating system.
@@ -36,15 +35,6 @@ Commands for communicating with other systems.
 .sp
 .ne 2
 .na
-\fB1F\fR
-.ad
-.RS 6n
-Commands associated with \fIForm and Menu Language Interpreter\fR (FMLI).
-.RE
-
-.sp
-.ne 2
-.na
 \fB1S\fR
 .ad
 .RS 6n
@@ -52,7 +42,6 @@ Commands specific to SunOS.
 .RE
 
 .SS "OTHER SECTIONS"
-.sp
 .LP
 See the following sections of the SunOS Reference Manual for more information.
 .RS +4
@@ -79,7 +68,6 @@ information pages.
 For tutorial information about these commands and procedures, see \fISolaris
 Advanced User\&'s Guide\fR.
 .SS "Manual Page Command Syntax"
-.sp
 .LP
 Unless otherwise noted, commands described in the SYNOPSIS section of a manual
 page accept options and other arguments according to the following syntax and
@@ -208,7 +196,6 @@ are syntactically recognized as numeric values.
 Ranges greater than those listed here are allowed.
 .RE
 .SS "Command Syntax Standard: Guidelines"
-.sp
 .LP
 These command syntax guidelines are not followed by all current commands, but
 new commands are likely to obey them. \fBgetopts\fR(1) should be used by all
@@ -414,7 +401,7 @@ long-option. The form \fB--name argument\fR is also accepted.
 All utilities should support two standard long-options: \fB--version\fR (with
 the short-option synonym \fB-V\fR ) and \fB--help\fR (with the short-option
 synonym \fB-?\fR ). The short option synonyms for \fB--\fRversion can vary if
-the preferred synonym is already in use (but a  synonym shall be provided).
+the preferred synonym is already in use (but a synonym shall be provided).
 Both of these options stop further argument processing when encountered and
 after displaying the appropriate output, the utility successfully exits.
 .RE
@@ -473,7 +460,7 @@ arbitrary character.
 If a long-option name consists of a single character, it must use the same
 character as the short-option name. Single character long-options should be
 avoided. They are only allowed for the exceptionally rare case that a single
-character is the most  descriptive name.
+character is the most descriptive name.
 .RE
 
 .sp
@@ -498,12 +485,10 @@ Several of these guidelines are only of interest to the authors of utilities.
 They are provided here for the use of anyone wanting to author utilities
 following this syntax.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a discussion of the attributes listed in this
 section.
 .SH ACKNOWLEDGMENTS
-.sp
 .LP
 Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission to
 reproduce portions of its copyrighted documentation. Original documentation
@@ -532,23 +517,20 @@ http://www.opengroup.org/unix/online.html\&.
 .LP
 This notice shall appear on any product containing this material.
 .SH SEE ALSO
-.sp
 .LP
 \fBgetopts\fR(1), \fBwait\fR(1), \fBexit\fR(2), \fBgetopt\fR(3C),
-\fBwait\fR(3UCB), \fBattributes\fR(5)
+\fBattributes\fR(5)
 .SH DIAGNOSTICS
-.sp
 .LP
 Upon termination, each command returns two bytes of status, one supplied by the
 system and giving the cause for termination, and (in the case of "normal"
-termination) one supplied by the program [see \fBwait\fR(3UCB) and
+termination) one supplied by the program [see
 \fBexit\fR(2)]. The former byte is \fB0\fR for normal termination. The latter
 byte is customarily \fB0\fR for successful execution and non-zero to indicate
 troubles such as erroneous parameters, or bad or inaccessible data. It is
 called variously "exit code", "exit status", or "return code", and is described
 only where special conventions are involved.
 .SH WARNINGS
-.sp
 .LP
 Some commands produce unexpected results when processing files containing null
 characters. These commands often treat text input lines as strings and
diff --git a/usr/src/man/man1/audioplay.1 b/usr/src/man/man1/audioplay.1
index 4e5f391f5a..324e26940b 100644
--- a/usr/src/man/man1/audioplay.1
+++ b/usr/src/man/man1/audioplay.1
@@ -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 AUDIOPLAY 1 "May 1, 2009"
+.TH AUDIOPLAY 1 "May 13, 2017"
 .SH NAME
 audioplay \- play audio files
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ audioplay \- play audio files
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBaudioplay\fR utility copies the named audio files (or the standard input
 if no filenames are present) to the audio device. If no input file is specified
@@ -32,7 +31,6 @@ ignored. This allows, for instance, data sampled at 8012 Hz to be played on an
 audio device that only supports 8000 Hz. If the \fB-V\fR option is present,
 such deviations are flagged with warning messages.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -93,7 +91,6 @@ the audio device or when sample rate deviations are detected.
 .RE
 
 .SH OPERANDS
-.sp
 .ne 2
 .na
 \fB\fIfile\fR\fR
@@ -108,12 +105,10 @@ variable is consulted (see below).
 .RE
 
 .SH USAGE
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBaudioplay\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH ENVIRONMENT VARIABLES
-.sp
 .ne 2
 .na
 \fB\fBAUDIODEV\fR\fR
@@ -136,7 +131,6 @@ set, only the current directory is searched.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -154,12 +148,10 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBaudioconvert\fR(1), \fBaudiorecord\fR(1), \fBmixerctl\fR(1),
+\fBaudioconvert\fR(1), \fBaudiorecord\fR(1),
 \fBattributes\fR(5), \fBlargefile\fR(5), \fBaudio\fR(7I)
 .SH BUGS
-.sp
 .LP
 \fBaudioplay\fR currently supports a limited set of audio format conversions.
 If the audio file is not in a format supported by the audio device, it must
diff --git a/usr/src/man/man1/audiorecord.1 b/usr/src/man/man1/audiorecord.1
index 185f565c9a..8f4354a524 100644
--- a/usr/src/man/man1/audiorecord.1
+++ b/usr/src/man/man1/audiorecord.1
@@ -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 AUDIORECORD 1 "April 9, 2016"
+.TH AUDIORECORD 1 "May 13, 2017"
 .SH NAME
 audiorecord \- record an audio file
 .SH SYNOPSIS
@@ -214,5 +214,5 @@ Interface Stability	Committed
 
 .SH SEE ALSO
 .LP
-\fBaudioconvert\fR(1), \fBaudioplay\fR(1), \fBmixerctl\fR(1),
+\fBaudioconvert\fR(1), \fBaudioplay\fR(1),
 \fBattributes\fR(5), \fBlargefile\fR(5), \fBaudio\fR(7I)
diff --git a/usr/src/man/man1/audiotest.1 b/usr/src/man/man1/audiotest.1
index 67f6033963..8c122094df 100644
--- a/usr/src/man/man1/audiotest.1
+++ b/usr/src/man/man1/audiotest.1
@@ -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 AUDIOTEST 1 "May 5, 2009"
+.TH AUDIOTEST 1 "May 13, 2017"
 .SH NAME
 audiotest \- test audio device
 .SH SYNOPSIS
@@ -13,14 +13,12 @@ audiotest \- test audio device
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBaudiotest\fR utility runs a test for the named audio device (or all
 audio devices found on the system if none is given). The test includes playing
 an audio sample over each channel and measuring the rate of playback for clock
 drift.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -75,7 +73,6 @@ The low frequency effects channel is not tested.
 .RE
 
 .SH OPERANDS
-.sp
 .ne 2
 .na
 \fB\fIdev\fR\fR
@@ -85,7 +82,6 @@ The path the device to test, for example, \fB/dev/dsp0\fR.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -103,12 +99,10 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBaudioconvert\fR(1), \fBaudiorecord\fR(1), \fBmixerctl\fR(1),
+\fBaudioconvert\fR(1), \fBaudiorecord\fR(1),
 \fBattributes\fR(5), \fBaudio\fR(7I)
 .SH BUGS
-.sp
 .LP
 \fBaudiotest\fR has no way to detect the number of actual audio channels
 supported by the physical device.
diff --git a/usr/src/man/man1/cdrw.1 b/usr/src/man/man1/cdrw.1
index 81f5a8fd80..74133c4698 100644
--- a/usr/src/man/man1/cdrw.1
+++ b/usr/src/man/man1/cdrw.1
@@ -4,7 +4,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 CDRW 1 "Dec 1, 2012"
+.TH CDRW 1 "May 13, 2017"
 .SH NAME
 cdrw \- CD read and write
 .SH SYNOPSIS
@@ -56,7 +56,6 @@ cdrw \- CD read and write
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBcdrw\fR command provides the ability to create data and audio CDs. This
 command also provides the ability to extract audio tracks from an audio CD and
@@ -79,7 +78,6 @@ the \fB-l\fR option provides a list of CD or DVD writers.
 For instructions on adding a USB-mass-storage-class-compliant CD-RW or DVD-RW
 device to your system, see \fBscsa2usb\fR(7D).
 .SS "Creating Data CDs"
-.sp
 .LP
 When creating data CDs, \fBcdrw\fR uses the Track-At-Once mode of writing. Use
 the \fB-i\fR option to specify a file that contains the data to write on CD
@@ -91,7 +89,6 @@ In either case, the data is typically prepared by using the \fBmkisofs\fR
 command to convert the file and file information into the ISO 9660 format
 used on CDs. See the examples that include use of this command.
 .SS "Creating Data DVDs"
-.sp
 .LP
 \fBcdrw\fR can create single-session data DVDs on DVD+RW or DVD-RW devices
 using images generated from \fBmkisofs\fR. These disks can be mounted as HSFS
@@ -101,7 +98,6 @@ further sessions from being added. The image should be prepared in advance when
 writing an image to the DVD media since DAO mode requires that the size of the
 image be known in advance.
 .SS "Creating Audio CDs"
-.sp
 .LP
 Use the \fB-a\fR option to create an audio CD. Single or multiple audio files
 can be specified with this option. All of the audio files should be in a
@@ -152,7 +148,6 @@ to be the audio file type for all the files specified. Also, using the \fB-c\fR
 option closes the session after writing the audio tracks. Therefore, the tracks
 to be written should be specified in a single command line.
 .SS "Extracting Audio"
-.sp
 .LP
 \fBcdrw\fR can also be used for extracting audio data from an audio CD with the
 \fB-x\fR option. The CD should have tracks in Red Book CDDA form. By default,
@@ -160,7 +155,6 @@ the output format is based on the file extension. A user can specify a
 \fBsun\fR, \fBwav\fR, \fBcda\fR, or \fBaur\fR output format with the \fB-T\fR
 option.
 .SS "Copying CDs"
-.sp
 .LP
 \fBcdrw\fR can be used to copy single session data CD-ROMs and Red Book audio
 CDs. When copying a CD, \fBcdrw\fR looks for a specified source device. If no
@@ -171,7 +165,6 @@ current CD writer. If no media is found, insert a blank writable CD media in
 the current CD writer. If the default temporary directory does not have enough
 space, an alternate directory can be specified by using the \fB-m\fR option.
 .SS "Erasing CD-RW or DVD-RW Media"
-.sp
 .LP
 Users have to erase the CD-RW media before it can be rewritten. With the
 \fB-b\fR option, the following flavors of erasing are currently supported:
@@ -227,18 +220,14 @@ DVD+RW media does not support erasing. To re-use DVD+RW media, simply write a
 new image onto the media. \fBcdrw\fR formats and overwrites the existing media
 automatically.
 .SS "Checking device-list or media-status"
-.sp
 .LP
 You can list a system's CD or DVD writers by using the \fB-l\fR option. Also,
 for a particular media, you can get the blanking status and table of contents
 by using the \fB-M\fR option. The \fB-M\fR option also prints information about
 the last session's start address and the next writable address. This
 information, along with the \fB-O\fR option, can be used to create multisession
-CDs. Refer to the \fBmkisofs\fR(8) man page,
-(\fB/usr/share/man/man8/mkisofs.8\fR), in the SUNWfsman package for more
-information.
+CDs. Refer to the \fBmkisofs\fR(8) man page for more information.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -601,19 +590,14 @@ example% \fBmkisofs -o /tmp/image2 -r -C 0,173464 -M \e
 .sp
 
 .SH SEE ALSO
-.sp
 .LP
 \fBaudioconvert\fR(1), \fBpriocntl\fR(1), \fBpolicy.conf\fR(4),
-\fBattributes\fR(5), \fBrbac\fR(5), \fBscsa2usb\fR(7D), \fBsd\fR(7D)
-.sp
-.LP
-\fBmkisofs\fR(8), (\fB/usr/share/man/man8/mkisofs.8\fR), in the SUNWfsman
-package
+\fBattributes\fR(5), \fBrbac\fR(5), \fBscsa2usb\fR(7D), \fBsd\fR(7D),
+\fBmkisofs\fR(8)
 .sp
 .LP
 \fISystem Administration Guide: Devices and File Systems\fR
 .SH NOTES
-.sp
 .LP
 The CD writing process requires data to be supplied at a constant rate to the
 drive. Keep I/O activity to a minimum and shut down any related I/O
diff --git a/usr/src/man/man1/download.1 b/usr/src/man/man1/download.1
index f7ae7da5a7..e11751d54c 100644
--- a/usr/src/man/man1/download.1
+++ b/usr/src/man/man1/download.1
@@ -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 DOWNLOAD 1 "Sep 9, 1996"
+.TH DOWNLOAD 1 "May 13, 2017"
 .SH NAME
 download \- host resident PostScript font downloader
 .SH SYNOPSIS
@@ -19,7 +19,6 @@ download \- host resident PostScript font downloader
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBdownload\fR prepends host resident fonts to \fIfiles\fR and writes the
 results on the standard output. If no \fIfiles\fR are specified, or if
@@ -41,12 +40,11 @@ font directory. Comments are introduced by % (as in PostScript) and extend to
 the end of the line.
 .sp
 .LP
-The only candidates for downloading are  fonts listed in the map table  that
+The only candidates for downloading are fonts listed in the map table that
 point \fBdownload\fR to readable files. A font is downloaded once, at most.
 Requests for unlisted fonts or inaccessible files are ignored. All requests are
 ignored if the map table can not be read.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-f\fR\fR
@@ -74,7 +72,7 @@ Check the list of printer-resident fonts in
 .ad
 .RS 16n
 Use \fIname\fR as the font map table. A \fIname\fR that begins with \fB/\fR is
-the full pathname of the map table and is used as is. Otherwise  \fIname\fR is
+the full pathname of the map table and is used as is. Otherwise \fIname\fR is
 appended to the pathname of the host font directory.
 .RE
 
@@ -93,7 +91,7 @@ Use \fIdir\fR as the host font directory. The default is
 \fBExample 1 \fRExamples of the \fBdownload\fR command.
 .sp
 .LP
-The following  map table could be used to control the downloading of the
+The following map table could be used to control the downloading of the
 Bookman font family:
 
 .sp
@@ -114,8 +112,8 @@ Bookman font family:
 
 .sp
 .LP
-Using the file \fBmyprinter/map\fR (in the default host font directory)  as the
-map table, you could download fonts  by issuing the following command:
+Using the file \fBmyprinter/map\fR (in the default host font directory) as the
+map table, you could download fonts by issuing the following command:
 
 .sp
 .in +2
@@ -126,7 +124,6 @@ map table, you could download fonts  by issuing the following command:
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -148,12 +145,9 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBdpost\fR(1), \fBpostdaisy\fR(1), \fBpostdmd\fR(1), \fBpostio\fR(1),
-\fBpostmd\fR(1), \fBpostprint\fR(1), \fBposttek\fR(1), \fBattributes\fR(5)
+\fBdpost\fR(1), \fBpostio\fR(1), \fBpostprint\fR(1), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fBdownload\fR program should be part of a more general program.
 .sp
diff --git a/usr/src/man/man1/dpost.1 b/usr/src/man/man1/dpost.1
index 104eb59e43..c977e416ad 100644
--- a/usr/src/man/man1/dpost.1
+++ b/usr/src/man/man1/dpost.1
@@ -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 DPOST 1 "Sep 9, 1996"
+.TH DPOST 1 "May 13, 2017"
 .SH NAME
 dpost \- troff postprocessor for PostScript printers
 .SH SYNOPSIS
@@ -20,7 +20,6 @@ dpost \- troff postprocessor for PostScript printers
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBdpost\fR translates \fIfiles\fR created by \fBtroff\fR(1) into PostScript
 and writes the results on the standard output. If no \fIfiles\fR are specified,
@@ -43,7 +42,6 @@ command sets the resolution used to translate the input \fIfiles\fR, the
 resolution used in the binary font files, and the PostScript prologue is
 responsible for setting up an appropriate user coordinate system.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-c\fR\fI num\fR\fR
@@ -73,7 +71,7 @@ previous versions of \fBdpost\fR.
 .RS 11n
 Magnify each logical page by the factor \fInum\fR. Pages are scaled uniformly
 about the origin, which is located near the upper left corner of each page. The
-default magnification is  \fB1.0\fR.
+default magnification is \fB1.0\fR.
 .RE
 
 .sp
@@ -83,7 +81,7 @@ default magnification is  \fB1.0\fR.
 .ad
 .RS 11n
 Print \fInum\fR logical pages on each piece of paper, where \fInum\fR can be
-any positive integer. By default, \fInum\fR is set to  \fB1\fR.
+any positive integer. By default, \fInum\fR is set to \fB1\fR.
 .RE
 
 .sp
@@ -122,7 +120,7 @@ character of \fImode\fR is significant. The default \fImode\fR is portrait.
 .RS 11n
 Set the line width used to implement \fBtroff\fR graphics commands to \fInum\fR
 points, where a point is approximately 1/72 of an inch. By default, \fInum\fR
-is set to  \fB0.3\fR points.
+is set to \fB0.3\fR points.
 .RE
 
 .sp
@@ -134,7 +132,7 @@ is set to  \fB0.3\fR points.
 Translate the origin \fInum\fR inches along the positive x axis. The default
 coordinate system has the origin fixed near the upper left corner of the page,
 with positive x to the right and positive y down the page. Positive \fInum\fR
-moves everything right. The default offset is  \fB0\fR inches.
+moves everything right. The default offset is \fB0\fR inches.
 .RE
 
 .sp
@@ -144,7 +142,7 @@ moves everything right. The default offset is  \fB0\fR inches.
 .ad
 .RS 11n
 Translate the origin \fInum\fR inches along the positive y axis. Positive
-\fInum\fR moves text up the page. The default offset is  \fB0\fR.
+\fInum\fR moves text up the page. The default offset is \fB0\fR.
 .RE
 
 .sp
@@ -236,7 +234,6 @@ example% \fBpic \fR\fBfile\fR\fB | tbl | eqn | troff \fR\fB-mm\fR\fB \fR\fB-Tpos
 should give the best results.
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -258,7 +255,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/font/devpost/*.out\fR\fR
@@ -318,38 +314,15 @@ An error occurred.
 
 .RE
 
-.sp
-.ne 2
-.na
-\fB\fB/usr/lib/macros/pictures\fR\fR
-.ad
-.sp .6
-.RS 4n
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/lib/macros/color\fR\fR
-.ad
-.sp .6
-.RS 4n
-
-.RE
-
 .SH SEE ALSO
-.sp
 .LP
-\fBdownload\fR(1), \fBpostdaisy\fR(1), \fBpostdmd\fR(1), \fBpostio\fR(1),
-\fBpostmd\fR(1), \fBpostprint\fR(1), \fBpostreverse\fR(1), \fBposttek\fR(1),
+\fBdownload\fR(1), \fBpostio\fR(1), \fBpostprint\fR(1), \fBpostreverse\fR(1),
 \fBtroff\fR(1), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 Output files often do not conform to Adobe's file structuring conventions.
-Piping the output of \fBdpost\fR through \fBpostreverse\fR(1) should produce a
-minimally conforming PostScript file.
+Piping the output of \fBdpost\fR(1) through \fBpostreverse\fR(1) should produce
+a minimally conforming PostScript file.
 .sp
 .LP
 Although \fBdpost\fR can handle files formatted for any device, emulation is
@@ -360,7 +333,7 @@ white space, and unrecognized fonts will usually default to one of the Times
 fonts (that is, \fBR\fR, \fBI\fR, \fBB\fR, or \fBBI\fR).
 .sp
 .LP
-An \fBx res\fR command  must precede the first \fBx init\fR command, and all
+An \fBx res\fR command must precede the first \fBx init\fR command, and all
 the input \fIfiles\fR should have been prepared for the same output device.
 .sp
 .LP
diff --git a/usr/src/man/man1/history.1 b/usr/src/man/man1/history.1
index 1edabba9a0..ccecac365e 100644
--- a/usr/src/man/man1/history.1
+++ b/usr/src/man/man1/history.1
@@ -10,7 +10,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 HISTORY 1 "Nov 2, 2007"
+.TH HISTORY 1 "May 13, 2017"
 .SH NAME
 history, fc, hist \- process command history list
 .SH SYNOPSIS
@@ -59,7 +59,6 @@ history, fc, hist \- process command history list
 
 .SH DESCRIPTION
 .SS "/usr/bin/fc"
-.sp
 .LP
 The \fBfc\fR utility lists or edits and reexecutes, commands previously entered
 to an interactive \fBsh\fR.
@@ -99,7 +98,6 @@ the \fBfc\fR command itself as well as the command that results, for example:
 reinvokes the previous command, suppressing standard error for both \fBfc\fR
 and the previous command.
 .SS "csh"
-.sp
 .LP
 Display the history list. If \fIn\fR is given, display only the \fIn\fR most
 recent events.
@@ -124,7 +122,6 @@ command, \fBsource\fR(1).
 .RE
 
 .SS "History Substitution:"
-.sp
 .LP
 History substitution allows you to use words from previous command lines in the
 command line you are typing. This simplifies spelling corrections and the
@@ -155,7 +152,6 @@ Input lines containing history substitutions are echoed on the terminal after
 being expanded, but before any other substitutions take place or the command
 gets executed.
 .SS "Event Designators:"
-.sp
 .LP
 An event designator is a reference to a command line entry in the history list.
 .sp
@@ -273,7 +269,6 @@ say, re-executing command #6:
 .RE
 
 .SS "Word Designators:"
-.sp
 .LP
 A `\fB:\fR' (colon) separates the event specification from the word designator.
 2It can be omitted if the word designator begins with a \fB^\fR, \fB$\fR,
@@ -373,7 +368,6 @@ Like \fIx\fR\fB*\fR but omitting word \fB$\fR.
 .RE
 
 .SS "Modifiers:"
-.sp
 .LP
 After the optional word designator, you can add a sequence of one or more of
 the following modifiers, each preceded by a \fB:\fR.
@@ -499,7 +493,6 @@ Without an event specification, a history reference refers either to the
 previous command, or to a previous history reference on the command line (if
 any).
 .SS "ksh"
-.sp
 .LP
 Using \fBfc\fR, in the form of
 .sp
@@ -576,7 +569,6 @@ or equal to this number. The default is \fB128\fR.
 .RE
 
 .SS "Command Re-entry:"
-.sp
 .LP
 The text of the last \fBHISTSIZE\fR (default 128) commands entered from a
 terminal device is saved in a \fBhistory\fR file. The file
@@ -602,7 +594,6 @@ modify the command before execution. For example, if \fBr\fR is aliased to
 Using the \fBfc\fR built-in command within a compound command causes the whole
 command to disappear from the history file.
 .SS "ksh93"
-.sp
 .LP
 \fBhist\fR lists, edits, or re-executes commands previously entered into the
 current shell environment.
@@ -671,7 +662,6 @@ If no editor is specified, then the editor specified by the \fBHISTEDIT\fR
 variable is used if set, or the \fBFCEDIT\fR variable is used if set,
 otherwise, \fBed\fR is used.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -727,7 +717,6 @@ Re-executes the command without invoking an editor.
 .RE
 
 .SS "ksh93"
-.sp
 .LP
 \fBksh93\fR supports the following options:
 .sp
@@ -798,7 +787,6 @@ string \fIold\fR in the command to \fInew\fR before re-executing the command.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -918,7 +906,6 @@ reexecuted by the string \fInew\fR.
 .RE
 
 .SH OUTPUT
-.sp
 .LP
 When the \fB-l\fR option is used to list commands, the format of each command
 in the list is as follows:
@@ -985,7 +972,6 @@ after the first are displayed as:
 .in -2
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBfc\fR: \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and
@@ -1026,7 +1012,7 @@ definition commands are recorded in the history file, unless the \fBset\fR
 function definitions in some system startup file called before the \fBENV\fR
 file, the history file is initialized before the user gets a chance to
 influence its characteristics.) The variable \fBHISTFILE\fR is accessed
-initially when the shell is invoked. Any changes to \fBHISTFILE\fR does not
+initially when the shell is invoked. Any change to \fBHISTFILE\fR does not
 take effect until another shell is invoked.
 .RE
 
@@ -1044,7 +1030,6 @@ take effect until another shell is invoked.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -1070,8 +1055,7 @@ An error occurred.
 Otherwise, the exit status is that of the commands executed by \fBfc\fR or
 \fBhist\fR.
 .SH SEE ALSO
-.sp
 .LP
 \fBcsh\fR(1), \fBed\fR(1), \fBksh\fR(1), \fBksh93\fR(1), \fBset\fR(1),
-\fBset\fR(1F), \fBsh\fR(1), \fBsource\fR(1), \fBattributes\fR(5),
+\fBsh\fR(1), \fBsource\fR(1), \fBattributes\fR(5),
 \fBenviron\fR(5)
diff --git a/usr/src/man/man1/lastcomm.1 b/usr/src/man/man1/lastcomm.1
index 4915a97dc0..5c1eb3dc00 100644
--- a/usr/src/man/man1/lastcomm.1
+++ b/usr/src/man/man1/lastcomm.1
@@ -4,7 +4,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 LASTCOMM 1 "Jan 10, 2000"
+.TH LASTCOMM 1 "May 13, 2017"
 .SH NAME
 lastcomm \- display the last commands executed, in reverse order
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ lastcomm \- display the last commands executed, in reverse order
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBlastcomm\fR command gives information on previously executed commands.
 \fBlastcomm\fR with no arguments displays information about all the commands
@@ -97,7 +96,6 @@ The amount of \fBCPU\fR time used by the process (in seconds).
 The date and time the process exited.
 .RE
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -159,7 +157,6 @@ example% \fBlastcomm root\fR
 produces a listing of all the commands executed by user \fBroot\fR.
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/adm/pacct\fR\fR
@@ -178,7 +175,6 @@ extended accounting file
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlast\fR(1), \fBacctadm\fR(1M), \fBacct\fR(2), \fBacct.h\fR(3HEAD),
-\fBsigvec\fR(3UCB), \fBcore\fR(4), \fBattributes\fR(5)
+\fBcore\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1/ld.1 b/usr/src/man/man1/ld.1
index 7fc0277160..5d26bbb556 100644
--- a/usr/src/man/man1/ld.1
+++ b/usr/src/man/man1/ld.1
@@ -5,7 +5,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 LD 1 "Jun 6, 2016"
+.TH LD 1 "May 13, 2017"
 .SH NAME
 ld \- link-editor for object files
 .SH SYNOPSIS
@@ -113,7 +113,7 @@ drawbacks.
 .TP
 .ie t \(bu
 .el o
-The executable is immune to the benefits of system patches delivered as shared
+The executable is immune to the benefits of system updates delivered as shared
 objects. The executable therefore, must be rebuilt to take advantage of many
 system improvements.
 .RE
@@ -1486,7 +1486,7 @@ no new members are extracted.
 \fB-z\fR \fBrescan\fR is a position independent option. The link-editor defers
 the rescan operation until after it has processed the entire command line, and
 then initiates a final rescan operation over all archives seen on the command
-line. The \fB-z\fR \fBrescan\fR operation can interact          incorrectly
+line. The \fB-z\fR \fBrescan\fR operation can interact incorrectly
 with objects that contain initialization (.init) or finalization (.fini)
 sections, preventing the code in those sections from running. For this reason,
 \fB-z\fR \fBrescan\fR is deprecated, and use of \fB-z\fR \fBrescan-now\fR is
@@ -1511,9 +1511,9 @@ advised.
 Defines an archive rescan group. This is a positional construct, and is
 processed by the link-editor immediately upon encountering the closing
 delimiter option.  Archives found within the group delimiter options are
-reprocessed as a group in an attempt to locate  additional archive members that
-resolve symbol references. This archive rescanning  is repeated  until a  pass
-over the archives On the occurs in  which no  new  members are extracted.
+reprocessed as a group in an attempt to locate additional archive members that
+resolve symbol references. This archive rescanning is repeated until a pass
+over the archives occurs in which no new members are extracted.
 Archive rescan groups cannot be nested.
 .RE
 
diff --git a/usr/src/man/man1/ldaplist.1 b/usr/src/man/man1/ldaplist.1
index 97d016235f..d5b823d68a 100644
--- a/usr/src/man/man1/ldaplist.1
+++ b/usr/src/man/man1/ldaplist.1
@@ -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 LDAPLIST 1 "Mar 6, 2017"
+.TH LDAPLIST 1 "May 13, 2017"
 .SH NAME
 ldaplist \- search and list naming information from an LDAP directory using the
 configured profile
@@ -38,7 +38,7 @@ configuration obtained.
 By default (if the \fB-h\fR \fILDAP_server\fR\fB[:\fR\fIserverPort\fR\fB]\fR
 option is not specified), the utility searches for and lists the naming
 information from the LDAP directory service defined in the LDAP configuration
-files generated by\fBldapclient\fR(1M) during the client initialization phase.
+files generated by \fBldapclient\fR(1M) during the client initialization phase.
 To use the utility in the default mode, the Solaris LDAP client must be set up
 in advance.
 .sp
@@ -495,7 +495,7 @@ Interface Stability	Committed
 \fBldap\fR(1), \fBldapadd\fR(1), \fBldapdelete\fR(1), \fBldapmodify\fR(1),
 \fBldapmodrdn\fR(1), \fBldapsearch\fR(1), \fBidsconfig\fR(1M),
 \fBldap_cachemgr\fR(1M), \fBldapaddent\fR(1M), \fBldapclient\fR(1M),
-\fBsuninstall\fR(1M), \fBresolv.conf\fR(4), \fBattributes\fR(5)
+\fBresolv.conf\fR(4), \fBattributes\fR(5)
 .SH NOTES
 .LP
 \fIRFC 2307bis\fR is an IETF informational document in draft stage that defines
diff --git a/usr/src/man/man1/man.1 b/usr/src/man/man1/man.1
index c4a16b60bb..1df42e4b1a 100644
--- a/usr/src/man/man1/man.1
+++ b/usr/src/man/man1/man.1
@@ -8,7 +8,7 @@
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\" Copyright 2016 Nexenta Systems, Inc.
 .\"
-.Dd February 12, 2016
+.Dd May 13, 2017
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -175,7 +175,7 @@ are limited to those specified by
 .Ar section
 can be a numerical digit, perhaps followed by one or more letters
 to match the desired section of the manual, for example,
-.Li "3libucb".
+.Li "3head".
 Also,
 .Ar section
 can be a word, for example,
diff --git a/usr/src/man/man1/mdb.1 b/usr/src/man/man1/mdb.1
index f3a084d151..a27eabc543 100644
--- a/usr/src/man/man1/mdb.1
+++ b/usr/src/man/man1/mdb.1
@@ -4,7 +4,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 MDB 1 "Oct 05, 2012"
+.TH MDB 1 "May 13, 2017"
 .SH NAME
 mdb \- modular debugger
 .SH SYNOPSIS
@@ -17,7 +17,6 @@ mdb \- modular debugger
 
 .SH DESCRIPTION
 .SS "Introduction"
-.sp
 .LP
 The \fBmdb\fR utility is an extensible utility for low-level debugging and
 editing of the live operating system, operating system crash dumps, user
@@ -47,7 +46,6 @@ can use to implement their own debugging commands to perform program-specific
 analysis. Each \fBmdb\fR module can be used to examine the program in several
 different contexts, including live and post-mortem.
 .SS "Definitions"
-.sp
 .LP
 The \fItarget\fR is the program being inspected by the debugger. \fBmdb\fR
 currently provides support for the following types of targets: user processes,
@@ -93,7 +91,6 @@ execution of macro files written for \fBadb\fR(1), and the Solaris installation
 includes a set of macro files for debugging the Solaris kernel that can be used
 with either tool.
 .SS "Syntax"
-.sp
 .LP
 The debugger processes commands from standard input. If standard input is a
 terminal, \fBmdb\fR provides terminal editing capabilities. \fBmdb\fR can also
@@ -165,7 +162,6 @@ An \fIexpression\fR is a sequence of words that is evaluated to compute a
 64-bit unsigned integer value. The words are evaluated using the rules
 described under \fBArithmetic Expansion\fR below.
 .SS "Commands"
-.sp
 .LP
 A \fIcommand\fR is one of the following:
 .sp
@@ -273,12 +269,10 @@ concatenating the words after the \fB!\fR character.
 .RE
 
 .SS "Comments"
-.sp
 .LP
 A word beginning with \fB//\fR causes that word and all the subsequent
 characters up to a \fINEWLINE\fR to be ignored.
 .SS "Arithmetic Expansion"
-.sp
 .LP
 Arithmetic expansion is performed when an \fBmdb\fR command is preceded by an
 optional expression representing a start address, or a start address and a
@@ -598,7 +592,6 @@ Bitwise inclusive OR.
 .RE
 
 .SS "Quoting"
-.sp
 .LP
 Each metacharacter described above (see \fBSyntax\fR) terminates a word unless
 quoted. Characters can be quoted (forcing \fBmdb\fR to interpret each character
@@ -607,7 +600,6 @@ single (\fB\&' '\fR) or double (\fB" "\fR) quote marks. A single quote cannot
 appear within single quotes. Inside double quotes, \fBmdb\fR recognizes the C
 programming language character escape sequences.
 .SS "Shell Escapes"
-.sp
 .LP
 The \fB!\fR character can be used to create a pipeline between an \fBmdb\fR
 command and the user's shell. If the $\fBSHELL\fR environment variable is set,
@@ -621,7 +613,6 @@ to the shell. The output of shell commands can not be piped to \fBmdb\fR dcmds.
 Commands executed by a shell escape have their output sent directly to the
 terminal, not to \fBmdb\fR.
 .SS "Variables"
-.sp
 .LP
 A \fIvariable\fR is a variable name, a corresponding integer value, and a set
 of attributes. A variable name is a sequence of letters, digits, underscores,
@@ -727,7 +718,6 @@ of the representative thread's register set as named variables. The names of
 these variables depend on the target's platform and instruction set
 architecture.
 .SS "Symbol Name Resolution"
-.sp
 .LP
 As explained in the \fBSyntax\fR description above, a symbol identifier present
 in an expression context evaluates to the value of this symbol. The value
@@ -840,7 +830,6 @@ either refer to the decimal integer value \fB15\fR specified in hexadecimal
 symbol table. If a symbol with an ambiguous name is present, the integer value
 can be specified by using an explicit \fB0x\fR or \fB0X\fR prefix.
 .SS "dcmd and Walker Name Resolution"
-.sp
 .LP
 As described earlier, each \fBmdb\fR dmod provides a set of dcmds and walkers.
 dcmds and walkers are tracked in two distinct, global namespaces. \fBmdb\fR
@@ -889,7 +878,6 @@ definition of a dcmd or walker can be determined using the \fB::which\fR dcmd,
 described below. The global definition list can be displayed using the
 \fB::which\fR \fB-v\fR option.
 .SS "dcmd Pipelines"
-.sp
 .LP
 dcmds can be composed into a pipeline using the \fB|\fR operator. The purpose
 of a pipeline is to pass a list of values, typically virtual addresses, from
@@ -920,7 +908,6 @@ output printed to standard output. If any dcmd in the pipeline produces output
 to standard error, these messages are printed directly to standard error and
 are not processed as part of the pipeline.
 .SS "Signal Handling"
-.sp
 .LP
 The debugger ignores the \fBPIPE\fR and \fBQUIT\fR signals. The \fBINT\fR
 signal aborts the command that is currently executing. The debugger intercepts
@@ -939,14 +926,12 @@ resume option provides limited protection against buggy dcmds. Refer to
 WARNINGS, \fBUse of the Error Recovery Mechanism\fR, below for information
 about the risks associated with the resume option.
 .SS "Command Re-entry"
-.sp
 .LP
 The text of the last \fBHISTSIZE \fR (default 128) commands entered from a
 terminal device are saved in memory. The in-line editing facility, described
 next, provides key mappings for searching and fetching elements from the
 history list.
 .SS "In-line Editing"
-.sp
 .LP
 If standard input is a terminal device, \fBmdb\fR provides some simple
 emacs-style facilities for editing the command line. The \fBsearch\fR,
@@ -1194,7 +1179,6 @@ Move cursor forward one character (same as \fB^F\fR).
 .RE
 
 .SS "Output Pager"
-.sp
 .LP
 \fBmdb\fR provides a built-in output pager. The output pager is enabled if the
 debugger's standard output is a terminal device. Each time a command is
@@ -1258,7 +1242,6 @@ Quit (abort) the current dcmd only.
 .RE
 
 .SS "Formatting dcmds"
-.sp
 .LP
 The \fB/\fR, \fB\e\fR, \fB?\fR, and \fB=\fR metacharacters are used to denote
 the special output formatting dcmds. Each of these dcmds accepts an argument
@@ -1484,7 +1467,6 @@ address that does not have a corresponding segment. If a search reaches a
 segment boundary without finding a match, it aborts when the read past the end
 of the segment boundary fails.
 .SS "Execution Control"
-.sp
 .LP
 \fBmdb\fR provides facilities for controlling and tracing the execution of a
 live running program. Currently, only the user process target provides support
@@ -1532,7 +1514,6 @@ target that does not support execution control. For more information about the
 interaction of exec, attach, release, and job control with debugger execution
 control, refer to NOTES, below.
 .SS "Event Callbacks"
-.sp
 .LP
 The \fB::evset\fR dcmd and event tracing dcmds allow you to associate an event
 callback (using the \fB-c\fR option) with each event specifier. The event
@@ -1557,7 +1538,6 @@ the highest precedence determines what type of continue occurs. The order of
 precedence from highest to lowest is: step, step-over (next), step-out,
 continue.
 .SS "Thread Support"
-.sp
 .LP
 \fBmdb\fR provides facilities to examine the stacks and registers of each
 thread associated with the target. The persistent "\fBthread\fR" variable
@@ -1591,7 +1571,6 @@ corresponding to the current representative thread. The \fB::tls\fR built-in
 dcmd can be used to display the value of the symbol for threads other than the
 representative thread.
 .SS "Built-in dcmds"
-.sp
 .LP
 \fBmdb\fR provides a set of built-in dcmds that are always defined. Some of
 these dcmds are only applicable to certain targets: if a dcmd is not applicable
@@ -2148,7 +2127,7 @@ Displays paragraphs at 16-byte paragraphs per line. The default number of
 .sp .6
 .RS 4n
 Print the arguments separated by blanks and terminated by a \fINEWLINE\fR to
-standard output. Expressions enclosed in \fB$[ ]\fR is  evaluated to a value
+standard output. Expressions enclosed in \fB$[ ]\fR is evaluated to a value
 and printed in the default base.
 .RE
 
@@ -3699,7 +3678,6 @@ specifiers can also be deleted using \fB::delete\fR.
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -4220,14 +4198,13 @@ only when debugging device drivers and with caution.
 \fB\fB-y\fR\fR
 .ad
 .RS 15n
-Sends explicit terminal initialization sequences for tty mode. Some terminals,
-such as \fBcmdtool\fR(1), require explicit initialization sequences to switch
+Sends explicit terminal initialization sequences for tty mode. Some legacy
+terminal emulators require explicit initialization sequences to switch
 into a tty mode. Without this initialization sequence, terminal features such
-as standout mode can not be available to \fBmdb\fR.
+as standout mode will not be available to \fBmdb\fR.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -4270,14 +4247,12 @@ present in the current directory.
 .RE
 
 .SH USAGE
-.sp
 .LP
 \fBmdb\fR processes all input files (including scripts, object files, core
 files, and raw data files) in a large file aware fashion. See
 \fBlargefile\fR(5) for more information about the processing of large files,
 which are files greater than or equal to 2 Gbytes (2^31 bytes).
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -4308,7 +4283,6 @@ Invalid command line options were specified.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .ne 2
 .na
 \fB\fBHISTSIZE\fR\fR
@@ -4341,7 +4315,6 @@ not present, \fB/bin/sh\fR is used.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB$HOME/.mdbrc\fR\fR
@@ -4421,7 +4394,6 @@ information in a core file or crash dump, or from the current machine as if by
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -4437,7 +4409,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBadb\fR(1), \fBcmdtool\fR(1), \fBgcore\fR(1), \fBproc\fR(1), \fBpgrep\fR(1),
 \fBps\fR(1), \fBstty\fR(1), \fBtruss\fR(1), \fBuname\fR(1), \fBcoreadm\fR(1M),
@@ -4455,7 +4426,6 @@ Interface Stability	Evolving
 \fISolaris Modular Debugger Guide\fR
 .SH WARNINGS
 .SS "Use of the Error Recovery Mechanism"
-.sp
 .LP
 The debugger and its dmods execute in the same address space, and thus it is
 quite possible that a buggy dmod can cause \fBmdb\fR to dump core or otherwise
@@ -4468,14 +4438,12 @@ subsequent crash of the debugger. The safest course of action following a
 resume is to save any important debug information, and then quit and restart
 the debugger.
 .SS "Use of the Debugger to Modify the Live Operating System"
-.sp
 .LP
 The use of the debugger to modify (that is, write to) the address space of live
 running operating system is extremely dangerous, and can result in a system
 panic in the event the user damages a kernel data structure.
 .SH NOTES
 .SS "Limitations on Examining Process Core Files"
-.sp
 .LP
 \fBmdb\fR does not provide support for examining process core files that were
 generated by a release of Solaris preceding Solaris 2.6. When debugging core
@@ -4490,7 +4458,6 @@ core files using \fBcoreadm\fR(1M). Thus, the information presented by
 time the process dumped core. Core files from Solaris x86 systems can not be
 examined on Solaris SPARC systems, and vice-versa.
 .SS "Limitations on Examining Crash Dump Files"
-.sp
 .LP
 Crash dumps from Solaris 7 and earlier releases can only be examined with the
 aid of the libkvm from the corresponding operating system release. If a crash
@@ -4500,7 +4467,6 @@ prevent some dcmds or walkers from working properly. \fBmdb\fR issues a warning
 message if it detects this condition. Crash dumps from Solaris x86 systems can
 not be examined on Solaris SPARC systems, and vice-versa.
 .SS "Relationship Between 32-bit and 64-bit Debugger"
-.sp
 .LP
 \fBmdb\fR provides support for debugging both 32-bit and 64-bit programs. Once
 it has examined the target and determined its data model, \fBmdb\fR
@@ -4516,7 +4482,6 @@ The debugger can also need to re-execute itself when debugging a 32-bit process
 that execs a 64-bit process, or vice-versa. The handling of this situation is
 discussed in more detail under \fBInteraction with Exec\fR, below.
 .SS "Interaction with Exec"
-.sp
 .LP
 When a controlled process performs a successful \fBexec\fR(2), the behavior of
 the debugger is controlled by the \fB::set\fR \fB-o\fR \fBfollow_exec_mode\fR
@@ -4544,7 +4509,6 @@ dcmds do not since they do not perform data model conversion of structures. The
 user should release and re-attach the debugger to the process as described
 above in order to restore full debugging capabilities.
 .SS "Interaction with Job Control"
-.sp
 .LP
 If the debugger is attached to a process that is stopped by job control (that
 is, it stopped in response to \fBSIGTSTP\fR, \fBSIGTTIN\fR, or \fBSIGTTOU\fR),
@@ -4561,7 +4525,6 @@ stopped by job control. \fBmdb\fR prints a warning in this case, and the user
 must issue an "\fBfg\fR" command from the appropriate shell in order to resume
 the process.
 .SS "Process Attach and Release"
-.sp
 .LP
 When \fBmdb\fR attaches to a running process, the process is stopped and
 remains stopped until one of the continue dcmds is applied, or the debugger
@@ -4585,19 +4548,17 @@ released. If the process was already running prior to attaching \fBmdb\fR to
 it, it is set running again when it is released. A process can be released and
 left stopped and abandoned using the \fB::release\fR \fB-a\fR option.
 .SS "Symbolic Debugging Information"
-.sp
 .LP
 The \fB::list\fR, \fB::offsetof\fR, \fB::print\fR, and \fB::sizeof\fR dcmds
 require that one or more load objects contain compressed symbolic debugging
 information suitable for use with \fBmdb\fR. This information is currently only
 available for certain Solaris kernel modules.
 .SS "Developer Information"
-.sp
 .LP
 The \fISolaris Modular Debugger Guide\fR provides a more detailed description
 of \fBmdb\fR features, as well as information for debugger module developers.
 .sp
 .LP
 The header file \fB<sys/mdb_modapi.h>\fR contains prototypes for the functions
-in the MDB Module \fBAPI\fR, and the SUNWmdbdm package provides source code for
+in the MDB Module \fBAPI\fR, and distributions may provide source code for
 an example module in the directory \fB/usr/demo/mdb\fR.
diff --git a/usr/src/man/man1/postio.1 b/usr/src/man/man1/postio.1
index ffd7084208..3a4b1e7fec 100644
--- a/usr/src/man/man1/postio.1
+++ b/usr/src/man/man1/postio.1
@@ -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 POSTIO 1 "Sep 9, 1996"
+.TH POSTIO 1 "May 13, 2017"
 .SH NAME
 postio \- serial interface for PostScript printers
 .SH SYNOPSIS
@@ -19,12 +19,10 @@ postio \- serial interface for PostScript printers
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBpostio\fR sends \fIfiles\fR to the PostScript printer attached to
 \fIline.\fR If no \fIfiles\fR are specified the standard input is sent.
 .SH OPTIONS
-.sp
 .LP
 The first group of \fIoptions\fR should be sufficient for most applications:
 .sp
@@ -55,7 +53,7 @@ each block is transmitted.
 .ad
 .RS 13n
 Transmit data over \fBline\fR at baud rate \fIspeed\fR. Recognized baud rates
-are 1200, 2400, 4800, 9600, and 19200. The default \fIspeed\fR is  \fB9600\fR
+are 1200, 2400, 4800, 9600, and 19200. The default \fIspeed\fR is \fB9600\fR
 baud.
 .RE
 
@@ -66,7 +64,7 @@ baud.
 .ad
 .RS 13n
 Set the internal buffer size for reading and writing \fIfiles\fR to \fInum\fR
-bytes. By default \fInum\fR is  \fB2048\fR bytes.
+bytes. By default \fInum\fR is \fB2048\fR bytes.
 .RE
 
 .sp
@@ -76,7 +74,7 @@ bytes. By default \fInum\fR is  \fB2048\fR bytes.
 .ad
 .RS 13n
 Connect to the printer attached to \fBline\fR. In most cases there is no
-default  and \fBpostio\fR must be able to read and write \fBline\fR. If the
+default and \fBpostio\fR must be able to read and write \fBline\fR. If the
 \fBline\fR does not begin with a \fB/\fR it may be treated as a Datakit
 destination.
 .RE
@@ -170,7 +168,7 @@ one process is used, only data sent to the printer is flow controlled.
 .sp
 .LP
 The \fIoptions\fR are not all mutually exclusive. The \fB-i\fR option always
-wins,  selecting its own settings for whatever is needed to run interactive
+wins, selecting its own settings for whatever is needed to run interactive
 mode, independent of anything else found on the command line. Interactive mode
 runs as separate read and write processes and few of the other \fIoptions\fR
 accomplish anything in the presence of the \fB-i\fR option. The \fB-t\fR option
@@ -181,12 +179,12 @@ process.
 .sp
 .LP
 In most cases \fBpostio\fR starts by making a connection to \fBline\fR and then
-attempts to force the printer into the  IDLE state by sending an appropriate
-sequence of  \fB^T\fR (status query), \fB^C\fR (interrupt), and  \fB^D\fR (end
+attempts to force the printer into the IDLE state by sending an appropriate
+sequence of \fB^T\fR (status query), \fB^C\fR (interrupt), and \fB^D\fR (end
 of job) characters. When the printer goes IDLE, \fIfiles\fR are transmitted
-along with an occasional  \fB^T\fR (unless the \fB-q\fR option was used). After
+along with an occasional \fB^T\fR (unless the \fB-q\fR option was used). After
 all the \fIfiles\fR are sent the program waits until it's reasonably sure the
-job is complete. Printer generated error messages received at any time  except
+job is complete. Printer generated error messages received at any time except
 while establishing the initial connection (or when running interactive mode)
 cause \fB postio\fR to exit with a non-zero status. In addition to being added
 to the log file, printer error messages are also echoed to standard error.
@@ -195,7 +193,7 @@ to the log file, printer error messages are also echoed to standard error.
 \fBExample 1 \fRExamples of the \fBpostio\fR command.
 .sp
 .LP
-Run as a single process at 9600 baud and send  \fIfile1\fR and \fIfile2\fR to
+Run as a single process at 9600 baud and send \fIfile1\fR and \fIfile2\fR to
 the printer attached to \fB/dev/tty01\fR:
 
 .sp
@@ -221,7 +219,7 @@ bytes, and data returned by the printer gets put in file \fIlog\fR:
 
 .sp
 .LP
-Establish an interactive connection with  the printer at Datakit destination
+Establish an interactive connection with the printer at Datakit destination
 \fImy/printer\fR:
 
 .sp
@@ -234,8 +232,8 @@ Establish an interactive connection with  the printer at Datakit destination
 
 .sp
 .LP
-Send file program to the printer connected to  \fB/dev/tty22\fR, recover any
-data in file results,  and put log messages in file \fIlog\fR:
+Send file program to the printer connected to \fB/dev/tty22\fR, recover any
+data in file results, and put log messages in file \fIlog\fR:
 
 .sp
 .in +2
@@ -246,7 +244,6 @@ data in file results,  and put log messages in file \fIlog\fR:
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -268,13 +265,10 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBdownload\fR(1), \fBdpost\fR(1), \fBpostdaisy\fR(1), \fBpostdmd\fR(1),
-\fBpostmd\fR(1), \fBpostprint\fR(1), \fBpostreverse\fR(1), \fBposttek\fR(1),
+\fBdownload\fR(1), \fBdpost\fR(1), \fBpostprint\fR(1), \fBpostreverse\fR(1),
 \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 The input \fIfiles\fR are handled as a single PostScript job. Sending several
 different jobs, each with their own internal end of job mark (\fB^D\fR) is not
@@ -283,15 +277,15 @@ completed and could be restarted before the last one finishes.
 .sp
 .LP
 All the capabilities described above may not be available on every machine or
-even across  the different versions of the UNIX system that are currently
+even across the different versions of the UNIX system that are currently
 supported by the program.
 .sp
 .LP
-There may be no default \fBline\fR, so using the \fB-l\fR option  is strongly
+There may be no default \fBline\fR, so using the \fB-l\fR option is strongly
 recommended. If omitted, \fBpostio\fR may attempt to connect to the printer
-using the standard output. If Datakit is involved,  the \fB-b\fR option may be
-ineffective  and attempts by \fBpostio\fR to impose flow control over data in
+using the standard output. If Datakit is involved, the \fB-b\fR option may be
+ineffective and attempts by \fBpostio\fR to impose flow control over data in
 both directions may not work. The \fB-q\fR option can help if the printer is
-connected to RADIAN. The \fB-S\fR option  is not generally recommended and
+connected to RADIAN. The \fB-S\fR option is not generally recommended and
 should be used only if all other attempts to establish a reliable connection
 fail.
diff --git a/usr/src/man/man1/postprint.1 b/usr/src/man/man1/postprint.1
index f31d69235e..e28054b1d6 100644
--- a/usr/src/man/man1/postprint.1
+++ b/usr/src/man/man1/postprint.1
@@ -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 POSTPRINT 1 "Sep 9, 1996"
+.TH POSTPRINT 1 "May 13, 2017"
 .SH NAME
 postprint \- PostScript translator for text files
 .SH SYNOPSIS
@@ -20,13 +20,11 @@ postprint \- PostScript translator for text files
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpostprint\fR filter translates text \fIfiles\fR into PostScript and
 writes the results on the standard output. If no \fIfiles\fR are specified, or
 if \fB\(mi\fR is one of the input \fIfiles\fR, the standard input is read.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-c\fR\fI num\fR\fR
@@ -53,7 +51,7 @@ default font is Courier.
 .ad
 .RS 11n
 Set the length of a page to \fInum\fR lines. By default, \fInum\fR is \fB66\fR.
-Setting \fInum\fR to  \fB0\fR is allowed, and will cause \fBpostprint\fR to
+Setting \fInum\fR to \fB0\fR is allowed, and will cause \fBpostprint\fR to
 guess a value, based on the point size that's being used.
 .RE
 
@@ -65,7 +63,7 @@ guess a value, based on the point size that's being used.
 .RS 11n
 Magnify each logical page by the factor \fInum\fR. Pages are scaled uniformly
 about the origin, which is located near the upper left corner of each page. The
-default magnification is  \fB1.0\fR.
+default magnification is \fB1.0\fR.
 .RE
 
 .sp
@@ -75,7 +73,7 @@ default magnification is  \fB1.0\fR.
 .ad
 .RS 11n
 Print \fInum\fR logical pages on each piece of paper, where \fInum\fR can be
-any positive integer. By default, \fInum\fR is set to  \fB1\fR.
+any positive integer. By default, \fInum\fR is set to \fB1\fR.
 .RE
 
 .sp
@@ -87,12 +85,12 @@ any positive integer. By default, \fInum\fR is set to  \fB1\fR.
 Print pages whose numbers are given in the comma-separated \fIlist\fR. The
 \fIlist\fR contains single numbers \fIN\fR and ranges \fIN1 \fR\(mi\fI N2\fR. A
 missing \fIN1\fR means the lowest numbered page, a missing \fIN2\fR means the
-highest. The page range is an expression of logical pages rather  than physical
+highest. The page range is an expression of logical pages rather than physical
 sheets of paper. For example, if you are printing two logical pages to a
-sheet, and you specified a range of  \fB4\fR, then two sheets of paper would
-print, containing four  page layouts. If you specified a page range of
-\fB3-4\fR, when requesting two logical pages to a sheet; then \fIonly\fR  page
-3 and page 4 layouts would print, and they would  appear on one physical sheet
+sheet, and you specified a range of \fB4\fR, then two sheets of paper would
+print, containing four page layouts. If you specified a page range of
+\fB3-4\fR, when requesting two logical pages to a sheet; then \fIonly\fR page
+3 and page 4 layouts would print, and they would appear on one physical sheet
 of paper.
 .RE
 
@@ -113,8 +111,8 @@ character of \fImode\fR is significant. The default \fImode\fR is portrait.
 .ad
 .RS 11n
 Selects carriage return behavior. Carriage returns are ignored if \fInum\fR is
-\fB0\fR, cause a return to column 1 if \fInum\fR is  \fB1\fR, and generate a
-newline if \fInum\fR is  \fB2\fR. The default \fInum\fR is  \fB0\fR.
+\fB0\fR, cause a return to column 1 if \fInum\fR is \fB1\fR, and generate a
+newline if \fInum\fR is \fB2\fR. The default \fInum\fR is \fB0\fR.
 .RE
 
 .sp
@@ -125,7 +123,7 @@ newline if \fInum\fR is  \fB2\fR. The default \fInum\fR is  \fB0\fR.
 .RS 11n
 Print \fIfiles\fR using point size \fInum\fR. When printing in landscape mode
 \fInum\fR is scaled by a factor that depends on the imaging area of the device.
-The default size for portrait mode is  \fB10\fR. Note that increasing point
+The default size for portrait mode is \fB10\fR. Note that increasing point
 size increases virtual image size, so you either need to load larger paper, or
 use the \fB\(mil0\fR option to scale the number of lines per page.
 .RE
@@ -137,7 +135,7 @@ use the \fB\(mil0\fR option to scale the number of lines per page.
 .ad
 .RS 11n
 Assume tabs are set every \fInum\fR columns, starting with the first column. By
-default, tabs are set every  \fB8\fR columns.
+default, tabs are set every \fB8\fR columns.
 .RE
 
 .sp
@@ -149,7 +147,7 @@ default, tabs are set every  \fB8\fR columns.
 Translate the origin \fInum\fR inches along the positive x axis. The default
 coordinate system has the origin fixed near the upper left corner of the page,
 with positive x to the right and positive y down the page. Positive \fInum\fR
-moves everything to the right. The default offset is  \fB0.25\fR inches.
+moves everything to the right. The default offset is \fB0.25\fR inches.
 .RE
 
 .sp
@@ -159,13 +157,13 @@ moves everything to the right. The default offset is  \fB0.25\fR inches.
 .ad
 .RS 11n
 Translate the origin \fInum\fR inches along the positive y axis. Positive
-\fInum\fR moves text up the page. The default offset is  \fB\(mi0.25\fR inches.
+\fInum\fR moves text up the page. The default offset is \fB\(mi0.25\fR inches.
 .RE
 
 .sp
 .LP
-A new logical page is started  after 66 lines have been printed on the current
-page,  or whenever an ASCII form feed character is read. The number of lines
+A new logical page is started after 66 lines have been printed on the current
+page, or whenever an ASCII form feed character is read. The number of lines
 per page can be changed using the \fB-l\fR option. Unprintable ASCII characters
 are ignored, and lines that are too long are silently truncated by the printer.
 .SH EXAMPLES
@@ -173,7 +171,7 @@ are ignored, and lines that are too long are silently truncated by the printer.
 \fBExample 1 \fRExamples of \fBpostprint\fR.
 .sp
 .LP
-To print \fIfile1\fR  and  \fIfile2\fR  in landscape mode, issue the following
+To print \fIfile1\fR and \fIfile2\fR in landscape mode, issue the following
 command:
 
 .sp
@@ -197,7 +195,6 @@ To print three logical pages on each physical page in portrait mode:
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -219,7 +216,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/lp/postscript/forms.ps\fR\fR
@@ -240,8 +236,6 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBdownload\fR(1), \fBdpost\fR(1), \fBpostdaisy\fR(1), \fBpostdmd\fR(1),
-\fBpostio\fR(1), \fBpostmd\fR(1), \fBpostreverse\fR(1), \fBposttek\fR(1),
+\fBdownload\fR(1), \fBdpost\fR(1), \fBpostio\fR(1), \fBpostreverse\fR(1),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1/postreverse.1 b/usr/src/man/man1/postreverse.1
index f514561cff..a44d70fc42 100644
--- a/usr/src/man/man1/postreverse.1
+++ b/usr/src/man/man1/postreverse.1
@@ -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 POSTREVERSE 1 "Sep 9, 1996"
+.TH POSTREVERSE 1 "May 13, 2017"
 .SH NAME
 postreverse \- reverse the page order in a PostScript file
 .SH SYNOPSIS
@@ -18,7 +18,6 @@ postreverse \- reverse the page order in a PostScript file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpostreverse\fR filter reverses the page order in files that conform to
 Adobe's Version 1.0 or Version 2.0 file structuring conventions, and writes the
@@ -40,7 +39,6 @@ Because global definitions are extracted from individual pages and put in the
 prologue, the output file can be minimally conforming, even if the input
 \fBfile\fR was not.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-o\fR\fI list\fR\fR
@@ -107,7 +105,6 @@ without reversing the pages:
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -129,13 +126,10 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBdownload\fR(1), \fBdpost\fR(1), \fBpostdaisy\fR(1), \fBpostdmd\fR(1),
-\fBpostio\fR(1), \fBpostmd\fR(1), \fBpostprint\fR(1), \fBposttek\fR(1),
+\fBdownload\fR(1), \fBdpost\fR(1), \fBpostio\fR(1), \fBpostprint\fR(1),
 \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 No attempt has been made to deal with redefinitions of global variables or
 procedures. If standard input is used, the input \fBfile\fR will be read three
diff --git a/usr/src/man/man1/rup.1 b/usr/src/man/man1/rup.1
index dccc894b01..d8c7b1c883 100644
--- a/usr/src/man/man1/rup.1
+++ b/usr/src/man/man1/rup.1
@@ -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 RUP 1 "Mar 7, 2003"
+.TH RUP 1 "May 13, 2017"
 .SH NAME
 rup \- show host status of remote machines (RPC version)
 .SH SYNOPSIS
@@ -18,7 +18,6 @@ rup \- show host status of remote machines (RPC version)
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBrup\fR gives a status similar to \fBuptime\fR for remote machines. It
 broadcasts on the local network, and displays the responses it receives.
@@ -32,14 +31,12 @@ When \fIhost\fR arguments are given, rather than broadcasting \fBrup\fR will
 only query the list of specified hosts.
 .sp
 .LP
-A remote host will only respond if it is running the \fBrstatd\fR daemon, which
-is normally started up from \fBinetd\fR(1M).
+A remote host will only respond if it is running the \fBrstatd\fR daemon.
 .sp
 .LP
-In the absence of a name service, such as LDAP or NIS, \fBrup\fR displays host
+In the absence of a name service, \fBrup\fR displays host
 names as numeric IP addresses.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-h\fR\fR
@@ -67,13 +64,8 @@ Sort the display by up time.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBruptime\fR(1), \fBinetd\fR(1M), \fBattributes\fR(5)
-.sp
-.LP
-\fISolaris Express Installation Guide: Basic Installations\fR
+\fBruptime\fR(1), \fBattributes\fR(5)
 .SH BUGS
-.sp
 .LP
 Broadcasting does not work through gateways.
diff --git a/usr/src/man/man1/sar.1 b/usr/src/man/man1/sar.1
index 8ea0c0b20c..9318d3d394 100644
--- a/usr/src/man/man1/sar.1
+++ b/usr/src/man/man1/sar.1
@@ -4,7 +4,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 SAR 1 "Jul 24, 2004"
+.TH SAR 1 "May 13, 2017"
 .SH NAME
 sar \- system activity reporter
 .SH SYNOPSIS
@@ -20,7 +20,6 @@ sar \- system activity reporter
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 In the first instance, the \fBsar\fR utility samples cumulative activity
 counters in the operating system at \fIn\fR intervals of \fIt\fR seconds, where
@@ -41,7 +40,6 @@ arguments with \fItime\fR specified in the form \fIhh\fR[:\fImm\fR[:\fIss\fR]].
 The \fB-i\fR option selects records at \fIsec\fR second intervals. Otherwise,
 all intervals found in the data file are reported.
 .SH OPTIONS
-.sp
 .LP
 The following options modify the subsets of information reported by \fBsar\fR.
 .sp
@@ -663,7 +661,6 @@ example% sar -d -f temp
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/adm/sa/sa\fIdd\fR\fR\fR
@@ -673,15 +670,13 @@ daily data file, where \fIdd\fR are digits representing the day of the month
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBsag\fR(1), \fBiostat\fR(1M), \fBsar\fR(1M), \fBvmstat\fR(1M), \fBexec\fR(2),
+\fBiostat\fR(1M), \fBsar\fR(1M), \fBvmstat\fR(1M), \fBexec\fR(2),
 \fBfork\fR(2), \fBattributes\fR(5)
 .sp
 .LP
 \fISystem Administration Guide: Advanced Administration\fR
 .SH NOTES
-.sp
 .LP
 The sum of CPU utilization might vary slightly from 100 because of rounding
 errors in the production of a percentage figure.
diff --git a/usr/src/man/man1/sleep.1 b/usr/src/man/man1/sleep.1
index c5307221c5..102ae2272c 100644
--- a/usr/src/man/man1/sleep.1
+++ b/usr/src/man/man1/sleep.1
@@ -11,7 +11,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 SLEEP 1 "Sep 10, 2013"
+.TH SLEEP 1 "May 13, 2017"
 .SH NAME
 sleep \- suspend execution for an interval
 .SH SYNOPSIS
@@ -28,7 +28,6 @@ sleep \- suspend execution for an interval
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBsleep\fR suspends execution for at least the time in seconds specified by
 \fIseconds\fR or until a \fBSIGALRM\fR signal is received. The \fIseconds\fR
@@ -36,7 +35,6 @@ operand can be specified as a floating point number but the actual granularity
 normally depends on the underlying system.
 .SH OPERANDS
 .SS "/usr/bin/sleep"
-.sp
 .LP
 The following operands are supported for \fB/usr/bin/sleep\fR and \fBksh93\fR's
 \fBsleep\fR built-in command:
@@ -48,11 +46,10 @@ The following operands are supported for \fB/usr/bin/sleep\fR and \fBksh93\fR's
 .RS 11n
 A non-negative floating-point number specifying the number of seconds for which
 to suspend execution. The floating-point number may be specified in all formats
-required by C99/XPG6, including constants such as "Inf" or "infinite".
+required by C99/XPG6, including constants such as "Inf" or "infinity".
 .RE
 
 .SS "ksh93"
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -134,13 +131,11 @@ example% sleep 0x1.0000000000000000000000000000p-01
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBsleep\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
@@ -163,13 +158,9 @@ An error has occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .SS "/usr/bin/sleep"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -182,9 +173,6 @@ Standard	See \fBstandards\fR(5).
 .TE
 
 .SS "ksh93"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -195,12 +183,10 @@ Interface Stability	Uncommitted
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBksh93\fR(1), \fBwait\fR(1), \fBalarm\fR(2), \fBsleep\fR(3C),
-\fBwait\fR(3UCB), \fBattributes\fR(5), \fBenviron\fR(5), \fBstandards\fR(5)
+\fBattributes\fR(5), \fBenviron\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 If the \fBsleep\fR utility receives a \fBSIGALRM\fR signal, one of the
 following actions is taken:
diff --git a/usr/src/man/man1/uname.1 b/usr/src/man/man1/uname.1
index f5e0c57f59..a8e879fab2 100644
--- a/usr/src/man/man1/uname.1
+++ b/usr/src/man/man1/uname.1
@@ -9,7 +9,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 UNAME 1 "Apr 14, 2016"
+.TH UNAME 1 "May 13, 2017"
 .SH NAME
 uname \- print name of current system
 .SH SYNOPSIS
@@ -109,8 +109,8 @@ The nodename may be changed by specifying a system name argument. The system
 name argument is restricted to \fBSYS_NMLN\fR characters. \fBSYS_NMLN\fR is an
 implementation specific value defined in \fB<sys/utsname.h>\fR\&. Only the
 super-user is allowed this capability. This change does not persist across
-reboots of the system. Use \fBsys-unconfig\fR(1M) to change a host's name
-permanently.
+reboots of the system. See \fBnodename\fR(4) for details of how to change a
+host's name permanently.
 .RE
 
 .sp
@@ -214,7 +214,7 @@ Interface Stability	Standard
 
 .SH SEE ALSO
 .LP
-\fBarch\fR(1), \fBisalist\fR(1), \fBsys-unconfig\fR(1M), \fBsysinfo\fR(2),
+\fBarch\fR(1), \fBisalist\fR(1), \fBsysinfo\fR(2),
 \fBuname\fR(2), \fBnodename\fR(4), \fBattributes\fR(5), \fBenviron\fR(5),
 \fBstandards\fR(5)
 .SH NOTES
@@ -228,8 +228,7 @@ To determine the operating system name and release level, use \fBuname
 \fR\fB-sr\fR. To determine only the operating system release level, use
 \fBuname \fR\fB-r\fR. Notice that operating system release levels are not
 guaranteed to be in \fIx.y\fR format (such as 5.3, 5.4, 5.5, and so forth);
-future releases could be in the \fIx.y.z\fR format (such as 5.3.1, 5.3.2,
-5.4.1, and so forth).
+but could be in the \fIx.y.z\fR format (such as 5.5.1).
 .sp
 .LP
 In SunOS 4.\fIx\fR releases, the \fBarch\fR(1) command was often used to obtain
diff --git a/usr/src/man/man1/vacation.1 b/usr/src/man/man1/vacation.1
index 40c61a55fe..744de3ff18 100644
--- a/usr/src/man/man1/vacation.1
+++ b/usr/src/man/man1/vacation.1
@@ -4,7 +4,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 VACATION 1 "Aug 20, 2005"
+.TH VACATION 1 "May 13, 2017"
 .SH NAME
 vacation \- reply to mail automatically
 .SH SYNOPSIS
@@ -25,17 +25,15 @@ vacation \- reply to mail automatically
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBvacation\fR utility automatically replies to incoming mail.
 .SS "Installation"
-.sp
 .LP
 The installation consists of an interactive program which sets up
 \fBvacation\fR's basic configuration.
 .sp
 .LP
-To install \fBvacation\fR,  type it with no arguments on the command line. The
+To install \fBvacation\fR, type it with no arguments on the command line. The
 program creates a \fB\&.vacation.msg\fR file, which contains the message that
 is automatically sent to all senders when \fBvacation\fR is enabled, and starts
 an editor for you to modify the message. (See USAGE section.) Which editor is
@@ -68,29 +66,24 @@ The program automatically creates \fB\&.vacation.pag\fR and
 \fB\&.vacation.dir\fR, which contain a list of senders when \fBvacation\fR is
 enabled.
 .SS "Activation and Deactivation"
-.sp
 .LP
 The presence of the \fB\&.forward\fR file determines whether or not
 \fBvacation\fR is disabled or enabled. To disable \fBvacation\fR, remove the
 \fB\&.forward\fR file, or move it to a new name.
 .SS "Initialization"
-.sp
 .LP
 The \fB-I\fR option clears the \fBvacation\fR log files, \fB\&.vacation.pag\fR
 and \fB\&.vacation.dir\fR, erasing the list of senders from a previous
 \fBvacation\fR session. (See OPTIONS section.)
 .SS "Additional Configuration"
-.sp
 .LP
 \fBvacation\fR provides configuration options that are not part of the
 installation, these being \fB-a\fR, \fB-e\fR, \fB-f\fR, \fB-j\fR, \fB-m\fR,
 \fB-s\fR, and \fB-t\fR. (See OPTIONS section.)
 .SS "Reporting"
-.sp
 .LP
 \fBvacation\fR provides a reporting option, \fB-l\fR. See \fBOPTIONS\fR.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -212,7 +205,6 @@ of \fBvacation -I\fR, along with a date and time stamp.
 .RE
 
 .SH USAGE
-.sp
 .LP
 \fB\&.vacation.msg\fR should include a header with at least a \fBSubject:\fR
 line (it should not include a \fBTo:\fR line). For example:
@@ -293,9 +285,8 @@ anotherfriend@herisp.com
 
 .sp
 .LP
-Blank lines and lines starting with  "\fB#\fR" are ignored.
+Blank lines and lines starting with "\fB#\fR" are ignored.
 .SH FILES
-.sp
 .LP
 \fB~/.forward\fR
 .sp
@@ -310,7 +301,6 @@ A list of senders is kept in the \fBdbm\fR format files \fB\&.vacation.pag\fR
 and \fB\&.vacation.dir\fR in your home directory. These files are \fBdbm\fR
 files and cannot be viewed directly with text editors.
 .SH SEE ALSO
-.sp
 .LP
-\fBvi\fR(1), \fBsendmail\fR(1M), \fBdbm\fR(3UCB), \fBgetusershell\fR(3C),
+\fBvi\fR(1), \fBsendmail\fR(1M), \fBgetusershell\fR(3C),
 \fBaliases\fR(4), \fBshells\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1/who.1 b/usr/src/man/man1/who.1
index 3e2c121ee7..326d3bff60 100644
--- a/usr/src/man/man1/who.1
+++ b/usr/src/man/man1/who.1
@@ -9,7 +9,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 WHO 1 "Nov 3, 2000"
+.TH WHO 1 "May 13, 2017"
 .SH NAME
 who \- who is on the system
 .SH SYNOPSIS
@@ -59,7 +59,6 @@ who \- who is on the system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBwho\fR utility can list the user's name, terminal line, login time,
 elapsed time since activity occurred on the line, and the process-ID of the
@@ -155,7 +154,6 @@ Exit status for dead processes
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -186,7 +184,7 @@ Indicates the time and date of the last reboot.
 .RS 9n
 Displays all processes that have expired and not been respawned by \fBinit\fR.
 The \fBexit\fR field appears for dead processes and contains the termination
-and exit values (as returned by \fBwait\fR(3UCB)), of the dead process. This
+and exit values of the dead process. This
 can be useful in determining why a process terminated.
 .RE
 
@@ -273,7 +271,6 @@ Indicates the current \fIrun-level\fR of the \fBinit\fR process.
 .RE
 
 .SS "/usr/bin/who"
-.sp
 .ne 2
 .na
 \fB\fB-T\fR \fR
@@ -312,7 +309,6 @@ The terminal write-access state cannot be determined.
 .RE
 
 .SS "/usr/xpg4/bin/who"
-.sp
 .ne 2
 .na
 \fB\fB-T\fR \fR
@@ -357,7 +353,6 @@ and so forth.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -386,13 +381,11 @@ users that \fBwho\fR uses by default.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBwho\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, \fBLC_TIME\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -414,7 +407,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/sbin/inittab\fR \fR
@@ -442,13 +434,9 @@ Historic user and accounting information
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .SS "/usr/xpg4/bin/who"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -459,13 +447,11 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdate\fR(1), \fBlogin\fR(1), \fBmesg\fR(1), \fBinit\fR(1M), \fBsu\fR(1M),
-\fBwait\fR(3UCB), \fBinittab\fR(4), \fButmpx\fR(4), \fBattributes\fR(5),
+\fBinittab\fR(4), \fButmpx\fR(4), \fBattributes\fR(5),
 \fBenviron\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 \fBSuperuser:\fR After a shutdown to the single-user state, \fBwho\fR returns a
 prompt. Since \fB/var/adm/utmpx\fR is updated at login time and there is no
diff --git a/usr/src/man/man1b/ps.1b b/usr/src/man/man1b/ps.1b
index 00f8f3b495..5db8faf6f6 100644
--- a/usr/src/man/man1b/ps.1b
+++ b/usr/src/man/man1b/ps.1b
@@ -1,7 +1,7 @@
 '\" te
 .\" Copyright (c) 2002, Sun Microsystems, Inc. - All Rights Reserved.
 .\" Copyright (c), 1980 Regents of the University of California.  All rights reserved.  The Berkeley software License Agreement  specifies the terms and conditions for redistribution.
-.TH PS 1B "May 26, 2006"
+.TH PS 1B "May 13, 2017"
 .SH NAME
 ps \- display the status of current processes
 .SH SYNOPSIS
@@ -11,11 +11,10 @@ ps \- display the status of current processes
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBps\fR command displays information about processes. Normally, only those
 processes that are running with your effective user \fBID\fR and are attached
-to a controlling terminal (see  \fBtermio\fR(7I)) are shown. Additional
+to a controlling terminal (see \fBtermio\fR(7I)) are shown. Additional
 categories of processes can be added to the display using various options. In
 particular, the \fB-a\fR option allows you to include processes that are not
 owned by you (that do not have your user \fBID\fR), and the \fB-x\fR option
@@ -79,7 +78,6 @@ Traced. Process stopped by a signal because parent is tracing it.
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 The following options must all be combined to form the first argument:
 .sp
@@ -167,9 +165,9 @@ children.
 .ad
 .RS 11n
 Lists only process data associated with the terminal, \fIterm\fR. Terminal
-identifiers may be specified in one of two forms:  the device's file name (for
-example,  \fBtty04\fR or \fBterm/14\fR ) or, if the device's file name starts
-with  \fBtty\fR, just the digit identifier (for example, \fB04\fR).
+identifiers may be specified in one of two forms: the device's file name (for
+example, \fBtty04\fR or \fBterm/14\fR ) or, if the device's file name starts
+with \fBtty\fR, just the digit identifier (for example, \fB04\fR).
 .RE
 
 .sp
@@ -235,7 +233,6 @@ process. This option must be supplied last.
 .RE
 
 .SH DISPLAY FORMATS
-.sp
 .LP
 Fields that are not common to all output formats:
 .sp
@@ -263,7 +260,7 @@ previous (real) time.
 \fB\fBNI\fR\fR
 .ad
 .RS 9n
-Process scheduling increment (see \fBgetpriority\fR(3C) and \fBnice\fR(3UCB)).
+Process scheduling increment (see \fBgetpriority\fR(3C) and \fBnice\fR(2)).
 .RE
 
 .sp
@@ -379,7 +376,6 @@ the parent, is marked <\fBdefunct\fR>\|; otherwise, \fBps\fR tries to determine
 the command name and arguments given when the process was created by examining
 the user block.
 .SH FILES
-.sp
 .LP
 \fB/dev/tty*\fR
 .sp
@@ -392,12 +388,10 @@ the user block.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkill\fR(1), \fBps\fR(1), \fBwhodo\fR(1M), \fBgetpriority\fR(3C),
-\fBnice\fR(3UCB), \fBproc\fR(4), \fBattributes\fR(5), \fBtermio\fR(7I)
+\fBnice\fR(2), \fBproc\fR(4), \fBattributes\fR(5), \fBtermio\fR(7I)
 .SH NOTES
-.sp
 .LP
 Things can change while \fBps\fR is running. The picture \fBps\fR gives is only
 a close approximation to the current state. Some data printed for defunct
diff --git a/usr/src/man/man1m/add_drv.1m b/usr/src/man/man1m/add_drv.1m
index c017280317..8376e3326e 100644
--- a/usr/src/man/man1m/add_drv.1m
+++ b/usr/src/man/man1m/add_drv.1m
@@ -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 ADD_DRV 1M "Dec 1, 2005"
+.TH ADD_DRV 1M "May 13, 2017"
 .SH NAME
 add_drv \- add a new device driver to the system
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ add_drv \- add a new device driver to the system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBadd_drv\fR command is used to inform the system about newly installed
 device drivers.
@@ -42,7 +41,6 @@ In some cases, adding a new driver may require a reconfiguration boot. See the
 Aliases might require quoting (with double-quotes) if they contain numbers. See
 \fBEXAMPLES\fR.
 .SS "The \fB/etc/minor_perm\fR File"
-.sp
 .LP
 \fBadd_drv\fR and \fBupdate_drv\fR(1M) read the \fB/etc/minor_perm\fR file to
 obtain permission information. The permission specified is applied to matching
@@ -87,9 +85,9 @@ are set to \fB0600\fR permission, owned by \fBuucp\fR, with group \fBuucp\fR.
 In the third line the \fBkmem\fR device exported by the \fBmm\fR driver is set
 to \fB0640\fR permission, owned by \fBroot\fR, with group \fBbin\fR.
 .SS "Running \fBadd_drv\fR from a \fBpostinstall\fR Script"
-.sp
 .LP
-When running \fBadd_drv\fR from within the context of a package's postinstall
+When running \fBadd_drv\fR from within the context of a legacy SVR4
+package's postinstall
 script, you must consider whether the package is being added to a system image
 or to a running system. When a package is being installed on a system image,
 the \fBBASEDIR\fR variable refers to the image's base directory. In this
@@ -137,16 +135,14 @@ fi
 .LP
 The \fB-b\fR option is described below.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-b\fR \fIbasedir\fR\fR
 .ad
 .RS 26n
 Installs the driver on the system with a root directory of \fIbasedir\fR rather
-than installing on the system executing \fBadd_drv\fR. This option is typically
-used in package post-installation scripts when the package is not being
-installed on the system executing the \fBpkgadd\fR command. The system using
+than installing on the system executing \fBadd_drv\fR. This option was typically
+used in package post-installation scripts. The system using
 \fIbasedir\fR as its root directory must reboot to complete the driver
 installation.
 .LP
@@ -430,11 +426,9 @@ example# add_drv -i '"pci10c5,25"' smc
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 \fBadd_drv\fR returns \fB0\fR on success and \fB1\fR on failure.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv\fR\fR
@@ -585,7 +579,6 @@ device privileges
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBboot\fR(1M), \fBchmod\fR(1), \fBdevfsadm\fR(1M), \fBkernel\fR(1M),
 \fBmodinfo\fR(1M), \fBrem_drv\fR(1M), \fBupdate_drv\fR(1M),
@@ -595,7 +588,6 @@ device privileges
 .LP
 \fI\fR
 .SH NOTES
-.sp
 .LP
 It is possible to add a driver for a device already being managed by a
 different driver, where the driver being added appears in the device's
@@ -639,7 +631,6 @@ alias is optional when used from the command line. However, when using
 \fBadd_drv\fR from packaging scripts, you should continue to use double quotes
 to specify an alias.
 .SH BUGS
-.sp
 .LP
 Previous versions of \fBadd_drv\fR accepted a pathname for \fIdevice_driver\fR.
 This feature is no longer supported and results in failure.
diff --git a/usr/src/man/man1m/datadm.1m b/usr/src/man/man1m/datadm.1m
index 00051afab3..929714d912 100644
--- a/usr/src/man/man1m/datadm.1m
+++ b/usr/src/man/man1m/datadm.1m
@@ -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 DATADM 1M "Jun 18, 2004"
+.TH DATADM 1M "May 13, 2017"
 .SH NAME
 datadm \- maintain DAT static registry file
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ datadm \- maintain DAT static registry file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBdatadm\fR utility maintains the DAT static registry file,
 \fBdat.conf\fR(4).
@@ -30,7 +29,6 @@ a system after its installation. You can use \fBdatadm\fR to update the
 interface adapters for all the service providers currently installed is
 regenerated.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -174,7 +172,6 @@ ibd2 u1.2 nonthreadsafe default udapl_tavor.so.1 SUNW.1.0 ""
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/dat/dat.conf\fR\fR
@@ -184,7 +181,6 @@ DAT static registry file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -200,7 +196,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBpkgadd\fR(1M), \fBpkgrm\fR(1M), \fBlibdat\fR(3LIB), \fBdat.conf\fR(4),
-\fBservice_provider.conf\fR(4). \fBattributes\fR(5)
+\fBlibdat\fR(3LIB), \fBdat.conf\fR(4),
+\fBservice_provider.conf\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/domainname.1m b/usr/src/man/man1m/domainname.1m
index 6888511393..98f59f378f 100644
--- a/usr/src/man/man1m/domainname.1m
+++ b/usr/src/man/man1m/domainname.1m
@@ -4,7 +4,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 DOMAINNAME 1M "Feb 25, 2017"
+.TH DOMAINNAME 1M "May 13, 2017"
 .SH NAME
 domainname \- set or display name of the current domain
 .SH SYNOPSIS
@@ -90,7 +90,7 @@ guidance as to appropriate corrective action.
 \fBsvcs\fR(1),
 \fBcheck-hostname\fR(1M), \fBhostconfig\fR(1M), \fBnamed\fR(1M),
 \fBsendmail\fR(1M), \fBsvcadm\fR(1M), \fBypinit\fR(1M),
-\fBsys-unconfig\fR(1M), \fBaliases\fR(4), \fBdefaultdomain\fR(4),
+\fBaliases\fR(4), \fBdefaultdomain\fR(4),
 \fBhosts\fR(4), \fBnsswitch.conf\fR(4), \fBpasswd\fR(4), \fBattributes\fR(5),
 \fBrbac\fR(5), \fBsmf\fR(5)
 .SH NOTES
diff --git a/usr/src/man/man1m/fssnap_ufs.1m b/usr/src/man/man1m/fssnap_ufs.1m
index 51211e2611..ca58f36e3f 100644
--- a/usr/src/man/man1m/fssnap_ufs.1m
+++ b/usr/src/man/man1m/fssnap_ufs.1m
@@ -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 FSSNAP_UFS 1M "Jan 29, 2007"
+.TH FSSNAP_UFS 1M "May 13, 2017"
 .SH NAME
 fssnap_ufs \- create a temporary snapshot of a UFS file system
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ fssnap_ufs \- create a temporary snapshot of a UFS file system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBfssnap\fR command queries, creates, or deletes a temporary snapshot of a
 \fBUFS\fR file system. A snapshot is a point-in-time image of a file system
@@ -45,7 +44,6 @@ file system that is being captured in a snapshot. The backing-store file(s) can
 reside on any type of file system, including another \fBUFS\fR file system or
 an \fBNFS\fR-mounted file system.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -278,7 +276,6 @@ Both devices are always created. This option affects only the output.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -468,7 +465,6 @@ they will have names of the form \fIfile\fR (for the first file), \fIfile\fR.1,
 \fIfile\fR.2, and so forth.
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -496,15 +492,9 @@ An error occurred.
 The script-readable output mode is a stable interface that can be added to, but
 will not change. All other interfaces are subject to change.
 .SH SEE ALSO
-.sp
 .LP
 \fBmlock\fR(3C), \fBattributes\fR(5)
-.sp
-.LP
-See the \fBntpd\fR man page, delivered in the \fBSUNWntpu\fR package (not a
-SunOS man page).
 .SH NOTES
-.sp
 .LP
 The \fBfssnap\fR device files should be treated like a regular disk block or
 character device.
@@ -512,14 +502,14 @@ character device.
 .LP
 The association between a file system and the snapshot is lost when the
 snapshot is deleted or the system reboots. Snapshot persistence across reboots
-is not currently supported.
+is not supported.
 .sp
 .LP
 To avoid unnecessary performance impacts, perform the snapshot and system
 backup when the system is least active.
 .sp
 .LP
-It is not possible to perform a snapshot of a file system if any of  the
+It is not possible to perform a snapshot of a file system if any of the
 following conditions are true:
 .RS +4
 .TP
@@ -539,7 +529,7 @@ The file system contains a local swap file
 .el o
 The file system is used as backing store by an application that uses
 \fBmlock\fR(3C) to lock its pages. Typically, these are real time applications,
-such as \fBntpd\fR (delivered in the \fBSUNWntpu\fR package).
+such as \fBntpd\fR.
 .RE
 .sp
 .LP
diff --git a/usr/src/man/man1m/idsconfig.1m b/usr/src/man/man1m/idsconfig.1m
index e4e15290a6..adb5081a09 100644
--- a/usr/src/man/man1m/idsconfig.1m
+++ b/usr/src/man/man1m/idsconfig.1m
@@ -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 IDSCONFIG 1M "Oct 18, 2001"
+.TH IDSCONFIG 1M "May 13, 2017"
 .SH NAME
 idsconfig \- prepare an iPlanet Directory Server (iDS) to be populated with
 data and serve LDAP clients
@@ -15,12 +15,11 @@ data and serve LDAP clients
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Use the \fBidsconfig\fR tool to set up an iPlanet Directory Server (iDS). You
 can specify the input configuration file with the \fB-i\fR option on the
 command line. Alternatively, the tool will prompt the user for configuration
-information. The input configuration  file is created by \fBidsconfig\fR with
+information. The input configuration file is created by \fBidsconfig\fR with
 the \fB-o\fR option on a previous run.
 .sp
 .LP
@@ -37,7 +36,6 @@ appropriate security precautions.
 You should back up the directory server's configuration and data prior to
 running this command.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -47,7 +45,7 @@ The following options are supported:
 .ad
 .RS 24n
 Specify the file name for \fBidsconfig\fR to use as a configuration file.  This
-file will be read by \fBidsconfig\fR, and the values  in the file will be used
+file will be read by \fBidsconfig\fR, and the values in the file will be used
 to configure the server.  Do not manually edit \fIinput_configfile\fR. The
 \fIinput_configfile\fR is only partially validated, as \fBidsconfig\fR assumes
 that the file was created by a previous invocation of the command.
@@ -72,7 +70,6 @@ Verbose output.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -140,7 +137,6 @@ example# \fBidsconfig -v -i config.1\fR
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -162,7 +158,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -178,9 +173,8 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBldap\fR(1), \fBldapadd\fR(1), \fBldapdelete\fR(1), \fBldaplist\fR(1),
 \fBldapmodify\fR(1), \fBldapmodrdn\fR(1), \fBldapsearch\fR(1),
 \fBldap_cachemgr\fR(1M), \fBldapaddent\fR(1M), \fBldapclient\fR(1M),
-\fBsuninstall\fR(1M), \fBresolv.conf\fR(4), \fBattributes\fR(5)
+\fBresolv.conf\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/inetd.1m b/usr/src/man/man1m/inetd.1m
index cf01f8c10e..6b360cec6f 100644
--- a/usr/src/man/man1m/inetd.1m
+++ b/usr/src/man/man1m/inetd.1m
@@ -4,9 +4,9 @@
 .\" 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 INETD 1M "April 9, 2016"
+.TH INETD 1M "May 13, 2017"
 .SH NAME
-inetd \- Solaris Management Facility delegated restarter for inet services
+inetd \- Service Management Facility delegated restarter for inet services
 .SH SYNOPSIS
 .LP
 .nf
@@ -540,10 +540,8 @@ wrappers facility and its configuration files is External. As the TCP wrappers
 facility is not controlled by Sun, intra-release incompatibilities are not
 uncommon. See \fBattributes\fR(5).
 .sp
-For more information about configuring TCP wrappers, you can refer to the
-\fBtcpd(1M)\fR and \fBhosts_access(4)\fR man pages, which are delivered as part
-of the Solaris operating system at \fB/usr/sfw/man\fR. These pages are not part
-of the standard Solaris man pages, available at \fB/usr/man\fR.
+For more information about configuring TCP wrappers, refer to
+\fBtcpd\fR(1M) and \fBhosts_access\fR(4).
 .sp
 \fBtcp_wrappers\fR is equivalent to the previous inetd's
 \fB/etc/default/inetd\fR property \fBENABLE_TCPWRAPPERS\fR.
@@ -843,7 +841,7 @@ Interface Stability	Evolving
 The \fBinetd\fR daemon performs the same function as, but is implemented
 significantly differently from, the daemon of the same name in Solaris 9 and
 prior Solaris operating system releases. In the current Solaris release,
-\fBinetd\fR is part of the Solaris Management Facility (see \fBsmf\fR(5)) and
+\fBinetd\fR is part of the Service Management Facility (see \fBsmf\fR(5)) and
 will run only within that facility.
 .sp
 .LP
diff --git a/usr/src/man/man1m/ldap_cachemgr.1m b/usr/src/man/man1m/ldap_cachemgr.1m
index c4089a78f6..3709d5d50b 100644
--- a/usr/src/man/man1m/ldap_cachemgr.1m
+++ b/usr/src/man/man1m/ldap_cachemgr.1m
@@ -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 LDAP_CACHEMGR 1M "Oct 7, 2008"
+.TH LDAP_CACHEMGR 1M "May 13, 2017"
 .SH NAME
 ldap_cachemgr \- LDAP daemon to manage client configuration for LDAP based
 Network Information Service lookups
@@ -14,7 +14,6 @@ Network Information Service lookups
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBldap_cachemgr\fR daemon is a process that provides an up-to-date
 configuration cache for LDAP naming services. It is started during multi-user
@@ -46,7 +45,6 @@ The \fBldap_cachemgr\fR daemon also acts as its own administration tool. If an
 instance of \fBldap_cachemgr\fR is already running, commands are passed
 transparently to the running version.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -104,7 +102,6 @@ example# pkill -HUP ldap_cachemgr
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/ldap/cachemgr.log\fR\fR
@@ -131,21 +128,18 @@ be modified manually. Their content is not guaranteed to be human readable. Use
 .RE
 
 .SH WARNINGS
-.sp
 .LP
 The \fBldap_cachemgr\fR utility is included in the current Solaris release on
 an uncommitted basis only. It is subject to change or removal in a future minor
 release.
 .SH SEE ALSO
-.sp
 .LP
 \fBldap\fR(1), \fBldapadd\fR(1), \fBldapdelete\fR(1), \fBldaplist\fR(1),
 \fBldapmodify\fR(1), \fBldapmodrdn\fR(1), \fBldapsearch\fR(1), \fBpkill\fR(1),
 \fBsvcs\fR(1), \fBidsconfig\fR(1M), \fBldapaddent\fR(1M), \fBldapclient\fR(1M),
-\fBsuninstall\fR(1M), \fBsvcadm\fR(1M), \fBsignal.h\fR(3HEAD),
+\fBsvcadm\fR(1M), \fBsignal.h\fR(3HEAD),
 \fBresolv.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fBldap_cachemgr\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifier:
diff --git a/usr/src/man/man1m/ldapaddent.1m b/usr/src/man/man1m/ldapaddent.1m
index 38821a0b16..2fd88040df 100644
--- a/usr/src/man/man1m/ldapaddent.1m
+++ b/usr/src/man/man1m/ldapaddent.1m
@@ -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 LDAPADDENT 1M "Mar 6, 2017"
+.TH LDAPADDENT 1M "May 13, 2017"
 .SH NAME
 ldapaddent \- create LDAP entries from corresponding /etc files
 .SH SYNOPSIS
@@ -551,7 +551,7 @@ Interface Stability	Committed
 .LP
 \fBldap\fR(1), \fBldaplist\fR(1), \fBldapmodify\fR(1), \fBldapmodrdn\fR(1),
 \fBldapsearch\fR(1), \fBidsconfig\fR(1M), \fBldapclient\fR(1M),
-\fBsuninstall\fR(1M), \fBnsswitch.conf\fR(4), \fBattributes\fR(5)
+\fBnsswitch.conf\fR(4), \fBattributes\fR(5)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man1m/lpadmin.1m b/usr/src/man/man1m/lpadmin.1m
index 7a601e756b..c509eafe2e 100644
--- a/usr/src/man/man1m/lpadmin.1m
+++ b/usr/src/man/man1m/lpadmin.1m
@@ -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 LPADMIN 1M "April 9, 2016"
+.TH LPADMIN 1M "May 13, 2017"
 .SH NAME
 lpadmin \- configure the LP print service
 .SH SYNOPSIS
@@ -889,7 +889,7 @@ For example:
 .in -2
 .sp
 
-See the \fB/usr/sfw/man/man1m/smbspool.1m\fR man page for details.
+See the \fBsmbspool\fR man page for details.
 .RE
 
 .SS "Removing a Printer Destination"
diff --git a/usr/src/man/man1m/luxadm.1m b/usr/src/man/man1m/luxadm.1m
index 524527f222..0892d542e7 100644
--- a/usr/src/man/man1m/luxadm.1m
+++ b/usr/src/man/man1m/luxadm.1m
@@ -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 LUXADM 1M "Sep 24, 2003"
+.TH LUXADM 1M "May 13, 2017"
 .SH NAME
 luxadm \- administer Sun Fire 880 storage subsystem and FC_AL devices
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ luxadm \- administer Sun Fire 880 storage subsystem and FC_AL devices
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBluxadm\fR program is an administrative command that manages the
 \fBSENA\fR, Sun Fire 880 internal storage subsystem, and individual Fiber
@@ -37,7 +36,6 @@ of the \fBSENA\fR enclosure, and an optional identifier for the particular
 device in the enclosure. The individual \fBFC_AL\fR devices may be specified by
 entering the \fBWWN\fR for the device or a port to the device.
 .SS "Pathname"
-.sp
 .LP
 Specify the device or controller by either a complete physical pathname or a
 complete logical pathname.
@@ -122,7 +120,6 @@ and a typical logical pathname is:
 .sp
 
 .SS "Enclosure"
-.sp
 .LP
 For \fBSENA,\fR a device may be identified by its enclosure name and slotname:
 .br
@@ -172,7 +169,6 @@ the disk slot number in the Sun Fire 880 internal storage subsystem, \fB0\fR -
 See \fBdisks\fR(1M) and \fBdevlinks\fR(1M) for additional information on
 logical names for disks and subsystems.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported by all subcommands:
 .sp
@@ -198,7 +194,6 @@ Verbose mode.
 Options that are specific to particular subcommands are described with the
 subcommand in the \fBUSAGE\fR section.
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -244,7 +239,6 @@ subsystem, or disk device. \fIpathname\fR can also be the \fBWWN\fR of a
 
 .SH USAGE
 .SS "Subcommands"
-.sp
 .ne 2
 .na
 \fB\fBdisplay\fR \fIenclosure\fR[,\fIdev\fR]\|.\|.\|.\||
@@ -752,7 +746,6 @@ Spin down the specified disks in a SENA.
 .RE
 
 .SS "SENA, Sun Fire 880 Internal Storage Subsystem, and Individual FC_AL Drive Expert Mode Subcommands"
-.sp
 .LP
 The following subcommands are for expert use only, and are applicable only to
 the \fBSENA\fR, Sun Fire 880 internal storage subsystem, and fiber channel
@@ -874,7 +867,6 @@ the loop that contains the device specified by the enclosure or pathname.
 .RE
 
 .SS "Other Expert Mode Subcommands"
-.sp
 .LP
 See \fBNOTES\fR for limitations of these subcommands. They should only be used
 by users that are knowledgeable about the systems they are managing.
@@ -1215,12 +1207,10 @@ example# \fBluxadm release /dev/rdsk/c1t8d0s2\fR
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 See \fBenviron\fR(5) for a description of the \fBLANG\fR environment variable
 that affects the execution of \fBluxadm\fR.
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -1242,7 +1232,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fBusr/lib/firmware/fc_s/fc_s_fcode\fR\fR
@@ -1263,26 +1252,12 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdevlinks\fR(1M), \fBdisks\fR(1M), \fBattributes\fR(5), \fBenviron\fR(5),
 \fBses\fR( 7D)
-.sp
-.LP
-\fISENA Array Installation and Service Manual\fR (p/n 802-7573).
-.sp
-.LP
-\fIRAID Manager 6.1 Installation and Support Guide Answerbook\fR
-.sp
-.LP
-\fIRAID Manager 6.1 User's Guide Answerbook\fR
 .SH NOTES
-.sp
 .LP
-See the \fISENA Array Installation and Service Manual\fR for additional
-information on the \fBSENA.\fR Refer to \fITutorial for SCSI use of IEEE
-Company_ID\fR, R. Snively, for additional information regarding the \fBIEEE\fR
-extended \fBWWN.\fR See \fBSEE ALSO\fR. Currently, only some device drivers
+Currently, only some device drivers
 support hot plugging. If hot plugging is attempted on a disk or bus where it is
 not supported, an error message of the form:
 .sp
diff --git a/usr/src/man/man1m/powerd.1m b/usr/src/man/man1m/powerd.1m
index 6b95512ddd..85e74a838a 100644
--- a/usr/src/man/man1m/powerd.1m
+++ b/usr/src/man/man1m/powerd.1m
@@ -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 POWERD 1M "Oct 15, 1999"
+.TH POWERD 1M "May 13, 2017"
 .SH NAME
 powerd \- power manager daemon
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ powerd \- power manager daemon
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpowerd\fR daemon is started by \fBpmconfig\fR(1M) to monitor system
 activity and perform an automatic shutdown using the suspend-resume feature.
@@ -26,7 +25,6 @@ prior to suspend.
 Immediately prior to system shutdown, the daemon notifies \fBsyslogd\fR(1M) of
 the shutdown, which broadcasts a notification.
 .SH OPTIONS
-.sp
 .LP
 The following option is supported:
 .sp
@@ -40,7 +38,6 @@ No broadcast mode. The daemon silently shuts down the system without notifying
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/power.conf\fR\fR
@@ -50,7 +47,6 @@ Power Management configuration information file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -66,9 +62,8 @@ Interface Stability 	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBpmconfig\fR(1M), \fBdtpower\fR(1M), \fBsyslogd\fR(1M), \fBpower.conf\fR(4),
+\fBpmconfig\fR(1M), \fBsyslogd\fR(1M), \fBpower.conf\fR(4),
 \fBattributes\fR(5), \fBcpr\fR(7), \fBpm\fR(7D)
 .sp
 .LP
diff --git a/usr/src/man/man1m/powertop.1m b/usr/src/man/man1m/powertop.1m
index cedab13ae2..8307bdf330 100644
--- a/usr/src/man/man1m/powertop.1m
+++ b/usr/src/man/man1m/powertop.1m
@@ -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 POWERTOP 1M "May 19, 2009"
+.TH POWERTOP 1M "May 13, 2017"
 .SH NAME
 powertop \- report and analyze events that affect power management
 .SH SYNOPSIS
@@ -13,12 +13,11 @@ powertop \- report and analyze events that affect power management
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBPowerTOP\fR is an observability tool that shows how effectively the system
 is taking advantage of the CPU's power management features. By running the tool
 on an otherwise idle system, the user can see for how long the CPU is running
-at dif- ferent power states. Ideally, an unutilized (idle) system spends 100%
+at different power states. Ideally, an unutilized (idle) system spends 100%
 of its time running at the lowest power state, but because of background user
 and kernel activity (random software periodically waking to poll status), idle
 systems can consume more power than they should.
@@ -49,8 +48,8 @@ management perspective.
 .sp
 .LP
 PowerTOP allows you to freeze each of its three subwindows, enabling you to
-better analyze each subwindow's contents.  when you have three different DTrace
-scripts running at the same time, freezing subwindows lowers CPU consumption .
+better analyze each subwindow's contents.  When you have three different DTrace
+scripts running at the same time, freezing subwindows lowers CPU consumption.
 This feature is activated by pressing the \fBi\fR, \fBf\fR, or \fBe\fR key
 while the tool running.  Pressing one of these keys freezes the idle,
 frequency, or event report, respectively. Pressing it once more, unfreezes it.
@@ -63,7 +62,6 @@ transitions might or might not be accurate as the physical CPU can be shared by
 different virtual CPUs. Both wakeup count and event report displays information
 regarding the current virtualized environment.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -177,7 +175,6 @@ The following command runs PowerTOP and only displays data for CPU 3:
 .sp
 
 .SH EXIT STATUS
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -208,7 +205,6 @@ Incorrect usage.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -226,16 +222,11 @@ Interface Stability	Volatile
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkstat\fR(1M), \fBpmconfig\fR(1M), \fBpowerd\fR(1M), \fBpsrinfo\fR(1M),
 \fBuadmin\fR(2), \fBlibdevinfo\fR(3LIB), \fBattributes\fR(5), \fBxVM\fR(5),
 \fBcpr\fR(7), \fBpm\fR(7D), \fBpm-components\fR(9P), \fBremovable-media\fR(9P)
-.sp
-.LP
-Among non-SunOS man pages, \fBxscreensaver(1)\fR and \fBdtpower(1M)\fR.
 .SH USAGE
-.sp
 .LP
 You must have \fBDTrace\fR privileges to run \fBPowerTOP\fR and root
 (superuser) privileges or assume the Primary Administrator role for the tool to
diff --git a/usr/src/man/man1m/route.1m b/usr/src/man/man1m/route.1m
index 60cbf3f1ae..3cafaee41a 100644
--- a/usr/src/man/man1m/route.1m
+++ b/usr/src/man/man1m/route.1m
@@ -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 ROUTE 1M "April 9, 2016"
+.TH ROUTE 1M "May 13, 2017"
 .SH NAME
 route \- manually manipulate the routing tables
 .SH SYNOPSIS
@@ -114,9 +114,7 @@ option is ignored unless used in conjunction with the \fB-p\fR option. When
 \fB-R\fR is specified, route changes are applied only to the list of saved
 routes to be used at startup, \fBnot\fR to the network routing tables. In
 addition, certain checks, such as the existence of network interfaces used with
-\fB-ifp\fR, are skipped. This can be useful from within JumpStart scripts,
-where the root directory of the system being modified is in a location other
-than \fB/\fR.
+\fB-ifp\fR, are skipped.
 .RE
 
 .sp
diff --git a/usr/src/man/man1m/routeadm.1m b/usr/src/man/man1m/routeadm.1m
index 66e43c8177..a3496050e6 100644
--- a/usr/src/man/man1m/routeadm.1m
+++ b/usr/src/man/man1m/routeadm.1m
@@ -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 ROUTEADM 1M "April 9, 2016"
+.TH ROUTEADM 1M "May 13, 2017"
 .SH NAME
 routeadm \- IP forwarding and routing configuration
 .SH SYNOPSIS
@@ -99,9 +99,7 @@ the configuration for the specified option or variable is displayed.
 .ad
 .sp .6
 .RS 4n
-Specify an alternate root directory where \fBrouteadm\fR applies changes. This
-can be useful from within JumpStart scripts, where the root directory of the
-system being modified is mounted elsewhere.
+Specify an alternate root directory where \fBrouteadm\fR applies changes.
 .LP
 Note -
 .sp
@@ -161,7 +159,7 @@ routing daemon service.
 .RS 4n
 Change property value of property \fIkey\fR to \fIvalue\fR in routing
 application property group for the SMF routing daemon service. For multi-valued
-properties, the  property name can be used multiple times in the modify
+properties, the property name can be used multiple times in the modify
 operation, and each associated value will be added.
 .RE
 
diff --git a/usr/src/man/man1m/rpc.smserverd.1m b/usr/src/man/man1m/rpc.smserverd.1m
index 0aa17afb1b..ba618d60e3 100644
--- a/usr/src/man/man1m/rpc.smserverd.1m
+++ b/usr/src/man/man1m/rpc.smserverd.1m
@@ -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 RPC.SMSERVERD 1M "Mar 1, 2007"
+.TH RPC.SMSERVERD 1M "May 13, 2017"
 .SH NAME
 rpc.smserverd \- removable media device server
 .SH SYNOPSIS
@@ -13,16 +13,14 @@ rpc.smserverd \- removable media device server
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBrpc.smserverd\fR is a server that handles requests from client
-applications, such as volume management software, for access to removable media
-devices. In addition to volume management software, \fBrmformat\fR(1) and the
-CDE Filemanager (when performing removable media operations) are
-\fBrpc.smserverd\fR clients. The \fBrpc.smserverd\fR daemon is started by
+applications, such as volume management software or \fBrmformat\fR(1),
+for access to removable media
+devices. The \fBrpc.smserverd\fR daemon is started by
 \fBinetd\fR(1M) when a client makes a call to a Solaris-internal library to
 access a SCSI, IDE, or USB device. The daemon is not started if a client
-attempts to access a  floppy or PCMCIA device. Once started, the daemon remains
+attempts to access a floppy or PCMCIA device. Once started, the daemon remains
 active until such time as it is idle for three minutes or more.
 .sp
 .LP
@@ -30,12 +28,10 @@ The \fBrpc.smserverd\fR daemon is provided for the exclusive use of the client
 applications mentioned above. It has no external, customer-accessible
 interfaces, including no configuration file.
 .SH SEE ALSO
-.sp
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBsvcadm\fR(1M),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBrmformat\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M),
+\fBsvcadm\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fBrpc.smserverd\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifier:
diff --git a/usr/src/man/man1m/rpcbind.1m b/usr/src/man/man1m/rpcbind.1m
index 556bd78f93..afd563c146 100644
--- a/usr/src/man/man1m/rpcbind.1m
+++ b/usr/src/man/man1m/rpcbind.1m
@@ -5,7 +5,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 RPCBIND 1M "Feb 13, 2015"
+.TH RPCBIND 1M "May 13, 2017"
 .SH NAME
 rpcbind \- universal addresses to RPC program number mapper
 .SH SYNOPSIS
@@ -247,11 +247,8 @@ TCP wrappers is External.
 .SH SEE ALSO
 .LP
 \fBsmf\fR(5), \fBrpcinfo\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
-\fBrpcbind\fR(3NSL), \fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
-.sp
-.LP
-For information on the TCP wrappers facility, see the \fBhosts_access(4)\fR man
-page available in the \fBSUNWtcpd\fR package.
+\fBrpcbind\fR(3NSL), \fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5),
+\fBhosts_access\fR(4)
 .SH NOTES
 .LP
 Terminating \fBrpcbind\fR with \fBSIGKILL\fR prevents the warm-start files from
diff --git a/usr/src/man/man1m/sar.1m b/usr/src/man/man1m/sar.1m
index 8641182475..854e8d5b4a 100644
--- a/usr/src/man/man1m/sar.1m
+++ b/usr/src/man/man1m/sar.1m
@@ -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 SAR 1M "Aug 20, 2004"
+.TH SAR 1M "May 13, 2017"
 .SH NAME
 sar, sa1, sa2, sadc \- system activity report package
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ sar, sa1, sa2, sadc \- system activity report package
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 System activity data can be accessed at the special request of a user (see
 \fBsar\fR(1)) and automatically, on a routine basis, as described here. The
@@ -93,7 +92,6 @@ during the working day:
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/tmp/sa.adrfl\fR\fR
@@ -134,16 +132,14 @@ Daily report file
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBcrontab\fR(1), \fBsag\fR(1), \fBsar\fR(1), \fBsvcs\fR(1), \fBtimex\fR(1),
+\fBcrontab\fR(1), \fBsar\fR(1), \fBsvcs\fR(1), \fBtimex\fR(1),
 \fBiostat\fR(1M), \fBsvcadm\fR(1M), \fBvmstat\fR(1M), \fBattributes\fR(5),
 \fBsmf\fR(5)
 .sp
 .LP
 \fI\fR
 .SH NOTES
-.sp
 .LP
 The \fBsar\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifier:
diff --git a/usr/src/man/man1m/sendmail.1m b/usr/src/man/man1m/sendmail.1m
index 45945aa83e..dff3a81c36 100644
--- a/usr/src/man/man1m/sendmail.1m
+++ b/usr/src/man/man1m/sendmail.1m
@@ -6,7 +6,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 SENDMAIL 1M "April 9, 2016"
+.TH SENDMAIL 1M "May 13, 2017"
 .SH NAME
 sendmail \- send mail over the internet
 .SH SYNOPSIS
@@ -158,9 +158,7 @@ automate (re)building of configuration files when the service is started.
 .LP
 \fBsendmail\fR uses TCP Wrappers to restrict access to hosts. It uses the
 service name of \fBsendmail\fR for \fBhosts_access()\fR. For more information
-on TCP Wrappers, see \fBtcpd\fR(1M) and \fBhosts_access\fR(4) in the
-\fBSUNWtcpd\fR package. \fBtcpd\fR(1M) and \fBhosts_access\fR(4) are not part
-of the Solaris man pages.
+on TCP Wrappers, see \fBtcpd\fR(1M) and \fBhosts_access\fR(4).
 .SS "Startup Options"
 .LP
 The \fB/etc/default/sendmail\fR file stores startup options for \fBsendmail\fR
@@ -3440,10 +3438,7 @@ Describes the steps needed to compile and run a filter
 \fBfork\fR(2), \fBgetpwnam\fR(3C), \fBgetusershell\fR(3C),
 \fBresolver\fR(3RESOLV), \fBaliases\fR(4), \fBhosts\fR(4), \fBsendmail\fR(4),
 \fBshells\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5), \fBsmf\fR(5),
-\fBrandom\fR(7D)
-.sp
-.LP
-\fBtcpd\fR(1M), \fBhosts_access\fR(4) in the \fBSUNWtcpd\fR package.
+\fBrandom\fR(7D), \fBtcpd\fR(1M), \fBhosts_access\fR(4)
 .sp
 .LP
 \fBRFC\fR 2821 \fISimple Mail Transfer Protocol\fR, John Klensin, April 2001.
diff --git a/usr/src/man/man1m/svccfg.1m b/usr/src/man/man1m/svccfg.1m
index 600a1c85b5..989e4a68db 100644
--- a/usr/src/man/man1m/svccfg.1m
+++ b/usr/src/man/man1m/svccfg.1m
@@ -4,7 +4,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 SVCCFG 1M "April 9, 2016"
+.TH SVCCFG 1M "May 13, 2017"
 .SH NAME
 svccfg \- import, export, and modify service configurations
 .SH SYNOPSIS
@@ -149,7 +149,7 @@ Uses \fIrepfile\fR as a repository. By default, \fBsvccfg\fR(1M) uses the
 system repository.
 .sp
 Use repository only with files from the identical version of Solaris, including
-patches, that you are currently running. Do not use this subcommand with the
+updates, that you are currently running. Do not use this subcommand with the
 system repository, \fB/etc/svc/repository.db\fR.
 .RE
 
diff --git a/usr/src/man/man1m/tnctl.1m b/usr/src/man/man1m/tnctl.1m
index 351f399d67..77817db9ec 100644
--- a/usr/src/man/man1m/tnctl.1m
+++ b/usr/src/man/man1m/tnctl.1m
@@ -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 TNCTL 1M "Mar 6, 2008"
+.TH TNCTL 1M "May 13, 2017"
 .SH NAME
 tnctl \- configure Trusted Extensions network parameters
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ tnctl \- configure Trusted Extensions network parameters
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBtnctl\fR provides an interface to manipulate trusted network parameters in
 the Solaris kernel.
@@ -24,8 +23,8 @@ the Solaris kernel.
 As part of Solaris Trusted Extensions initialization, \fBtnctl\fR is run in the
 global zone by an \fBsmf\fR(5) script during system boot. The \fBtnctl\fR
 command is not intended to be used during normal system administration.
-Instead, if a local trusted networking database file is modified without using
-the Solaris Management Console, the administrator first issues
+Instead, if a local trusted networking database file is modified,
+the administrator first issues
 \fBtnchkdb\fR(1M) to check the syntax, and then refreshes the kernel copy with
 this command:
 .sp
@@ -41,7 +40,6 @@ this command:
 See \fBWARNINGS\fR about the risks of changing remote host and template
 information on a running system.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-d\fR\fR
@@ -94,7 +92,7 @@ Turn on verbose mode.
 .ad
 .sp .6
 .RS 4n
-Update the kernel remote-host cache on the local host for  the specified
+Update the kernel remote-host cache on the local host for the specified
 \fIhost\fR or, if a template name is given, change the kernel's cache to use
 the specified \fItemplate\fR. If \fIprefix\fR is not specified, then an implied
 prefix length is determined according to the rules used for interpreting the
@@ -167,7 +165,6 @@ reload MLPs for a non-global zone, reboot the zone:
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -183,7 +180,6 @@ Interface Stability	Uncommitted
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/security/tsol/tnrhdb\fR\fR
@@ -224,7 +220,6 @@ Configuration file for the name service switch
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBtninfo\fR(1M), \fBtnd\fR(1M),
 \fBtnchkdb\fR(1M), \fBzoneadm\fR(1M), \fBnsswitch.conf\fR(4),
@@ -234,12 +229,10 @@ Configuration file for the name service switch
 \fIHow to Synchronize Kernel Cache With Network Databases\fR in \fISolaris
 Trusted Extensions Administrator\&'s Procedures\fR
 .SH WARNINGS
-.sp
 .LP
 Changing a template while the network is up can change the security view of an
 undetermined number of hosts.
 .SH NOTES
-.sp
 .LP
 The functionality described on this manual page is available only if the system
 is configured with Trusted Extensions.
diff --git a/usr/src/man/man1m/usermod.1m b/usr/src/man/man1m/usermod.1m
index 5ddf6ae88d..fd337ca082 100644
--- a/usr/src/man/man1m/usermod.1m
+++ b/usr/src/man/man1m/usermod.1m
@@ -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 USERMOD 1M "Feb 25, 2017"
+.TH USERMOD 1M "May 13, 2017"
 .SH NAME
 usermod \- modify a user's login information on the system
 .SH SYNOPSIS
@@ -341,8 +341,7 @@ jdoe::::type=normal;defaultpriv=basic,!proc_session;limitpriv=all
 .sp
 .LP
 The following command assigns a role to a user. The role must have been created
-prior to this command, either through use of the Solaris Management Console GUI
-or through \fBroleadd\fR(1M).
+prior to this command, see \fBroleadd\fR(1M).
 
 .sp
 .in +2
@@ -581,5 +580,5 @@ network nameservice. However \fBusermod\fR will verify the uniqueness of user
 name and user \fBID\fR against the external nameservice.
 .sp
 .LP
-The \fBusermod\fR utility uses the \fB/etc/datemsk\fR file, available with
-SUNWaccr, for date formatting.
+The \fBusermod\fR utility uses the \fB/etc/datemsk\fR file
+for date formatting.
diff --git a/usr/src/man/man1m/ypbind.1m b/usr/src/man/man1m/ypbind.1m
index 5e8101b686..1cd12276e9 100644
--- a/usr/src/man/man1m/ypbind.1m
+++ b/usr/src/man/man1m/ypbind.1m
@@ -4,7 +4,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 YPBIND 1M "Feb 25, 2017"
+.TH YPBIND 1M "May 13, 2017"
 .SH NAME
 ypbind \- NIS binder process
 .SH SYNOPSIS
@@ -26,7 +26,7 @@ Administrative tools are described in \fBypinit\fR(1M), \fBypwhich\fR(1), and
 \fBypbind\fR is a daemon process that is activated at system startup time from
 the \fBsvc:/network/nis/client:default\fR service. By default, it is invoked as
 \fBypbind\fR \fB-broadcast\fR. \fBypbind\fR runs on all client machines that
-are set up to use \fBNIS\fR. See \fBsysidtool\fR(1M). The function of
+are set up to use \fBNIS\fR. The function of
 \fBypbind\fR is to remember information that lets all \fBNIS\fR client
 processes on a node communicate with some \fBNIS\fR server process.
 \fBypbind\fR must run on every machine which has \fBNIS\fR client processes.
@@ -36,10 +36,10 @@ running somewhere on the network.
 .LP
 The information \fBypbind\fR remembers is called a \fIbinding\fR \(em the
 association of a domain name with a \fBNIS\fR server. The process of binding is
-driven by client requests.  As a request for  an unbound domain comes in, if
-started with the \fB-broadcast\fR option, the \fBypbind\fR process  broadcasts
+driven by client requests.  As a request for an unbound domain comes in, if
+started with the \fB-broadcast\fR option, the \fBypbind\fR process broadcasts
 on the net trying to find an \fBNIS\fR server, a \fBypserv\fR process
-serving the domain. Since the binding is established by broadcasting,  there
+serving the domain. Since the binding is established by broadcasting, there
 must be at least one \fBNIS\fR server on the net. If started without the
 \fB-broadcast\fR option, \fBypbind\fR process steps through the list of
 \fBNIS\fR servers that was created by \fBypinit\fR \fB-c\fR for the requested
@@ -75,7 +75,7 @@ work, \fBypbind\fR must have been invoked with flags \fB-ypset\fR or
 .ad
 .sp .6
 .RS 4n
-Send a broadcast datagram using \fBUDP/IP\fR  that requests the information
+Send a broadcast datagram using \fBUDP/IP\fR that requests the information
 needed to bind to a specific \fBNIS\fR server. This option is analogous to
 \fBypbind\fR with no options in earlier Sun releases and is recommended for
 ease of use.
@@ -134,9 +134,9 @@ File in which it is recommended that NIS servers be listed.
 \fBattributes\fR(5), \fBsmf\fR(5)
 .SH NOTES
 .LP
-\fBypbind\fR supports multiple domains. The  \fBypbind\fR process can maintain
+\fBypbind\fR supports multiple domains. The \fBypbind\fR process can maintain
 bindings to several domains and their servers, the default domain is the one
-specified by the  \fBdomainname\fR(1M) command at startup time.
+specified by the \fBdomainname\fR(1M) command at startup time.
 .sp
 .LP
 The \fB-broadcast\fR option works only on the \fBUDP\fR transport. It is
diff --git a/usr/src/man/man1m/zoneadm.1m b/usr/src/man/man1m/zoneadm.1m
index 1ddfc1356a..145e6cc893 100644
--- a/usr/src/man/man1m/zoneadm.1m
+++ b/usr/src/man/man1m/zoneadm.1m
@@ -4,7 +4,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 ZONEADM 1M "Sep 8, 2015"
+.TH ZONEADM 1M "May 13, 2017"
 .SH NAME
 zoneadm \- administer zones
 .SH SYNOPSIS
@@ -666,13 +666,3 @@ svc:/system/zones:default
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
 status can be queried using the \fBsvcs\fR(1) command.
-.sp
-.LP
-The act of installing a new non-global zone is a fresh installation of the
-Solaris operating system. A new installation of Solaris must not require
-interaction with the user (that is, it must be "hands off"). Because of this,
-packages installed in the global zone and all non-global zones cannot contain
-request scripts (see \fBpkgask\fR(1M)). If a package did have a request script,
-then the creation of a non-global zone could not be done without user
-intervention. Any package that contains a request script is added to the global
-zone only. See \fBpkgadd\fR(1M).
diff --git a/usr/src/man/man1m/zonecfg.1m b/usr/src/man/man1m/zonecfg.1m
index 5371592ade..8182046544 100644
--- a/usr/src/man/man1m/zonecfg.1m
+++ b/usr/src/man/man1m/zonecfg.1m
@@ -4,7 +4,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 ZONECFG 1M "Jun 6, 2016"
+.TH ZONECFG 1M "May 13, 2017"
 .SH NAME
 zonecfg \- set up zone configuration
 .SH SYNOPSIS
@@ -1517,8 +1517,8 @@ other zones configured on the system.
 
 .sp
 .LP
-The IP addresses and routing is configured inside the new zone using
-\fBsysidtool\fR(1M).
+The IP addresses and routing should be configured inside the new zone using
+the normal networking administration tools such as \fBipadm\fR(1M).
 
 .sp
 .in +2
@@ -1883,7 +1883,7 @@ Interface Stability	Volatile
 .LP
 \fBppriv\fR(1), \fBprctl\fR(1), \fBzlogin\fR(1), \fBkstat\fR(1M),
 \fBmount\fR(1M), \fBpooladm\fR(1M), \fBpoolcfg\fR(1M), \fBpoold\fR(1M),
-\fBrcapd\fR(1M), \fBrctladm\fR(1M), \fBsvcadm\fR(1M), \fBsysidtool\fR(1M),
+\fBrcapd\fR(1M), \fBrctladm\fR(1M), \fBsvcadm\fR(1M), \fBipadm\fR(1M),
 \fBzfs\fR(1M), \fBzoneadm\fR(1M), \fBpriv_str_to_set\fR(3C),
 \fBkstat\fR(3KSTAT), \fBvfstab\fR(4), \fBattributes\fR(5), \fBbrands\fR(5),
 \fBfnmatch\fR(5), \fBlx\fR(5), \fBprivileges\fR(5), \fBresource_controls\fR(5),
diff --git a/usr/src/man/man2/getcontext.2 b/usr/src/man/man2/getcontext.2
index 98ec4f4857..8e884a926b 100644
--- a/usr/src/man/man2/getcontext.2
+++ b/usr/src/man/man2/getcontext.2
@@ -7,7 +7,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 GETCONTEXT 2 "Feb 5, 2001"
+.TH GETCONTEXT 2 "May 13, 2017"
 .SH NAME
 getcontext, setcontext \- get and set current user context
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ getcontext, setcontext \- get and set current user context
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBgetcontext()\fR function initializes the structure pointed to by
 \fIucp\fR to the current user context of the calling process.  The
@@ -52,23 +51,20 @@ then this context is the main context, and the process will exit when this
 context returns.  The effects of passing a \fIucp\fR argument obtained from any
 other source are unspecified.
 .SH RETURN VALUES
-.sp
 .LP
 On successful completion, \fBsetcontext()\fR does not return and
 \fBgetcontext()\fR returns \fB0\fR. Otherwise, \fB\(mi1\fR is returned.
 .SH ERRORS
-.sp
 .LP
 No errors are defined.
 .SH USAGE
-.sp
 .LP
 When a signal handler is executed, the current user context is saved and a new
 context is created.  If the thread leaves the signal handler via
-\fBlongjmp\fR(3UCB), then it is unspecified whether the context at the time of
-the corresponding \fBsetjmp\fR(3UCB) call is restored and thus whether future
+\fBlongjmp\fR(3C), then it is unspecified whether the context at the time of
+the corresponding \fBsetjmp\fR(3C) call is restored and thus whether future
 calls to \fBgetcontext()\fR will provide an accurate representation of the
-current context, since the context restored by \fBlongjmp\fR(3UCB) may not
+current context, since the context restored by \fBlongjmp\fR(3C) may not
 contain all the information that \fBsetcontext()\fR requires.  Signal handlers
 should use \fBsiglongjmp\fR(3C) instead.
 .sp
@@ -79,7 +75,6 @@ includes any process-wide static data, possibly including \fBerrno\fR. Users
 manipulating contexts should take care to handle these explicitly when
 required.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -95,9 +90,8 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsigaction\fR(2), \fBsigaltstack\fR(2), \fBsigprocmask\fR(2),
-\fBbsd_signal\fR(3C), \fBmakecontext\fR(3C), \fBsetjmp\fR(3UCB),
+\fBbsd_signal\fR(3C), \fBmakecontext\fR(3C), \fBsetjmp\fR(3C),
 \fBsigsetjmp\fR(3C), \fBucontext.h\fR(3HEAD), \fBattributes\fR(5),
 \fBstandards\fR(5)
diff --git a/usr/src/man/man2/memcntl.2 b/usr/src/man/man2/memcntl.2
index 0e380753d1..d0f34fd221 100644
--- a/usr/src/man/man2/memcntl.2
+++ b/usr/src/man/man2/memcntl.2
@@ -4,7 +4,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 MEMCNTL 2 "Apr 10, 2007"
+.TH MEMCNTL 2 "May 13, 2017"
 .SH NAME
 memcntl \- memory management control
 .SH SYNOPSIS
@@ -18,7 +18,6 @@ memcntl \- memory management control
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBmemcntl()\fR function allows the calling process to apply a variety of
 control operations over the address space identified by the mappings
@@ -320,10 +319,8 @@ Due to the potential impact on system resources, the operations
 \fBMC_LOCKAS\fR, \fBMC_LOCK\fR, \fBMC_UNLOCKAS\fR, and \fBMC_UNLOCK\fR are
 restricted to privileged processes.
 .SH USAGE
-.sp
 .LP
-The \fBmemcntl()\fR function subsumes the operations of \fBplock\fR(3C) and
-\fBmctl\fR(3UCB).
+The \fBmemcntl()\fR function subsumes the operations of \fBplock\fR(3C).
 .sp
 .LP
 \fBMC_HAT_ADVISE\fR is intended to improve performance of applications that use
@@ -334,12 +331,10 @@ also introduce extra overhead that could reduce performance or available
 memory.  Using large sizes for one application may reduce available resources
 for other applications and result in slower system wide performance.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBmemcntl()\fR returns \fB0\fR; otherwise, it
 returns \fB\(mi1\fR and sets \fBerrno\fR to indicate an error.
 .SH ERRORS
-.sp
 .LP
 The \fBmemcntl()\fR function will fail if:
 .sp
@@ -377,7 +372,7 @@ When the selection criteria match, some or all of the addresses in the range
 .ad
 .RS 10n
 The \fIaddr\fR argument specifies invalid selection criteria or is not a
-multiple of the page size as returned by  \fBsysconf\fR(3C); the \fIaddr\fR
+multiple of the page size as returned by \fBsysconf\fR(3C); the \fIaddr\fR
 and/or \fIlen\fR argument does not have the value \fB0\fR when \fBMC_LOCKAS\fR
 or \fBMC_UNLOCKAS\fR is specified; the \fIarg\fR argument is not valid for the
 function specified; \fBmha_pagesize\fR or \fBmha_cmd\fR is invalid; or
@@ -408,7 +403,6 @@ or \fBMC_UNLOCKAS\fR was specified.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -424,9 +418,8 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBppgsz\fR(1), \fBfork\fR(2), \fBmmap\fR(2), \fBmprotect\fR(2),
-\fBgetpagesizes\fR(3C), \fBmctl\fR(3UCB), \fBmlock\fR(3C), \fBmlockall\fR(3C),
+\fBgetpagesizes\fR(3C), \fBmlock\fR(3C), \fBmlockall\fR(3C),
 \fBmsync\fR(3C), \fBplock\fR(3C), \fBsysconf\fR(3C), \fBattributes\fR(5),
 \fBprivileges\fR(5)
diff --git a/usr/src/man/man2/ntp_adjtime.2 b/usr/src/man/man2/ntp_adjtime.2
index e905117b90..417413eba5 100644
--- a/usr/src/man/man2/ntp_adjtime.2
+++ b/usr/src/man/man2/ntp_adjtime.2
@@ -4,7 +4,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 NTP_ADJTIME 2 "May 21, 2009"
+.TH NTP_ADJTIME 2 "May 13, 2017"
 .SH NAME
 ntp_adjtime \- adjust local clock parameters
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ ntp_adjtime \- adjust local clock parameters
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBntp_adjtime()\fR function adjusts the parameters used to discipline the
 local clock, according to the values in the struct \fBtimex\fR pointed to by
@@ -54,13 +53,11 @@ struct timex {
 .in -2
 
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBntp_adjtime()\fR returns the current clock state
 (see <\fBsys/timex.h\fR>). Otherwise, it returns \fB\(mi1\fR and sets
 \fBerrno\fR to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBntp_adjtime()\fR function will fail if:
 .sp
@@ -69,7 +66,7 @@ The \fBntp_adjtime()\fR function will fail if:
 \fB\fBEFAULT\fR\fR
 .ad
 .RS 10n
-The  \fItptr\fR argument is an invalid pointer.
+The \fItptr\fR argument is an invalid pointer.
 .RE
 
 .sp
@@ -93,10 +90,5 @@ calling process.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBntp_gettime\fR(2), \fBprivileges\fR(5)
-.sp
-.LP
-See the \fBntpd\fR man page, delivered in the \fBSUNWntpu\fR package (not a
-SunOS man page).
diff --git a/usr/src/man/man2/ntp_gettime.2 b/usr/src/man/man2/ntp_gettime.2
index 1a0976163c..d3f886a197 100644
--- a/usr/src/man/man2/ntp_gettime.2
+++ b/usr/src/man/man2/ntp_gettime.2
@@ -4,7 +4,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 NTP_GETTIME 2 "May 21, 2009"
+.TH NTP_GETTIME 2 "May 13, 2017"
 .SH NAME
 ntp_gettime \- get local clock values
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ ntp_gettime \- get local clock values
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBntp_gettime()\fR function reads the local clock value and dispersion,
 returning the information in \fItptr\fR.
@@ -35,13 +34,11 @@ struct ntptimeval {
 .in -2
 
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBntp_gettime()\fR returns the current clock state
 (see <\fBsys/timex.h\fR>). Otherwise, it returns \fB\(mi1\fR and sets
 \fBerrno\fR to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBntp_gettime()\fR function will fail if:
 .sp
@@ -67,10 +64,5 @@ pointed to by \fItptr\fR is too small to contain the correct number of seconds.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBntp_adjtime\fR(2)
-.sp
-.LP
-See the \fBntpd\fR man page, delivered in the \fBSUNWntpu\fR package (not a
-SunOS man page).
diff --git a/usr/src/man/man3/Intro.3 b/usr/src/man/man3/Intro.3
index 330dec1b76..def871c8d9 100644
--- a/usr/src/man/man3/Intro.3
+++ b/usr/src/man/man3/Intro.3
@@ -1,10 +1,11 @@
 '\" te
+.\" Copyright 2017 Peter Tribble
 .\" Copyright 2015 Joyent, Inc.
 .\" Copyright (c) 2009, 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 INTRO 3 "Mar 6, 2017"
+.TH INTRO 3 "May 13, 2017"
 .SH NAME
 Intro, intro \- introduction to functions and libraries
 .SH DESCRIPTION
@@ -43,17 +44,6 @@ use only, and could change at any time.
 .sp
 .ne 2
 .na
-\fB(3LIBUCB)\fR
-.ad
-.sp .6
-.RS 4n
-The SunOS/BSD Compatibility libraries described in this section are implemented
-as a shared object. See (3LIB) above.
-.RE
-
-.sp
-.ne 2
-.na
 \fB(3HEAD)\fR
 .ad
 .sp .6
@@ -126,21 +116,6 @@ link with, respectively, \fBlibmalloc\fR, \fBlibbsdmalloc\fR,
 \fBlibmtmalloc\fR(3LIB), and \fBlibumem\fR(3LIB).
 .RE
 
-.sp
-.ne 2
-.na
-\fB(3UCB)\fR
-.ad
-.sp .6
-.RS 4n
-These functions constitute the source compatibility (with BSD functions)
-library. It is implemented as a shared object, \fBlibucb.so\fR, but is not
-automatically linked by the C compilation system. Specify \fB-lucb\fR on the
-\fBcc\fR command line to link with this library, which is located in the
-\fB/usr/ucb\fR subdirectory. Headers for this library are located within
-\fB/usr/ucbinclude\fR. See \fBlibucb\fR(3LIBUCB).
-.RE
-
 .SS "Networking Library Functions"
 .LP
 The functions described in this volume comprise the various networking
@@ -256,7 +231,7 @@ applications should not link to it. Both libraries are implemented as shared
 objects, \fBlibrpcsvc.so\fR and \fBlibrpcsoc.so\fR, respectively. Neither
 library is automatically linked by the C compilation system. Specify
 \fB-lrpcsvc\fR or \fB-lrpcsoc\fR on the \fBcc\fR command line to link with
-these libraries. See \fBlibrpcsvc\fR(3LIB) and \fBlibrpcsoc\fR(3LIBUCB).
+these libraries. See \fBlibrpcsvc\fR(3LIB).
 .RE
 
 .sp
@@ -406,19 +381,6 @@ command line to link with this library. See \fBlibpanel\fR(3LIB).
 .sp
 .ne 2
 .na
-\fB(3PLOT)\fR
-.ad
-.sp .6
-.RS 4n
-These functions constitute the graphics library, \fBlibplot\fR. This library is
-implemented as a shared object, \fBlibplot.so\fR, but is not automatically
-linked by the C compilation system. Specify \fB-lplot\fR on the \fBcc\fR
-command line to link with this library. See \fBlibplot\fR(3LIB).
-.RE
-
-.sp
-.ne 2
-.na
 \fB(3XCURSES)\fR
 .ad
 .sp .6
@@ -571,7 +533,7 @@ command line to link with these libraries. See \fBlibexacct\fR(3LIB) and
 .ad
 .sp .6
 .RS 4n
-These functions constitute the Fibre  Channel  over Ethernet port management
+These functions constitute the Fibre Channel over Ethernet port management
 library. This library is implemented as a shared object, \fBlibfcoe.so\fR, but
 is not automatically linked by the C compilation system. Specify \fB-lfcoe\fR
 on the \fBcc\fR command line to link with this library. See
@@ -661,19 +623,6 @@ line to link with this library. See \fBlibkvm\fR(3LIB).
 .sp
 .ne 2
 .na
-\fB(3LAYOUT)\fR
-.ad
-.sp .6
-.RS 4n
-These functions constitute the layout service library, which is implemented as
-a shared object, \fBliblayout.so\fR, but is not automatically linked by the C
-compilation system. Specify \fB-llayout\fR on the \fBcc\fR command line to link
-with this library. See \fBliblayout\fR(3LIB).
-.RE
-
-.sp
-.ne 2
-.na
 \fB(3LGRP)\fR
 .ad
 .sp .6
@@ -918,35 +867,6 @@ See \fBlibsecdb\fR(3LIB).
 .sp
 .ne 2
 .na
-\fB(3SMARTCARD)\fR
-.ad
-.sp .6
-.RS 4n
-These functions constitute the smartcard library, \fBlibsmartcard\fR. This
-library is implemented as a shared object, \fBlibsmartcard.so\fR, but is not
-automatically linked by the C compilation system. Specify \fB-lsmartcard\fR on
-the \fBcc\fR command line to link with this library. See
-\fBlibsmartcard\fR(3LIB).
-.RE
-
-.sp
-.ne 2
-.na
-\fB(3SNMP)\fR
-.ad
-.sp .6
-.RS 4n
-These functions constitute the SNMP libraries, \fBlibssagent\fR and
-\fBlibssasnmp\fR. These libraries are implemented as shared objects,
-\fBlibssagent.so\fR and \fBlibssasnmp.so\fR, respectively, but are not
-automatically linked by the C compilation system. Specify \fB-lssagent\fR or
-\fB-lssasnmp\fR on the \fBcc\fR command line to link with these libraries. See
-\fBlibssagent\fR(3LIB) and \fBlibssasnmp\fR(3LIB).
-.RE
-
-.sp
-.ne 2
-.na
 \fB(3STMF)\fR
 .ad
 .sp .6
@@ -1047,20 +967,6 @@ automatically linked by the C compilation system. Specify \fB-lvolmgt\fR on the
 .sp
 .ne 2
 .na
-\fB(3WSREG)\fR
-.ad
-.sp .6
-.RS 4n
-These functions constitute the product install registry library,
-\fBlibwsreg\fR. This library is implemented as a shared object,
-\fBlibwsreg.so\fR, but is not automatically linked by the C compilation system.
-Specify \fB-lwsreg\fR on the \fBcc\fR command line to link with this library.
-See \fBlibwsreg\fR(3LIB).
-.RE
-
-.sp
-.ne 2
-.na
 \fB(3XTSOL)\fR
 .ad
 .sp .6
@@ -1072,32 +978,6 @@ Specify \fB-lX11\fR and then \fB-lXtsol\fR on the \fBcc\fR command line to link
 with this library. See \fBlibXtsol\fR(3LIB).
 .RE
 
-.SS "Multimedia Library Functions"
-.ne 2
-.na
-\fB(3MLIB)\fR
-.ad
-.sp .6
-.RS 4n
-These functions constitute the mediaLib library, \fBlibmlib\fR. This library is
-implemented as a shared object, \fBlibmlib.so\fR, but is not automatically
-linked by the C compilation system. Specify \fB-lmlib\fR on the \fBcc\fR
-command line to link with this library. See \fBlibmlib\fR(3LIB).
-.RE
-
-.sp
-.ne 2
-.na
-\fB(3MMS)\fR
-.ad
-.sp .6
-.RS 4n
-These functions constitute the Media Management System library, \fBlibmms\fR.
-This library is implemented as a shared object, \fBlibmms.so\fR, but is not
-automatically linked by the C compilation system. Specify \fB-lmms\fR on the
-\fBcc\fR command line to link with this library. See \fBlibmms\fR(3LIB).
-.RE
-
 .SH DEFINITIONS
 .LP
 A character is any bit pattern able to fit into a byte on the machine. In some
diff --git a/usr/src/man/man3/hosts_access.3 b/usr/src/man/man3/hosts_access.3
index 5a421a8e6d..95032c4baf 100644
--- a/usr/src/man/man3/hosts_access.3
+++ b/usr/src/man/man3/hosts_access.3
@@ -1,4 +1,4 @@
-.TH HOSTS_ACCESS 3 "Sep 15, 2011"
+.TH HOSTS_ACCESS 3 "May 13, 2017"
 .SH NAME
 hosts_access, hosts_ctl, libwrap, request_init, request_set \- access control library
 .SH SYNOPSIS
@@ -24,7 +24,7 @@ char *client_addr;
 char *client_user;
 .fi
 .SH DESCRIPTION
-The routines described in this document are part of the \fIlibwrap.a\fR
+The routines described in this document are part of the \fIlibwrap\fR
 library. They implement a rule-based access control language with
 optional shell commands that are executed when a rule fires.
 .PP
@@ -56,7 +56,7 @@ The name of the daemon process running on the server host.
 The name of the user on whose behalf the client host makes the request.
 .PP
 hosts_access() consults the access control tables described in the
-\fIhosts_access(5)\fR manual page.  When internal endpoint information
+\fIhosts_access\fR(4) manual page.  When internal endpoint information
 is available, host names and client user names are looked up on demand,
 using the request structure as a cache.  hosts_access() returns zero if
 access should be denied.
@@ -75,8 +75,8 @@ tables.
 .SH DIAGNOSTICS
 Problems are reported via the syslog daemon.
 .SH SEE ALSO
-hosts_access(5), format of the access control tables.
-hosts_options(5), optional extensions to the base language.
+hosts_access(4), format of the access control tables.
+hosts_options(4), optional extensions to the base language.
 .SH FILES
 /etc/hosts.allow, /etc/hosts.deny, access control tables.
 .SH BUGS
diff --git a/usr/src/man/man3c/aioread.3c b/usr/src/man/man3c/aioread.3c
index 03ebaa704d..1a790d07e8 100644
--- a/usr/src/man/man3c/aioread.3c
+++ b/usr/src/man/man3c/aioread.3c
@@ -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 AIOREAD 3C "Feb 5, 2008"
+.TH AIOREAD 3C "May 13, 2017"
 .SH NAME
 aioread, aiowrite \- read or write asynchronous I/O operations
 .SH SYNOPSIS
@@ -23,7 +23,6 @@ aioread, aiowrite \- read or write asynchronous I/O operations
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBaioread()\fR function initiates one asynchronous \fBread\fR(2) and
 returns control to the calling program. The read continues concurrently with
@@ -72,8 +71,8 @@ application until after the operation has completed. While the operation is in
 progress, this buffer is in use by the operating system.
 .sp
 .LP
-Notification of the completion of an asynchronous I/O  operation can be
-obtained synchronously through the  \fBaiowait\fR(3C) function, or
+Notification of the completion of an asynchronous I/O operation can be
+obtained synchronously through the \fBaiowait\fR(3C) function, or
 asynchronously by installing a signal handler for the \fBSIGIO\fR signal.
 Asynchronous notification is accomplished by sending the process a \fBSIGIO\fR
 signal. If a signal handler is not installed for the \fBSIGIO\fR signal,
@@ -97,13 +96,11 @@ It is an error to use the same result buffer in more than one outstanding
 request. These structures can be reused only after the system has completed the
 operation.
 .SH RETURN VALUES
-.sp
 .LP
-Upon successful completion,  \fBaioread()\fR and \fBaiowrite()\fR return
+Upon successful completion, \fBaioread()\fR and \fBaiowrite()\fR return
 \fB0\fR. Upon failure, \fBaioread()\fR and \fBaiowrite()\fR return \fB\(mi1\fR
 and set \fBerrno\fR to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBaioread()\fR and \fBaiowrite()\fR functions will fail if:
 .sp
@@ -165,12 +162,10 @@ Memory resources are unavailable to initiate request.
 .RE
 
 .SH USAGE
-.sp
 .LP
 The \fBaioread()\fR and \fBaiowrite()\fR functions have transitional interfaces
 for 64-bit file offsets.  See \fBlf64\fR(5).
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -186,9 +181,8 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBclose\fR(2), \fBexecve\fR(2), \fBexit\fR(2), \fBllseek\fR(2),
 \fBlseek\fR(2), \fBopen\fR(2), \fBread\fR(2), \fBwrite\fR(2),
-\fBaiocancel\fR(3C), \fBaiowait\fR(3C), \fBsigvec\fR(3UCB),
+\fBaiocancel\fR(3C), \fBaiowait\fR(3C),
 \fBattributes\fR(5), \fBlf64\fR(5)
diff --git a/usr/src/man/man3c/bsd_signal.3c b/usr/src/man/man3c/bsd_signal.3c
index b8f7784015..1a6cd472ea 100644
--- a/usr/src/man/man3c/bsd_signal.3c
+++ b/usr/src/man/man3c/bsd_signal.3c
@@ -7,7 +7,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 BSD_SIGNAL 3C "Jul 24, 2002"
+.TH BSD_SIGNAL 3C "May 13, 2017"
 .SH NAME
 bsd_signal \- simplified signal facilities
 .SH SYNOPSIS
@@ -19,7 +19,6 @@ bsd_signal \- simplified signal facilities
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBbsd_signal()\fR function provides a partially compatible interface for
 programs written to historical system interfaces (see \fBUSAGE\fR below).
@@ -61,28 +60,24 @@ where \fIsig\fR is the signal number.  The behavior is undefined if \fIfunc\fR
 is a function that takes more than one argument, or an argument of a different
 type.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBbsd_signal()\fR returns the previous action for
 \fIsig\fR. Otherwise, \fBSIG_ERR\fR is returned and \fBerrno\fR is set to
 indicate the error.
 .SH ERRORS
-.sp
 .LP
 Refer to \fBsigaction\fR(2).
 .SH USAGE
-.sp
 .LP
-This function is a direct replacement for the \fBBSD\fR \fBsignal\fR(3UCB)
+This function is a direct replacement for the \fBBSD\fR \fBsignal()\fR
 function for simple applications that are installing a single-argument signal
 handler function.  If a \fBBSD\fR signal handler function is being installed
 that expects more than one argument, the application has to be modified to use
-\fBsigaction\fR(2). The \fBbsd_signal()\fR function differs from
-\fBsignal\fR(3UCB) in that the \fBSA_RESTART\fR flag is set and the
+\fBsigaction\fR(2). The \fBbsd_signal()\fR function differs from the \fBBSD\fR
+\fBsignal()\fR in that the \fBSA_RESTART\fR flag is set and the
 \fBSA_RESETHAND\fR will be clear when \fBbsd_signal()\fR is used.  The state of
-these flags is not specified for \fBsignal\fR(3UCB).
+these flags is not specified for the \fBBSD\fR \fBsignal()\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -98,7 +93,6 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsigaction\fR(2), \fBsigaddset\fR(3C), \fBsigemptyset\fR(3C),
-\fBsignal\fR(3UCB), \fBattributes\fR(5), \fBstandards\fR(5)
+\fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3c/fputc.3c b/usr/src/man/man3c/fputc.3c
index 4943c8ce60..a9ea15244a 100644
--- a/usr/src/man/man3c/fputc.3c
+++ b/usr/src/man/man3c/fputc.3c
@@ -7,7 +7,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 FPUTC 3C "Nov 1, 2003"
+.TH FPUTC 3C "May 13, 2017"
 .SH NAME
 fputc, putc, putc_unlocked, putchar, putchar_unlocked, putw \- put a byte on a
 stream
@@ -45,7 +45,6 @@ stream
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBfputc()\fR function writes the byte specified by \fIc\fR (converted to
 an \fBunsigned char\fR) to the output stream pointed to by \fIstream\fR, at the
@@ -90,7 +89,6 @@ update between the successful execution of \fBputw()\fR and the next successful
 completion of a call to \fBfflush\fR(3C) or \fBfclose\fR(3C) on the same stream
 or a call to \fBexit\fR(3C) or \fBabort\fR(3C).
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBfputc()\fR, \fBputc()\fR, \fBputc_unlocked()\fR,
 \fBputchar()\fR, and \fBputchar_unlocked()\fR return the value that was
@@ -106,7 +104,6 @@ sets \fBerrno\fR to indicate the error.
 An unsuccessful completion will occur, for example, if the file associated with
 \fIstream\fR is not open for writing or if the output file cannot grow.
 .SH ERRORS
-.sp
 .LP
 The \fBfputc()\fR, \fBputc()\fR, \fBputc_unlocked()\fR, \fBputchar()\fR,
 \fBputchar_unlocked()\fR, and \fBputw()\fR functions will fail if either the
@@ -138,7 +135,7 @@ for writing.
 \fB\fBEFBIG\fR\fR
 .ad
 .RS 10n
-An attempt was made to write to a file that exceeds the maximum file size  or
+An attempt was made to write to a file that exceeds the maximum file size or
 the process' file size limit.
 .RE
 
@@ -168,7 +165,7 @@ was transferred.
 \fB\fBEIO\fR\fR
 .ad
 .RS 10n
-A physical I/O error has occurred, or  the process is a member of a background
+A physical I/O error has occurred, or the process is a member of a background
 process group attempting to write to its controlling terminal, \fBTOSTOP\fR is
 set, the process is neither ignoring nor blocking \fBSIGTTOU\fR and the process
 group of the process is orphaned. This error may also be returned under
@@ -219,7 +216,6 @@ capabilities of the device.
 .RE
 
 .SH USAGE
-.sp
 .LP
 Functions exist for the \fBputc()\fR, \fBputc_unlocked()\fR, \fBputchar()\fR,
 and \fBputchar_unlocked()\fR macros. To get the function form, the macro name
@@ -244,7 +240,6 @@ in the context of either multibyte character streams or wide-character streams.
 Application programmers are encouraged to use one of the character-based output
 functions instead.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -264,15 +259,13 @@ MT-Level	See \fBNOTES\fR below.
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBgetrlimit\fR(2), \fBulimit\fR(2) \fBwrite\fR(2), \fBIntro\fR(3),
 \fBabort\fR(3C), \fBexit\fR(3C), \fBfclose\fR(3C), \fBferror\fR(3C),
-\fBfflush\fR(3C), \fBflockfile\fR(3C), \fBfopen\fR(3UCB), \fBprintf\fR(3C),
+\fBfflush\fR(3C), \fBflockfile\fR(3C), \fBprintf\fR(3C),
 \fBputc\fR(3C), \fBputs\fR(3C), \fBsetbuf\fR(3C), \fBstdio\fR(3C),
 \fBattributes\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fBfputc()\fR, \fBputc()\fR, \fBputchar()\fR, and \fBputw()\fR routines are
 MT-Safe in multithreaded applications.  The \fBputc_unlocked()\fR and
diff --git a/usr/src/man/man3c/fseek.3c b/usr/src/man/man3c/fseek.3c
index 7db56303c2..50e23871d0 100644
--- a/usr/src/man/man3c/fseek.3c
+++ b/usr/src/man/man3c/fseek.3c
@@ -7,7 +7,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 FSEEK 3C "Nov 1, 2003"
+.TH FSEEK 3C "May 13, 2017"
 .SH NAME
 fseek, fseeko \- reposition a file-position indicator in a stream
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ fseek, fseeko \- reposition a file-position indicator in a stream
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBfseek()\fR function sets the file-position indicator for the stream
 pointed to by \fIstream\fR. The \fBfseeko()\fR function is identical to
@@ -94,12 +93,10 @@ underlying file, \fBfseek()\fR will cause the unwritten data to be written to
 the file and mark the \fBst_ctime\fR and \fBst_mtime\fR fields of the file for
 update.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBfseek()\fR and \fBfseeko()\fR functions return \fB0\fR on success;
 otherwise, they returned \fB\(mi1\fR and set \fBerrno\fR to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBfseek()\fR and \fBfseeko()\fR functions will fail if, either the
 \fIstream\fR is unbuffered or the \fIstream\fR's buffer needed to be flushed,
@@ -235,7 +232,6 @@ correctly in an object of type \fBoff_t\fR.
 .RE
 
 .SH USAGE
-.sp
 .LP
 Although on the UNIX system an offset returned by \fBftell()\fR or
 \fBftello()\fR (see \fBftell\fR(3C)) is measured in bytes, and it is
@@ -248,7 +244,6 @@ necessarily measured in bytes.
 The \fBfseeko()\fR function has a transitional interface for 64-bit file
 offsets.  See \fBlf64\fR(5).
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -266,8 +261,7 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBgetrlimit\fR(2), \fBulimit\fR(2), \fBfopen\fR(3UCB), \fBftell\fR(3C),
+\fBgetrlimit\fR(2), \fBulimit\fR(2), \fBftell\fR(3C),
 \fBrewind\fR(3C), \fBungetc\fR(3C), \fBungetwc\fR(3C), \fBattributes\fR(5),
 \fBlf64\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3c/ndbm.3c b/usr/src/man/man3c/ndbm.3c
index 786f92db24..b9f4e24cf2 100644
--- a/usr/src/man/man3c/ndbm.3c
+++ b/usr/src/man/man3c/ndbm.3c
@@ -5,7 +5,7 @@
 .\" http://www.opengroup.org/bookstore/.
 .\" The Institute of Electrical and Electronics Engineers and The Open Group, have given us permission to reprint portions of their documentation. In the following statement, the phrase "this text" refers to portions of the system documentation. Portions of this text are reprinted and reproduced in electronic form in the Sun OS Reference Manual, from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- Portable Operating System Interface (POSIX), The Open Group Base Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of Electrical and Electronics Engineers, Inc and The Open Group. In the event of any discrepancy between these versions and the original IEEE and The Open Group Standard, the original IEEE and The Open Group Standard is the referee document. The original Standard can be obtained online at http://www.opengroup.org/unix/online.html.
 .\"  This notice shall appear on any product containing this material.
-.TH NDBM 3C "Sep 17, 2001"
+.TH NDBM 3C "May 13, 2017"
 .SH NAME
 ndbm, dbm_clearerr, dbm_close, dbm_delete, dbm_error, dbm_fetch, dbm_firstkey,
 dbm_nextkey, dbm_open, dbm_store \- database functions
@@ -58,12 +58,11 @@ dbm_nextkey, dbm_open, dbm_store \- database functions
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 These functions create, access and modify a database. They maintain
 \fIkey\fR/\fIcontent\fR pairs in a database. The functions will handle large
 databases (up to a billion blocks) and will access a keyed item in one or two
-file system accesses. This package replaces the earlier \fBdbm\fR(3UCB)
+file system accesses. This package replaces the earlier \fBdbm\fR
 library, which managed only a single database.
 .sp
 .LP
@@ -152,7 +151,6 @@ returned from a call to \fBdbm_open()\fR.
 .LP
 These database functions support key/content pairs of at least 1024 bytes.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBdbm_store()\fR and \fBdbm_delete()\fR functions return \fB0\fR when they
 succeed and a negative value when they fail.
@@ -185,11 +183,9 @@ The \fBdbm_open()\fR function returns a pointer to a database structure.  If an
 error is detected during the operation, \fBdbm_open()\fR returns a (\fBDBM
 *\fR)0.
 .SH ERRORS
-.sp
 .LP
 No errors are defined.
 .SH USAGE
-.sp
 .LP
 The following code can be used to traverse the database:
 .sp
@@ -263,7 +259,6 @@ main()
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -281,12 +276,10 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBar\fR(1), \fBcat\fR(1), \fBcp\fR(1), \fBtar\fR(1), \fBopen\fR(2),
-\fBdbm\fR(3UCB), \fBnetconfig\fR(4), \fBattributes\fR(5), \fBstandards\fR(5)
+\fBnetconfig\fR(4), \fBattributes\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fB\&.pag\fR file will contain holes so that its apparent size may be
 larger than its actual content. Older versions of the UNIX operating system may
@@ -312,5 +305,5 @@ updating and reading is risky.
 .LP
 The database files (\fBfile\fR\fB\&.dir\fR and \fBfile\fR\fB\&.pag\fR) are
 binary and are architecture-specific (for example, they depend on the
-architecture's byte order.)  These files are not guaranteed to be portable
+architecture's byte order.) These files are not guaranteed to be portable
 across architectures.
diff --git a/usr/src/man/man3c/syslog.3c b/usr/src/man/man3c/syslog.3c
index 3a3b78a583..1b4dbe6ea3 100644
--- a/usr/src/man/man3c/syslog.3c
+++ b/usr/src/man/man3c/syslog.3c
@@ -7,7 +7,7 @@
 .\" are reprinted and reproduced in electronic form in the Sun OS Reference Manual, from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- Portable Operating System Interface (POSIX), The Open Group Base Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of Electrical
 .\" and Electronics Engineers, Inc and The Open Group. In the event of any discrepancy between these versions and the original IEEE and The Open Group Standard, the original IEEE and The Open Group Standard is the referee document. The original Standard can be obtained online at http://www.opengroup.org/unix/online.html.
 .\"  This notice shall appear on any product containing this material.
-.TH SYSLOG 3C "Mar 16, 2009"
+.TH SYSLOG 3C "May 13, 2017"
 .SH NAME
 syslog, openlog, closelog, setlogmask \- control system log
 .SH SYNOPSIS
@@ -45,7 +45,7 @@ timestamp, a tag string, and optionally the process ID.
 .sp
 .LP
 The message body is generated from the \fImessage\fR and following arguments in
-the same manner as if these were arguments to \fBprintf\fR(3UCB), except that
+the same manner as if these were arguments to \fBprintf\fR(3C), except that
 occurrences of \fB%m\fR in the format string pointed to by the \fImessage\fR
 argument are replaced by the error message string associated with the current
 value of \fBerrno\fR.  A trailing \fBNEWLINE\fR character is added if needed.
@@ -461,7 +461,7 @@ call to \fBsyslog\fR:
 .LP
 A locally-written utility could use the following call to \fBsyslog()\fR to log
 a message at priority \fBLOG_INFO\fR to be treated by \fBsyslogd\fR(1M) as
-other messages to the facility  \fBLOG_LOCAL2\fR are:
+other messages to the facility \fBLOG_LOCAL2\fR are:
 
 .sp
 .in +2
@@ -494,5 +494,5 @@ Standard	See \fBstandards\fR(5).
 .LP
 \fBat\fR(1), \fBcrontab\fR(1), \fBlogger\fR(1), \fBlogin\fR(1), \fBlpc\fR(1B),
 \fBlpr\fR(1B), \fBauditd\fR(1M), \fBcron\fR(1M), \fBgetty\fR(1M),
-\fBsu\fR(1M), \fBsyslogd\fR(1M), \fBprintf\fR(3UCB),
+\fBsu\fR(1M), \fBsyslogd\fR(1M), \fBprintf\fR(3C),
 \fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3kvm/kvm_nlist.3kvm b/usr/src/man/man3kvm/kvm_nlist.3kvm
index a01e59f98f..e6413d15e5 100644
--- a/usr/src/man/man3kvm/kvm_nlist.3kvm
+++ b/usr/src/man/man3kvm/kvm_nlist.3kvm
@@ -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 KVM_NLIST 3KVM "May 2, 2002"
+.TH KVM_NLIST 3KVM "May 13, 2017"
 .SH NAME
 kvm_nlist \- get entries from kernel symbol table
 .SH SYNOPSIS
@@ -17,7 +17,6 @@ kvm_nlist \- get entries from kernel symbol table
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBkvm_nlist()\fR function examines the symbol table from the kernel image
 identified by \fIkd\fR (see \fBkvm_open\fR(3KVM)) and selectively extracts a
@@ -32,12 +31,9 @@ and type are placed in the \fBn_value\fR and \fBn_type\fR fields. If a symbol
 cannot be located, the corresponding \fBn_type\fR field of \fInl\fR is set to
 0.
 .SH RETURN VALUES
-.sp
 .LP
-The \fBkvm_nlist()\fR functions returns the value of  \fBnlist\fR(3UCB) or
-\fBnlist\fR(3ELF), depending on the library used.
+The \fBkvm_nlist()\fR functions returns the value of \fBnlist\fR(3ELF).
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -55,12 +51,10 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkvm_open\fR(3KVM), \fBkvm_kread\fR(3KVM), \fBnlist\fR(3ELF),
-\fBnlist\fR(3UCB), \fBattributes\fR(5)
+\fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 Although the \fBlibkvm\fR API is Stable, the symbol names and data values that
 can be accessed through this set of interfaces are Private and are subject to
diff --git a/usr/src/man/man3ldap/ldap.3ldap b/usr/src/man/man3ldap/ldap.3ldap
index 79e283fa62..6644b3c6bf 100644
--- a/usr/src/man/man3ldap/ldap.3ldap
+++ b/usr/src/man/man3ldap/ldap.3ldap
@@ -4,7 +4,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 LDAP 3LDAP "April 9, 2016"
+.TH LDAP 3LDAP "May 13, 2017"
 .SH NAME
 ldap \- Lightweight Directory Access Protocol package
 .SH SYNOPSIS
@@ -17,7 +17,7 @@ cc[ \fIflag\fR... ] \fIfile\fR... -lldap[ \fIlibrary\fR... ]
 
 .SH DESCRIPTION
 .LP
-The Lightweight Directory Access Protocol ("LDAP") package (SUNWlldap) includes
+The Lightweight Directory Access Protocol ("LDAP") package includes
 various command line LDAP clients and a LDAP client library to provide
 programmatic access to the LDAP protocol. This man page gives an overview of
 the LDAP client library functions.
@@ -29,20 +29,20 @@ application would initialize a LDAP session with a LDAP server by calling
 \fBldap_sasl_bind\fR(3LDAP) and friends. It may perform some LDAP operations
 and obtain results by calling \fBldap_search\fR(3LDAP) and friends. To parse
 the results returned from these functions, it calls
-\fBldap_parse_result\fR(3LDAP),\fBldap_next_entry\fR(3LDAP), and
+\fBldap_parse_result\fR(3LDAP), \fBldap_next_entry\fR(3LDAP), and
 \fBldap_first_entry\fR(3LDAP) and others. It closes the LDAP session by calling
 \fBldap_unbind\fR(3LDAP).
 .sp
 .LP
 LDAP operations can be either synchronous or asynchronous. By convention, the
-names of the sychronous functions end with "_s." For example, a synchronous
+names of the synchronous functions end with "_s." For example, a synchronous
 binding to the LDAP server can be performed by calling
 \fBldap_sasl_bind_s\fR(3LDAP). Complete an asynchronous binding with
 \fBldap_sasl_bind\fR(3LDAP). All synchronous functions return the actual
 outcome of the operation, either \fBLDAP_SUCCESS\fR or an error code.
 Asynchronous routines provide an invocation identifier which can be used to
-obtain the  result of a specific operation by passing it to
-the\fBldap_result\fR(3LDAP) function.
+obtain the result of a specific operation by passing it to
+the \fBldap_result\fR(3LDAP) function.
 .SS "Initializing a LDAP session"
 .LP
 Initializing a LDAP session involves calling the \fBldap_init\fR(3LDAP)
@@ -135,14 +135,14 @@ names like "mark smith, umich, us".
 .LP
 The \fBldap_memcache\fR(3LDAP) functions provide an in-memory client side cache
 to store search requests. Caching improves performance and reduces network
-bandwidth when a client  makes repeated requests.
+bandwidth when a client makes repeated requests.
 .SS "Utility Functions"
 .LP
 There are also various utility functions. You can use the
 \fBldap_sort\fR(3LDAP) functions are used to sort the entries and values
 returned by means of the ldap search functions. The \fBldap_friendly\fR(3LDAP)
 functions will map from short two letter country codes or other strings to
-longer  "friendlier" names. Use the \fBldap_charset\fR(3LDAP) functions to
+longer "friendlier" names. Use the \fBldap_charset\fR(3LDAP) functions to
 translate to and from the T.61 character set that is used for many character
 strings in the LDAP protocol.
 .SS "Generating Filters"
@@ -159,7 +159,7 @@ that has been allocated by means of \fBldap_init_getfilter()\fR.
 The LDAP package includes a set of lightweight Basic Encoding Rules ("BER)"
 functions. The LDAP library functions use the BER functions to encode and
 decode LDAP protocol elements through the slightly simplified BER defined by
-LDAP. They are not normally used directly by an LDAP  application program will
+LDAP. They are not normally used directly by an LDAP application program will
 not normally use the BER functions directly. Instead, these functions provide a
 \fBprintf()\fR and \fBscanf()\fR-like interface, as well as lower-level access.
 .SH LIST OF INTERFACES
@@ -354,7 +354,7 @@ Create the in-memory client side cache.
 .ad
 .sp .6
 .RS 4n
-Associate an in-memory cache that has been already created  by calling the
+Associate an in-memory cache that has been already created by calling the
 \fBldap_memcache_init\fR(3LDAP) function with an LDAP connection handle.
 .RE
 
diff --git a/usr/src/man/man3ldap/ldap_first_attribute.3ldap b/usr/src/man/man3ldap/ldap_first_attribute.3ldap
index 9db90e252c..2b90dfcf10 100644
--- a/usr/src/man/man3ldap/ldap_first_attribute.3ldap
+++ b/usr/src/man/man3ldap/ldap_first_attribute.3ldap
@@ -4,7 +4,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 LDAP_FIRST_ATTRIBUTE 3LDAP "Dec 16, 2003"
+.TH LDAP_FIRST_ATTRIBUTE 3LDAP "May 13, 2017"
 .SH NAME
 ldap_first_attribute, ldap_next_attribute \- step through LDAP entry attributes
 .SH SYNOPSIS
@@ -25,7 +25,6 @@ cc [ \fIflag\fR...] \fIfile\fR... -lldap[ \fIlibrary\fR...]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBldap_first_attribute()\fR function gets the value of the first attribute
 in an entry.
@@ -45,13 +44,11 @@ After stepping through the attributes, the application should call
 \fBber_free()\fR to free the \fBBerElement\fR structure allocated by the
 \fBldap_first_attribute()\fR function if the structure is other than NULL.
 .SH ERRORS
-.sp
 .LP
 If an error occurs, \fINULL\fR is returned and the \fBld_errno\fR field in the
 \fIld\fR parameter is set to indicate the error. See \fBldap_error\fR(3LDAP)
 for a description of possible error codes.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -63,18 +60,14 @@ c | c
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-MT-Level	SUNWcsl (32-bit)SUNWcslx (64-bit)
-_
 Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBldap\fR(3LDAP), \fBldap_first_entry\fR(3LDAP), \fBldap_get_values\fR(3LDAP),
 \fBldap_error\fR(3LDAP), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fBldap_first_attribute()\fR function alllocates memory that might need to
 be freed by the caller by means of \fBber_free\fR(3LDAP).
diff --git a/usr/src/man/man3lib/libcurses.3lib b/usr/src/man/man3lib/libcurses.3lib
index bf1077f35e..0f3787d5b0 100644
--- a/usr/src/man/man3lib/libcurses.3lib
+++ b/usr/src/man/man3lib/libcurses.3lib
@@ -17,7 +17,7 @@
 .\" fields enclosed by brackets "[]" replaced with your own identifying
 .\" information: Portions Copyright [yyyy] [name of copyright owner]
 .\"
-.TH LIBCURSES 3LIB "Mar 24, 2004"
+.TH LIBCURSES 3LIB "May 13, 2017"
 .SH NAME
 libcurses, libtermcap, libtermlib \- screen handling and optimization library
 .SH SYNOPSIS
@@ -27,7 +27,6 @@ cc [ \fIflag\fR... ] \fIfile\fR... \fB-lcurses\fR [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Functions in the \fBlibcurses\fR library provide a terminal-independent
 method of updating character screens with reasonable optimization.
@@ -44,7 +43,6 @@ is maintained for backward compatibility.
 See \fBlibcurses\fR(3XCURSES) for information about the curses library that
 conforms to X/Open Curses, Issue 4, Version 2.
 .SH INTERFACES
-.sp
 .LP
 The shared objects \fBlibcurses.so.1\fR and
 \fBlibtermlib.so.1\fR provide the public interfaces defined below. See
@@ -249,7 +247,6 @@ l l .
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/lib/libcurses.so.1\fR\fR
@@ -304,7 +301,6 @@ shared object (symbolic link to \fB/lib/libcurses.so.1\fR)
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -319,7 +315,6 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBIntro\fR(3), \fBcurses\fR(3CURSES), \fBlibcurses\fR(3LIBUCB),
+\fBIntro\fR(3), \fBcurses\fR(3CURSES),
 \fBlibcurses\fR(3XCURSES), \fBattributes\fR(5)
diff --git a/usr/src/man/man3lib/libexacct.3lib b/usr/src/man/man3lib/libexacct.3lib
index daa4ff9769..46cc1dfd58 100644
--- a/usr/src/man/man3lib/libexacct.3lib
+++ b/usr/src/man/man3lib/libexacct.3lib
@@ -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 LIBEXACCT 3LIB "May 22, 2003"
+.TH LIBEXACCT 3LIB "May 13, 2017"
 .SH NAME
 libexacct \- extended accounting file access library
 .SH SYNOPSIS
@@ -14,14 +14,12 @@ cc [ \fIflag\fR... ] \fIfile\fR... \fB-lexacct\fR [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Functions in this library define the interface for reading and writing extended
 accounting (\fBexacct\fR) files. The <\fBexacct.h\fR> header provides type and
 function declarations for all library services, as well as for the
 characteristics of accounting files generated by the Solaris kernel.
 .SH INTERFACES
-.sp
 .LP
 The shared object \fBlibexacct.so.1\fR provides the public interfaces defined
 below. See \fBIntro\fR(3) for additional information on shared object
@@ -48,7 +46,6 @@ l l .
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/libexacct.so.1\fR \fR
@@ -69,7 +66,6 @@ shared object
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -87,15 +83,13 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBacctadm\fR(1M), \fBIntro\fR(3), \fBea_error\fR(3EXACCT),
 \fBea_open\fR(3EXACCT), \fBea_pack_object\fR(3EXACCT),
 \fBea_set_item\fR(3EXACCT), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
-The SUNWosdem package provides source code for the \fBexdump\fR utility that
+Distributions may provide source code for the \fBexdump\fR utility that
 uses the \fBlibexacct\fR APIs to dump the contents of extended accounting
 files. The source code can be compiled in the directory
 \fB/usr/demo/libexacct\fR.
diff --git a/usr/src/man/man3nsl/rpc_soc.3nsl b/usr/src/man/man3nsl/rpc_soc.3nsl
index c01be93ad0..a94dab4dfe 100644
--- a/usr/src/man/man3nsl/rpc_soc.3nsl
+++ b/usr/src/man/man3nsl/rpc_soc.3nsl
@@ -4,7 +4,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 RPC_SOC 3NSL "Feb 7, 2015"
+.TH RPC_SOC 3NSL "May 13, 2017"
 .SH NAME
 rpc_soc, authdes_create, authunix_create, authunix_create_default, callrpc,
 clnt_broadcast, clntraw_create, clnttcp_create, clntudp_bufcreate,
@@ -199,16 +199,16 @@ New programs should use the preferred routines, as support for the older
 interfaces may be dropped in future releases.
 .SS "File Descriptors"
 .LP
-Transport independent  \fBRPC\fR uses  \fBTLI\fR as its transport interface
+Transport independent \fBRPC\fR uses \fBTLI\fR as its transport interface
 instead of sockets.
 .sp
 .LP
 Some of the routines described in this section (such as \fBclnttcp_create()\fR)
 take a pointer to a file descriptor as one of the parameters. If the user wants
 the file descriptor to be a socket, then the application will have to be linked
-with both  \fBlibrpcsoc\fR and \fBlibnsl\fR. If the user passed
+with both \fBlibrpcsoc\fR and \fBlibnsl\fR. If the user passed
 \fBRPC_ANYSOCK\fR as the file descriptor, and the application is linked with
-\fBlibnsl\fR only, then the routine will return a  \fBTLI\fR file descriptor
+\fBlibnsl\fR only, then the routine will return a \fBTLI\fR file descriptor
 and not a socket.
 .SS "Routines"
 .LP
@@ -227,16 +227,16 @@ second is \fBauthdes_getucred()\fR, below.  Note: the keyserver daemon
 \fBkeyserv\fR(1M) must be running for the \fBDES\fR authentication system to
 work.
 .sp
-\fBauthdes_create()\fR, used on the client side,  returns an authentication
+\fBauthdes_create()\fR, used on the client side, returns an authentication
 handle that will enable the use of the secure authentication system. The first
 parameter \fIname\fR is the network name, or \fInetname\fR, of the owner of the
 server process.  This field usually represents a hostname derived from the
 utility routine \fBhost2netname()\fR, but could also represent a user name
 using \fBuser2netname()\fR. See \fBsecure_rpc\fR(3NSL). The second field is
-window on the validity of the client credential, given in seconds.   A small
-window is more secure than a large one,  but choosing too small of a window
+window on the validity of the client credential, given in seconds.  A small
+window is more secure than a large one, but choosing too small of a window
 will increase the frequency of resynchronizations because of clock drift.  The
-third parameter \fIsyncaddr\fR is optional.   If it is \fBNULL,\fR then the
+third parameter \fIsyncaddr\fR is optional.  If it is \fBNULL,\fR then the
 authentication system will assume that the local clock is always in sync with
 the server's clock, and will not attempt resynchronizations. If an address is
 supplied, however, then the system will use the address for consulting the
@@ -244,7 +244,7 @@ remote time service whenever resynchronization is required.  This parameter is
 usually the address of the \fBRPC\fR server itself. The final parameter
 \fIckey\fR is also optional. If it is \fBNULL,\fR then the authentication
 system will generate a random \fBDES\fR key to be used for the encryption of
-credentials. If it is supplied, however,  then it will be used instead.
+credentials. If it is supplied, however, then it will be used instead.
 .sp
 This routine exists for backward compatibility only, and it is made obsolete by
 \fBauthdes_seccreate()\fR. See \fBsecure_rpc\fR(3NSL).
@@ -319,7 +319,7 @@ routine calls \fBeachresult()\fR, whose form is:
 where \fIout\fR is the same as \fIout\fR passed to \fBclnt_broadcast()\fR,
 except that the remote procedure's output is decoded there; \fIaddr\fR points
 to the address of the machine that sent the results. If \fBeachresult()\fR
-returns  \fB0\fR. \fBclnt_broadcast()\fR waits for more replies; otherwise it
+returns \fB0\fR, \fBclnt_broadcast()\fR waits for more replies; otherwise it
 returns with appropriate status.  If \fBeachresult()\fR is \fBNULL,\fR
 \fBclnt_broadcast()\fR returns without waiting for any replies.
 .sp
@@ -360,14 +360,14 @@ which obsoletes it.
 This routine creates an \fBRPC\fR client for the remote program \fIprognum\fR,
 version \fIversnum\fR; the client uses \fBTCP/IP\fR as a transport. The remote
 program is located at Internet address \fIaddr\fR. If
-\fIaddr\fR\fB\fR->\fIsin_port\fR is  \fB0\fR, then it is set to the actual port
+\fIaddr\fR\fB\fR->\fIsin_port\fR is \fB0\fR, then it is set to the actual port
 that the remote program is listening on. The remote \fBrpcbind\fR service is
 consulted for this information. The parameter \fI*fdp\fR is a file descriptor,
 which may be open and bound; if it is \fBRPC_ANYSOCK\fR, then this routine
 opens a new one and sets \fI*fdp\fR. Refer to the \fBFile Descriptor\fR section
 for more information. Since \fBTCP-based\fR \fBRPC\fR uses buffered \fBI/O,\fR
 the user may specify the size of the send and receive buffers with the
-parameters \fIsendsz\fR and \fIrecvsz\fR. Values of  \fB0\fR choose suitable
+parameters \fIsendsz\fR and \fIrecvsz\fR. Values of \fB0\fR choose suitable
 defaults. This routine returns \fBNULL\fR if it fails.
 .sp
 This routine exists for backward compatibility only. \fBclnt_create()\fR,
@@ -382,9 +382,9 @@ This routine exists for backward compatibility only. \fBclnt_create()\fR,
 .ad
 .RS 30n
 Create a client handle for the remote program \fIprognum\fR, on \fIversnum\fR;
-the client uses  \fBUDP/IP\fR as the transport. The remote program is located
-at the Internet address \fIaddr\fR. If \fIaddr\fR->\fIsin_port\fR is  \fB0\fR,
-it is set to  port on which the remote program is listening on (the remote
+the client uses \fBUDP/IP\fR as the transport. The remote program is located
+at the Internet address \fIaddr\fR. If \fIaddr\fR->\fIsin_port\fR is \fB0\fR,
+it is set to port on which the remote program is listening on (the remote
 \fBrpcbind\fR service is consulted for this information). The parameter
 \fI*fdp\fR is a file descriptor, which may be open and bound. If it is
 \fBRPC_ANYSOCK\fR, then this routine opens a new one and sets \fI*fdp\fR. Refer
@@ -399,7 +399,7 @@ error can be printed using the \fBclnt_pcreateerror()\fR routine. See
 The user can specify the maximum packet size for sending and receiving by using
 \fIsendsz\fR and \fIrecvsz\fR arguments for \fBUDP-based\fR \fBRPC\fR messages.
 .sp
-If \fIaddr\fR->\fIsin_port\fR is  \fB0\fR and the requested version number
+If \fIaddr\fR->\fIsin_port\fR is \fB0\fR and the requested version number
 \fIversnum\fR is not registered with the remote portmap service, it returns a
 handle if at least a version number for the given program number is registered.
 The version mismatch is discovered by a \fBclnt_call()\fR later (see
@@ -418,7 +418,7 @@ This routine exists for backward compatibility only. \fBclnt_tli_create()\fR or
 This routine creates an \fBRPC\fR client handle for the remote program
 \fIprognum\fR, version \fIversnum\fR; the client uses \fBUDP/IP\fR as a
 transport. The remote program is located at Internet address \fIaddr\fR. If
-\fIaddr\fR->\fIsin_port\fR is  \fB0\fR, then it is set to actual port that the
+\fIaddr\fR->\fIsin_port\fR is \fB0\fR, then it is set to actual port that the
 remote program is listening on. The remote \fBrpcbind\fR service is consulted
 for this information. The parameter \fI*fdp\fR is a file descriptor, which may
 be open and bound; if it is \fBRPC_ANYSOCK\fR, then this routine opens a new
@@ -449,11 +449,11 @@ Places the local system's \fBIP\fR address into \fI*addr\fR, without consulting
 the library routines that deal with \fB/etc/hosts\fR. The port number is always
 set to \fBhtons(PMAPPORT)\fR.
 .sp
-This routine is only intended for use with the  \fBRPC\fR library. It returns
-the local system's address in a form compatible with the  \fBRPC\fR library,
+This routine is only intended for use with the \fBRPC\fR library. It returns
+the local system's address in a form compatible with the \fBRPC\fR library,
 and should not be taken as the system's actual IP address. In fact, the
 \fI*addr\fR buffer's host address part is actually zeroed. This address may
-have only local significance and should  not be assumed to be an address that
+have only local significance and should not be assumed to be an address that
 can be used to connect to the local system by remote systems or processes.
 .sp
 This routine remains for backward compatibility only. The routine
@@ -470,13 +470,13 @@ retrieve the local system's network address as a \fInetbuf\fR structure. See
 .RS 30n
 \fBgetrpcport()\fR returns the port number for the version \fIversnum\fR of the
 \fBRPC\fR program \fIprognum\fR running on \fIhost\fR and using protocol
-\fIproto\fR. \fBgetrpcport()\fR returns  \fB0\fR if the  \fBRPC\fR system
-failed to contact  the remote portmap service, the program associated with
+\fIproto\fR. \fBgetrpcport()\fR returns \fB0\fR if the \fBRPC\fR system
+failed to contact the remote portmap service, the program associated with
 \fIprognum\fR is not registered, or there is no mapping between the program and
 a port.
 .sp
 This routine exists for backward compatibility only. Enhanced functionality is
-provided by \fBrpcb_getaddr()\fR. See  \fBrpcbind\fR(3NSL).
+provided by \fBrpcb_getaddr()\fR. See \fBrpcbind\fR(3NSL).
 .RE
 
 .sp
@@ -485,7 +485,7 @@ provided by \fBrpcb_getaddr()\fR. See  \fBrpcbind\fR(3NSL).
 \fB\fBpmaplist()\fR\fR
 .ad
 .RS 30n
-A user interface to the \fBportmap\fR service,  which returns a list of the
+A user interface to the \fBportmap\fR service, which returns a list of the
 current \fBRPC\fR program-to-port mappings on the host located at \fBIP\fR
 address \fIaddr\fR. This routine can return \fBNULL .\fR The command
 `\fBrpcinfo\fR\fB-p\fR' uses this routine.
@@ -500,13 +500,13 @@ provided by \fBrpcb_getmaps()\fR. See \fBrpcbind\fR(3NSL).
 \fB\fBpmap_getport()\fR\fR
 .ad
 .RS 30n
-A user interface to the \fBportmap\fR service,  which returns the port number
-on which waits a service that supports program  \fIprognum\fR, version
+A user interface to the \fBportmap\fR service, which returns the port number
+on which waits a service that supports program \fIprognum\fR, version
 \fIversnum\fR, and speaks the transport protocol associated with
 \fIprotocol\fR. The value of \fIprotocol\fR is most likely \fBIPPROTO_UDP\fR or
-\fBIPPROTO_TCP\fR. A return value of  \fB0\fR means that the mapping does not
+\fBIPPROTO_TCP\fR. A return value of \fB0\fR means that the mapping does not
 exist or that the \fBRPC\fR system failured to contact the remote \fBportmap\fR
-service.   In the latter case, the global variable \fBrpc_createerr\fR contains
+service.  In the latter case, the global variable \fBrpc_createerr\fR contains
 the \fB RPC\fR status.
 .sp
 This routine exists for backward compatibility only, enhanced functionality is
@@ -541,14 +541,14 @@ provided by \fBrpcb_rmtcall()\fR. See \fBrpcbind\fR(3NSL).
 \fB\fBpmap_set()\fR\fR
 .ad
 .RS 30n
-A user interface to the \fBportmap\fR service,  that establishes a mapping
+A user interface to the \fBportmap\fR service, that establishes a mapping
 between the triple [\fIprognum\fR, \fIversnum\fR, \fIprotocol\fR] and
 \fIport\fR on the machine's \fBportmap\fR service.  The value of \fIprotocol\fR
 may be \fBIPPROTO_UDP\fR or \fBIPPROTO_TCP\fR. Formerly, the routine failed if
 the requested \fIport\fR was found to be in use.  Now, the routine only fails
-if it finds that \fIport\fR is still bound.  If  \fIport\fR is not bound, the
-routine completes the requested registration.  This routine returns  \fB1\fR if
-it succeeds,  \fB0\fR otherwise. Automatically done by \fBsvc_register()\fR.
+if it finds that \fIport\fR is still bound.  If \fIport\fR is not bound, the
+routine completes the requested registration.  This routine returns \fB1\fR if
+it succeeds, \fB0\fR otherwise. Automatically done by \fBsvc_register()\fR.
 .sp
 This routine exists for backward compatibility only, enhanced functionality is
 provided by \fBrpcb_set()\fR. See \fBrpcbind\fR(3NSL).
@@ -560,10 +560,10 @@ provided by \fBrpcb_set()\fR. See \fBrpcbind\fR(3NSL).
 \fB\fBpmap_unset()\fR\fR
 .ad
 .RS 30n
-A user interface to the \fBportmap\fR service,  which destroys all mapping
+A user interface to the \fBportmap\fR service, which destroys all mapping
 between the triple [\fIprognum\fR, \fIversnum\fR, \fIall-protocols\fR] and
 \fIport\fR on the machine's \fBportmap\fR service.  This routine returns one if
-it succeeds,  \fB0\fR otherwise.
+it succeeds, \fB0\fR otherwise.
 .sp
 This routine exists for backward compatibility only, enhanced functionality is
 provided by \fBrpcb_unset()\fR. See \fBrpcbind\fR(3NSL).
@@ -669,7 +669,7 @@ section for more information. Upon completion, \fIxprt\fR->\fBxp_fd\fR is the
 transport's file descriptor, and \fIxprt\fR->\fBxp_port\fR is the transport's
 port number. This routine returns \fBNULL\fR if it fails. Since \fBTCP-based\fR
 \fBRPC\fR uses buffered \fBI/O,\fR users may specify the size of buffers;
-values of  \fB0\fR choose suitable defaults.
+values of \fB0\fR choose suitable defaults.
 .sp
 This routine exists for backward compatibility only. \fBsvc_create()\fR,
 \fBsvc_tli_create()\fR, or \fBsvc_vc_create()\fR should be used instead. See
@@ -687,12 +687,12 @@ it returns a pointer. The transport is associated with the file descriptor
 \fIfd\fR. If \fIfd\fR is \fBRPC_ANYSOCK\fR then a new file descriptor is
 created. If the file descriptor is not bound to a local \fBUDP\fR port, then
 this routine binds it to an arbitrary port. Upon completion,
-\fIxprt\fR\fBxp_fd\fR is the transport's file descriptor, and
+\fIxprt\fR->\fBxp_fd\fR is the transport's file descriptor, and
 \fIxprt\fR->\fBxp_port\fR is the transport's port number. Refer to the \fBFile
 Descriptor\fR section for more information. This routine returns \fBNULL\fR if
 it fails.
 .sp
-The user specifies the maximum packet size for sending and  receiving UDP-based
+The user specifies the maximum packet size for sending and receiving UDP-based
 \fBRPC\fR messages by using the \fIsendsz\fR and \fIrecvsz\fR parameters.
 .sp
 This routine exists for backward compatibility only. \fBsvc_tli_create()\fR, or
@@ -711,7 +711,7 @@ it returns a pointer. The transport is associated with the file descriptor
 is created. If the file descriptor is not bound to a local \fBUDP\fR port, then
 this routine binds it to an arbitrary port. Upon completion,
 \fIxprt\fR->\fBxp_fd\fR is the transport's file descriptor, and
-\fIxprt\fR->\fBxp_port\fR  is the transport's port number. This routine returns
+\fIxprt\fR->\fBxp_port\fR is the transport's port number. This routine returns
 \fBNULL\fR if it fails.
 .sp
 Since \fBUDP-based\fR \fBRPC\fR messages can only hold up to 8 Kbytes of
@@ -735,7 +735,7 @@ program \fIprognum\fR, version \fIversnum\fR, and procedure \fIprocnum\fR,
 \fIprocname\fR is called with a pointer to its parameter(s). \fIprocname\fR
 should return a pointer to its static result(s). \fIinproc\fR is used to decode
 the parameters while \fIoutproc\fR is used to encode the results. This routine
-returns  \fB0\fR if the registration succeeded, \(mi1 otherwise.
+returns \fB0\fR if the registration succeeded, \(mi1 otherwise.
 .sp
 \fBsvc_run()\fR must be called after all the services are registered.
 .sp
@@ -750,11 +750,11 @@ This routine exists for backward compatibility only, and it is made obsolete by
 .ad
 .RS 30n
 Associates \fIprognum\fR and \fIversnum\fR with the service dispatch procedure,
-\fIdispatch\fR. If \fIprotocol\fR is  \fB0\fR, the service is not registered
-with the \fBportmap\fR service. If \fIprotocol\fR is non-zero,  then a mapping
+\fIdispatch\fR. If \fIprotocol\fR is \fB0\fR, the service is not registered
+with the \fBportmap\fR service. If \fIprotocol\fR is non-zero, then a mapping
 of the triple [\fIprognum\fR, \fIversnum\fR, \fIprotocol\fR] to
 \fIxprt\fR->\fBxp_port\fR is established with the local \fBportmap\fR service
-(generally \fIprotocol\fR is  \fB0\fR, \fBIPPROTO_UDP\fR or \fBIPPROTO_TCP\fR).
+(generally \fIprotocol\fR is \fB0\fR, \fBIPPROTO_UDP\fR or \fBIPPROTO_TCP\fR).
 The procedure \fIdispatch\fR has the following form:
 .sp
 .in +2
@@ -763,7 +763,7 @@ The procedure \fIdispatch\fR has the following form:
 .fi
 .in -2
 
-The \fBsvc_register()\fR routine returns one if it succeeds,  and  \fB0\fR
+The \fBsvc_register()\fR routine returns one if it succeeds, and \fB0\fR
 otherwise.
 .sp
 This routine exists for backward compatibility only. Enhanced functionality is
@@ -821,7 +821,7 @@ MT-Level	Unsafe
 \fBrpc_svc_calls\fR(3NSL), \fBrpc_svc_create\fR(3NSL), \fBrpc_svc_err\fR(3NSL),
 \fBrpc_svc_reg\fR(3NSL), \fBrpc_xdr\fR(3NSL), \fBrpcbind\fR(3NSL),
 \fBsecure_rpc\fR(3NSL), \fBselect\fR(3C), \fBxdr_authsys_parms\fR(3NSL),
-\fBlibnsl\fR(3LIB), \fBlibrpcsoc\fR(3LIBUCB), \fBattributes\fR(5)
+\fBlibnsl\fR(3LIB), \fBattributes\fR(5)
 .SH NOTES
 .LP
 These interfaces are unsafe in multithreaded applications.  Unsafe interfaces
diff --git a/usr/src/man/man3sasl/sasl_client_start.3sasl b/usr/src/man/man3sasl/sasl_client_start.3sasl
index 05c4b13c72..b5d31c1a39 100644
--- a/usr/src/man/man3sasl/sasl_client_start.3sasl
+++ b/usr/src/man/man3sasl/sasl_client_start.3sasl
@@ -5,7 +5,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 SASL_CLIENT_START 3SASL "Aug 26, 2003"
+.TH SASL_CLIENT_START 3SASL "May 13, 2017"
 .SH NAME
 sasl_client_start \- perform a step in the authentication negotiation
 .SH SYNOPSIS
@@ -20,7 +20,6 @@ sasl_client_start \- perform a step in the authentication negotiation
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Use the \fBsasl_client_start()\fR interface to select a mechanism for
 authentication and start the authentication session. The \fImechlist\fR
@@ -39,7 +38,6 @@ requests. The application fullfills these requests and calls
 \fIprompt_need\fR parameter is the same pointer as before, but it is filled in
 by the application.
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIconn\fR\fR
@@ -96,12 +94,10 @@ Contains the name of the chosen SASL mechanism, upon success.
 .RE
 
 .SH RETURN VALUES
-.sp
 .LP
 \fBsasl_client_start()\fR returns an integer that corresponds to a SASL error
 code.
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBSASL_CONTINUE\fR\fR
@@ -117,7 +113,6 @@ All other error codes indicate an error situation that must be handled, or the
 authentication session should be quit. See \fBsasl_errors\fR(3SASL) for
 information on SASL error codes.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -129,14 +124,11 @@ c | c
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Availablity	SUNWlibsasl
-_
 Interface Stability	Evolving
 _
 MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsasl_errors\fR(3SASL), \fBattributes\fR(5)
diff --git a/usr/src/man/man3scf/scf_snapshot_create.3scf b/usr/src/man/man3scf/scf_snapshot_create.3scf
index e1d7a4bf05..909f33c636 100644
--- a/usr/src/man/man3scf/scf_snapshot_create.3scf
+++ b/usr/src/man/man3scf/scf_snapshot_create.3scf
@@ -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_SNAPSHOT_CREATE 3SCF "Aug 27, 2007"
+.TH SCF_SNAPSHOT_CREATE 3SCF "May 13, 2017"
 .SH NAME
 scf_snapshot_create, scf_snapshot_handle, scf_snapshot_destroy,
 scf_snapshot_get_parent, scf_snapshot_get_name, scf_snapshot_update,
@@ -52,11 +52,10 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lscf\fR [ \fIlibrary\fR\&.\|.
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 A snapshot is an unchanging picture of the full set of property groups
 associated with an instance. Snapshots are automatically created and managed by
-the Solaris Management Facility. See \fBsmf\fR(5).
+the Service Management Facility. See \fBsmf\fR(5).
 .sp
 .LP
 A snapshot consists of a set of snaplevels, each of which holds copies of the
@@ -94,7 +93,6 @@ the snapshots, see \fBscf_iter_instance_snapshots\fR(3SCF).
 To access the snaplevels of a snapshot, see
 \fBscf_snapshot_get_base_snaplevel\fR(3SCF).
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBscf_snapshot_create()\fR returns a new
 \fBscf_snapshot_t\fR. Otherwise, it returns \fINULL\fR.
@@ -116,7 +114,6 @@ The \fBscf_snapshot_update()\fR function returns 1 if the snapshot was updated,
 Upon successful completion, \fBscf_snapshot_get_parent()\fR and
 \fBscf_instance_get_snapshot()\fR return 0. Otherwise, they return -1.
 .SH ERRORS
-.sp
 .LP
 The \fBscf_snapshot_create()\fR function will fail if:
 .sp
@@ -279,7 +276,7 @@ The \fBscf_instance_get_snapshot()\fR function will fail if:
 .ad
 .sp .6
 .RS 4n
-The  storage  mechanism  that  the   repository server (\fBsvc.configd\fR(1M))
+The storage mechanism that the repository server (\fBsvc.configd\fR(1M))
 chose for the operation denied access.
 .RE
 
@@ -377,7 +374,6 @@ The instance is not set.
 .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
@@ -395,7 +391,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibscf\fR(3LIB), \fBscf_error\fR(3SCF),
 \fBscf_iter_instance_snapshots\fR(3SCF),
diff --git a/usr/src/man/man3xcurses/libcurses.3xcurses b/usr/src/man/man3xcurses/libcurses.3xcurses
index ebf790313c..c80df46a10 100644
--- a/usr/src/man/man3xcurses/libcurses.3xcurses
+++ b/usr/src/man/man3xcurses/libcurses.3xcurses
@@ -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 LIBCURSES 3XCURSES "April 9, 2016"
+.TH LIBCURSES 3XCURSES "May 13, 2017"
 .SH NAME
 libcurses \- X/Open Curses library
 .SH SYNOPSIS
@@ -296,4 +296,4 @@ MT-Level	Unsafe
 .SH SEE ALSO
 .LP
 \fBIntro\fR(3), \fBcurses\fR(3XCURSES), \fBlibcurses\fR(3LIB),
-\fBlibcurses\fR(3LIBUCB), \fBattributes\fR(5), \fBstandards\fR(5)
+\fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man4/admin.4 b/usr/src/man/man4/admin.4
index c7090f9b04..9163dfc5fb 100644
--- a/usr/src/man/man4/admin.4
+++ b/usr/src/man/man4/admin.4
@@ -4,7 +4,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 ADMIN 4 "Mar 2, 2017"
+.TH ADMIN 4 "May 13, 2017"
 .SH NAME
 admin \- installation defaults file
 .SH DESCRIPTION
@@ -303,10 +303,8 @@ Abort installation if package dependencies are not met.
 \fB\fBrdepend\fR\fR
 .ad
 .RS 30n
-Controls resolution if other packages depend on the package to be removed. Also
-determines behavior if registered products components to be removed. See
-\fBlibwsreg\fR(3LIB) and \fBprodreg\fR(1M) for a definition of product
-components. Options are:
+Controls resolution if other packages depend on the package to be removed.
+Options are:
 .sp
 .ne 2
 .na
@@ -389,7 +387,7 @@ basic privileges of the unprivileged user \fBnoaccess\fR.
 If this parameter is not present or has a null value, the user \fBnoaccess\fR
 is assumed. Likewise, if this parameter is set to anything other than the
 values described here, a warning is issued, and \fBnoaccess\fR is assumed.
-\fBrscriptalt\fR is not present in the default  \fBadmin\fR file,
+\fBrscriptalt\fR is not present in the default \fBadmin\fR file,
 \fB/var/sadm/install/admin/default\fR. In this case, request scripts are run as
 the user \fBnoaccess\fR.
 .RE
@@ -474,8 +472,7 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBpkgadd\fR(1M), \fBprodreg\fR(1M), \fBlibwsreg\fR(3LIB), \fBpkginfo\fR(4),
-\fBattributes\fR(5), \fBzones\fR(5)
+\fBpkgadd\fR(1M), \fBpkginfo\fR(4), \fBattributes\fR(5), \fBzones\fR(5)
 .SH NOTES
 .LP
 The value \fBask\fR should not be defined in an \fBadmin\fR file that will be
diff --git a/usr/src/man/man4/bootparams.4 b/usr/src/man/man4/bootparams.4
index 6106d9e5b0..082fc6f4b3 100644
--- a/usr/src/man/man4/bootparams.4
+++ b/usr/src/man/man4/bootparams.4
@@ -1,9 +1,10 @@
 '\" te
+.\" Copyright 2017 Peter Tribble
 .\" Copyright (C) 2002, 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 BOOTPARAMS 4 "Jul 22, 2004"
+.TH BOOTPARAMS 4 "May 13, 2017"
 .SH NAME
 bootparams \- boot parameter data base
 .SH SYNOPSIS
@@ -13,7 +14,6 @@ bootparams \- boot parameter data base
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBbootparams\fR file contains a list of client entries that diskless
 clients use for booting. Diskless booting clients retrieve this information by
@@ -152,7 +152,7 @@ ns=hoot:nisplus(255.255.255.0)
 
 .sp
 .LP
-An \fBns\fR entry forces \fBsysidtool\fR(1M) to use the specified name service.
+An \fBns\fR entry forces \fBsysidtool\fR to use the specified name service.
 By default, \fBsysidtool\fR uses \fBNIS+\fR in preference to \fBNIS\fR or
 \fBLDAP\fR if it can find an \fBNIS+\fR server for the system's domain on the
 subnet. An \fBns\fR entry might be necessary if you are trying to set up a
@@ -208,7 +208,6 @@ ns=otis:nisplus(255.255.255.0) term=:xterms domain=eu.cte.work.com
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/bootparams\fR\fR
@@ -218,10 +217,13 @@ ns=otis:nisplus(255.255.255.0) term=:xterms domain=eu.cte.work.com
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBrpc.bootparamd\fR(1M), \fBsysidtool\fR(1M), \fBnsswitch.conf\fR(4)
+\fBrpc.bootparamd\fR(1M), \fBnsswitch.conf\fR(4)
 .SH NOTES
+.LP
+The \fBNIS+\fR, \fBsysidtool\fR, and jumpstart facilities are not present in
+illumos. They are documented here solely for users who wish to use illumos as
+a jumpstart server for older Solaris releases.
 .sp
 .LP
 Solaris diskless clients use the keywords \fBroot\fR and \fBrootopts\fR to look
diff --git a/usr/src/man/man4/hosts_access.4 b/usr/src/man/man4/hosts_access.4
index 7452c14b07..1a8f493667 100644
--- a/usr/src/man/man4/hosts_access.4
+++ b/usr/src/man/man4/hosts_access.4
@@ -3,7 +3,7 @@
 .\" Modified for Solaris to to add the Solaris stability classification,
 .\" and to add a note about source availability.
 .\"
-.TH HOSTS_ACCESS 4 "April 9, 2016"
+.TH HOSTS_ACCESS 4 "May 13, 2017"
 .SH NAME
 hosts_access \- format of host access control files
 .SH DESCRIPTION
@@ -108,7 +108,7 @@ Matches any host whose name does not contain a dot character.
 .IP UNKNOWN
 Matches any user whose name is unknown, and matches any host whose name
 \fIor\fR address are unknown.  This pattern should be used with care:
-host names may be unavailable due to temporary name server problems. A
+host names may be unavailable due to temporary name server problems.  A
 network address will be unavailable when the software cannot figure out
 what type of network it is talking to.
 .IP KNOWN
@@ -394,6 +394,5 @@ l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 =
 Interface Stability	Committed
-Source for tcp_wrappers is available in the SUNWtcpdS package.
 .TE
 .\" End Sun update
diff --git a/usr/src/man/man4/init.d.4 b/usr/src/man/man4/init.d.4
index 94477bb677..c0ae9654c0 100644
--- a/usr/src/man/man4/init.d.4
+++ b/usr/src/man/man4/init.d.4
@@ -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 INIT.D 4 "Aug 17, 2005"
+.TH INIT.D 4 "May 13, 2017"
 .SH NAME
 init.d \- initialization and termination scripts for changing init states
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ init.d \- initialization and termination scripts for changing init states
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fB/etc/init.d\fR is a directory containing initialization and termination
 scripts for changing init states. These scripts are linked when appropriate to
@@ -88,12 +87,10 @@ is executed by \fB/etc/rc2.d/S68netdaemon start\fR when init state 2 is entered
 and by \fB/etc/rc0.d/K67netdaemon stop\fR when shutting the system down.
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsvcs\fR(1), \fBinit\fR(1M), \fBsvc.startd\fR(1M), \fBsvccfg\fR(1M),
 \fBsmf\fR(5)
 .SH NOTES
-.sp
 .LP
 Solaris now provides an expanded mechanism, which includes automated restart,
 for applications historically started via the init script mechanism. The
@@ -108,9 +105,3 @@ On earlier Solaris releases, a script named with a suffix of '.sh' would be
 sourced, allowing scripts to modify the environment of other scripts executed
 later. This behavior is no longer supported; for altering the environment in
 which services are run, see the \fBsetenv\fR subcommand in \fBsvccfg\fR(1M).
-.sp
-.LP
-\fB/sbin/rc2\fR has references to the obsolescent \fBrc.d\fR directory. These
-references are for compatibility with old \fBINSTALL\fR scripts. New
-\fBINSTALL\fR scripts should use the \fBinit.d\fR directory for related
-executables. The same is true for the \fBshutdown.d\fR directory.
diff --git a/usr/src/man/man4/pci.4 b/usr/src/man/man4/pci.4
index 6d5b2c27cf..7df0d6be9a 100644
--- a/usr/src/man/man4/pci.4
+++ b/usr/src/man/man4/pci.4
@@ -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 PCI 4 "May 13, 2005"
+.TH PCI 4 "May 13, 2017"
 .SH NAME
 pci, pcie \- configuration files for PCI and PCI Express device drivers
 .SH DESCRIPTION
-.sp
 .LP
 The Peripheral Component Interconnect (PCI) bus is a little endian bus. PCI
 Express (PCIe) and PCI-X are successors to PCI. All three types of devices
@@ -239,7 +238,6 @@ device. As before, the logical bus is identified by the pathname of the parent
 of the device. The device has a device number of 2, and a function number of 1.
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -255,7 +253,6 @@ Architecture	SPARC, x86
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdriver.conf\fR(4), \fBattributes\fR(5), \fBddi_intr_add_handler\fR(9F),
 \fBddi_prop_lookup\fR(9F), \fBddi_regs_map_setup\fR(9F)
@@ -265,11 +262,7 @@ Architecture	SPARC, x86
 .sp
 .LP
 \fIIEEE 1275 PCI Bus Binding\fR
-.sp
-.LP
-http://playground.sun.com/1275/bindings/pci/pci-express.txt
 .SH NOTES
-.sp
 .LP
 PCIe devices support an extended configuration space unavailable to PCI
 devices. While PCIe devices can be operated using a PCI device driver,
diff --git a/usr/src/man/man4/pkginfo.4 b/usr/src/man/man4/pkginfo.4
index 59d4b17eec..bff96a2d38 100644
--- a/usr/src/man/man4/pkginfo.4
+++ b/usr/src/man/man4/pkginfo.4
@@ -1,14 +1,14 @@
 '\" te
+.\" Copyright 2017 Peter Tribble
 .\" Copyright (c) 2003, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 1989 AT&T
 .\" 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 PKGINFO 4 "Mar 24, 2006"
+.TH PKGINFO 4 "May 13, 2017"
 .SH NAME
 pkginfo \- package characteristics file
 .SH DESCRIPTION
-.sp
 .LP
 \fBpkginfo\fR is an \fBASCII\fR file that describes the characteristics of the
 package along with information that helps control the flow of installation. It
@@ -124,8 +124,8 @@ company's stock symbol.
 Text that specifies the current version associated with the software package.
 The maximum length is 256 \fBASCII\fR characters and the first character cannot
 be a left parenthesis. The \fBpkgmk\fR(1) tool can be used to create or modify
-this value when actually building the package. Current Solaris software
-practice is to assign this parameter monotonically increasing Dewey decimal
+this value when actually building the package. Traditional Solaris
+practice was to assign this parameter monotonically increasing Dewey decimal
 values of the form:
 .sp
 .in +2
@@ -304,49 +304,6 @@ default \fBISA\fR (instruction set architecture) is set to the value of the
 .sp
 .ne 2
 .na
-\fB\fBSUNW_LOC\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solaris-only optional parameter used to indicate a software package containing
-localization files for a given product or application. The parameter value is a
-comma-separated list of locales supported by a package. It is only used for
-packages containing localization files, typically the message catalogues. The
-allowable values for this string field are those found in the table of Standard
-Locale Names located in the \fIInternational Language Environments Guide\fR.
-.sp
-.in +2
-.nf
-SUNW_LOC="<\fIlocale_name\fR>,<\fIlocale_name\fR>,..,\e
-<\fIlocale_name\fR>"
-.fi
-.in -2
-
-where
-.sp
-.in +2
-.nf
-<\fIlocale_name\fR>::= <\fIlanguage\fR>[_<\fIterritory\fR>]\e
-[.<\fIcodeset\fR>]
-<\fIlanguage\fR>::= the set of names from ISO 639
-<\fIterritory\fR>::= the set of territories specified
-in ISO 3166
-<\fIcodeset\fR>::= is a string corresponding to the coded
-character set
-.fi
-.in -2
-
-Since a value of C specifies the traditional UNIX system behavior (American
-English, en_US), packages belonging to the C locale are viewed as non-localized
-packages, and thus must not have \fBSUNW_LOC\fR and \fBSUNW_PKGLIST\fR included
-in their \fBpkginfo\fR file. See also the \fBSUNW_LOC\fR parameter in
-\fBpackagetoc\fR(4) and \fBsetlocale\fR(3C) for more information. This keyword
-is not recognized by the add-on software utility Software Manager.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fBSUNW_PKG_DIR\fR\fR
 .ad
 .sp .6
@@ -605,54 +562,6 @@ non-global zones.
 .sp
 .ne 2
 .na
-\fB\fBSUNW_PKGLIST\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solaris-only optional parameter used to associate a localization package to the
-package(s) from which it is derived. It is required whenever the \fBSUNW_LOC\fR
-parameter is defined. This parameter value is an comma-separated list of
-package abbreviations of the form:
-.sp
-.in +2
-.nf
-SUNW_PKGLIST="\fIpkg1\fR[\fI:version\fR],\fIpkg2\fR[:\fIversion\fR],..."
-.fi
-.in -2
-
-where \fIversion\fR (if specified) should match the version string in the base
-package specified (see \fBVERSION\fR parameter in this manual page). When in
-use, \fBSUNW_PKGLIST\fR helps determine the order of package installation. The
-packages listed in the parameter are installed before the localization package
-in question is installed. When left blank, \fBSUNW_PKGLIST="\|"\fR, the package
-is assumed to be required for the locale to function correctly. See the
-\fBSUNW_PKGLIST\fR parameter in \fBpackagetoc\fR(4) for more information. This
-keyword is not recognized by the add-on software utility Software Manager.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBSUNW_PKGTYPE\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solaris-only parameter for Sun internal use only. Required for packages part of
-the Solaris operating environment releases which install into the \fB/\fR,
-\fB/usr\fR, \fB/usr/kvm\fR, and \fB/usr/openwin\fR file systems. The Solaris
-operating environment installation software must know which packages are part
-of which file system to properly install a server/client configuration. The
-currently allowable values for this parameter are \fBroot\fR, \fBusr\fR,
-\fBkvm\fR, and \fBow\fR. If no \fBSUNW_PKGTYPE\fR parameter is present, the
-package is assumed to be of \fBBASEDIR=\fR\fI/opt\fR. \fBSUNW_PKGTYPE\fR is
-optional only for packages which install into the \fB/opt\fR name space as is
-the case for the majority of Solaris add-on software. See the
-\fBSUNW_PKGTYPE\fR parameter in \fBpackagetoc\fR(4) for further information.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fBSUNW_PKGVERS\fR\fR
 .ad
 .sp .6
@@ -666,7 +575,7 @@ SUNW_PKGVERS="<\fIsunw_package_version\fR>"
 .fi
 .in -2
 
-where <\fIunw_package_version\fR> has the form \fIx.y[.z]\fR and \fIx\fR,
+where <\fIsunw_package_version\fR> has the form \fIx.y[.z]\fR and \fIx\fR,
 \fIy\fR, and z are integers. For packages built for this release and previous
 releases, use \fBSUNW_PKGVERS="\fI1.0\fR"\fR.
 .RE
@@ -680,7 +589,7 @@ releases, use \fBSUNW_PKGVERS="\fI1.0\fR"\fR.
 .RS 4n
 Solaris-only parameter indicating the name of the product this package is a
 part of or comprises (maximum length of 256 \fBASCII\fR characters). A few
-examples of currently used \fBSUNW_PRODNAME\fR values are: \fB"SunOS"\fR,
+examples of \fBSUNW_PRODNAME\fR values are: \fB"SunOS"\fR,
 \fB"OpenWindows"\fR, and \fB"Common Desktop Environment"\fR.
 .RE
 
@@ -737,79 +646,8 @@ of 256 \fBASCII\fR characters).
 .sp
 .LP
 For further discussion of the zones-related parameters described above, see
-\fISystem Administration Guide:  Virtualization Using the Solaris Operating
+\fISystem Administration Guide: Virtualization Using the Solaris Operating
 System\fR.
-.SH ENVIRONMENT VARIABLES
-.sp
-.LP
-The following environment variables are available only to package class action
-scripts and to checkinstall, preinstall, postinstall scripts.
-.sp
-.ne 2
-.na
-\fB\fBSUNW_PKG_INSTALL_ZONENAME\fR\fR
-.ad
-.sp .6
-.RS 4n
-This variable is set only during the initial installation of a zone.
-.sp
-If this variable is not set, the system does not support the \fBzones\fR(5)
-feature. In this case, the package is being installed to or removed from a
-system that is not configured for zones.
-.sp
-If the variable is set, and equal to \fBglobal\fR, the package is being
-installed to or removed from the global zone.
-.sp
-If the variable is set and not equal to \fBglobal\fR, the package is being
-installed to or removed from the non-global zone named by the contents of the
-environment variable \fB${\fR\fBSUNW_PKG_INSTALL_ZONENAME\fR\fB}\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBPKG_INIT_INSTALL\fR\fR
-.ad
-.sp .6
-.RS 4n
-This variable is set only during an initial installation of Solaris, such as
-installing Solaris from a CD, DVD, or net install image.
-.sp
-If this variable is set and equal to \fBTRUE\fR, then the package is being
-installed as part of an initial installation of Solaris.
-.sp
-If this variable is not set, or set and not equal to \fBTRUE\fR, then the
-package is not being installed as part of an initial installation of Solaris.
-.RE
-
-.sp
-.LP
-The following code excerpt illustrates the semantics of the preceding
-environment variables.
-.sp
-.in +2
-.nf
-if [ $PKG_INIT_INSTALL != "" ] ; then
-        # Package being installed as part of initial
-        # installation of Solaris.
-
-elif [ $SUNW_PKG_INSTALL_ZONENAME != "" ] ; then
-
-    if [ $SUNW_PKG_INSTALL_ZONENAME != "global" ] ; then
-         # Package being installed as part of initial installation
-         # of non-global zone $SUNW_PKG_INSTALL_ZONENAME
-    else
-         # Package being installed as part of initial installation
-         # of a global zone.
-    fi
-
-else
-    # Package not being installed as part of initial installation of
-    # Solaris and package not being installed as part of initial
-    # installation of non-global zone.
-fi
-.fi
-.in -2
 
 .SH EXAMPLES
 .LP
@@ -823,7 +661,6 @@ Here is a sample \fBpkginfo\fR file:
 .nf
 SUNW_PRODNAME="SunOS"
 SUNW_PRODVERS="5.5"
-SUNW_PKGTYPE="usr"
 SUNW_PKG_ALLZONES=false
 SUNW_PKG_HOLLOW=false
 PKG="SUNWesu"
@@ -841,7 +678,6 @@ RSTATES="S 2"
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -887,35 +723,21 @@ SUNW_PRODVERS	Evolving
 _
 SUNW_PKGVERS	Evolving
 _
-SUNW_PKGTYPE	Unstable
-_
-SUNW_LOC	Evolving
-_
-SUNW_PKGLIST	Evolving
-_
 SUNW_PKG_DIR	Evolving
-_
-PKG_INIT_INSTALL	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBisalist\fR(1), \fBlimit\fR(1), \fBpkgmk\fR(1), \fBuname\fR(1),
-\fBinit\fR(1M), \fBsetlocale\fR(3C), \fBclustertoc\fR(4), \fBorder\fR(4),
-\fBpackagetoc\fR(4), \fBpkgmap\fR(4), \fBattributes\fR(5), \fBzones\fR(5)
+\fBinit\fR(1M), \fBpkgmap\fR(4), \fBattributes\fR(5), \fBzones\fR(5)
 .sp
 .LP
 \fIApplication Packaging Developer\&'s Guide\fR
 .sp
 .LP
-\fIInternational Language Environments Guide\fR
-.sp
-.LP
-\fISystem Administration Guide:  Virtualization Using the Solaris Operating
+\fISystem Administration Guide: Virtualization Using the Solaris Operating
 System\fR
 .SH NOTES
-.sp
 .LP
 Developers can define their own installation parameters by adding a definition
 to this file. A developer-defined parameter must begin with a capital letter.
diff --git a/usr/src/man/man4/power.conf.4 b/usr/src/man/man4/power.conf.4
index b07fd633d3..0fdb2be5ad 100644
--- a/usr/src/man/man4/power.conf.4
+++ b/usr/src/man/man4/power.conf.4
@@ -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 POWER.CONF 4 "Feb 27, 2009"
+.TH POWER.CONF 4 "May 13, 2017"
 .SH NAME
 power.conf \- Power Management configuration information file
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ power.conf \- Power Management configuration information file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpower.conf\fR file is used by the Power Management configuration program
 \fBpmconfig\fR(1M), to initialize the settings for Power Management. If you
@@ -21,12 +20,6 @@ make changes to this file, you must run \fBpmconfig\fR(1M) manually for the
 changes to take effect.
 .sp
 .LP
-The \fBdtpower\fR(1M) GUI allows the configuration of a subset of parameters
-allowed by this file. For ease-of-use, it is recommended that you use
-\fBdtpower\fR(1M) to configure the parameters. See the \fBEXAMPLES\fR section
-for information on disabling Power Management.
-.sp
-.LP
 Power Management addresses two specific management scenarios: management of
 individual devices and management of the whole system. An individual device is
 power managed if the device supports multiple power levels and if the device
@@ -37,7 +30,6 @@ power when the device is idle.
 All entries in the \fBpower.conf\fR file are processed in the order that they
 occur in the file.
 .SS "Automatic Device Power Management"
-.sp
 .LP
 Devices with drivers that use the automatic device Power Management interfaces
 are automatically power managed if the \fBautopm\fR entry is enabled. The
@@ -459,7 +451,6 @@ Once every device is at its lowest possible power state, additional power
 savings can be obtained by putting the system into a sleep state (if the
 platform hardware is capable of doing so).
 .SS "S3 Support"
-.sp
 .LP
 Because of reliability problems encountered in BIOS implementations of X86
 systems not produced by Sun Microsystems, by default, only X86 workstation
@@ -492,7 +483,6 @@ The system does not support entry into S3 state.
 .RE
 
 .SS "Automatic Entry Into S3"
-.sp
 .LP
 If supported by your platform, an autoS3 entry can be used to enable or disable
 automatic entry into the S3 state. When in the S3 state, the power button,
@@ -538,7 +528,6 @@ The system does not automatically enter the S3 state.
 .RE
 
 .SS "System Power Management"
-.sp
 .LP
 The system Power Management entries control Power Management of the entire
 system using the suspend-resume feature. When the system is suspended, the
@@ -765,13 +754,7 @@ autopm disable
 .LP
 Then run \fBpmconfig\fR or reboot. See \fBpmconfig\fR(1M) for more information.
 
-.sp
-.LP
-You can also use \fBdtpower\fR to disable automatic device Power Management.
-See \fBdtpower\fR(1M) for more information.
-
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -787,19 +770,14 @@ Interface stability 	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBpmconfig\fR(1M), \fBpowerd\fR(1M), \fBsys-unconfig\fR(1M), \fBuadmin\fR(2),
+\fBpmconfig\fR(1M), \fBpowerd\fR(1M), \fBuadmin\fR(2),
 \fBlibdevinfo\fR(3LIB), \fBattributes\fR(5), \fBcpr\fR(7), \fBldterm\fR(7M),
 \fBpm\fR(7D), \fBpm-components\fR(9P), \fBremovable-media\fR(9P)
 .sp
 .LP
 \fIWriting Device Drivers\fR
-.sp
-.LP
-\fISolaris Common Desktop Environment: User\&'s Guide\fR
 .SH NOTES
-.sp
 .LP
 SPARC desktop models first shipped after October 1, 1995 and before July 1,
 1999 comply with the United States Environmental Protection Agency's \fIEnergy
@@ -807,8 +785,7 @@ Star Memorandum of Understanding #2\fR guidelines and have \fBautoshutdown\fR
 enabled by default after 30 minutes of system idleness. This is achieved by
 \fBdefault\fR keyword of \fBautoshutdown\fR entry behave as \fBshutdown\fR for
 these machines. The user is prompted to confirm this default behavior at system
-installation reboot, or during the first reboot after the system is
-unconfigured by \fBsys-unconfig\fR(1M).
+installation reboot.
 .sp
 .LP
 SPARC desktop models first shipped after July 1, 1999 comply with the United
@@ -834,11 +811,8 @@ Absence of a property indicates no Energy Star guidelines are applicable to
 your machine.
 .sp
 .LP
-System Power Management ( suspend-resume) is currently supported only on a
-limited set of hardware platforms. See the \fISolaris Common Desktop
-Environment: User\&'s Guide\fR for a complete list of platforms that support
-system Power Management. See \fBuname\fR(2) to programmatically determine if
-the machine supports suspend-resume.
+System Power Management (suspend-resume) is currently supported only on a
+limited set of hardware platforms.
 .sp
 .LP
 Sun X86 desktop models first shipped after July 1, 1999 fall within United
diff --git a/usr/src/man/man4/sendmail.4 b/usr/src/man/man4/sendmail.4
index 3476f4981f..917bd8d5c4 100644
--- a/usr/src/man/man4/sendmail.4
+++ b/usr/src/man/man4/sendmail.4
@@ -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 SENDMAIL 4 "May 8, 2008"
+.TH SENDMAIL 4 "May 13, 2017"
 .SH NAME
 sendmail, sendmail.cf, submit.cf \- sendmail configuration files
 .SH SYNOPSIS
@@ -18,7 +18,6 @@ sendmail, sendmail.cf, submit.cf \- sendmail configuration files
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsendmail.cf\fR and \fBsubmit.cf\fR files are the configuration files for
 \fBsendmail\fR(1M). Starting with version 8.12 of \fBsendmail\fR, which was
@@ -222,7 +221,6 @@ You do not need to restart \fBsendmail\fR for changes to \fBsubmit.cf\fR to
 take effect.  Steps 4 and 5 can be automated. See \fBAutomated Rebuilding of
 Configuration Files\fR below.
 .SS "Enabling Access to Remote Clients"
-.sp
 .LP
 The \fBsendmail\fR(1M) man page describes how the \fBconfig/local_only\fR
 property can be set to \fBtrue\fR or \fBfalse\fR to disallow or allow,
@@ -261,11 +259,10 @@ Each property, if set, results in the corresponding \fB\&.mc\fR file being used
 to (re)build the matching \fB\&.cf\fR file when the service is started.
 .sp
 .LP
-These properties persist across upgrades and patches. To prevent a patch or
-upgrade from clobbering your \fB\&.cf\fR file, or renaming it to
-\fB\&.cf.old\fR, you can set the desired  properties instead.
+These properties persist across updates. To prevent an update
+from clobbering your \fB\&.cf\fR file, or renaming it to
+\fB\&.cf.old\fR, you can set the desired properties instead.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/mail/cf/README\fR\fR
@@ -275,7 +272,6 @@ Describes \fBsendmail\fR configuration files.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -291,7 +287,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBmake\fR(1S), \fBps\fR(1), \fBsendmail\fR(1M), \fBsvcadm\fR(1M),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man4/timezone.4 b/usr/src/man/man4/timezone.4
index c59b91434c..84ed9d5556 100644
--- a/usr/src/man/man4/timezone.4
+++ b/usr/src/man/man4/timezone.4
@@ -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 TIMEZONE 4 "Feb 18, 2003"
+.TH TIMEZONE 4 "May 13, 2017"
 .SH NAME
 timezone \- default timezone data base
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ timezone \- default timezone data base
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The timezone file contains information regarding the default timezone for each
 host in a domain. Alternatively, a single default line for the entire domain
@@ -34,10 +33,8 @@ relative to the directory \fB/usr/share/lib/zoneinfo\fR.
 .sp
 .LP
 This file is not actually referenced by any system software; it is merely used
-as a source file to construct the \fBNIS\fR \fBtimezone.byname\fR map. This map
-is read by \fBsysidtool\fR(1M) to initialize the timezone of the client system
-at installation time. For more information, see the \fISolaris Express
-Installation Guide: Basic Installations\fR.
+as a source file to construct the \fBNIS\fR \fBtimezone.byname\fR map, which
+was used by the installer in older releases of Solaris.
 .sp
 .LP
 The \fBtimezone\fR file does not set the timezone environment variable
@@ -59,7 +56,6 @@ US/Eastern          East.Sun.COM #Sun East Coast
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/timezone\fR\fR
@@ -69,9 +65,5 @@ US/Eastern          East.Sun.COM #Sun East Coast
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBsysidtool\fR(1M), \fBTIMEZONE\fR(4)
-.sp
 .LP
-\fISolaris Express Installation Guide: Basic Installations\fR
+\fBTIMEZONE\fR(4)
diff --git a/usr/src/man/man4/user_attr.4 b/usr/src/man/man4/user_attr.4
index 8051f24f97..3de85c52f5 100644
--- a/usr/src/man/man4/user_attr.4
+++ b/usr/src/man/man4/user_attr.4
@@ -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 USER_ATTR 4 "Feb 25, 2017"
+.TH USER_ATTR 4 "May 13, 2017"
 .SH NAME
 user_attr \- extended user attributes database
 .SH SYNOPSIS
@@ -275,9 +275,7 @@ privileges. Note that you specify privileges as they are displayed by
 \fBprivileges\fR(5) as \fBPRIV_FILE_CHOWN\fR.
 .sp
 .LP
-Privileges are specified through the Solaris Management Console
-(\fBsmc\fR(1M)), the recommended method, or, on the command line, for users,
-through\fBusermod\fR(1M). See \fBusermod\fR(1M) for examples of commands that
+See \fBusermod\fR(1M) for examples of commands that
 modify privileges and their subsequent effect on \fBuser_attr\fR.
 .SH EXAMPLES
 .LP
@@ -353,10 +351,6 @@ The command-line syntax is Committed. The output is Uncommitted.
 \fBprof_attr\fR(4), \fBproject\fR(4), \fBattributes\fR(5), \fBprivileges\fR(5)
 .sp
 .LP
-See the \fBdtstyle\fR(1X), \fBlabel_encodings\fR(4), and \fBlabels\fR(5) man
-pages in the \fISolaris Trusted Extensions Reference Manual\fR.
-.sp
-.LP
 \fISystem Administration Guide: Security Services\fR
 .SH NOTES
 .LP
diff --git a/usr/src/man/man5/attributes.5 b/usr/src/man/man5/attributes.5
index f9c0290fda..cae1a869d2 100644
--- a/usr/src/man/man5/attributes.5
+++ b/usr/src/man/man5/attributes.5
@@ -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 ATTRIBUTES 5 "Jul 29, 2007"
+.TH ATTRIBUTES 5 "May 13, 2017"
 .SH NAME
 attributes, architecture, availability, CSI, stability, MT-Level, standard \-
 attributes of interfaces
@@ -14,8 +14,6 @@ attribute types and their corresponding values. The following is an example of
 an attributes table. Not all attribute types are appropriate for all types of
 interfaces.
 .sp
-
-.sp
 .TS
 box;
 c | c
@@ -45,7 +43,7 @@ code sets are said to have Code Set Independence (CSI). They have the attribute
 of being \fBCSI\fR enabled. This is in contrast to many commands and utilities,
 for example, that work only with Extended Unix Codesets (EUC), an encoding
 method that allows concurrent support for up to four code sets and is commonly
-used  to represent Asian character sets.
+used to represent Asian character sets.
 .sp
 .LP
 For practical reasons, however, this independence is not absolute. Certain
@@ -60,7 +58,7 @@ File code is a superset of \fBASCII\fR.
 .TP
 .ie t \(bu
 .el o
-To support multi-byte characters and null-terminated  \fBUNIX\fR file names,
+To support multi-byte characters and null-terminated \fBUNIX\fR file names,
 the \fINULL\fR and \fB/\fR (slash) characters cannot be part of any multi-byte
 characters.
 .RE
@@ -222,7 +220,7 @@ l l l .
 Release	Version	Significance
 _
 Major	x.0	T{
-Likely to contain major feature additions; adhere to different,  possibly incompatible standard revisions; and though unlikely, could change, drop, or replace Committed interfaces. Initial product releases are usually 1.0.
+Likely to contain major feature additions; adhere to different, possibly incompatible standard revisions; and though unlikely, could change, drop, or replace Committed interfaces. Initial product releases are usually 1.0.
 T}
 _
 Minor	x.y	T{
@@ -240,7 +238,7 @@ In the context of interface stability, update releases (occasionally referred
 to as patch releases) should be considered equivalent to Micro Releases.
 .SS "Classifications"
 .LP
-The following table summarizes how stability level  classifications relate to
+The following table summarizes how stability level classifications relate to
 release level. The first column lists the Stability Level. The second column
 lists the Release Level for Incompatible Changes, and the third column lists
 other comments. For a complete discussion of individual classifications, see
@@ -263,7 +261,7 @@ Volatile	Micro (x.y.z)	Incompatibilities are common.
 .sp
 .LP
 The interface stability level classifications described on this manual page
-apply to both source and binary  interfaces unless otherwise stated. All
+apply to both source and binary interfaces unless otherwise stated. All
 stability level classifications are public, with the exception of the
 \fBPrivate\fR classification. The precise stability level of a public interface
 (one that is documented in the manual pages) is unspecified unless explicitly
@@ -719,4 +717,4 @@ accepted organization such as IETF, or as informal as the sole contributor in
 the case of FOSS (Free or Open Source Software).
 .SH SEE ALSO
 .LP
-\fBuname\fR(1), \fBpkgadd\fR(1M), \fBIntro\fR(3), \fBstandards\fR(5)
+\fBuname\fR(1), \fBIntro\fR(3), \fBstandards\fR(5)
diff --git a/usr/src/man/man5/filesystem.5 b/usr/src/man/man5/filesystem.5
index 005f803f52..d2aa496c41 100644
--- a/usr/src/man/man5/filesystem.5
+++ b/usr/src/man/man5/filesystem.5
@@ -18,8 +18,9 @@
 .\" Copyright 1989 AT&T
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 2016 Nexenta Systems, Inc.
+.\" Copyright 2017 Peter Tribble
 .\"
-.TH FILESYSTEM 5 "Mar 6, 2017"
+.TH FILESYSTEM 5 "May 13, 2017"
 .SH NAME
 filesystem \- File system organization
 .SH SYNOPSIS
@@ -83,11 +84,6 @@ platform-independent file is a standard configuration file, such as
 the \fBplatform-specific\fR file is installed only on a subset of supported
 platforms. Most platform-specific files are gathered under \fB/platform\fR and
 \fB/usr/platform\fR.
-.sp
-.LP
-In the following file or directory descriptions, GNOME stands for GNU Network
-Object Model Environment. The GNOME Desktop is shipped with the Solaris
-operating system.
 .SS "Root File System"
 .LP
 The root file system contains files that are unique to each machine. It
@@ -109,8 +105,7 @@ Root of the overall file system name space.
 .ad
 .sp .6
 .RS 4n
-Primary location for special files. Typically, device files are built to match
-the kernel and hardware configuration of the machine.
+The device name file system. See \fBdev\fR(7FS).
 .RE
 
 .sp
@@ -291,7 +286,7 @@ Terminal devices.
 .ad
 .sp .6
 .RS 4n
-Physical device files.
+The devices file system. See \fBdevfs\fR(7FS).
 .RE
 
 .sp
@@ -325,38 +320,7 @@ Xorg Xserver (X11) configuration files.
 .ad
 .sp .6
 .RS 4n
-Accounting system configuration information.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/apache\fR\fR
-.ad
-.sp .6
-.RS 4n
-Apache configuration files.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/apoc\fR\fR
-.ad
-.sp .6
-.RS 4n
-Files for configuring Sun Java Desktop System Configuration Manager remote
-access.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/bonobo-activation\fR\fR
-.ad
-.sp .6
-.RS 4n
-GNOME XML configuration file for identifying CORBA servers.
+Process accounting system configuration information.
 .RE
 
 .sp
@@ -422,36 +386,6 @@ Dynamic Host Configuration Protocol (\fBDHCP\fR) configuration files.
 .sp
 .ne 2
 .na
-\fB\fB/etc/dmi\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solstice Enterprise Agents configuration files.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/dt\fR\fR
-.ad
-.sp .6
-.RS 4n
-Desktop configuration files.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/flash\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solaris Flash Archive configuration files.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/etc/fm\fR\fR
 .ad
 .sp .6
@@ -493,58 +427,6 @@ Binaries organized by file system types for operations required before
 .sp
 .ne 2
 .na
-\fB\fB/etc/gconf\fR\fR
-.ad
-.sp .6
-.RS 4n
-GConf system configuration (including system defaults and system mandatory
-settings)
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/gimp\fR\fR
-.ad
-.sp .6
-.RS 4n
-GNU Image Manipulation Program (GIMP) configuration files.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/gnome\fR\fR
-.ad
-.sp .6
-.RS 4n
-GNOME Desktop configuration files.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/gnome-vfs-2.0\fR\fR
-.ad
-.sp .6
-.RS 4n
-Files for customizing GNOME 2.0 desktop menus.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/gnopernicus-1.0\fR\fR
-.ad
-.sp .6
-.RS 4n
-Configuration files for GNOME's Gnopernicus, an Assistive Technology (AT)
-screen reader.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/etc/gss\fR\fR
 .ad
 .sp .6
@@ -556,36 +438,6 @@ configuration files.
 .sp
 .ne 2
 .na
-\fB\fB/etc/gtk\fR\fR
-.ad
-.sp .6
-.RS 4n
-GTK+ configuration files
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/gtk-2.0\fR\fR
-.ad
-.sp .6
-.RS 4n
-GTK+ Pixbuf loaders and Input Method modules
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/imq\fR\fR
-.ad
-.sp .6
-.RS 4n
-Sun Java System Message Queue security configuration files.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/etc/inet\fR\fR
 .ad
 .sp .6
@@ -600,7 +452,8 @@ Configuration files for Internet services.
 .ad
 .sp .6
 .RS 4n
-Shell scripts for transitioning between run levels.
+Shell scripts for transitioning between init states. The service management
+facility, \fBsmf\fR(5) is the preferred mechanism for managing services.
 .RE
 
 .sp
@@ -696,26 +549,6 @@ Configuration information for optional packages.
 .sp
 .ne 2
 .na
-\fB\fB/etc/pango\fR\fR
-.ad
-.sp .6
-.RS 4n
-Pango configuration and module information.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/patch\fR\fR
-.ad
-.sp .6
-.RS 4n
-Configuration files for patch management.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/etc/ppp\fR\fR
 .ad
 .sp .6
@@ -817,27 +650,6 @@ Extensions).
 .sp
 .ne 2
 .na
-\fB\fB/etc/sfw\fR\fR
-.ad
-.sp .6
-.RS 4n
-Platform-dependent administrative, configuration files and databases for
-subsystems from \fB/usr/sfw\fR that are not shared among systems.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/sfw/samba\fR\fR
-.ad
-.sp .6
-.RS 4n
-Samba configuration files.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/etc/skel\fR\fR
 .ad
 .sp .6
@@ -848,36 +660,6 @@ Default profile scripts for new user accounts. See \fBuseradd\fR(1M).
 .sp
 .ne 2
 .na
-\fB\fB/etc/sma\fR\fR
-.ad
-.sp .6
-.RS 4n
-Systems Management Agent (SMA) configuration files.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/smartcard\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solaris Smart Card configuration files.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/snmp\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solstice Enterprise Agents configuration files.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/etc/sound\fR\fR
 .ad
 .sp .6
@@ -971,6 +753,16 @@ Extensible Markup Language (XML) catalog.
 .sp
 .ne 2
 .na
+\fB\fB/etc/zfs\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains the zfs state file, \fBzpool.cache\fR.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fB/etc/zones\fR\fR
 .ad
 .sp .6
@@ -995,7 +787,8 @@ Default root of the shared file system tree.
 .ad
 .sp .6
 .RS 4n
-Default root of a subtree for user directories.
+Default root of a subtree for user directories. Often managed by the
+automounter, see \fBautomount\fR(1M) for more details.
 .RE
 
 .sp
@@ -1253,7 +1046,7 @@ Solaris software and for add-on system software.
 .ad
 .sp .6
 .RS 4n
-Root of a subtree for the process file system.
+Root of a subtree for the process file system. See \fBproc\fR(4).
 .RE
 
 .sp
@@ -1276,7 +1069,8 @@ Solaris software.
 .ad
 .sp .6
 .RS 4n
-Mount point for the contract (CTFS) and object (OBJFS) file systems.
+Mount point for the contract (CTFS) and object (OBJFS) file systems. See
+\fBctfs\fR(7FS) and \fBobjfs\fR(7FS).
 .RE
 
 .sp
@@ -1286,7 +1080,8 @@ Mount point for the contract (CTFS) and object (OBJFS) file systems.
 .ad
 .sp .6
 .RS 4n
-Temporary files; cleared during the boot operation.
+Temporary files. Usually mounted as a memory based file system. See
+\fBtmpfs\fR(7FS).
 .RE
 
 .sp
@@ -1327,26 +1122,6 @@ System logging and accounting files.
 .sp
 .ne 2
 .na
-\fB\fB/var/apache\fR\fR
-.ad
-.sp .6
-.RS 4n
-Scripts, icons, logs, and cache pages for Apache web server.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/var/appserver\fR\fR
-.ad
-.sp .6
-.RS 4n
-Sun Java System Application Server administrative domain files.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/var/audit\fR\fR
 .ad
 .sp .6
@@ -1361,7 +1136,7 @@ Default location for Audit log files.
 .ad
 .sp .6
 .RS 4n
-Directory provided for global core files storage.
+Directory provided for global core files storage. See \fBcoreadm\fR(1M).
 .RE
 
 .sp
@@ -1371,7 +1146,7 @@ Directory provided for global core files storage.
 .ad
 .sp .6
 .RS 4n
-Default depository for kernel crash dumps.
+Default depository for kernel crash dumps. See \fBdumpadm\fR(1M).
 .RE
 
 .sp
@@ -1387,27 +1162,6 @@ Log files for \fBcron\fR(1M).
 .sp
 .ne 2
 .na
-\fB\fB/var/dmi\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solstice Enterprise Agents (\fBSEA\fR) Desktop Management Interface (\fBDMI\fR)
-run-time components.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/var/dt\fR\fR
-.ad
-.sp .6
-.RS 4n
-\fBdtlogin\fR configuration files.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/var/fm\fR\fR
 .ad
 .sp .6
@@ -1418,16 +1172,6 @@ Fault manager state files. For more information, see \fBfmd\fR(1M).
 .sp
 .ne 2
 .na
-\fB\fB/var/imq\fR\fR
-.ad
-.sp .6
-.RS 4n
-Message queue broker instance configuration file.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/var/ftp\fR\fR
 .ad
 .sp .6
@@ -1462,7 +1206,7 @@ Database and log files for Kerberos.
 .ad
 .sp .6
 .RS 4n
-Configuration files for runtime linker.
+Configuration files for runtime linker. See \fBcrle\fR(1).
 .RE
 
 .sp
@@ -1518,16 +1262,6 @@ Directory where users' mail is kept.
 .sp
 .ne 2
 .na
-\fB\fB/var/mysql\fR\fR
-.ad
-.sp .6
-.RS 4n
-Dynamic database directory for MySQL Database Management System.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/var/news\fR\fR
 .ad
 .sp .6
@@ -1569,11 +1303,11 @@ An approved installation location for add-on system software and applications.
 .sp
 .ne 2
 .na
-\fB\fB/var/patchsrv\fR\fR
+\fB\fB/var/pkg\fR\fR
 .ad
 .sp .6
 .RS 4n
-Patch management log files.
+Data associated with the Image Packaging System.
 .RE
 
 .sp
@@ -1604,20 +1338,7 @@ contents of this directory.
 .ad
 .sp .6
 .RS 4n
-Databases maintained by the software package management utilities.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/var/sadm/system/logs\fR\fR
-.ad
-.sp .6
-.RS 4n
-Status log files produced by software management functions and/or applications.
-For example, log files produced for product installation. An approved
-installation location for bundled Solaris software and for add-on system
-software and applications.
+Data associated with legacy SVR4 package management utilities.
 .RE
 
 .sp
@@ -1633,36 +1354,6 @@ Service access facility logging and accounting files.
 .sp
 .ne 2
 .na
-\fB\fB/var/samba\fR\fR
-.ad
-.sp .6
-.RS 4n
-Log and lock files for Samba.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/var/sma_snmp\fR\fR
-.ad
-.sp .6
-.RS 4n
-Systems Management Agent (SMA) security and MIB component information.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/var/snmp\fR\fR
-.ad
-.sp .6
-.RS 4n
-SNMP status and configuration information.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/var/spool\fR\fR
 .ad
 .sp .6
@@ -1744,16 +1435,6 @@ LP print service client-side request staging area.
 .sp
 .ne 2
 .na
-\fB\fB/var/spool/samba\fR\fR
-.ad
-.sp .6
-.RS 4n
-Samba print queue.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/var/spool/uucp\fR\fR
 .ad
 .sp .6
@@ -1905,26 +1586,6 @@ Symbolic link to the \fB/usr/bin\fR directory.
 .sp
 .ne 2
 .na
-\fB\fB/usr/SUNWale\fR\fR
-.ad
-.sp .6
-.RS 4n
-Configuration files for Asian Lanuguage Environment (ALE).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/X\fR\fR
-.ad
-.sp .6
-.RS 4n
-Symbolic link to the \fB/usr/openwin\fR directory.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/X11\fR\fR
 .ad
 .sp .6
@@ -1945,36 +1606,6 @@ Symbolic link to the \fB/var/adm\fR directory.
 .sp
 .ne 2
 .na
-\fB\fB/usr/apache\fR\fR
-.ad
-.sp .6
-.RS 4n
-Apache executables, loadable modules, and documentation.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/appserver\fR\fR
-.ad
-.sp .6
-.RS 4n
-Sun Java System Application Server software.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/benchmarks\fR\fR
-.ad
-.sp .6
-.RS 4n
-Directory for benchmarks.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/bin\fR\fR
 .ad
 .sp .6
@@ -2082,27 +1713,9 @@ is \fB/opt/\fIpackagename\fR/bin/sparcv9\fR.
 .ad
 .sp .6
 .RS 4n
-C compilation system.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/ccs/bin\fR\fR
-.ad
-.sp .6
-.RS 4n
-C compilation commands and system utilities.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/ccs/lib\fR\fR
-.ad
-.sp .6
-.RS 4n
-Symbolic link to \fB/usr/lib\fR.
+Former location of files for the C compilation system, now containing
+compatibility symbolic links to their new locations in \fB/usr/bin\fR
+and \fB/usr/lib\fR.
 .RE
 
 .sp
@@ -2129,78 +1742,6 @@ dictionary file used by the \fBUNIX\fR spell program.
 .sp
 .ne 2
 .na
-\fB\fB/usr/dt\fR\fR
-.ad
-.sp .6
-.RS 4n
-root of a subtree for CDE software.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/dt/bin\fR\fR
-.ad
-.sp .6
-.RS 4n
-Primary location for CDE system utilities.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/dt/include\fR\fR
-.ad
-.sp .6
-.RS 4n
-Header files for CDE software.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/dt/lib\fR\fR
-.ad
-.sp .6
-.RS 4n
-Libraries for CDE software.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/dt/share/man\fR\fR
-.ad
-.sp .6
-.RS 4n
-On-line reference manual pages for CDE software.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/games\fR\fR
-.ad
-.sp .6
-.RS 4n
-An empty directory, a remnant of the SunOS 4.0/4.1 software.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/gnome\fR\fR
-.ad
-.sp .6
-.RS 4n
-This is an obsolete directory where 3rd party programs can install their
-applications and \fBpixmap\fR files. It is supported for backwards
-compatibility.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/include\fR\fR
 .ad
 .sp .6
@@ -2381,16 +1922,6 @@ Database files for \fBspell\fR(1).
 .sp
 .ne 2
 .na
-\fB\fB/usr/lib/dns\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains DNS resolver libraries.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/lib/dtrace\fR\fR
 .ad
 .sp .6
@@ -2401,16 +1932,6 @@ Contains \fBdtrace\fR D source files.
 .sp
 .ne 2
 .na
-\fB\fB/usr/lib/flash\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains Solaris flash archive deployment scripts.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/lib/fm\fR\fR
 .ad
 .sp .6
@@ -2714,16 +2235,6 @@ Solaris security plug-in modules.
 .sp
 .ne 2
 .na
-\fB\fB/usr/lib/smartcard\fR\fR
-.ad
-.sp .6
-.RS 4n
-IFD handler libraries.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/lib/smedia\fR\fR
 .ad
 .sp .6
@@ -2862,16 +2373,6 @@ Auxiliary programs and daemons for \fBuucp\fR(1C).
 .sp
 .ne 2
 .na
-\fB\fB/usr/lib/webconsole\fR\fR
-.ad
-.sp .6
-.RS 4n
-Sun Java web console programs and scripts.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/lib/zones\fR\fR
 .ad
 .sp .6
@@ -2948,16 +2449,6 @@ Programs that are being phased out.
 .sp
 .ne 2
 .na
-\fB\fB/usr/openwin\fR\fR
-.ad
-.sp .6
-.RS 4n
-Installation or mount point for the OpenWindows software.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/perl5\fR\fR
 .ad
 .sp .6
@@ -3048,7 +2539,8 @@ Symbolic link to the \fB/var/preserve\fR directory.
 .ad
 .sp .6
 .RS 4n
-Directory for the \fBproc\fR tools.
+Former location of the \fBproc\fR(1) tools, now containing compatibility
+symbolic links to their new locations in \fB/usr/bin\fR.
 .RE
 
 .sp
@@ -3075,17 +2567,6 @@ System administration files and directories.
 .sp
 .ne 2
 .na
-\fB\fB/usr/sadm/bin\fR\fR
-.ad
-.sp .6
-.RS 4n
-Binaries for the Form and Menu Language Interpreter (\fBFMLI\fR) scripts. See
-\fBfmli\fR(1).
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/sadm/install\fR\fR
 .ad
 .sp .6
@@ -3109,21 +2590,11 @@ applications is \fB/opt/\fIpackagename\fR/sbin\fR.
 .sp
 .ne 2
 .na
-\fB\fB/usr/sbin/install.d\fR\fR
+\fB\fB/usr/sbin/sparcv7\fR and \fBsparcv9\fR\fR
 .ad
 .sp .6
 .RS 4n
-Custom Jumpstart scripts and executables.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/sbin/sparc7\fR and \fBsparc9\fR\fR
-.ad
-.sp .6
-.RS 4n
-32-bit and 64-bit versions of commands.
+32-bit and 64-bit SPARC versions of commands.
 .RE
 
 .sp
@@ -3133,7 +2604,7 @@ Custom Jumpstart scripts and executables.
 .ad
 .sp .6
 .RS 4n
-64-bit x86versions of commands.
+64-bit x86 versions of commands.
 .RE
 
 .sp
@@ -3167,16 +2638,6 @@ add-on system software or for applications is
 .sp
 .ne 2
 .na
-\fB\fB/usr/sfw\fR\fR
-.ad
-.sp .6
-.RS 4n
-\fBGNU\fR and open source executables, libraries, and documentation.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/share\fR\fR
 .ad
 .sp .6
@@ -3202,7 +2663,7 @@ Open source \fBm4\fR files.
 .ad
 .sp .6
 .RS 4n
-Open source desktop applications files.
+Desktop application files.
 .RE
 
 .sp
@@ -3218,62 +2679,11 @@ Sample audio files.
 .sp
 .ne 2
 .na
-\fB\fB/usr/share/glib-2.0\fR\fR
-.ad
-.sp .6
-.RS 4n
-Makefile for \fBglib\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/share/gnome\fR\fR
-.ad
-.sp .6
-.RS 4n
-GNOME desktop and application data.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/share/gtk-2.0\fR\fR
-.ad
-.sp .6
-.RS 4n
-GTK+ application data and demos
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/share/gtk-doc\fR\fR
-.ad
-.sp .6
-.RS 4n
-API documentation for libraries which use gtk-doc documentation format, which
-mostly includes desktop interfaces.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/share/icons\fR\fR
 .ad
 .sp .6
 .RS 4n
-Sun Java Desktop icons.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/share/idl\fR\fR
-.ad
-.sp .6
-.RS 4n
-Open source Interface Definition Language (IDL) files.
+Desktop icon files.
 .RE
 
 .sp
@@ -3299,16 +2709,6 @@ Open source IP Filter sample files.
 .sp
 .ne 2
 .na
-\fB\fB/usr/share/javadoc\fR\fR
-.ad
-.sp .6
-.RS 4n
-Help files for Message Queue broker and Smart Card applications.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/share/lib\fR\fR
 .ad
 .sp .6
@@ -3423,41 +2823,11 @@ or for applications is \fB/opt/\fIpackagename\fR/man\fR.
 .sp
 .ne 2
 .na
-\fB\fB/usr/share/omf\fR\fR
-.ad
-.sp .6
-.RS 4n
-GNOME Scrollkeeper database files.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/share/pixmaps\fR\fR
 .ad
 .sp .6
 .RS 4n
-Sun Java graphics.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/share/scrollkeeper\fR\fR
-.ad
-.sp .6
-.RS 4n
-GNOME Scrollkeeper templates and \fBxslt\fR files.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/share/sgml\fR\fR
-.ad
-.sp .6
-.RS 4n
-Open source SGML files.
+Desktop icon files.
 .RE
 
 .sp
@@ -3487,27 +2857,7 @@ Source code for kernel, utilities, and libraries.
 .ad
 .sp .6
 .RS 4n
-GNOME 2.0 Desktop themes.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/share/webconsole\fR\fR
-.ad
-.sp .6
-.RS 4n
-Sun Web Console status files.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/share/xml\fR\fR
-.ad
-.sp .6
-.RS 4n
-GNOME Scrollkeeper DTD files.
+Desktop themes.
 .RE
 
 .sp
@@ -3602,7 +2952,7 @@ Directory for newer versions of POSIX-compliant utilities.
 
 .SH SEE ALSO
 .LP
-\fBat\fR(1), \fBex\fR(1), \fBfmli\fR(1), \fBiconv\fR(1), \fBlp\fR(1),
+\fBat\fR(1), \fBex\fR(1), \fBiconv\fR(1), \fBlp\fR(1),
 \fBisainfo\fR(1), \fBmail\fR(1), \fBmailx\fR(1), \fBnroff\fR(1),
 \fBpriocntl\fR(1), \fBrefer\fR(1), \fBsar\fR(1), \fBsh\fR(1), \fBspell\fR(1),
 \fBsvcs\fR(1), \fBtroff\fR(1), \fBuname\fR(1), \fBuucp\fR(1C), \fBvi\fR(1),
@@ -3610,4 +2960,6 @@ Directory for newer versions of POSIX-compliant utilities.
 \fBfmd\fR(1M), \fBfsck\fR(1M), \fBinit\fR(1M), \fBkernel\fR(1M),
 \fBmknod\fR(1M), \fBmount\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
 \fBuseradd\fR(1M), \fBypbind\fR(1M), \fBmount\fR(2), \fBIntro\fR(4),
-\fBterminfo\fR(4)
+\fBproc\fR(4), \fBterminfo\fR(4), \fBsmf\fR(5), \fBctfs\fR(7FS),
+\fBdev\fR(7FS), \fBdevfs\fR(7FS), \fBctfs\fR(7FS), \fBobjfs\fR(7FS),
+\fBtmpfs\fR(7FS)
diff --git a/usr/src/man/man5/pkcs11_tpm.5 b/usr/src/man/man5/pkcs11_tpm.5
index fe17fcdd77..22de6e14a4 100644
--- a/usr/src/man/man5/pkcs11_tpm.5
+++ b/usr/src/man/man5/pkcs11_tpm.5
@@ -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 PKCS11_TPM 5 "Mar 20, 2009"
+.TH PKCS11_TPM 5 "May 13, 2017"
 .SH NAME
 pkcs11_tpm \- RSA PKCS#11 token for Trusted Platform Modules (TPM)
 .SH SYNOPSIS
@@ -18,12 +18,11 @@ pkcs11_tpm \- RSA PKCS#11 token for Trusted Platform Modules (TPM)
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpkcs11_tpm.so\fR object implements the RSA PKCS#11 v2.20 specification
 using Trusted Computing Group protocols to talk to a TPM security device. This
 provider implements the PKCS#11 specification and uses the TCG Software Stack
-(TSS) APIs in the \fBSUNWtrousers\fR package.
+(TSS) APIs in the \fBtrousers\fR package.
 .sp
 .LP
 Application developers should link to \fBlibpkcs11.so.1\fR rather than link
@@ -79,10 +78,9 @@ CKM_MD5_HMAC_GENERAL
 .sp
 
 .SS "Per-User Initialization"
-.sp
 .LP
 The \fBpkcs11_tpm\fR provider can only be used on a system which has a TPM
-device and which also has the \fBSUNWtrousers\fR package installed. If those
+device and which also has the \fBtrousers\fR package installed. If those
 prerequisites are met, users can create their own private tokens using
 \fBpktool\fR(1), which will allow them to perform operations using the TPM
 device and protect their private data with TPM-protected keys.
@@ -178,7 +176,6 @@ The PIN provided for the \fBpktool\fR \fBsetpin\fR operation or by calling
 \fBC_Login()\fR and \fBC_SetPIN()\fR functions can be any string of characters
 with a length between 1 and 256 and no embedded nulls.
 .SS "Accessing the Token"
-.sp
 .LP
 After a user initializes their token, they can begin using it with
 \fBpktool\fR(1) or by writing PKCS11 applications and locating the token using
@@ -196,7 +193,6 @@ $ \fBpktool list token=tpm/joeuser\fR
 .sp
 
 .SS "Notes"
-.sp
 .LP
 \fBpkcs11_tpm.so\fR provides object storage in a filesystem-specific token
 object storage area. Private objects are protected by encryption with private
@@ -222,12 +218,10 @@ for each token created. By default, this area is created as
 the \fBPKCS11_TPM_DIR\fR environment variable prior to initializing or using
 the token.
 .SH RETURN VALUES
-.sp
 .LP
 The return values for each of the implemented functions are defined and listed
 in the RSA PKCS#11 v2.20 specification. See \fBhttp://www.rsasecurity.com\fR.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/tpm/pkcs11/USERNAME\fR\fR
@@ -248,7 +242,6 @@ Alternate token object store.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -272,11 +265,9 @@ Standard 	PKCS#11 v2.20
 Exceptions to MT-Safe attribute are documented in section 6.5.2 of RSA PKCS#11
 v2.20.
 .SH SEE ALSO
-.sp
 .LP
 \fBpktool\fR(1), \fBcryptoadm\fR(1M), \fBlibpkcs11\fR(3LIB),
 \fBattributes\fR(5)
 .sp
 .LP
-TCG Software Stack (TSS) Specifications: \fBhttps://www.trustedcomputinggroup.
-org/specs/TSS\fR (as of the date of publication)
+TCG Software Stack (TSS) Specifications: \fBhttps://www.trustedcomputinggroup.org/specs/TSS\fR (as of the date of publication)
diff --git a/usr/src/man/man5/privileges.5 b/usr/src/man/man5/privileges.5
index 53b86177e2..a2e5596d3f 100644
--- a/usr/src/man/man5/privileges.5
+++ b/usr/src/man/man5/privileges.5
@@ -4,7 +4,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 PRIVILEGES 5 "Jun 6, 2016"
+.TH PRIVILEGES 5 "May 13, 2017"
 .SH NAME
 privileges \- process privilege model
 .SH DESCRIPTION
@@ -1323,8 +1323,7 @@ set priv_debug = 1
 On a running system, you can use \fBmdb\fR(1) to change this variable.
 .SS "Privilege Administration"
 .LP
-The Solaris Management Console (see \fBsmc\fR(1M)) is the preferred method of
-modifying privileges for a command. Use \fBusermod\fR(1M) or \fBsmrole\fR(1M)
+Use \fBusermod\fR(1M) or \fBrolemod\fR(1M)
 to assign privileges to or modify privileges for, respectively, a user or a
 role. Use \fBppriv\fR(1) to enumerate the privileges supported on a system and
 \fBtruss\fR(1) to determine which privileges a program requires.
diff --git a/usr/src/man/man5/smf_security.5 b/usr/src/man/man5/smf_security.5
index 5da69d1390..6f94f14c4e 100644
--- a/usr/src/man/man5/smf_security.5
+++ b/usr/src/man/man5/smf_security.5
@@ -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 SMF_SECURITY 5 "May 20, 2009"
+.TH SMF_SECURITY 5 "May 13, 2017"
 .SH NAME
 smf_security \- service management facility security behavior
 .SH DESCRIPTION
-.sp
 .LP
 The configuration subsystem for the service management facility, \fBsmf\fR(5),
 requires privilege to modify the configuration of a service. Privileges are
@@ -28,7 +27,6 @@ properties, and to read protected property values.
 .RE
 
 .SS "Property Group Authorizations"
-.sp
 .LP
 The \fBsmf\fR(5) configuration subsystem associates properties with each
 service and service instance. Related properties are grouped. Groups can
@@ -144,7 +142,6 @@ The above authorization properties are only used if they have type
 properties, but the instance's service has a property group of the same name
 with the property, its values are used.
 .SS "Protected Property Groups"
-.sp
 .LP
 Normally, all property values in the repository can be read by any user without
 explicit authorization. Property groups of non-framework types can be used to
@@ -161,7 +158,6 @@ the face of such a policy, non-protected property values can be backed up by
 using the \fBsvccfg\fR(1M) archive command to create an archive of the
 repository without protected property values.
 .SS "Service Action Authorization"
-.sp
 .LP
 Certain actions on service instances can result in service interruption or
 deactivation. These actions require an authorization to ensure that any denial
@@ -186,7 +182,6 @@ additional authorizations that permit service actions to be requested for that
 service instance. The \fBsolaris.smf.manage\fR authorization is required to
 modify this property.
 .SS "Defined Rights Profiles"
-.sp
 .LP
 Two rights profiles are included that offer grouped authorizations for
 manipulating typical \fBsmf\fR(5) operations.
@@ -199,10 +194,6 @@ manipulating typical \fBsmf\fR(5) operations.
 A service manager can manipulate any service in the repository in any way. It
 corresponds to the \fBsolaris.smf.manage\fR and \fBsolaris.smf.modify\fR
 authorizations.
-.sp
-The service management profile is the minimum required to use the
-\fBpkgadd\fR(1M) or \fBpkgrm\fR(1M) commands to add or remove software packages
-that contain an inventory of services in its service manifest.
 .RE
 
 .sp
@@ -220,18 +211,15 @@ Sites can define additional rights profiles customized to their needs.
 .RE
 
 .SS "Remote Repository Modification"
-.sp
 .LP
 Remote repository servers can deny modification attempts due to additional
 privilege checks. See NOTES.
 .SH SEE ALSO
-.sp
 .LP
-\fBauths\fR(1), \fBprofiles\fR(1), \fBpkgadd\fR(1M), \fBpkgrm\fR(1M),
+\fBauths\fR(1), \fBprofiles\fR(1),
 \fBsvccfg\fR(1M), \fBprof_attr\fR(4), \fBuser_attr\fR(4), \fBrbac\fR(5),
 \fBsmf\fR(5)
 .SH NOTES
-.sp
 .LP
 The present version of \fBsmf\fR(5) does not support remote repositories.
 .sp
diff --git a/usr/src/man/man7/FSS.7 b/usr/src/man/man7/FSS.7
index 79b2e2005c..89435041ee 100644
--- a/usr/src/man/man7/FSS.7
+++ b/usr/src/man/man7/FSS.7
@@ -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 FSS 7 "Oct 1, 2004"
+.TH FSS 7 "May 13, 2017"
 .SH NAME
 FSS \- Fair share scheduler
 .SH DESCRIPTION
-.sp
 .LP
 The fair share scheduler (FSS) guarantees application performance by explicitly
 allocating shares of CPU resources to projects. A share indicates a project's
@@ -153,7 +152,6 @@ as shown in the following example:
 .in -2
 
 .SH CONFIGURING SCHEDULER WITH DISPADMIN
-.sp
 .LP
 You can use the \fBdispadmin\fR(1M) command to examine and tune the FSS
 scheduler's time quantum value. Time quantum is the amount of time that a
@@ -191,27 +189,11 @@ different while the amount of time is the same.
 You can use the \fB-s\fR option to change the time quantum value. Note that
 such changes are not preserved across reboot. Please refer to the
 \fBdispadmin\fR(1M) man page for additional information.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-l l
-l l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-Architecture	SUNWcsu
-.TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBprctl\fR(1), \fBpriocntl\fR(1), \fBdispadmin\fR(1M), \fBpsrset\fR(1M),
-\fBpriocntl\fR(2), \fBproject\fR(4), \fBattributes\fR(5),
-\fBresource_controls\fR(5)
+\fBpriocntl\fR(2), \fBproject\fR(4), \fBresource_controls\fR(5)
 .sp
 .LP
 \fISystem Administration Guide:  Virtualization Using the Solaris Operating
diff --git a/usr/src/man/man7/cpr.7 b/usr/src/man/man7/cpr.7
index 9845202dee..8f9f0a1d0f 100644
--- a/usr/src/man/man7/cpr.7
+++ b/usr/src/man/man7/cpr.7
@@ -4,7 +4,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 CPR 7 "May 7, 2001"
+.TH CPR 7 "May 13, 2017"
 .SH NAME
 cpr \- Suspend and resume module
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ cpr \- Suspend and resume module
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBcpr\fR module is a loadable module used to suspend and resume the entire
 system. You may wish to suspend a system to save power or to power off
@@ -26,11 +25,11 @@ state is preserved in non-volatile storage until a resume operation is
 conducted.
 .sp
 .LP
-\fBdtpower\fR(1M) or \fBpower.conf\fR(4) are used to configure the
+\fBpmconfig\fR(1M) and \fBpower.conf\fR(4) are used to configure the
 suspend-resume feature.
 .sp
 .LP
-The speed of suspend  and resume operations can range from 15 seconds to
+The speed of suspend and resume operations can range from 15 seconds to
 several minutes, depending on the system speed, memory size, and load.
 .sp
 .LP
@@ -45,14 +44,14 @@ refresh the screen in response to \fBSIGTHAW\fR.
 In some cases the \fBcpr\fR module may be unable to perform the suspend
 operation. If a system contains additional devices outside the standard shipped
 configuration, it is possible that device drivers for these additional devices
-might not support suspend-resume  operations. In this case, the suspend fails
+might not support suspend-resume operations. In this case, the suspend fails
 and an error message is displayed. These devices must be removed or their
-device drivers unloaded for the  suspend operation to succeed. Contact the
+device drivers unloaded for the suspend operation to succeed. Contact the
 device manufacturer to obtain a new version of device driver that supports
 suspend-resume.
 .sp
 .LP
-A  suspend  may also fail when devices or processes are performing critical or
+A suspend may also fail when devices or processes are performing critical or
 time-sensitive operations (such as realtime operations). The system will remain
 in its current running state. Messages reporting the failure will be displayed
 on the console and status returned to the caller. Once the system is
@@ -63,10 +62,9 @@ influences such as a hardware reconfiguration.
 Some network-based applications may fail across a suspend and resume cycle.
 This largely depends on the underlying network protocol and the applications
 involved.  In general, applications that retry and automatically reestablish
-connections will continue to operate  transparently on a resume  operation;
+connections will continue to operate transparently on a resume operation;
 those applications that do not will likely fail.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -82,26 +80,19 @@ Interface stability 	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBdtpower\fR(1M) (OpenWindows Reference Manual), \fBpmconfig\fR(1M),
+\fBpmconfig\fR(1M),
 \fBuadmin\fR(1M), \fBuadmin\fR(2), \fBpower.conf\fR(4), \fBattributes\fR(5)
 .sp
 .LP
-\fIUsing Power Management\fR
-.sp
-.LP
 \fIWriting Device Drivers\fR
 .SH NOTES
-.sp
 .LP
 Certain device operations such as tape and floppy disk activities are not
 resumable due to the nature of removable media.  These activities are detected
-at suspend time, and must be stopped before the suspend  operation will
+at suspend time, and must be stopped before the suspend operation will
 complete successfully.
 .sp
 .LP
-Suspend-resume is currently  supported only on a limited set of hardware
-platforms. Please see  the book \fIUsing Power Management\fR for a complete
-list of platforms that support system Power Management. See \fBuname\fR(2) to
-programatically determine if the machine supports suspend-resume.
+Suspend-resume is currently supported only on a limited set of hardware
+platforms.
diff --git a/usr/src/man/man7d/audiopci.7d b/usr/src/man/man7d/audiopci.7d
index 68a2e5cee0..116efce9f3 100644
--- a/usr/src/man/man7d/audiopci.7d
+++ b/usr/src/man/man7d/audiopci.7d
@@ -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 AUDIOPCI 7D "May 6, 2009"
+.TH AUDIOPCI 7D "May 13, 2017"
 .SH NAME
 audiopci \- Ensoniq 1370 driver support
 .SH DESCRIPTION
-.sp
 .LP
 The \fBaudiopci\fR driver provides support for the Ensoniq 1370 audio
 controller. Ensoniq 1370 chips are found on add-in PCI cards commonly
 identified as Audio PCI and SoundBlaster PCI.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/audiopci\fR\fR
@@ -34,7 +32,7 @@ identified as Audio PCI and SoundBlaster PCI.
 .sp
 .ne 2
 .na
-\fB\fB/kernel/drv/amd64/audiopci\fR\fR
+\fB\fB/kernel/drv/sparcv9/audiopci\fR\fR
 .ad
 .RS 30n
 64-bit SPARC kernel driver module
@@ -50,7 +48,6 @@ Driver configuration file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -66,13 +63,9 @@ Architecture	PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBioctl\fR(2), \fBattributes\fR(5), \fBaudio\fR(7I), \fBmixer\fR(7I),
 \fBstreamio\fR(7I)
 .sp
 .LP
 \fICreative Technology Ltd ES1370 Specification\fR
-.sp
-.LP
-http://www.sun.com
diff --git a/usr/src/man/man7d/ecpp.7d b/usr/src/man/man7d/ecpp.7d
index 6723835203..9c81264ef1 100644
--- a/usr/src/man/man7d/ecpp.7d
+++ b/usr/src/man/man7d/ecpp.7d
@@ -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 ECPP 7D "Oct 9, 2004"
+.TH ECPP 7D "May 13, 2017"
 .SH NAME
 ecpp \- IEEE 1284 compliant parallel port driver
 .SH SYNOPSIS
@@ -23,7 +23,6 @@ ecpp@unit-address
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBecpp\fR driver provides a bi-directional interface to \fIIEEE 1284\fR
 compliant devices as well as a forward single-directional interface to
@@ -49,7 +48,6 @@ in \fBecpp.conf\fR.
 The \fBecpp\fR driver is an \fIexclusive-use\fR device, meaning that if the
 device is already open, subsequent opens fail with \fBEBUSY\fR.
 .SS "Default Operation"
-.sp
 .LP
 Each time the \fBecpp\fR device is opened, the device is marked as \fBEBUSY\fR
 and the configuration variables are set to their default values. The
@@ -73,7 +71,6 @@ the \fBwrite_timeout\fR values through the \fBECPPIOC_SETPARMS\fR
 \fBioctl\fR(2) call. For mode negotiation to be successful, both the host
 workstation and the peripheral must support the requested mode.
 .SS "Tunables"
-.sp
 .LP
  Characteristics of the \fBecpp\fR driver may be tuned by the variables
 described in \fB/kernel/drv/ecpp.conf\fR. These variables are read by the
@@ -86,13 +83,11 @@ will not operate with the parallel port operating in a fast handshaking mode.
 If printing problems occur, set "fast-centronics" and "fast-1284-compatible" to
 "false." See \fB/kernel/drv/ecpp.conf\fR for more information.
 .SS "Read/Write Operation"
-.sp
 .LP
 The \fBecpp\fR driver is a full duplex STREAMS device driver. While an
 application is writing to an \fIIEEE 1284\fR compliant device, another thread
 may read from it.
 .SS "Write Operation"
-.sp
 .LP
 A \fBwrite\fR(2) operation returns the number of bytes successfully written to
 the stream head. If a failure occurs while a Centronics device is transferring
@@ -101,7 +96,6 @@ and can be retrieved by the application program using the \fBBPPIOC_GETERR\fR
 \fBioctl\fR(2) call. The captured status information is overwritten each time
 an attempted transfer or a \fBBPPIOC_TESTIO\fR \fBioctl\fR(2) occurs.
 .SS "Read Operation"
-.sp
 .LP
 If a failure or error condition occurs during a \fBread\fR(2), the number of
 bytes successfully read is returned (short read). When attempting to read a
@@ -110,7 +104,6 @@ port that has no data currently available, \fBread\fR(2) returns \fB0\fR if
 \fB-1\fR and sets errno to \fBEAGAIN.\fR If \fBO_NDELAY\fR and \fBO_NONBLOCK\fR
 are clear, \fBread\fR(2) blocks until data become available.
 .SH IOCTLS
-.sp
 .LP
 The \fBioctl\fR(2) calls described below are supported. Note that when
 \fBecpp\fR is transferring data, the driver waits until the data has been sent
@@ -127,7 +120,7 @@ followed by default negotiation.
 .RE
 .sp
 .LP
-The following \fBioctl(2)\fR calls are supported for backward compatibility and
+The following \fBioctl\fR(2) calls are supported for backward compatibility and
 are not recommended for new applications:
 .sp
 .ne 2
@@ -342,7 +335,6 @@ bits are reserved. Reading reserved bits always return 1. An attempt to write
 .RE
 
 .SH DEVICE SPECIAL FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/lp\fIN\fR\fR\fR
@@ -361,7 +353,6 @@ Solaris x86 only. (Backwards compatibility with former \fBlp\fR(7D) devices.)
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fBkernel/drv/ecpp\fR\fR
@@ -422,7 +413,6 @@ driver configuration file for 64-bit x86
 .RE
 
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBEBADF\fR\fR
@@ -478,7 +468,6 @@ peripheral error.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -498,19 +487,14 @@ Interface stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBmodload\fR(1M), \fBmodunload\fR(1M), \fBupdate_drv\fR(1M)\fBioctl\fR(2),
+\fBmodload\fR(1M), \fBmodunload\fR(1M), \fBupdate_drv\fR(1M), \fBioctl\fR(2),
 \fBopen\fR(2), \fBread\fR(2), \fBwrite\fR(2), \fBattributes\fR(5),
 \fBbpp\fR(7D), \fBusbprn\fR(7D), \fBprnio\fR(7I), \fBstreamio\fR(7I)
 .sp
 .LP
 \fIIEEE Std 1284-1994\fR
-.sp
-.LP
-\fIhttp://www.sun.com/io\fR
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fBParallel port controller not supported\fR
diff --git a/usr/src/man/man7d/ehci.7d b/usr/src/man/man7d/ehci.7d
index 618a1562ea..a1a9a3efb8 100644
--- a/usr/src/man/man7d/ehci.7d
+++ b/usr/src/man/man7d/ehci.7d
@@ -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 EHCI 7D "Apr 13, 2006"
+.TH EHCI 7D "May 13, 2017"
 .SH NAME
 ehci \- Enhanced host controller driver
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ ehci \- Enhanced host controller driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBehci\fR driver is a USBA (Solaris USB Architecture) compliant nexus
 driver that supports the Enhanced Host Controller Interface Specification 2.0,
@@ -26,8 +25,8 @@ EHCI (Enhanced Host Controller Interface) that is used for all high-speed
 communications to high-speed-mode devices.
 .sp
 .LP
-All USB 2.0 devices  connected to the root ports of the USB 2.0  host
-controller and all devices connected to a high- speed-mode hub should be routed
+All USB 2.0 devices connected to the root ports of the USB 2.0 host
+controller and all devices connected to a high-speed-mode hub should be routed
 to the EHCI host controller.
 .sp
 .LP
@@ -36,10 +35,9 @@ controller should be routed to the companion USB 1.1 host controllers. (OHCI or
 UHCI host controller).
 .sp
 .LP
-The \fBehci\fR supports bulk, interrupt, control  and  iso chronous transfers
+The \fBehci\fR supports bulk, interrupt, control and iso chronous transfers
 (on USB1.\fIx\fR devices behind a USB2.0 hub).
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/ehci\fR\fR
@@ -76,7 +74,6 @@ Driver configuration file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -92,7 +89,6 @@ Architecture	SPARC, x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBadd_drv\fR(1M), \fBprtconf\fR(1M), \fBrem_drv\fR(1M), \fBupdate_drv\fR(1M),
 \fBattributes\fR(5), \fBhubd\fR(7D), \fBuhci\fR(7D), \fBohci\fR(7D),
@@ -114,15 +110,8 @@ Architecture	SPARC, x86, PCI-based systems
 \fIhttp://www.usb.org\fR
 .sp
 .LP
-\fIhttp://www.sun.com/io\fR
-.sp
-.LP
-\fIhttp://www.sun.com/bigadmin/hcl\fR
-.sp
-.LP
 \fIhttp://www.intel.com/technology/usb/ehcispec.htm\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 In addition to being logged, the following messages may appear on the system
 console. All messages are formatted in the following manner:
@@ -212,7 +201,7 @@ comment out a property in ehci.conf. (x86 only).
 .ad
 .sp .6
 .RS 4n
-The driver is unable to take control of the EHCI hardware          from the
+The driver is unable to take control of the EHCI hardware from the
 system's BIOS and aborts the attach. High speed (USB 2.0) support is disabled.
 In this case, all USB devices run at full/low speed. Contact your system vendor
 or your system administror for possible changes in BIOS settings. You can
@@ -300,13 +289,11 @@ Note -
 Due to recently discovered incompatibilities with this USB controller,
 USB2.\fIx\fR transfer support has been disabled. However, this device continues
 to function as a USB1.\fIx\fR controller. Information on enabling USB2.x
-support is provided in this man page. Please refer to \fIwww.sun.com/io\fR for
-Solaris Ready products and to \fIwww.sun.com/bigadmin/hcl\fR for additional
-compatible USB products.
+support is provided in this man page.
 .LP
 VIA chips may not be compatible with this driver. To bind \fBehci\fR
 specifically to the chip and eliminate the warnings, and to enable USB2.x
-suppport, a new, more specific driver alias  (refer to \fBadd_drv\fR(1M) and
+support, a new, more specific driver alias (refer to \fBadd_drv\fR(1M) and
 \fBupdate_drv\fR(1M)) must be specified for \fBehci\fR. By default, the
 \fBehci\fR alias is 'pciclass,0c0320.' The compatible names in the
 \fBprtconf\fR(1M) output provides additional aliases. For example:
diff --git a/usr/src/man/man7d/hid.7d b/usr/src/man/man7d/hid.7d
index 15ccca13dd..e6538e34a0 100644
--- a/usr/src/man/man7d/hid.7d
+++ b/usr/src/man/man7d/hid.7d
@@ -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 HID 7D "Aug 21, 2009"
+.TH HID 7D "May 13, 2017"
 .SH NAME
 hid \- Human interface device (HID) class driver
 .SH SYNOPSIS
@@ -17,7 +17,6 @@ hid \- Human interface device (HID) class driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .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
@@ -45,7 +44,6 @@ information about the device. The \fBhid\fR driver queries the HID parser to
 find out the type and characteristics of the HID device. The HID specification
 predefines packet formats for the boot protocol keyboard and mouse.
 .SH IOCTLS
-.sp
 .ne 2
 .na
 \fB\fBHIDIOCKMGDIRECT\fR\fR
@@ -79,7 +77,6 @@ gets the input.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/hid\fR\fR
@@ -140,7 +137,6 @@ gets the input.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -156,7 +152,6 @@ Architecture	SPARC, x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcfgadm_usb\fR(1M), \fBattributes\fR(5), \fBusba\fR(7D), \fBvirtualkm\fR(7D)
 .sp
@@ -174,11 +169,7 @@ Architecture	SPARC, x86, PCI-based systems
 .sp
 .LP
 \fISystem Administration Guide: Basic Administration\fR
-.sp
-.LP
-\fIhttp://www.sun.com\fR
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fBhid_attach: Unsupported HID device.\fR
@@ -253,13 +244,12 @@ The device cannot be supported by this version of the HID driver.
 .RE
 
 .SH NOTES
-.sp
 .LP
 The hid driver currently supports only keyboard, mouse and audio HID control
 devices.
 .sp
 .LP
-Normally a mouse is not power managed and consquently, screen darkening can be
+Normally a mouse is not power managed and consequently, screen darkening can be
 undone with a mouse movement. If power management of the mouse is required, add
 the following line to \fBhid.conf\fR then reboot the system:
 .sp
diff --git a/usr/src/man/man7d/hubd.7d b/usr/src/man/man7d/hubd.7d
index cabb1f938e..881272cadb 100644
--- a/usr/src/man/man7d/hubd.7d
+++ b/usr/src/man/man7d/hubd.7d
@@ -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 HUBD 7D "Oct 4, 2016"
+.TH HUBD 7D "May 13, 2017"
 .SH NAME
 hubd \- USB hub driver
 .SH SYNOPSIS
@@ -82,9 +82,6 @@ Architecture	SPARC, x86, PCI-based systems
 .sp
 .LP
 \fISystem Administration Guide: Basic Administration\fR
-.sp
-.LP
-http://\fIwww.sun.com/io\fR
 .SH DIAGNOSTICS
 .LP
 In addition to being logged, the following messages may also appear on the
@@ -257,7 +254,7 @@ bus.\fR
 .sp .6
 .RS 4n
 A USB self/bus-powered hub has lost external power. Some USB devices connected
-down-stream from this hub may cease          to function. Disconnect the
+down-stream from this hub may cease to function. Disconnect the
 external power-supply and then plug in the hub again.
 .RE
 
diff --git a/usr/src/man/man7d/ieee1394.7d b/usr/src/man/man7d/ieee1394.7d
index 41b63a6744..bcdf216811 100644
--- a/usr/src/man/man7d/ieee1394.7d
+++ b/usr/src/man/man7d/ieee1394.7d
@@ -3,16 +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 IEEE1394 7D "Apr 3, 2009"
+.TH IEEE1394 7D "May 13, 2017"
 .SH NAME
 ieee1394, firewire, 1394 \- Solaris IEEE-1394 Architecture
 .SH DESCRIPTION
-.sp
 .LP
-IEEE-1394 provides a means for interconnecting devices  in computer and  home
+IEEE-1394 provides a means for interconnecting devices in computer and home
 entertainment systems. (The IEEE-1394 architecture is also known as Firewire,
 an Apple Computer trademark, and i.Link, a Sony trademark). The most common
-IEEE-1394 devices  are digital camcorders, mass-storage devices and cameras
+IEEE-1394 devices are digital camcorders, mass-storage devices and cameras
 (including webcam-type devices). For more information on USB, refer to the 1394
 Trade Association website at http://\fIwww.1394ta.org\fR.
 .sp
@@ -28,13 +27,12 @@ in the \fIIEEE 1394-1995\fR and \fIIEEE 1394a-2000\fR specifications.
 .sp
 .LP
 IEEE-1394 host controllers implementing the 1394 Open Host Controller Interface
-specification are supported. Camcorders      implementing the \fIIEC 61883\fR
+specification are supported. Camcorders implementing the \fIIEC 61883\fR
 and 1394 Trade Association AV/C specifications are supported. Mass-storage
 devices implementing the \fIANSI SBP-2\fR specification are supported. Digital
 cameras implementing the 1394 Trade Association 1394-based Digital Camera
 (IIDC) specification are supported.
 .SH FILES
-.sp
 .LP
 Listed below are drivers and modules which either utilize or are utilized by
 the Solaris IEEE-1394 architecture. Drivers in \fB/kernel/drv\fR are 32 bit
@@ -85,7 +83,6 @@ _
 .TE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -101,21 +98,16 @@ Architecture	PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5), \fBav1394\fR(7D), \fBdcam1394\fR(7D), \fBhci1394\fR(7D),
 \fBscsa1394\fR(7D), \fBiec61883\fR(7I)
 .sp
 .LP
-http://www.sun.com
-.sp
-.LP
 \fIIEEE 1394a\fR Specification - 1394 Trade Association, 2000
 .sp
 .LP
 \fIIEEE 1394\fR Specification - 1394 Trade Association, 1995
 .SH NOTES
-.sp
 .LP
 Booting from IEEE-1394 mass-storage devices is not supported, but may be
-possible if supported by the BIOS of the computer      system.
+possible if supported by the BIOS of the computer system.
diff --git a/usr/src/man/man7d/ohci.7d b/usr/src/man/man7d/ohci.7d
index b2a60de881..922cd18bfd 100644
--- a/usr/src/man/man7d/ohci.7d
+++ b/usr/src/man/man7d/ohci.7d
@@ -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 OHCI 7D "Nov 23, 2006"
+.TH OHCI 7D "May 13, 2017"
 .SH NAME
 ohci \- OpenHCI host controller driver
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ ohci \- OpenHCI host controller driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBohci\fR driver is a USBA (Solaris USB Architecture) compliant nexus
 driver that supports the \fIOpen Host Controller Interface Specification
@@ -24,7 +23,6 @@ Semiconductor.
 The \fBohci\fR driver supports bulk, interrupt, control and isochronous
 transfers.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/ohci\fR\fR
@@ -61,7 +59,6 @@ driver configuration file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -77,7 +74,6 @@ Architecture	SPARC, x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5), \fBehci\fR(7D), \fBhubd\fR(7D), \fBuhci\fR(7D),
 \fBusba\fR(7D)
@@ -93,11 +89,7 @@ Architecture	SPARC, x86, PCI-based systems
 .sp
 .LP
 \fISystem Administration Guide: Basic Administration\fR
-.sp
-.LP
-\fIhttp://www.sun.com/io\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 All host controller errors are passed to the client drivers. Root hub errors
 are documented in \fBhubd\fR(7D).
@@ -138,7 +130,7 @@ system. If this problem persists, contact your system vendor.
 
 .sp
 .LP
-The following messages may be entered into the  system  log. They are formatted
+The following messages may be entered into the system log. They are formatted
 in the following manner:
 .sp
 .in +2
diff --git a/usr/src/man/man7d/sata.7d b/usr/src/man/man7d/sata.7d
index b3ad7f9692..558d273d6e 100644
--- a/usr/src/man/man7d/sata.7d
+++ b/usr/src/man/man7d/sata.7d
@@ -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 SATA 7D "Sep 10, 2009"
+.TH SATA 7D "May 13, 2017"
 .SH NAME
 sata \- Solaris SATA framework
 .SH DESCRIPTION
-.sp
 .LP
 Serial ATA is an interconnect technology designed to replace parallel ATA
 technology. It is used to connect hard drives, optical drives, removable
@@ -18,7 +17,7 @@ http://\fIwww.serialata.org\fR.
 .LP
 Up to 32 SATA devices may be plugged directly to each SATA HBA and up to 15
 SATA devices may be plugged directly to each SATA port multiplier supported by
-the Solaris SATA framework. The actual number of pluggable devices my be lower,
+the Solaris SATA framework. The actual number of pluggable devices may be lower,
 and is limited by the number of device ports on the SATA HBA or the SATA port
 multiplier. The maximum data rate is either 1.5Gb/sec. or 3.0Gb/sec., depending
 on the capability of a SATA device, port multiplier and SATA HBA controller.
@@ -32,7 +31,6 @@ attached as a target driver for each device node created by the SATA framework.
 You can use the \fBcfgadm\fR(1M) utility to manage hot plugged and unplugged
 SATA devices.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/misc/sata\fR\fR
@@ -51,7 +49,6 @@ SATA devices.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attribute:
 .sp
@@ -67,10 +64,9 @@ Architecture	x86
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcfgadm\fR(1M), \fBprtconf\fR(1M), \fBcfgadm_sata\fR(1M),
-\fBattributes\fR(5), \fBahci\fR(7D), \fBmarvell88sx\fR(7D), \fBnv_sata\fR(7D),
+\fBattributes\fR(5), \fBahci\fR(7D), \fBnv_sata\fR(7D),
 \fBsd\fR(7D), \fBsi3124\fR(7D)
 .sp
 .LP
@@ -79,11 +75,7 @@ Architecture	x86
 .LP
 \fISerial ATA II (Extension to Serial ATA 1.0.a.)\fR \(em Serial ATA
 International Organization.
-.sp
-.LP
-\fIhttp://www.sun.com/\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 The messages described below may appear on the system console as well as being
 logged. All messages are presented in one of the following formats and are
diff --git a/usr/src/man/man7d/scsa1394.7d b/usr/src/man/man7d/scsa1394.7d
index 4c4e66b047..a9ae97d88b 100644
--- a/usr/src/man/man7d/scsa1394.7d
+++ b/usr/src/man/man7d/scsa1394.7d
@@ -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 SCSA1394 7D "Mar 2, 2007"
+.TH SCSA1394 7D "May 13, 2017"
 .SH NAME
 scsa1394 \- SCSI to 1394 bridge driver
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ scsa1394 \- SCSI to 1394 bridge driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBscsa1394\fR driver is a 1394 target and an SCSA HBA driver that supports
 1394 mass storage devices compliant with the \fISerial Bus Protocol 2
@@ -41,11 +40,10 @@ In the current release, however, only mass storage devices with a removable bit
 INQUIRY data.) See SCSI specifications T10/995D Revision 11a, T10/1236-D
 Revision 20 or T10/1416-D Revision 23 for more information. However, for
 backward compatibility, all 1394 mass storage devices can still be managed by
-\fBrmformat\fR(1). With or without a volume  manager,  you can mount, eject,
-hot remove and hot insert a  1394 mass storage device as the following sections
+\fBrmformat\fR(1). With or without a volume manager, you can mount, eject,
+hot remove and hot insert a 1394 mass storage device as the following sections
 explain.
 .SH USING VOLUME MANAGEMENT
-.sp
 .LP
 Mass storage devices are managed by a volume manager. Software that manages
 removable media creates a device nickname that can be listed with
@@ -69,12 +67,7 @@ the USB device, use \fBeject\fR(1) to unmount the file system.
 You can disable the automatic mounting and unmounting of removable devices by
 inserting a entry for a removable device in \fB/etc/vfstab\fR. In this entry,
 you must set the \fBmount at boot\fR field to \fBno\fR. See \fBvfstab\fR(4).
-See the \fISystem Administration Guide, Volume I\fR and \fISolaris Common
-Desktop Environment: User's Guide\fR for details on how to manage a removable
-device with CDE and Removable Media Manager. See \fBdtfile.1X\fR under CDE for
-information on how to use Removable Media Manager.
 .SH USING \fBmount\fR AND \fBumount\fR
-.sp
 .LP
 Use \fBmount\fR(1M) to explicitly mount the device and \fBumount\fR(1M) to
 unmount the device. Use \fBeject\fR(1) to eject the media. After you have
@@ -86,26 +79,18 @@ Removing the storage device while it is being accessed or mounted fails with a
 console warning. To hot remove the storage device from the system, unmount the
 file system, then kill all applications accessing the device. Next, hot remove
 the device. A storage device can be hot inserted at any time.
-.sp
-.LP
-For a comprehensive listing of (non-bootable) 1394 mass-storage devices that
-are compatible with this driver, see \fBwww.sun.com/io\fR.
 .SH DEVICE SPECIAL FILES
-.sp
 .LP
 Block special file names are located in \fB/dev/dsk\fR. Raw file names are
 located in \fB/dev/rdsk\fR. Input/output requests to the devices must follow
 the same restrictions as those for SCSI disks. Refer to \fBsd\fR(7D).
 .SH IOCTLS
-.sp
 .LP
 Refer to \fBcdio\fR(7I) and \fBdkio\fR(7I).
 .SH ERRORS
-.sp
 .LP
 Refer to \fBsd\fR(7D).
 .SH FILES
-.sp
 .LP
 The device special files for the 1394 mass storage device are created like
 those for a SCSI disk. Refer to \fBsd\fR(7D).
@@ -171,7 +156,6 @@ is a generic removable media device.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -187,11 +171,10 @@ Architecture	SPARC, x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcdrw\fR(1), \fBeject\fR(1), \fBrmformat\fR(1), \fBrmmount\fR(1),
 \fBcfgadm_scsi\fR(1M), \fBfdisk\fR(1M), \fBmount\fR(1M), \fBumount\fR(1M),
-\fBdtfile.1X\fR (in CDE man pages), \fBscsi\fR(4), \fBvfstab\fR(4),
+\fBscsi\fR(4), \fBvfstab\fR(4),
 \fBattributes\fR(5), \fBhci1394\fR(7D), \fBsd\fR(7D), \fBpcfs\fR(7FS),
 \fBcdio\fR(7I), \fBdkio\fR(7I)
 .sp
@@ -212,9 +195,3 @@ SCSI Specification\fIT10/1236-D Revision 20\fR \(em July 2001
 .sp
 .LP
 SCSI Specification\fIT10/1416-D Revision 23\fR\(em May 2005
-.sp
-.LP
-\fISolaris Common Desktop Environment: User's Guide\fR
-.sp
-.LP
-\fIhttp://www.sun.com/io\fR
diff --git a/usr/src/man/man7d/scsa2usb.7d b/usr/src/man/man7d/scsa2usb.7d
index 94903e0cbe..7a14176b7b 100644
--- a/usr/src/man/man7d/scsa2usb.7d
+++ b/usr/src/man/man7d/scsa2usb.7d
@@ -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 SCSA2USB 7D "Jul 28, 2008"
+.TH SCSA2USB 7D "May 13, 2017"
 .SH NAME
 scsa2usb \- SCSI to USB bridge driver
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ scsa2usb \- SCSI to USB bridge driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBscsa2usb\fR driver is a \fBUSBA\fR (Solaris USB architecture) compliant
 nexus driver that supports the \fIUSB Mass Storage Bulk Only Transport
@@ -27,7 +26,7 @@ supports storage devices that utilize the above two transports.
 .sp
 .LP
 The \fBscsa2usb\fR driver also supports a \fBugen\fR(7D) interface allowing raw
-access to the device, for example by \fBlibusb\fR(3LIB) applications, bypassing
+access to the device, for example by libusb applications, bypassing
 the child \fBsd\fR(7D) or \fBst\fR(7D) driver. Because a libusb application
 might change the state of the device, you should not access the disk or tape
 concurrently.
@@ -55,8 +54,8 @@ In the current release, however, only disk storage devices with a removable bit
 INQUIRY data.) See SCSI specifications T10/995D Revision 11a, T10/1236-D
 Revision 20 or T10/1416-D Revision 23 for more information. However, for
 backward compatibility, all USB disk storage devices can still be managed by
-\fBrmformat\fR(1). With or without a volume  manager,  you can  mount, eject,
-hot remove and hot insert a  1394 mass storage device as the following sections
+\fBrmformat\fR(1). With or without a volume manager, you can mount, eject,
+hot remove and hot insert a 1394 mass storage device as the following sections
 explain.
 .sp
 .LP
@@ -72,8 +71,8 @@ enable support of particular devices.
 .sp
 .LP
 Follow the information given in the \fBscsa2usb.conf\fR file to see if a
-particular device can be supported using the override information. Also see
-http:/\fI/www.sun.com/io\fR. For example, by adding the following to the
+particular device can be supported using the override information.
+For example, by adding the following to the
 \fBscsa2usb.conf\fR file, many USB memory sticks and card readers might operate
 more reliably:
 .sp
@@ -104,7 +103,6 @@ exclude: scsa2usb
 Alternatively, you can disable automatic handling of a device as described in
 the following subsection.
 .SS "Using Volume Management"
-.sp
 .LP
 Disk storage devices are managed by Volume Manager. Software that manages
 removable media creates a device nickname that can be listed with
@@ -131,12 +129,7 @@ it.
 You can disable the automatic mounting and unmounting of removable devices by
 inserting a entry for a removable device in \fB/etc/vfstab\fR. In this entry,
 you must set the \fBmount at boot\fR field to \fBno\fR. See \fBvfstab\fR(4).
-See the \fISystem Administration Guide, Volume I\fR and \fISolaris Common
-Desktop Environment: User's Guide\fR for details on how to manage a removable
-device with CDE and Removable Media Manager. See \fBdtfile.1X\fR under CDE for
-information on how to use Removable Media Manager.
 .SS "Using \fBmount\fR and \fBumount\fR"
-.sp
 .LP
 Use \fBmount\fR(1M) to explicitly mount the device and \fBumount\fR(1M) to
 unmount the device. Use \fBeject\fR(1) to eject the media. After you have
@@ -148,12 +141,7 @@ Removing the disk device while it is being accessed or mounted fails with a
 console warning. To hot remove the disk device from the system, unmount the
 file system, then kill all applications accessing the device. Next, hot remove
 the device. A storage device can be hot inserted at any time.
-.sp
-.LP
-For a comprehensive listing of (non-bootable) USB mass-storage devices that are
-compatible with this driver, see \fBwww.sun.com/io\fR.
 .SH DEVICE SPECIAL FILES
-.sp
 .LP
 Disk block special file names are located in \fB/dev/dsk\fR, while raw file
 names are located in \fB/dev/rdsk\fR. Tape raw file names are located in
@@ -161,15 +149,12 @@ names are located in \fB/dev/rdsk\fR. Tape raw file names are located in
 restrictions as those for SCSI disks or tapes. Refer to \fBsd\fR(7D) or
 \fBst\fR(7D).
 .SH IOCTLS
-.sp
 .LP
 Refer to \fBdkio\fR(7I) and \fBcdio\fR(7I).
 .SH ERRORS
-.sp
 .LP
 Refer to \fBsd\fR(7D) for disks or \fBst\fR(7D) for tapes.
 .SH FILES
-.sp
 .LP
 The device special files for the USB mass storage device are created like those
 for a \fBSCSI\fR disk or SCSI tape. Refer to \fBsd\fR(7D) or \fBst\fR(7D).
@@ -285,7 +270,6 @@ Can be used to override specific characteristics.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -301,13 +285,12 @@ Architecture	SPARC, x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcdrw\fR(1), \fBeject\fR(1), \fBrmformat\fR(1), \fBrmmount\fR(1),
 \fBcfgadm_scsi\fR(1M), \fBcfgadm_usb\fR(1M), \fBfdisk\fR(1M), \fBmount\fR(1M),
-\fBumount\fR(1M), \fBdtfile.1X\fR (in CDE man pages), \fBlibusb\fR(3LIB),
+\fBumount\fR(1M),
 \fBscsi\fR(4), \fBvfstab\fR(4), \fBattributes\fR(5),
-\fBieee1394\fR(7D)\fBsd\fR(7D), \fBst\fR(7D), \fBugen\fR(7D), \fBusba\fR(7D),
+\fBieee1394\fR(7D), \fBsd\fR(7D), \fBst\fR(7D), \fBugen\fR(7D), \fBusba\fR(7D),
 \fBpcfs\fR(7FS), \fBcdio\fR(7I), \fBdkio\fR(7I)
 .sp
 .LP
@@ -317,9 +300,6 @@ Architecture	SPARC, x86, PCI-based systems
 \fISystem Administration Guide, Volume I\fR
 .sp
 .LP
-\fISolaris Common Desktop Environment: User's Guide\fR
-.sp
-.LP
 \fIUniversal Serial Bus Specification 2.0\fR
 .sp
 .LP
@@ -343,12 +323,8 @@ SCSI Specification \fIT10/995D Revision 11a\fR \(em March 1997
 SCSI Specification\fIT10/1236-D Revision 20\fR \(em July 2001
 .sp
 .LP
-SCSI Specification\fIT10/1416-D Revision 23\fR\(em May 2005
-.sp
-.LP
-http://\fIwww.sun.com/io\fR
+SCSI Specification\fIT10/1416-D Revision 23\fR \(em May 2005
 .SH DIAGNOSTICS
-.sp
 .LP
 Refer to \fBsd\fR(7D) and \fBst\fR(7D).
 .sp
@@ -475,7 +451,6 @@ USB mass storage devices.
 .RE
 
 .SH NOTES
-.sp
 .LP
 The Zip 100 drive does not comply with \fIUniversal Serial Bus Specification
 1.0\fR and cannot be power managed. Power Management support for Zip 100 has
@@ -502,17 +477,13 @@ some other USB device will also fail. To successfully remove a USB mass-storage
 device you must "close" all references to it.
 .sp
 .LP
-An Iomega Zip 100Mb disk cannot be formatted on an Iomega Zip250 drive. See the
-Iomega web site at \fIhttp://www.iomega.com\fR for details.
-.sp
-.LP
 Concurrent I/O to devices with multiple LUNs on the same device is not
 supported.
 .sp
 .LP
 Some USB CD-RW devices may perform inadequately at their advertised speeds. To
 compensate, use USB CD-RW devices at lower speeds (2X versus 4X). See
-\fBcdrw(1)\fR for details.
+\fBcdrw\fR(1) for details.
 .sp
 .LP
 This driver also supports CBI devices that do not use USB interrupt pipe for
diff --git a/usr/src/man/man7d/sd.7d b/usr/src/man/man7d/sd.7d
index e0cbc53c7d..476a048757 100644
--- a/usr/src/man/man7d/sd.7d
+++ b/usr/src/man/man7d/sd.7d
@@ -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 "Sep 8, 2009"
+.TH SD 7D "May 13, 2017"
 .SH NAME
 sd \- SCSI disk and ATAPI/SCSI CD-ROM device driver
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ sd \- SCSI disk and ATAPI/SCSI CD-ROM device driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 To open a device without checking if the vtoc is valid, use the O_NDELAY flag.
 When the device is opened using O_NDELAY, the first read or write to the device
@@ -21,7 +20,6 @@ that happens after the open results in the label being read if the label is not
 currently valid. Once read, the label remains valid until the last close of the
 device. Except for reading the label, O_NDELAY has no impact on the driver.
 .SS "SPARC"
-.sp
 .LP
 The \fBsd\fR \fBSCSI\fR and \fBSCSI/ATAPI\fR driver supports embedded
 \fBSCSI\fR-2 and \fBCCS\fR-compatible \fBSCSI\fR disk and CD-ROM drives,
@@ -36,7 +34,6 @@ describes the disk geometry and partitioning and must be present for the disk
 to be mounted by the system.) A volume label is not required for removable,
 re-writable or read-only media.
 .SS "x86 Only"
-.sp
 .LP
 The \fBsd\fRdriver supports embedded \fBSCSI\fR-2 and \fBCCS\fR-compatible
 \fBSCSI \fRdisk and CD-ROM drives, \fBATAPI \fR2.6 (SFF-8020i)-compliant CD-ROM
@@ -49,7 +46,6 @@ in the first physical sector of the bootable media. If the x86 hard disk
 contains a Solaris disk label, it is located in the second 512-byte sector of
 the FDISK partition.
 .SH DEVICE SPECIAL FILES
-.sp
 .LP
 Block-files access the disk using normal buffering mechanism and are read-from
 and written-to without regard to physical disk records. A \fBraw\fR interface
@@ -66,7 +62,6 @@ Requests that do not meet these requirements will trigger an \fBEINVAL\fR
 error. There are no alignment or length restrictions on I/O requests to the
 block device.
 .SH CD-ROM DRIVE SUPPORT
-.sp
 .LP
 A CD-ROM disk is single-sided and contains approximately 640 megabytes of data
 or 74 minutes of audio. When the CD-ROM is opened, the eject button is disabled
@@ -76,7 +71,6 @@ information are constant and never change. If the CD-ROM contains data recorded
 in a Solaris-aware file system format, it can be mounted using the appropriate
 Solaris file system support.
 .SH DVD-ROM DRIVE SUPPORT
-.sp
 .LP
 DVD-ROM media can be single or double-sided and can be recorded upon using a
 single or double layer structure. Double-layer media provides parallel or
@@ -91,7 +85,6 @@ required for a DVD-ROM. If the DVD-ROM contains data recorded in a
 Solaris-aware file system format, it can be mounted using the appropriate
 Solaris file system support.
 .SH ZIP/JAZ DRIVE SUPPORT
-.sp
 .LP
 \fBZIP/JAZ\fR media provide varied data capacity points; a single \fBJAZ
 \fRdrive can store up to 2 GBytes of data, while a ZIP-250 can store up to
@@ -105,7 +98,6 @@ label is required for a \fBZIP/JAZ\fR drive. If the \fBZIP/JAZ\fR drive
 contains data recorded in a Solaris-aware file system format, it can be mounted
 using the appropriate Solaris file system support.
 .SH DEVICE STATISTICS SUPPORT
-.sp
 .LP
 Each device maintains I/O statistics for the device and for partitions
 allocated for that device. For each device/partition, the driver accumulates
@@ -118,11 +110,9 @@ Not all device drivers make per-partition IO statistics available for
 reporting. \fBsd\fR and \fBssd\fR(7D) per-partition statistics are enabled by
 default but may disabled in their configuration files.
 .SH IOCTLS
-.sp
 .LP
 Refer to \fBdkio\fR(7I), and \fBcdio\fR(7I)
 .SS "ERRORS"
-.sp
 .ne 2
 .na
 \fB\fBEACCES\fR\fR
@@ -232,7 +222,6 @@ media.
 .RE
 
 .SH CONFIGURATION
-.sp
 .LP
 The \fBsd\fR driver can be configured by defining properties in the
 \fBsd.conf\fR file. The \fBsd\fR driver supports the following properties:
@@ -308,7 +297,7 @@ to 0 prevents automatic binding. The default behavior for the SPARC-based
 .ad
 .RS 27n
 Boolean type, when set to \fBFalse\fR, it indicates that the disk does not
-support \fBpower condition\fR field in th\fBe START STOP UNIT\fR command.
+support \fBpower condition\fR field in the \fBSTART STOP UNIT\fR command.
 .RE
 
 .sp
@@ -360,7 +349,6 @@ command is used instead.
 .RE
 
 .SH EXAMPLES
-.sp
 .in +2
 .nf
 The following is an example of a global sd-config-list property:
@@ -372,7 +360,6 @@ The following is an example of a global sd-config-list property:
 .in -2
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/sd.conf\fR\fR
@@ -440,7 +427,6 @@ partition n (0-7)
 .RE
 
 .SS "x86 Only"
-.sp
 .ne 2
 .na
 \fB\fB/dev/rdsk/cntndnpn\fR\fR
@@ -462,7 +448,6 @@ Where \fIn\fR=0 the node corresponds to the entire disk.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsar\fR(1), \fBcfgadm_scsi\fR(1M), \fBfdisk\fR(1M), \fBformat\fR(1M),
 \fBiostat\fR(1M), \fBclose\fR(2), \fBioctl\fR(2), \fBlseek\fR(2),
@@ -479,11 +464,7 @@ Where \fIn\fR=0 the node corresponds to the entire disk.
 .sp
 .LP
 \fIMt.Fuji Commands for CD and DVD, SFF8090v3\fR
-.sp
-.LP
-http://\fIwww.sun.com/io\fR
 .SH DIAGNOSTICS
-.sp
 .in +2
 .nf
 Error for Command:\fI<command name>\fR
@@ -864,7 +845,6 @@ Drive went offline; probably powered down.
 .RE
 
 .SH NOTES
-.sp
 .LP
 DVD-ROM media containing DVD-Video data may follow/adhere to the requirements
 of content scrambling system or copy protection scheme. Reading of
diff --git a/usr/src/man/man7d/ugen.7d b/usr/src/man/man7d/ugen.7d
index bab5b5a847..cb5f430d2c 100644
--- a/usr/src/man/man7d/ugen.7d
+++ b/usr/src/man/man7d/ugen.7d
@@ -1,9 +1,10 @@
 '\" te
+.\" Copyright 2017 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 UGEN 7D "April 9, 2016"
+.TH UGEN 7D "May 13, 2017"
 .SH NAME
 ugen \- USB generic driver
 .SH SYNOPSIS
@@ -28,8 +29,8 @@ endpoint. Status is obtained by reading file descriptors created for endpoint
 and full device status.
 .sp
 .LP
-\fBugen\fR supports control, bulk, isochronous and interrupt (in and  out)
-transfers. \fBlibusb\fR(3LIB) uses \fBugen\fR to access devices that do not
+\fBugen\fR supports control, bulk, isochronous and interrupt (in and out)
+transfers. libusb uses \fBugen\fR to access devices that do not
 contain drivers (such as digital cameras and PDAs).
 .SH BINDING
 .LP
@@ -63,12 +64,12 @@ USB 2.0 device (usb<vid>,<pid>)...
 
 .sp
 .LP
-where vid is the USB vendor identifier in hex and pid is the  product
-identifier in hex supplied by the device  descriptor \fBusb_dev_descr\fR(9S).
+where vid is the USB vendor identifier in hex and pid is the product
+identifier in hex supplied by the device descriptor \fBusb_dev_descr\fR(9S).
 Note, the USB device version may vary depending on the device.
 .sp
 .LP
-When using ugen for the first time, you must add the  driver utilizing
+When using ugen for the first time, you must add the driver utilizing
 \fBadd_drv\fR(1M), using a command of the following form:
 .sp
 .in +2
@@ -121,7 +122,7 @@ where cfg value is the value of bConfigurationValue in the configuration
 descriptor (\fBusb_cfg_descr\fR(9S)). For example "usbif1234,4567.config1.0."
 .sp
 .LP
-Note that you can use update_drv to  also  remove  bindings. Please see
+Note that you can use update_drv to also remove bindings. Please see
 \fBupdate_drv\fR(1M) for more information.
 .sp
 .LP
@@ -142,23 +143,10 @@ update_drv -a -m '* 0666 root sys'
 
 .sp
 .LP
-Note that you can completely uninstall the \fBugen\fR driver and delete it from
-the system by doing:
-.sp
-.in +2
-.nf
-pkgrm SUNWugen
-.fi
-.in -2
-
-.sp
-.LP
-Any \fBpkgadd\fR of SUNWugen after the \fBpkgrm\fR reactivates any pre-existing
-ugen driver device-bindings.
-.sp
-.LP
-Any pre-existing ugen driver device-bindings are preserved across operating
-system upgrades.
+Note that if you uninstall the \fBugen\fR driver, and later reinstall it,
+any pre-existing ugen driver device-bindings will be reactivated. Likewise,
+any pre-existing ugen driver device-bindings are preserved across operating
+system updates or upgrades.
 .SH LOGICAL DEVICE NAME FORMAT
 .LP
 For each device or child device it manages, \fBugen\fR creates one logical
@@ -181,7 +169,7 @@ first interface and as \fBif1devstat\fR to the second interface.
 .sp
 .LP
 Any \fBugen\fR logical device name can be held open by only one user at a time,
-regardless of whether the\fB O_EXCL\fR flag passed to \fBopen\fR(2). When a
+regardless of whether the \fBO_EXCL\fR flag passed to \fBopen\fR(2). When a
 single pipe or data source is shared by multiple logical device names, such as
 if[0,1]cntrl0 or if[0,1]devstat above, more than one logical device name
 sharing the pipe or data source can be open at a time.  However, only one user
@@ -884,14 +872,14 @@ interrupt-IN data endpoints, not their status endpoints.)
 You can monitor the device status endpoint via \fBpoll\fR(2) concurrently with
 the multiple interrupt-IN endpoints.  Simply add another pollfd element to the
 pfd array in the previous code example, and initialize the new element's
-\fBfd\fR field with the file  descriptor  of the device status endpoint (opened
-without O_NONBLOCK  or  O_NDELAY).  Set the new element's event field to POLLIN
+\fBfd\fR field with the file descriptor of the device status endpoint (opened
+without O_NONBLOCK or O_NDELAY).  Set the new element's event field to POLLIN
 like the other elements. Note that only interrupt-IN endpoints and the device
 status endpoint can be monitored using \fBpoll\fR(2).
 .SH INTERRUPT-OUT TRANSFERS
 .LP
 Applications requiring output on an interrupt-OUT endpoint can open the
-corresponding  logical  device name and perform regular UNIX I/O  system calls
+corresponding logical device name and perform regular UNIX I/O system calls
 such as \fBwrite\fR(2) and \fBaiowrite\fR(3C).
 .sp
 .LP
@@ -1147,7 +1135,7 @@ The following example shows how to read an isochronous-IN endpoint:
 .sp
 .LP
 For an isochronous-OUT endpoint, applications use the same packet descriptor
-and request structures to write request   information to the \fBugen\fR node.
+and request structures to write request information to the \fBugen\fR node.
 Following the packet request head information is the packet payload data. Upon
 successful return of \fBwrite\fR(2), applications can \fBread\fR(2) the same
 \fBugen\fR file immediately to retrieve the individual packet transfer status
@@ -1430,7 +1418,7 @@ Device was disconnected.
 .ad
 .sp .6
 .RS 4n
-Polling was stopped as the interrupt-IN data buffer was full. Buffer is  now
+Polling was stopped as the interrupt-IN data buffer was full. Buffer is now
 empty and polling has been resumed.
 .RE
 
@@ -1582,46 +1570,72 @@ No memory for the allocation of internal structures.
 .RE
 
 .SH FILES
-.in +2
-.nf
-        /kernel/drv/ugen   32 bit ELF kernel module (x86 platform only)
-        /kernel/drv/sparcv9/ugen   64 bit ELF kernel module
+.ne 2
+.na
+\fB\fB/kernel/drv/ugen\fR\fR
+.ad
+.sp .6
+.RS 4n
+32-bit ELF kernel module. (x86).
+.RE
 
-        /dev/usb/<vid>.<pid>/<N>/cntrl0
-        /dev/usb/<vid>.<pid>/<N>/cntrl0stat
+.sp
+.ne 2
+.na
+\fB\fB/kernel/drv/amd64/ugen\fR\fR
+.ad
+.sp .6
+.RS 4n
+64-bit ELF kernel module. (x86).
+.RE
 
-        /dev/usb/<vid>.<pid>/<N>/if<interface#>
-                                <in|out|cntrl><endpoint#>
-        /dev/usb/<vid>.<pid>/<N>/if<interface#>
-                                <in|out|cntrl><endpoint#>stat
+.sp
+.ne 2
+.na
+\fB\fB/kernel/drv/sparcv9/ugen\fR\fR
+.ad
+.sp .6
+.RS 4n
+64-bit ELF kernel module. (SPARC).
+.RE
 
-        /dev/usb/<vid>.<pid>/<N>/if<interface#>.
-                                <alternate><in|out|cntrl<endpoint#>
-        /dev/usb/<vid>.<pid>/<N>/if<interface#>.
-                                <alternate><in|out|cntrl><endpoint#>stat
+.sp
+.ne 2
+.na
+/dev/usb/<vid>.<pid>/<N>/cntrl0
+/dev/usb/<vid>.<pid>/<N>/cntrl0stat
 
-        /dev/usb/<vid>.<pid>/<N>/cfg<value>if<interface#>
-                                <in|out|cntrl><endpoint#>
-        /dev/usb/<vid>.<pid>/<N>/cfg<value>if<interface#>
-                                <in|out|cntrl<endpoint#stat>
+/dev/usb/<vid>.<pid>/<N>/if<interface#>
+                        <in|out|cntrl><endpoint#>
+/dev/usb/<vid>.<pid>/<N>/if<interface#>
+                        <in|out|cntrl><endpoint#>stat
 
-        /dev/usb/<vid>.<pid>/<N>/cfg<value>if<interface#>.
-                                <alternate><in|out|cntrl><endpoint#>
-        /dev/usb/<vid>.<pid>/<N>/cfg<value>if<interface#>.
-                                <alternate><in|out|cntrl><endpoint#>stat
+/dev/usb/<vid>.<pid>/<N>/if<interface#>.
+                        <alternate><in|out|cntrl<endpoint#>
+/dev/usb/<vid>.<pid>/<N>/if<interface#>.
+                        <alternate><in|out|cntrl><endpoint#>stat
 
+/dev/usb/<vid>.<pid>/<N>/cfg<value>if<interface#>
+                        <in|out|cntrl><endpoint#>
+/dev/usb/<vid>.<pid>/<N>/cfg<value>if<interface#>
+                        <in|out|cntrl<endpoint#stat>
 
-        /dev/usb/<vid>.<pid>/<N>/devstat
+/dev/usb/<vid>.<pid>/<N>/cfg<value>if<interface#>.
+                        <alternate><in|out|cntrl><endpoint#>
+/dev/usb/<vid>.<pid>/<N>/cfg<value>if<interface#>.
+                        <alternate><in|out|cntrl><endpoint#>stat
 
-        /dev/usb/<vid>.<pid>/<N>/if<interface#>cntrl0
-        /dev/usb/<vid>.<pid>/<N>/if<interface#>cntrl0stat
-.fi
-.in -2
+/dev/usb/<vid>.<pid>/<N>/devstat
 
-.sp
-.LP
+/dev/usb/<vid>.<pid>/<N>/if<interface#>cntrl0
+/dev/usb/<vid>.<pid>/<N>/if<interface#>cntrl0stat
+.ad
+.sp .6
+.RS 4n
 where \fIN\fR is an integer representing the instance number of this type of
 device. (All logical device names for a single device share the same \fIN\fR.)
+.RE
+
 .SH ATTRIBUTES
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
@@ -1634,12 +1648,12 @@ c | c
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Architecture	PCI-based  SPARC
+Architecture	SPARC & x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
 .LP
-\fBlibusb\fR(3LIB), \fBclose\fR(2), \fBpoll\fR(2), \fBread\fR(2),
+\fBclose\fR(2), \fBpoll\fR(2), \fBread\fR(2),
 \fBwrite\fR(2), \fBaioread\fR(3C), \fBaiowrite\fR(3C), \fBusba\fR(7D),
 \fBusb_dev_descr\fR(9S).
 .SH DIAGNOSTICS
diff --git a/usr/src/man/man7d/uhci.7d b/usr/src/man/man7d/uhci.7d
index 0d77b5bba6..b291369a35 100644
--- a/usr/src/man/man7d/uhci.7d
+++ b/usr/src/man/man7d/uhci.7d
@@ -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 UHCI 7D "Jul 26, 2005"
+.TH UHCI 7D "May 13, 2017"
 .SH NAME
 uhci \- host controller driver
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ uhci \- host controller driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBuhci\fR host controller driver is a \fBUSBA \fR (Solaris USB
 Architecture) compliant nexus driver that supports the \fIUniversal Host
@@ -21,7 +20,6 @@ Controller Interface Specification 1.1\fR, an industry standard developed by
 Intel. The \fBuhci\fR driver supports all USB transfers, including interrupt,
 control, isochronous and bulk.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/uhci\fR\fR
@@ -58,7 +56,6 @@ Driver configuration file.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -74,7 +71,6 @@ Architecture	SPARC or  x86  PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5), \fBehci\fR(7D), \fBhubd\fR(7D), \fBohci\fR(7D),
 \fBusba\fR(7D)
@@ -90,11 +86,7 @@ Architecture	SPARC or  x86  PCI-based systems
 .sp
 .LP
 \fISystem Administration Guide: Basic Administration\fR
-.sp
-.LP
-http://\fIwww.sun.com/io\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 All host controller errors are passed to the client drivers. Root errors are
 documented in \fBhubd\fR(7D).
diff --git a/usr/src/man/man7d/usb_ia.7d b/usr/src/man/man7d/usb_ia.7d
index 9b8e74d81b..206d5c0e1e 100644
--- a/usr/src/man/man7d/usb_ia.7d
+++ b/usr/src/man/man7d/usb_ia.7d
@@ -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 USB_IA 7D "Dec 21, 2006"
+.TH USB_IA 7D "May 13, 2017"
 .SH NAME
 usb_ia \- USB interface association driver
 .SH SYNOPSIS
@@ -18,7 +18,6 @@ interface association@unit-address
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBusb_ia\fR driver is a USBA (Solaris Universal Serial Bus
 Architecture)-compliant nexus driver that binds to a device's interface
@@ -32,7 +31,6 @@ Each interface association node has a parent device node that is created by
 \fBusb_mid\fR(7D). (Note: attempting to export \fBugen\fR(7D) interfaces using
 \fBusb_ia\fR is prohibited.)
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/usb_ia\fR\fR
@@ -63,7 +61,6 @@ Each interface association node has a parent device node that is created by
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -79,9 +76,8 @@ Architecture	SPARC & x86 PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBattributes\fR(5),\fBugen\fR(7D), \fBusb_mid\fR(7D), \fBusba\fR(7D)
+\fBattributes\fR(5), \fBugen\fR(7D), \fBusb_mid\fR(7D), \fBusba\fR(7D)
 .sp
 .LP
 \fIWriting Device Drivers\fR
@@ -94,14 +90,7 @@ Architecture	SPARC & x86 PCI-based systems
 .sp
 .LP
 \fIInterface Association Descriptor Engineering Change Notice (ECN)\fR\(em2003
-.sp
-.LP
-\fIhttp://www.sun.com/io\fR
-.sp
-.LP
-\fIhttp://docs.sun.com\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 In addition to being logged, the following messages may appear on the system
 console. All messages are formatted in the     following manner:
diff --git a/usr/src/man/man7d/usb_mid.7d b/usr/src/man/man7d/usb_mid.7d
index bcd784c2fc..6baa22f718 100644
--- a/usr/src/man/man7d/usb_mid.7d
+++ b/usr/src/man/man7d/usb_mid.7d
@@ -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 USB_MID 7D "Dec 22, 2006"
+.TH USB_MID 7D "May 13, 2017"
 .SH NAME
 usb_mid \- USB Multi Interface Driver
 .SH SYNOPSIS
@@ -13,26 +13,23 @@ usb_mid \- USB Multi Interface Driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBusb_mid\fR driver is a \fBUSBA\fR (Solaris Universal Serial Bus
-Architecture)-compliant  nexus  driver that binds to device level nodes of a
+Architecture)-compliant nexus driver that binds to device level nodes of a
 composite (multi interface) device if no vendor or class-specific driver is
 available. The \fBusb_mid\fR driver creates interface nodes or interface
 association nodes and attempts to bind drivers to them. If no driver is found
 for interface association nodes, \fBusb_ia\fR(7D) is bound by default.
 .SS "UGEN (Generic USB)"
-.sp
 .LP
 The \fBusb_mid\fR driver also supports a \fBugen\fR(7D) interface allowing raw
-access to the device, for example by \fBlibusb\fR(3LIB) applications, by
+access to the device, for example by libusb applications, by
 passing the drivers bound to each interface. Since a libusb application might
 change the state of the device, you should not access the device through the
 child interface drivers. Note that the \fBusb_mid\fR driver creates a ugen
 interface only if none of its children are explicitly bound to the
 \fBugen\fR(7D) driver. Additionally, \fBusb_mid\fR does not create children.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/usb_mid\fR \fR
@@ -73,7 +70,6 @@ ugen(7D) nodes.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -89,9 +85,8 @@ Architecture	SPARC & x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBcfgadm_usb\fR(1M), \fBlibusb\fR(3LIB), \fBattributes\fR(5), \fBusba\fR(7D),
+\fBcfgadm_usb\fR(1M), \fBattributes\fR(5), \fBusba\fR(7D),
 \fBusb_ia\fR(7D)
 .sp
 .LP
@@ -105,11 +100,7 @@ Architecture	SPARC & x86, PCI-based systems
 .sp
 .LP
 \fISystem Administration Guide: Basic Administration\fR
-.sp
-.LP
-http://\fIwww.sun.com/io\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 In addition to being logged, the following messages may appear on the system
 console. All messages are formatted in the following manner:
@@ -195,7 +186,7 @@ child interface drivers.\fR
 .ad
 .sp .6
 .RS 4n
-No ugen interface is available and \fBlibusb\fR(3LIB) cannot work with this
+No ugen interface is available and libusb cannot work with this
 device.
 .RE
 
diff --git a/usr/src/man/man7d/usba.7d b/usr/src/man/man7d/usba.7d
index 3565badc61..dfd59bb244 100644
--- a/usr/src/man/man7d/usba.7d
+++ b/usr/src/man/man7d/usba.7d
@@ -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]
-.Dd October 4, 2016
+.Dd May 13, 2017
 .Dt USBA 7D
 .Os
 .Sh NAME
@@ -34,8 +34,7 @@ For a complete list of USBA interfaces, see
 or
 .Xr Intro 9S .
 .Pp
-Devices without a driver may be able to leverage
-.Xr libusb 3LIB .
+Devices without a driver may be able to leverage libusb.
 .Sh FILES
 Listed below are drivers and modules which either utilize or are utilized by
 USBA.
@@ -148,7 +147,6 @@ Driver is incompatible with USBA framework.
 .El
 .Sh SEE ALSO
 .Xr cfgadm_usb 1M ,
-.Xr libusb 3LIB ,
 .Xr attributes 5 ,
 .Xr ehci 7D ,
 .Xr hid 7D ,
diff --git a/usr/src/man/man7d/usbprn.7d b/usr/src/man/man7d/usbprn.7d
index 017e648cd7..b28b0a7626 100644
--- a/usr/src/man/man7d/usbprn.7d
+++ b/usr/src/man/man7d/usbprn.7d
@@ -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 USBPRN 7D "April 9, 2016"
+.TH USBPRN 7D "May 13, 2017"
 .SH NAME
 usbprn \- USB printer class driver
 .SH SYNOPSIS
@@ -31,13 +31,11 @@ driver functionality. However, unlike the STREAMS-based \fBecpp\fR driver,
 \fBusbprn\fR is a character driver.
 .sp
 .LP
-The \fBusbprn\fR driver supports all USB printer-class compliant printers. For
-a list of recommended printers and USB parallel printer adapters, visit
-http://\fIwww.sun.com/io\fR.
+The \fBusbprn\fR driver supports all USB printer-class compliant printers.
 .sp
 .LP
 The \fBusbrpn\fR driver includes support for communicating with many different
-printers. To use these printers, it may be nesessary to install and configure
+printers. To use these printers, it may be necessary to install and configure
 additional format conversion packages available in the Solaris distribution.
 Configuration of these conversion packages under the Solaris printing system
 can be simplified through the use of the \fBprintmgr\fR(1M). This tool allows
@@ -48,7 +46,7 @@ printer.
 .SS "UGEN (Generic USB)"
 .LP
 The \fBusbprn\fR driver also supports a \fBugen\fR(7D) interface allowing raw
-access to the device, for example by \fBlibusb\fR(3LIB) applications, by
+access to the device, for example by libusb applications, by
 passing the drivers bound to each interface. Because a libusb application might
 change the state of the device, you should not access the device through the
 child interface drivers.
@@ -84,7 +82,7 @@ call. The captured status information is overwritten each time an
 ECPPIOC_TESTIO \fBioctl\fR(2) occurs.
 .SH IOCTLS
 .LP
-The \fBusbprn\fR driver supports \fBprnio(7I)\fR interfaces. Note that the
+The \fBusbprn\fR driver supports \fBprnio\fR(7I) interfaces. Note that the
 \fBPRNIOC_RESET\fR command has no effect on USB printers.
 .sp
 .LP
@@ -246,14 +244,14 @@ Unlike \fBecpp\fR(7D), only the ECPP_CENTRONICS mode is currently supported in
 
 .SH READ OPERATION
 .LP
- The \fBread\fR operation is not supported and returns \fBEIO\fR.
+The \fBread\fR operation is not supported and returns \fBEIO\fR.
 .SH ERRORS
 .ne 2
 .na
 \fB\fBEBUSY\fR\fR
 .ad
 .RS 19n
- The device has been opened and another open is attempted. An attempt has been
+The device has been opened and another open is attempted. An attempt has been
 made to unload the driver while one of the units is open.
 .RE
 
@@ -373,8 +371,8 @@ Architecture	SPARC, x86, PCI-based systems
 .SH SEE ALSO
 .LP
 \fBcfgadm_usb\fR(1M), \fBprintmgr\fR(1M), \fBioctl\fR(2), \fBopen\fR(2),
-\fBread\fR(2), \fBwrite\fR(2), \fBlibusb\fR(3LIB), \fBattributes\fR(5),
-\fBbpp\fR(7D), \fBecpp\fR(7D), \fBugen\fR(7D), \fBusba\fR(7D)\fBprnio\fR(7I),
+\fBread\fR(2), \fBwrite\fR(2), \fBattributes\fR(5),
+\fBbpp\fR(7D), \fBecpp\fR(7D), \fBugen\fR(7D), \fBusba\fR(7D), \fBprnio\fR(7I),
 \fBattach\fR(9E)
 .sp
 .LP
@@ -388,9 +386,6 @@ Architecture	SPARC, x86, PCI-based systems
 .sp
 .LP
 \fISystem Administration Guide: Basic Administration\fR
-.sp
-.LP
-http://\fIwww.sun.com/io\fR
 .SH DIAGNOSTICS
 .LP
 In addition to being logged, the following messages may appear on the system
diff --git a/usr/src/man/man7d/usbsksp.7d b/usr/src/man/man7d/usbsksp.7d
index c6c59ef923..80e23ae628 100644
--- a/usr/src/man/man7d/usbsksp.7d
+++ b/usr/src/man/man7d/usbsksp.7d
@@ -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 USBSKSP 7D "Aug 23, 2006"
+.TH USBSKSP 7D "May 13, 2017"
 .SH NAME
 usbsksp \- Keyspan USB to serial converter driver
 .SH SYNOPSIS
@@ -32,25 +32,23 @@ the USA19HS and USA49WG models are compatible with the \fBusbsksp\fR driver and
 no configuration or installation steps are required.  (The USA49WG model is a
 USB 2.0 device conforming to \fIUniversal Serial Bus Specification 2.0\fR and
 the USB 2.0 host controller is required to support the USA49WG model. Note that
-the USA49WG is not compatible with USB 1.1 host controllers). If you use the
-Keyspan USA49WLC model, you must download and install a firmware package to
-enable the device to work with the \fBusbsksp\fR driver. See the Keyspan
-website (\fIhttp://www.keyspan.com/downloads/sun/\fR) for more information.
-Serial device streams are built with appropriate modules that  are  pushed atop
+the USA49WG is not compatible with USB 1.1 host controllers). The Keyspan
+USA49WLC model requires a firmware package that is no longer publicly available.
+Serial device streams are built with appropriate modules that are pushed atop
 the \fBusbsksp\fR driver by the \fBautopush\fR(1M) facility.
 .sp
 .LP
 The \fBusbsksp\fR module supports the \fBtermio\fR(7I) device control functions
 specified by flags in the \fBc_cflag\fR word of the termios structure, and by
-the IGNBRK,  IGNPAR,  PARMRK and INPCK flags in the \fBc_iflag\fR word of the
+the IGNBRK, IGNPAR, PARMRK and INPCK flags in the \fBc_iflag\fR word of the
 termios structure. All other \fBtermio\fR(7I) functions must be performed by
 \fBSTREAMS\fR modules pushed atop the driver. When a device is opened, the
-\fBldterm\fR(7M) and \fBttcompat\fR(7M)  \fBSTREAMS\fR modules are
+\fBldterm\fR(7M) and \fBttcompat\fR(7M) \fBSTREAMS\fR modules are
 automatically pushed on top of the stream, providing the standard
 \fBtermio\fR(7I) interface.
 .sp
 .LP
-Use device logical names \fB/dev/term/[0-9]\fR*  to  access  the serial ports.
+Use device logical names \fB/dev/term/[0-9]\fR* to access the serial ports.
 These names are typically used to provide a logical access point for a dial-in
 line that is used with a modem.
 .sp
@@ -58,12 +56,12 @@ line that is used with a modem.
 A special feature (controlled by the minor device number) is available that
 enables a single tty line to be connected to a modem and used for incoming and
 outgoing calls. By accessing through device logical name \fB/dev/cua/[0-9]\fR*,
-you can open a port without  the carrier detect signal being asserted, either
+you can open a port without the carrier detect signal being asserted, either
 through hardware or an equivalent software mechanism. These devices are
-commonly known as  'dial-out' lines.
+commonly known as 'dial-out' lines.
 .sp
 .LP
-Unlike onboard serial ports, the \fBusbsksp\fR ports  cannot serve as a local
+Unlike onboard serial ports, the \fBusbsksp\fR ports cannot serve as a local
 serial console.
 .SH APPLICATION PROGRAMMING INTERFACE
 .LP
@@ -74,24 +72,24 @@ well) and carrier is detected again.  A non-blocking \fB/dev/term\fR open
 returns an error if the \fB/dev/cua\fR is open.
 .sp
 .LP
-If the \fB/dev/term\fR line is opened successfully  (usually  only when
+If the \fB/dev/term\fR line is opened successfully (usually only when
 carrier is recognized on the modem), the corresponding \fB/dev/cua\fR line
-cannot be opened. This allows a modem and port to be used  for dial-in (by
+cannot be opened. This allows a modem and port to be used for dial-in (by
 enabling the line for login in \fB/etc/inittab\fR) or dial-out (by
 \fBtip\fR(1), or \fBuucp\fR(1C)) when no one is logged in on the line.
 .sp
 .LP
-Device hot-removal  is functionally equivalent to a modem disconnect event, as
+Device hot-removal is functionally equivalent to a modem disconnect event, as
 defined in \fBtermio\fR(7I).
 .SH IOCTLS
 .LP
-The  \fBusbsksp\fR driver supports the  standard set of \fBtermio\fR(7I) ioctl
+The \fBusbsksp\fR driver supports the standard set of \fBtermio\fR(7I) ioctl
 calls.
 .sp
 .LP
-Input and output line speeds can be set to the following baud rates:  0, 50,
-75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600,  19200,  38400,
-57600,  115200, or 230400.  Input and output line speeds cannot be set
+Input and output line speeds can be set to the following baud rates: 0, 50,
+75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600, 19200, 38400,
+57600, 115200, or 230400.  Input and output line speeds cannot be set
 independently. For example, when the output speed is set, the input speed is
 automatically set to the same speed.
 .SH ERRORS
@@ -103,7 +101,7 @@ An \fBopen()\fR fails under the following conditions:
 \fB\fBENXIO\fR\fR
 .ad
 .RS 9n
-The  unit being opened does not exist.
+The unit being opened does not exist.
 .RE
 
 .sp
@@ -112,7 +110,7 @@ The  unit being opened does not exist.
 \fB\fBEBUSY\fR\fR
 .ad
 .RS 9n
-The \fB/dev/cua\fR (dial-out) device is being opened while  the \fB/dev/term\fR
+The \fB/dev/cua\fR (dial-out) device is being opened while the \fB/dev/term\fR
 (dial-in device) is open, or the dial-in device is being opened with a no-delay
 open while the dial-out device is open.
 .RE
@@ -123,7 +121,7 @@ open while the dial-out device is open.
 \fB\fBEBUSY\fR\fR
 .ad
 .RS 9n
-The  unit has been marked as exclusive-use by another  process with a TIOCEXCL
+The unit has been marked as exclusive-use by another process with a TIOCEXCL
 ioctl() call.
 .RE
 
@@ -237,7 +235,7 @@ and reconnect.\fR
 .ad
 .sp .6
 .RS 4n
-The device was hot-removed while open. A new device  was hot-inserted which is
+The device was hot-removed while open. A new device was hot-inserted which is
 not identical to the original device. Please disconnect the device and
 reconnect the original device to the same port.
 .RE
@@ -250,7 +248,7 @@ reconnect the original device to the same port.
 .sp .6
 .RS 4n
 The device that was hot-removed from its USB port has been re-inserted again to
-the same port. It is available for access but data from a  previous transfer
+the same port. It is available for access but data from a previous transfer
 may be lost.
 .RE
 
@@ -263,7 +261,7 @@ may be lost.
 .RS 4n
 This device has been disconnected because a device other than the original one
 has been inserted. The driver informs you of this fact by displaying the name
-of  the original device.
+of the original device.
 .RE
 
 .sp
@@ -275,7 +273,7 @@ Please download it from Keyspan website and install it.\fR
 .sp .6
 .RS 4n
 By default, only an empty firmware package is installed for the usa49wlc model.
-Please download the SUNWukspfw package from Keyspan's web site and install it.
+You will need to obtain a copy of the SUNWukspfw package and install it.
 .RE
 
 .sp
diff --git a/usr/src/man/man7d/usbvc.7d b/usr/src/man/man7d/usbvc.7d
index 9ff2377634..9fe2bd332b 100644
--- a/usr/src/man/man7d/usbvc.7d
+++ b/usr/src/man/man7d/usbvc.7d
@@ -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 USBVC 7D "Jul 18, 2008"
+.TH USBVC 7D "May 13, 2017"
 .SH NAME
 usbvc \- USB video class driver
 .SH SYNOPSIS
@@ -22,7 +22,6 @@ usbvc@unit-address
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBusbvc\fR driver is a USBA (Solaris USB Architecture)-compliant client
 driver that supports the \fIUSB Device Class Definition for Video Devices\fR
@@ -36,17 +35,15 @@ visit \fIhttp://www.thedirks.org/v4l2\fR.
 .sp
 .LP
 Note that the \fBusbvc\fR driver supports the video capture function only and
-that video output is not supported. For more information on supported USB
-video-class devices and functions, visit \fIhttp://www.sun.com/io\fR.
+that video output is not supported.
 .SH READING DATA
-.sp
 .LP
 The \fBusbvc\fR driver reads video data from the isochronous endpoint of the
 device. Bulk data endpoints are not supported.
 .sp
 .LP
 MJPEG and UNCOMPRESSED video formats are supported. Isochronous data are read
-from the isochronous  input  device frame-by-frame and are maintained in a
+from the isochronous input device frame-by-frame and are maintained in a
 buffer array within the driver. Video frames are read from the driver using the
 \fBread\fR(2) or \fBmmap\fR(2) I/O method. For \fBread\fR(2), each read returns
 a buffer of a video frame. For \fBmmap\fR(2), each \fBVIDIOC_DQBUF\fR ioctl
@@ -54,7 +51,6 @@ returns the buffer structure v4l2_buffer. (A video frame buffer pointer is
 included in the structure). See the \fIV4L2 API\fR for buffer structure and
 other related data structure information.
 .SH IOCTLS
-.sp
 .LP
 A brief overview of supported ioctl requests appears below. For more detailed
 information, refer to the \fIV4L2 API\fR document. Note: ioctl information
@@ -197,7 +193,7 @@ one input only.
 .ad
 .sp .6
 .RS 4n
-Set the  device's current input. At this time, the \fBusbvc\fR driver supports
+Set the device's current input. At this time, the \fBusbvc\fR driver supports
 one input only.
 .RE
 
@@ -256,7 +252,6 @@ used internally by driver in read/write mode.
 .RE
 
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBEBUSY\fR\fR
@@ -271,7 +266,7 @@ An open was attempted after the device has already been opened.
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 10n
-An  unsupported ioctl is received or an ioctl is attempted with an out-of-range
+An unsupported ioctl is received or an ioctl is attempted with an out-of-range
 value.
 .RE
 
@@ -281,7 +276,7 @@ value.
 \fB\fBEIO\fR\fR
 .ad
 .RS 10n
-The driver received an  unrecoverable device error or the device did not
+The driver received an unrecoverable device error or the device did not
 respond or the device stalled when attempting an access. A \fBread\fR(2) or
 \fBioctl\fR(2) did not complete due to a peripheral access.
 .RE
@@ -292,7 +287,7 @@ respond or the device stalled when attempting an access. A \fBread\fR(2) or
 \fB\fBENXIO\fR\fR
 .ad
 .RS 10n
-The driver received  an \fBopen\fR(2) request for a device for which the attach
+The driver received an \fBopen\fR(2) request for a device for which the attach
 failed.
 .RE
 
@@ -302,11 +297,10 @@ failed.
 \fBENODEV\fR
 .ad
 .RS 10n
-The driver received  an \fBopen\fR(2) request for a disconnected device.
+The driver received an \fBopen\fR(2) request for a disconnected device.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/usbvc\fR\fR
@@ -357,7 +351,6 @@ Device node for isochronous input from USB video device and device control.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -373,10 +366,9 @@ Architecture	 SPARC, x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcfgadm_usb\fR(1M), \fBioctl\fR(2), \fBopen\fR(2), \fBmmap\fR(2),
-\fBread\fR(2), \fBlibusb\fR(3LIB), \fBattributes\fR(5),\fBugen\fR(7D),
+\fBread\fR(2), \fBattributes\fR(5), \fBugen\fR(7D),
 \fBusba\fR(7D), \fBattach\fR(9E)
 .sp
 .LP
@@ -395,21 +387,14 @@ Architecture	 SPARC, x86, PCI-based systems
 \fIVideo4Linux2 API (V4L2), Version 0.20\fR
 .sp
 .LP
-\fII/O Technologies and Solutions \(emhttp://www.sun.com/io\fR
-.sp
-.LP
-\fIhttp://docs.sun.com\fR
-.sp
-.LP
 \fIhttp://www.usb.org\fR
 .sp
 .LP
 \fIhttp://www.thedirks.org/v4l2\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 In addition to being logged, the following messages may appear on the system
-console. All messages are formatted in the     following manner:
+console. All messages are formatted in the following manner:
 .sp
 .in +2
 .nf
@@ -455,7 +440,6 @@ reconnect the original device to the same port.
 .RE
 
 .SH NOTES
-.sp
 .LP
 The USB video device will be power-managed when the device is idle.
 .sp
@@ -466,7 +450,7 @@ you of potential data loss. Hot-removal of an active video device is strongly
 discouraged.
 .sp
 .LP
-Always close all applications before hot-removing or  hot-inserting a  device.
-If an application is open when a device is hot-removed, inserting the  device
-in  a  different  port  will create new \fB/dev/video\fR\fIN\fR  links. Moving
+Always close all applications before hot-removing or hot-inserting a device.
+If an application is open when a device is hot-removed, inserting the device
+in a different port will create new \fB/dev/video\fR\fIN\fR links. Moving
 an active device to another port is not recommended.
diff --git a/usr/src/man/man7d/virtualkm.7d b/usr/src/man/man7d/virtualkm.7d
index fc09fadb4f..03d7535ff1 100644
--- a/usr/src/man/man7d/virtualkm.7d
+++ b/usr/src/man/man7d/virtualkm.7d
@@ -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 VIRTUALKM 7D "Jan 16, 2007"
+.TH VIRTUALKM 7D "May 13, 2017"
 .SH NAME
 virtualkm \- Virtual keyboard and mouse
 .SH SYNOPSIS
@@ -33,11 +33,10 @@ virtualkm \- Virtual keyboard and mouse
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 A virtual keyboard or mouse is an abstraction of one or more physical keyboards
-or mice (USB or PS2) connected to a system.   Input streams for these physical
-devices are coalesced into a single input  stream and appear as a single device
+or mice (USB or PS2) connected to a system.  Input streams for these physical
+devices are coalesced into a single input stream and appear as a single device
 to the upper layers.
 .sp
 .LP
@@ -57,28 +56,27 @@ single mouse to the window system.
 Commands from applications are dispatched by the virtual keyboard/mouse
 facility to the underlying physical devices and will succeed provided that one
 of the underlying devices responds with success. For example, a single command
-issued to turn on LED's  will turn on corresponding LED's for all underlying
+issued to turn on LED's will turn on corresponding LED's for all underlying
 physical keyboards.
 .sp
 .LP
-Although physical keyboards/mice are linked to the  virtual keyboard/mouse
-facility, each may be opened separately by  accessing its associated device
+Although physical keyboards/mice are linked to the virtual keyboard/mouse
+facility, each may be opened separately by accessing its associated device
 file. (For example, \fB/dev/usb/hid0\fR for a usb mouse).  Directly accessing a
-device file can be useful for multi-seat, \fBgok(1)\fR or similar purposes.
+device file can be useful for multi-seat or similar purposes.
 .sp
 .LP
-When a single physical device is opened via its associated device file, it  is
+When a single physical device is opened via its associated device file, it is
 automatically removed from the single virtual input stream. When closed, it is
 automatically re- coalesced into the single virtual input stream.
 .sp
 .LP
 Under the \fBvirtualkm\fR facility, the PS/2 mouse is coalesced into a virtual
 mouse single input stream and can be accessed using the \fB/dev/mouse\fR file.
-(Note that in previous releases, the  PS/2 mouse was accessed via the
+(Note that in previous releases, the PS/2 mouse was accessed via the
 \fB/dev/kdmouse\fR physical device file). In the current release, you use the
-\fB/dev/kdmouse\fR file to directly access the physical PS/2  mouse.
+\fB/dev/kdmouse\fR file to directly access the physical PS/2 mouse.
 .SS "INTERFACES"
-.sp
 .LP
 The virtual mouse provides the following event ID's for mouse capability
 changes:
@@ -112,7 +110,7 @@ with other events, firm events are received using \fBread\fR(2).
 .sp
 .LP
 Event ID's are used by applications (including certain mouse demo applications)
-that are programmed to graphically  represent the actual number of buttons and
+that are programmed to graphically represent the actual number of buttons and
 wheels on a mouse. When an application of this type receives a \fBFirm_event\fR
 with a ID MOUSE_CAP_CHANGE_NUM_BUT or MOUSE_CAP_CHANGE_NUM_WHEEL event, it is
 instructed to update its state information using the new value. Consider, for
@@ -122,17 +120,16 @@ mouse. If, for example, the system has a single two-button USB mouse attached,
 the application, by default, will graphically display the mouse with a left and
 a right button. However, if a another three-button USB mouse is hot-plugged
 into the system, a MOUSE_CAP_CHANGE_NUM_BUT Firm event with
-\fBFirm_event.value\fR of three instructs the demo  application to update the
+\fBFirm_event.value\fR of three instructs the demo application to update the
 mouse display to indicate three buttons.
 .SH IOCTLS
-.sp
 .ne 2
 .na
 \fBKIOCSETFREQ\fR
 .ad
 .RS 15n
 Sets the frequency for either keyboard beeper or console beeper. To set the
-corresponding beeper frequency,  \fIarg\fR must point to a \fBfreq_request\fR
+corresponding beeper frequency, \fIarg\fR must point to a \fBfreq_request\fR
 structure:
 .sp
 .in +2
@@ -158,7 +155,6 @@ inclusive.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/kbd\fR\fR
@@ -204,7 +200,6 @@ Device auto-configuration file.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -220,19 +215,14 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkbd\fR(1), \fBeeprom\fR(1M), \fBread\fR(2), \fBattributes\fR(5),
 \fBhid\fR(7D), \fBusba\fR(7D), \fBkb\fR(7M), \fBusbkbm\fR(7M), \fBusbms\fR(7M),
 \fBvuidmice\fR(7M)
-.sp
-.LP
-See gok(1) in the GNOME man pages, available in the SUNWgnome package.
 .SH DIAGNOSTICS
-.sp
 .LP
-The messages described below may appear on the  system  console as well as
-being logged. All  messages are formatted in the following manner:
+The messages described below may appear on the system console as well as
+being logged. All messages are formatted in the following manner:
 .sp
 .in +2
 .nf
@@ -280,9 +270,8 @@ removed), it is unavailable beneath \fB/dev/mouse\fR.
 .RE
 
 .SH NOTES
-.sp
 .LP
-Currently, the \fBvirtualkm\fR device supports only  USB and PS2 keyboards and
+Currently, the \fBvirtualkm\fR device supports only USB and PS2 keyboards and
 mice.
 .sp
 .LP
diff --git a/usr/src/man/man7m/usbkbm.7m b/usr/src/man/man7m/usbkbm.7m
index 8eed65b495..12a3414b13 100644
--- a/usr/src/man/man7m/usbkbm.7m
+++ b/usr/src/man/man7m/usbkbm.7m
@@ -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 USBKBM 7M "Jun 27, 2005"
+.TH USBKBM 7M "May 13, 2017"
 .SH NAME
 usbkbm \- keyboard STREAMS module for Sun USB Keyboard
 .SH SYNOPSIS
@@ -18,24 +18,22 @@ open("/dev/kbd", O_RDWR)
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
-The  \fBusbkbm\fR \fBSTREAMS\fR module processes byte streams generated by a
-keyboard attached to a  \fBUSB\fR port.   \fBUSB\fR keyboard is a member of
+The \fBusbkbm\fR \fBSTREAMS\fR module processes byte streams generated by a
+keyboard attached to a \fBUSB\fR port.  \fBUSB\fR keyboard is a member of
 Human Interface Device (HID) Class, and \fBusbkbm\fR only supports the keyboard
 protocol defined in the specification.  Definitions for altering keyboard
-translation and reading events from the keyboard are in  \fB<sys/kbio.h>\fR and
+translation and reading events from the keyboard are in \fB<sys/kbio.h>\fR and
 \fB<sys/kbd.h>\fR\&.
 .sp
 .LP
-The  \fBusbkbm\fR \fBSTREAMS\fR module adheres to the interfaces exported by
-\fBkb\fR(7M). Refer to the  \fBDESCRIPTION\fR section of  \fBkb\fR(7M) for a
+The \fBusbkbm\fR \fBSTREAMS\fR module adheres to the interfaces exported by
+\fBkb\fR(7M). Refer to the \fBDESCRIPTION\fR section of \fBkb\fR(7M) for a
 discussion of the keyboard translation modes and the \fBIOCTL\fR section for
-the supported  \fBioctl\fR(2) requests.
+the supported \fBioctl\fR(2) requests.
 .SS "IOCTLS"
-.sp
 .LP
-\fBUSB\fR Keyboard \fBusbkbm\fR returns different values  for the following
+\fBUSB\fR Keyboard \fBusbkbm\fR returns different values for the following
 ioctls than \fBkb\fR(7M):
 .sp
 .ne 2
@@ -43,7 +41,7 @@ ioctls than \fBkb\fR(7M):
 \fB\fBKIOCTYPE\fR \fR
 .ad
 .RS 13n
-This  \fBioctl()\fR returns a new keyboard type defined for the  \fBUSB\fR
+This \fBioctl()\fR returns a new keyboard type defined for the \fBUSB\fR
 keyboard. All types are listed below:
 .RE
 
@@ -60,18 +58,18 @@ KB_USB    USB keyboard
 
 .sp
 .LP
-The  \fBUSB\fR keyboard type is \fBKB_USB\fR; \fBusbkbm\fR will return
-\fBKB_USB\fR in response to the  \fBKIOCTYPE\fR ioctl.
+The \fBUSB\fR keyboard type is \fBKB_USB\fR; \fBusbkbm\fR will return
+\fBKB_USB\fR in response to the \fBKIOCTYPE\fR ioctl.
 .sp
 .ne 2
 .na
 \fB\fBKIOCLAYOUT\fR \fR
 .ad
 .RS 15n
-The argument is a pointer to an  \fBint\fR. The layout code specified by the
+The argument is a pointer to an \fBint\fR. The layout code specified by the
 \fBbCountryCode\fR value returned in the \fBHID\fR descriptor is returned in
 the int pointed to by the argument. The \fBcountrycodes\fR are defined in 6.2.1
-of the  \fBHID\fR 1.0 specifications.
+of the \fBHID\fR 1.0 specifications.
 .RE
 
 .sp
@@ -99,7 +97,7 @@ are ignored. Because clicking is not supported on the \fBUSB\fR keyboard,
 .ad
 .sp .6
 .RS 4n
-Set keyboard LEDs. Same as  \fBkb\fR(7M).
+Set keyboard LEDs. Same as \fBkb\fR(7M).
 .RE
 
 .sp
@@ -132,13 +130,12 @@ buzzer.  The request for the bell is rerouted.
 .sp .6
 .RS 4n
 There is no notion of resetting the keyboard as there is for the type4
-keyboard. \fBusbkbm\fR ignores this command and  does not return an error.
+keyboard. \fBusbkbm\fR ignores this command and does not return an error.
 .RE
 
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB/kernel/strmod/usbkbm\fR
@@ -159,7 +156,6 @@ SPARC 64-bit ELF kernel STREAMS module
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -175,7 +171,6 @@ Architecture	PCI-based  systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdumpkeys\fR(1), \fBkbd\fR(1), \fBloadkeys\fR(1), \fBioctl\fR(2),
 \fBkeytables\fR(4), \fBattributes\fR(5), \fBhid\fR(7D), \fBusba\fR(7D),
@@ -186,10 +181,6 @@ Architecture	PCI-based  systems
 .sp
 .LP
 \fISystem Administration Guide: Basic Administration\fR
-.sp
-.LP
-http://\fIwww.sun.com/io\fR
 .SH DIAGN0STICS
-.sp
 .LP
 None
diff --git a/usr/src/man/man7m/usbms.7m b/usr/src/man/man7m/usbms.7m
index 34ae87ae42..ae2e980ac1 100644
--- a/usr/src/man/man7m/usbms.7m
+++ b/usr/src/man/man7m/usbms.7m
@@ -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 USBMS 7M "Dec 1, 2005"
+.TH USBMS 7M "May 13, 2017"
 .SH NAME
 usbms \- USB mouse STREAMS module
 .SH SYNOPSIS
@@ -28,35 +28,33 @@ usbms \- USB mouse STREAMS module
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
-The  \fBusbms\fR \fBSTREAMS\fR module processes byte streams generated by a
-\fBUSB\fR mouse.  A  \fBUSB\fR mouse is a member of the Human Interface Device
-(HID) class and the  \fBusbms\fR module supports only the mouse boot protocol
+The \fBusbms\fR \fBSTREAMS\fR module processes byte streams generated by a
+\fBUSB\fR mouse.  A \fBUSB\fR mouse is a member of the Human Interface Device
+(HID) class and the \fBusbms\fR module supports only the mouse boot protocol
 defined in the \fBHID\fR specification.
 .sp
 .LP
 The \fBusbms\fR module must be pushed on top of the \fBHID\fR class driver (see
-\fBhid\fR(7D)). In the  \fBVUID_FIRM_EVENT\fR mode, the \fBusbms\fR module
+\fBhid\fR(7D)). In the \fBVUID_FIRM_EVENT\fR mode, the \fBusbms\fR module
 translates packets from the \fBUSB\fR mouse into Firm events. The Firm event
-structure is defined in \fB<sys/vuid_event.h>\fR\&. The  \fBSTREAMS\fR module
+structure is defined in \fB<sys/vuid_event.h>\fR\&. The \fBSTREAMS\fR module
 state is initially set to raw or \fBVUID_NATIVE\fR mode which performs no
-message processing. See the  \fIHID 1.0\fR specification for the raw format of
+message processing. See the \fIHID 1.0\fR specification for the raw format of
 the mouse packets. To initiate mouse protocol conversion to Firm events, change
 the state to \fBVUID_FIRM_EVENT\fR.
 .sp
 .LP
-When the usb mouse is opened or hot plugged in, the MOUSE_TYPE_ABSOLUTE  event
+When the usb mouse is opened or hot plugged in, the MOUSE_TYPE_ABSOLUTE event
 (Firm event) is sent to the upper level to notify the VUID application that it
 is the absolute mouse.
 .SH IOCTLS
-.sp
 .ne 2
 .na
 \fB\fBVUIDGFORMAT\fR \fR
 .ad
 .RS 16n
-This option returns the current state of the  \fBSTREAMS\fR module. The state
+This option returns the current state of the \fBSTREAMS\fR module. The state
 of the \fBusbms\fR \fBSTREAMS\fR module may be either \fBVUID_NATIVE\fR (no
 message processing) or \fBVUID_FIRM_EVENT\fR (convert to Firm events).
 .RE
@@ -67,7 +65,7 @@ message processing) or \fBVUID_FIRM_EVENT\fR (convert to Firm events).
 \fB\fBVUIDSFORMAT\fR \fR
 .ad
 .RS 16n
-The argument is a pointer to an \fBint\fR. Set the state of the  \fBSTREAMS\fR
+The argument is a pointer to an \fBint\fR. Set the state of the \fBSTREAMS\fR
 module to the \fBint\fR pointed to by the argument.
 .RE
 
@@ -97,7 +95,7 @@ to next.
 
 .sp
 .LP
-If base does not equal \fBVKEY_FIRST\fR,  \fBENODEV\fR is returned.
+If base does not equal \fBVKEY_FIRST\fR, \fBENODEV\fR is returned.
 .sp
 .ne 2
 .na
@@ -130,8 +128,8 @@ if wheel(s) are present and zero if no wheels are present.
 .ad
 .sp .6
 .RS 4n
-This command returns static information about the wheel that does not  change
-while a device is in use. Currently the only information  defined  is  the
+This command returns static information about the wheel that does not change
+while a device is in use. Currently the only information defined is the
 wheel orientation which is either VUID_WHEEL_FORMAT_VERTICAL or
 VUID_WHEEL_FORMAT_HORIZONTAL. If the module cannot distinguish the orientation
 of the wheel or the wheel is of some other format, the format is set to
@@ -147,7 +145,7 @@ VUID_WHEEL_FORMAT_UNKNOWN.
 .fi
 .in -2
 
-The  ioctl  takes a pointer to "wheel_info" structure with the "vers" set to
+The ioctl takes a pointer to "wheel_info" structure with the "vers" set to
 the current version of the "wheel_info" structure and "id" set to the id of the
 wheel for which the information is desired.
 .RE
@@ -163,7 +161,7 @@ VUIDSWHEELSTATE sets the state of the wheel to that specified in the
 stateflags. VUIDGWHEELSTATE returns the current state settings in the
 stateflags field.
 .sp
-stateflags is an  OR'ed  set of  flag  bits. The only flag currently defined is
+stateflags is an OR'ed set of flag bits. The only flag currently defined is
 VUID_WHEEL_STATE_ENABLED.
 .sp
 When stateflags is set to VUID_WHEEL_STATE_ENABLED the module converts motion
@@ -184,7 +182,7 @@ stateflags and then change only the bit they want.
 .fi
 .in -2
 
-These ioctls take a pointer to "wheel_state" as an argument with  the "vers"
+These ioctls take a pointer to "wheel_state" as an argument with the "vers"
 and "id" members filled in. These members have the same meaning as that
 for 'VUIDGWHEEL INFO' ioctl.
 .RE
@@ -240,7 +238,7 @@ module parameters are set according to the values in the structure.
 \fB\fBMSIOSRESOLUTION\fR\fR
 .ad
 .RS 19n
-Used by the absolute mouse to get the  current screen resolution. The parameter
+Used by the absolute mouse to get the current screen resolution. The parameter
 is a pointer to the \fBMs_screen_resolution\fR structure:
 .sp
 .in +2
@@ -256,7 +254,6 @@ structure and used to calculate the correct coordinates.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB/kernel/strmod/usbms\fR
@@ -277,7 +274,6 @@ SPARC 64-bit ELF kernel STREAMS module
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -293,18 +289,13 @@ Architecture	PCI-based  systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBioctl\fR(2), \fBattributes\fR(5), \fBhid\fR(7D), \fBvirtualkm\fR(7D),
 \fBusba\fR(7D)
 .sp
 .LP
 \fISystem Administration Guide: Basic Administration\fR
-.sp
-.LP
-http://\fIwww/sun.com/io\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 The following messages may be logged into the system log. They are formatted in
 the following manner:
diff --git a/usr/src/man/man9s/queue.9s b/usr/src/man/man9s/queue.9s
index 12d008d08b..7265f96dee 100644
--- a/usr/src/man/man9s/queue.9s
+++ b/usr/src/man/man9s/queue.9s
@@ -4,7 +4,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 QUEUE 9S "Jan 10, 2006"
+.TH QUEUE 9S "May 13, 2017"
 .SH NAME
 queue \- STREAMS queue structure
 .SH SYNOPSIS
@@ -14,17 +14,14 @@ queue \- STREAMS queue structure
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Architecture independent level 1 (DDI/DKI)
 .SH DESCRIPTION
-.sp
 .LP
 A \fBSTREAMS\fR driver or module consists of two \fBqueue\fR structures:
 \fIread\fR for upstream processing and \fIwrite\fR for downstream processing.
 The queue structure is the major building block of a stream.
 .SS "\fBqueue\fR Structure Members"
-.sp
 .LP
 The \fBqueue\fR structure is defined as type \fBqueue_t\fR. The structure can
 be accessed at any time from inside a \fBSTREAMS\fR entry point associated with
@@ -51,7 +48,6 @@ size_t             q_lowat;     /* queue low water mark */
 Contstraints and restrictions on the use of \fBq_flag\fR and \fBqueue_t\fR
 fields and the \fBq_next\fR values are detailed in the following sections.
 .SS "\fBq_flag\fR Field"
-.sp
 .LP
 The \fBq_flag\fR field must be used only to check the following flag values.
 .sp
@@ -118,7 +114,6 @@ Downstream processing element wants to write to queue.
 .RE
 
 .SS "\fBqueue_t\fR Fields"
-.sp
 .LP
 Aside from \fBq_ptr\fR and \fBq_qinfo\fR, a module or driver must never assume
 that a \fBqueue_t\fR field value will remain unchanged across calls to
@@ -178,10 +173,9 @@ visible fields, \fBq_qinfo\fR, \fBq_first\fR, \fBq_last\fR, \fBq_next\fR,
 .LP
 The Solaris DDI requires that \fBSTREAMS\fR modules and drivers obey the rules
 described on this page. Those that do not follow the rules can cause data
-corruption or system instability, and might change in behavior across patches
+corruption or system instability, and might change in behavior across updates
 or upgrades.
 .SS "\fBq_next\fR Restrictions"
-.sp
 .LP
 There are additional restrictions associated with the use of the \fBq_next\fR
 value. In particular, a \fBSTREAMS\fR module or driver:
@@ -216,7 +210,6 @@ However, checking \fBq_next\fR for NULL can be used to distinguish a module
 from a driver in code shared by both.
 .RE
 .SH SEE ALSO
-.sp
 .LP
 \fBclose\fR(9E), \fBopen\fR(9E), \fBbcanput\fR(9F), \fBcanput\fR(9F),
 \fBgetq\fR(9F), \fBinsq\fR(9F), \fBmod_install\fR(9F), \fBput\fR(9F),