[illumos-gate merge]release-20160625

commit 01aaaf328842760a1002109b299908a027e94cf8
    7051 want id_space(9F) docs
commit c1de7575521deda5ee777b8054a9c5b12f15b1ee
    7120 mDNS resync was not wsdiff safe
commit 9c05409f2b9301e686735887a9573454cceb0331
    7069 i386_XARCH should include -m32
commit 406fc5100dac8d225a315a6def6be8d628f34e24
    6602 lofi should support labeled devices
commit f3a07f941f1be263a48a040c059edbcb722cf436
    4712 Prefer 'parsable' over 'parseable' in the manual pages
commit 1b2031a95889aea96be6af55dcf31a0d5ffdfed9
    7050 Prefer 'subcommand' over 'sub-command' in the manual pages
commit 831b40b1c811223fd0b1131791a38e3ae5143377
    7049 Prefer 'writable' over 'writeable' in the manual pages
commit a716f1a92056bc2e231e57ae2a20725ce606ea73
    7047 Fix spelling mistakes in sections 9E, 9F and 9S
commit 95e15299a2c42b8014fa27631a6f3be2a93febc2
    7048 Fix spelling mistakes in sections 7D, 7I, 7IPP, and 7P
commit df23565fe1d0b225f9f898c50dfafea6749b0b7f
    7046 Fix spelling mistakes in section 5
commit c855112f85cf71e42f6381a66f3f86f98e2ed24e
    7045 Fix spelling mistakes in section 4
commit 843c398e8904ed9d833d2af3103894f909fb4b52
    7042 Fix spelling mistakes in library sections
commit 0db8de19c0e494758b68b702523a2b0eaffe3b2e
    7044 Fix spelling mistakes in sections 1HAS and 2
commit df23d905b96680e56379c5a5ecb4b363f36b9e74
    7041 Fix spelling mistakes in sections 1 and 1M
commit 71af3be340c57171837478555e2eb0d496318cfc
    7040 Detect common spelling errors in manual pages

	Conflicts:
	usr/src/uts/common/fs/vfs.c
	usr/src/man/man7d/cpuid.7d
	usr/src/man/man5/privileges.5
	usr/src/man/man3c/signalfd.3c
	usr/src/cmd/lofiadm/main.c

42 files changed, 643 insertions, 1071 deletions

diff --git a/usr/src/man/man1m/acctadm.1m b/usr/src/man/man1m/acctadm.1m
index ce6a1e19ef..2040762f06 100644
--- a/usr/src/man/man1m/acctadm.1m
+++ b/usr/src/man/man1m/acctadm.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 ACCTADM 1M "Dec 17, 2008"
+.TH ACCTADM 1M "April 9, 2016"
 .SH NAME
 acctadm \- configure extended accounting facility
 .SH SYNOPSIS
@@ -15,13 +15,11 @@ acctadm \- configure extended accounting facility
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBacctadm\fR configures various attributes of the extended accounting
 facility. Without arguments, \fBacctadm\fR displays the current status of the
 extended accounting facility.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -126,7 +124,6 @@ This option requires an operand. See \fBOPERANDS\fR.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The \fB-d\fR, \fB-D\fR, \fB-e\fR, \fB-E\fR, \fB-f\fR, and \fB-x\fR options
 require an operand.
@@ -286,7 +283,6 @@ $ \fBacctadm -r task\fR
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -311,7 +307,7 @@ successfully.
 .RS 4n
 An error occurred.
 .sp
-A fatal error occured either in obtaining or modifying the accounting
+A fatal error occurred either in obtaining or modifying the accounting
 configuration.
 .RE
 
@@ -348,7 +344,6 @@ service instance.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -364,12 +359,10 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdladm\fR(1M), \fBflowadm\fR(1M), \fBacct\fR(2), \fBattributes\fR(5),
 \fBsmf\fR(5), \fBipqos\fR(7IPP)
 .SH NOTES
-.sp
 .LP
 Both extended accounting and regular accounting can be active.
 .sp
diff --git a/usr/src/man/man1m/catman.1m b/usr/src/man/man1m/catman.1m
index aba601c583..5a79706553 100644
--- a/usr/src/man/man1m/catman.1m
+++ b/usr/src/man/man1m/catman.1m
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"
-.Dd Jul 19, 2014
+.Dd April 9, 2016
 .Dt CATMAN 1M
 .Os
 .Sh NAME
@@ -55,7 +55,7 @@ The following environment variables affect the execution of
 .Nm :
 .Bl -tag -width ".Ev MANPATH"
 .It Ev MANPATH
-Used to specify a colon seperated list of manual paths within
+Used to specify a colon separated list of manual paths within
 which to generate
 .Nm whatis
 database files.
diff --git a/usr/src/man/man1m/cfgadm_pci.1m b/usr/src/man/man1m/cfgadm_pci.1m
index 875b7e7a0b..7015a06f33 100644
--- a/usr/src/man/man1m/cfgadm_pci.1m
+++ b/usr/src/man/man1m/cfgadm_pci.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 CFGADM_PCI 1M "Jun 13, 2008"
+.TH CFGADM_PCI 1M "April 9, 2016"
 .SH NAME
 cfgadm_pci \- PCI, CompactPCI, and PCI Express Hotplug hardware specific
 commands for cfgadm
@@ -39,7 +39,6 @@ commands for cfgadm
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The PCI hardware specific library, \fB/usr/lib/cfgadm/pci.so.1\fR, provides the
 support for hot plugging PCI, CompactPCI, and PCI Express adapter cards into
@@ -76,7 +75,6 @@ Note that the \fBap_type\fR is not the same as the information in the
 .LP
 See the \fI\fR for a detailed description of the hot plug procedure.
 .SS "PCI Express ap_id naming"
-.sp
 .LP
 For attachment points located in a PCI Express hierarchy (that is, the parent
 or an ancestor is a PCI Express device), including attachment points which are
@@ -117,7 +115,7 @@ is the PCI device number in standard PCI nomenclature.
 First, an \fIabsolute-slot-path\fR is constructed that attempts to describe the
 attachment point's topological location in more physically identifiable terms
 for the user . This \fIabsolute-slot-path\fR consists of \fIslot-path\fR
-components each seperated by a ":" (colon). The leaf or left-most
+components each separated by a ":" (colon). The leaf or left-most
 \fIslot-path\fR component describes the device of the attachment point itself
 while its right adjacent \fIslot-path\fR component up to the right or top-most
 \fIslot-path\fR component describes the parent up to the root devices,
@@ -254,7 +252,7 @@ Whichever final \fIap_id\fR name is used, the \fIabsolute-slot-path\fR is
 stored in the Information ("info") field which can be displayed using the
 \fB-s\fR or \fB-v\fRoptions. This information can be used to physically locate
 any \fIap_id\fRs named using "ap_id form (2)" or "ap_id form (3)". The
-\fIabsolute-slot-path\fR is tranformed slightly when stored in the information
+\fIabsolute-slot-path\fR is transformed slightly when stored in the information
 field, by the replacement of a colon (":") with forward slashes ("/") to more
 closely denote a topological context. The \fIabsolute-slot-path\fR can include
 \fIslot-path\fR components that are not hotpluggable above the leaf or
@@ -263,7 +261,6 @@ right-most \fIslot-path\fR component up to the onboard host slot.
 .LP
 See the EXAMPLES section for a list of hotpluggable examples.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -411,7 +408,7 @@ command outputs information about the attachment point. For attachment points
 located in a PCI Express hierarhcy, the Information field will contain the
 attachment point's absolute slot path location, including any hardware or
 platform specific labeling information for each component in the slot path.
-Each component in the slot path will be seperated by a "/" (foward slash). See
+Each component in the slot path will be separated by a "/" (forward slash). See
 the PCI Express ap_id naming section. For PCI Hot Plug attachment points not
 located in a PCI Express hieararchy, the \fBInformation\fR field will be the
 slot's system label, if any. This string will be obtained from the
@@ -935,7 +932,6 @@ component ".../iob.pcie2" represents a  PCI Express slot with device number 0,
 bound to driver instance 21 of "px_pci"
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB/usr/lib/cfgadm/pci.so.1\fR
@@ -946,7 +942,6 @@ Hardware specific library for PCI hot plugging.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcfgadm\fR(1M), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/chat.1m b/usr/src/man/man1m/chat.1m
index 0f3b594215..db5b98ebd5 100644
--- a/usr/src/man/man1m/chat.1m
+++ b/usr/src/man/man1m/chat.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 CHAT 1M "May 4, 2001"
+.TH CHAT 1M "April 9, 2016"
 .SH NAME
 chat \- automated conversational exchange tool
 .SH SYNOPSIS
@@ -14,14 +14,12 @@ chat \- automated conversational exchange tool
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBchat\fR program implements a conversational text-based exchange between
 the computer and any serial device, including (but not limited to) a modem, an
 ISDN TA, and the remote peer itself, establishing a connection between the
 Point-To-Point Protocol daemon (\fBpppd\fR) and the remote \fBpppd\fR process.
 .SH OPTIONS
-.sp
 .LP
 The  \fBchat\fR command supports the following options:
 .sp
@@ -161,7 +159,6 @@ is included as parameters to the \fBchat\fR program.
 
 .SH EXTENDED DESCRIPTION
 .SS "Chat Script"
-.sp
 .LP
 The \fBchat\fR script defines communications. A script consists of one or more
 "expect-send" pairs of strings separated by spaces, with an optional
@@ -233,7 +230,6 @@ return sequence is sent and then the script looks for login: again. If line
 noise obscures the first login prompt, send the empty line to generate a login
 prompt again.
 .SS "Comments"
-.sp
 .LP
 Comments can be embedded in the \fBchat\fR script. Comment lines are ignored by
 the chat program. A comment starts with the hash ("#") character in column one.
@@ -249,7 +245,6 @@ with a \fB#\fR character, write something like this:
 .in -2
 
 .SS "Sending Data From A File"
-.sp
 .LP
 If the string to send begins with an at sign ("@"), the remainder of the string
 is interpreted as the name of the file that contains the string. If the last
@@ -258,7 +253,6 @@ pipe (or fifo) instead of a regular file. This enables \fBchat\fR to
 communicate with another program, for example, a program to prompt the user and
 receive a password typed in.
 .SS "Abort "
-.sp
 .LP
 Many modems report the status of a call as a string. These status strings are
 often "CONNECTED" or "NO CARRIER" or "BUSY." If the modem fails to connect to
@@ -281,13 +275,11 @@ sends the string BUSY, causing the string to match the abort character
 sequence. The script fails because it found a match to the abort string. If the
 NO CARRIER string is received, it aborts for the same reason.
 .SS "Clr_Abort "
-.sp
 .LP
 The CLR_ABORT sequence clears previously set ABORT strings. ABORT strings are
 kept in an array of a pre-determined size; CLR_ABORT reclaims the space for
 cleared entries, enabling new strings to use that space.
 .SS "Say "
-.sp
 .LP
 The SAY string enables the script to send strings to a user at a terminal via
 standard error. If \fBchat\fR is being run by \fBpppd\fR and \fBpppd\fR is
@@ -334,7 +326,6 @@ Logged in OK ...
 .in -2
 
 .SS "Report"
-.sp
 .LP
 REPORT is similar to the ABORT string. With REPORT, however, strings and all
 characters to the next control character (such as a carriage return), are
@@ -368,13 +359,11 @@ remainder of the script is executed. In addition, the program writes the string
 CONNECT to the report file (specified by \fB-r\fR) in addition to any
 characters that follow.
 .SS "Clr_Report"
-.sp
 .LP
 CLR_REPORT clears previously set REPORT strings. REPORT strings are kept in an
 array of a pre-determined size; CLR_REPORT reclaims the space for cleared
 entries so that new strings can use that space.
 .SS "Echo"
-.sp
 .LP
 ECHO determines if modem output is echoed to \fBstderr\fR. This option may be
 set with the \fB-e\fR option, but can also be controlled by the ECHO keyword.
@@ -400,7 +389,6 @@ ogin:   account
 All output resulting from modem configuration and dialing is not visible, but
 output is echoed beginning with the CONNECT (or BUSY) message.
 .SS "Hangup"
-.sp
 .LP
 The HANGUP option determines if a modem hangup is considered as an error.
 HANGUP is useful for dialing systems that hang up and call your system back.
@@ -431,10 +419,9 @@ ABORT   'BUSY'
 .in -2
 
 .SS "Timeout"
-.sp
 .LP
 The initial timeout value is 45 seconds. Use the \fB-t\fR parameter to change
-the intial timeout value.
+the initial timeout value.
 .sp
 .LP
 To change the timeout value for the next expect string, the following example
@@ -461,7 +448,6 @@ prompt.
 .LP
 Once changed, the timeout value remains in effect until it is changed again.
 .SS " EOT"
-.sp
 .LP
 The EOT special reply string instructs the \fBchat\fR program to send an EOT
 character to the remote. This is equivalent to using ^D\ec as the reply string.
@@ -469,7 +455,6 @@ The EOT string normally indicates the end-of-file character sequence. A return
 character is not sent following the EOT. The EOT sequence can embedded into the
 send string using the sequence ^D.
 .SS " BREAK"
-.sp
 .LP
 The BREAK special reply string sends a break condition. The break is a special
 transmitter signal. Many UNIX systems handle break by cycling through available
@@ -477,7 +462,6 @@ bit rates, and sending break is often needed when the remote system does not
 support autobaud. BREAK is equivalent to using \eK\ec as the reply string.
 You embed the break sequence into the send string using the \eK sequence.
 .SS "Escape Sequences"
-.sp
 .LP
 Expect and reply strings can contain escape sequences. Reply strings accept all
 escape sequences, while expect strings accept most sequences. A list of escape
@@ -653,7 +637,6 @@ in expect.)
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 Environment variables are available within \fBchat\fR scripts if the \fB-E\fR
 option is specified on the command line. The metacharacter \fB$\fR introduces
@@ -661,7 +644,6 @@ the name of the environment variable to substitute. If the substition fails
 because the requested environment variable is not set, nothing is replaced for
 the variable.
 .SH EXIT STATUS
-.sp
 .LP
 The \fBchat\fR program terminates with the following completion codes:
 .sp
@@ -759,7 +741,6 @@ possible to decide if the string "BUSY" was received from the modem versus "NO
 DIALTONE." While the first event may be retried, the second probably will not
 succeed during a retry.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5)  for descriptions of the following attributes:
 .sp
@@ -775,7 +756,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsleep\fR(1), \fBuucp\fR(1C), \fBpppd\fR(1M), \fBuucico\fR(1M),
 \fBsyslog\fR(3C), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/cpustat.1m b/usr/src/man/man1m/cpustat.1m
index e5a1a7c6c4..3ec2265bde 100644
--- a/usr/src/man/man1m/cpustat.1m
+++ b/usr/src/man/man1m/cpustat.1m
@@ -1,6 +1,6 @@
 '\" te
 .\" Copyright (c) 2005, Sun Microsystems, Inc.
-.TH CPUSTAT 1M "Jun 16, 2009"
+.TH CPUSTAT 1M "April 9, 2016"
 .SH NAME
 cpustat \- monitor system behavior using CPU performance counters
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ cpustat \- monitor system behavior using CPU performance counters
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBcpustat\fR utility allows \fBCPU\fR performance counters to be used to
 monitor the overall behavior of the \fBCPU\fRs in the system.
@@ -28,7 +27,6 @@ statistics are repeated \fIcount\fR times. If neither are specified, an
 interval of five seconds is used, and there is no limit to the number of
 samples that are taken.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -157,7 +155,6 @@ current architecture.
 .RE
 
 .SH USAGE
-.sp
 .LP
 A closely related utility, \fBcputrack\fR(1), can be used to monitor the
 behavior of individual applications with little or no interference from other
@@ -195,7 +192,7 @@ processor clock cycles. If such an event is of interest, sampling should occur
 frequently so that less than 4 billion clock cycles can occur between samples.
 .sp
 .LP
-The output of cpustat is designed to be readily parseable by \fBnawk\fR(1) and
+The output of cpustat is designed to be readily parsable by \fBnawk\fR(1) and
 \fBperl\fR(1), thereby allowing performance tools to be composed by embedding
 \fBcpustat\fR in scripts. Alternatively, tools can be constructed directly
 using the same \fBAPI\fRs that \fBcpustat\fR is built upon using the facilities
@@ -295,7 +292,6 @@ cpustat -c \e
 .sp
 
 .SH WARNINGS
-.sp
 .LP
 By running the \fBcpustat\fR command, the super-user forcibly invalidates all
 existing performance counter context. This can in turn cause all invocations of
@@ -323,7 +319,6 @@ the problem and possible solutions.
 If a short interval is requested, \fBcpustat\fR might not be able to keep up
 with the desired sample rate. In this case, some samples might be dropped.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -339,14 +334,12 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcputrack\fR(1), \fBnawk\fR(1), \fBperl\fR(1), \fBiostat\fR(1M),
 \fBprstat\fR(1M), \fBpsrset\fR(1M), \fBvmstat\fR(1M), \fBcpc\fR(3CPC),
 \fBcpc_open\fR(3CPC), \fBcpc_bind_cpu\fR(3CPC), \fBgethrtime\fR(3C),
 \fBstrtoll\fR(3C), \fBlibcpc\fR(3LIB), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 When \fBcpustat\fR is run on a Pentium 4 with HyperThreading enabled, a CPC set
 is bound to only one logical CPU of each physical CPU. See
diff --git a/usr/src/man/man1m/dladm.1m b/usr/src/man/man1m/dladm.1m
index 12224b1ecb..67a82b0b63 100644
--- a/usr/src/man/man1m/dladm.1m
+++ b/usr/src/man/man1m/dladm.1m
@@ -548,12 +548,12 @@ Number of output errors.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -844,12 +844,12 @@ The name of the physical device under this link.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -1520,12 +1520,12 @@ fields listed under \fB-L\fR, above, can be used with \fB-o\fR.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -1835,7 +1835,7 @@ links. This option cannot be used with the \fB-f\fR and \fB-t\fR options.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -2637,12 +2637,12 @@ Additional flags might be defined in the future.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -2772,12 +2772,12 @@ Either \fBbss\fR for \fBBSS\fR (infrastructure) networks, or \fBibss\fR for
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .RE
@@ -3084,12 +3084,12 @@ displayed.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Displays using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Displays using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .RE
@@ -3202,12 +3202,12 @@ By default, all fields except \fBREM_FAULT\fR are displayed for the "current"
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Displays using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Displays using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -3440,12 +3440,12 @@ driver man page for details.
 .sp
 .ne 2
 .na
-\fB\fB-c\fR, \fB--parseable\fR\fR
+\fB\fB-c\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with this option. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with this option. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -3635,12 +3635,12 @@ The class of the secure object.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -3922,12 +3922,12 @@ A factory MAC address used by the VNIC.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -4290,12 +4290,12 @@ Display the persistent IP tunnel configuration.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The -o option is required with
--p. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The -o option is required with
+-p. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -4823,10 +4823,10 @@ display network usage for all links.
 
 .RE
 
-.SS "Parseable Output Format"
+.SS "Parsable Output Format"
 .LP
 Many \fBdladm\fR subcommands have an option that displays output in a
-machine-parseable format. The output format is one or more lines of colon
+machine-parsable format. The output format is one or more lines of colon
 (\fB:\fR) delimited fields. The fields displayed are specific to the subcommand
 used and are listed under the entry for the \fB-o\fR option for a given
 subcommand. Output includes only those fields requested by means of the
@@ -4835,7 +4835,7 @@ subcommand. Output includes only those fields requested by means of the
 .LP
 When you request multiple fields, any literal colon characters are escaped by a
 backslash (\fB\e\fR) before being output. Similarly, literal backslash
-characters will also be escaped (\fB\e\e\fR). This escape format is parseable
+characters will also be escaped (\fB\e\e\fR). This escape format is parsable
 by using shell \fBread\fR(1) functions with the environment variable
 \fBIFS=:\fR (see \fBEXAMPLES\fR, below). Note that escaping is not done when
 you request only a single field.
@@ -4849,7 +4849,7 @@ The following general link properties are supported:
 .ad
 .sp .6
 .RS 4n
-A comma-seperated list of IP addresses that are allowed on the interface.
+A comma-separated list of IP addresses that are allowed on the interface.
 .sp
 An address in CIDR format with no host address specified is used to indicate
 that any address on that subnet is allowed (e.g. 192.168.10.0/24 means any
@@ -5313,7 +5313,7 @@ capabilities allowed by the device and the link partner.
 .ad
 .sp .6
 .RS 4n
-A comma-seperated list of additional MAC addresses that are allowed on the
+A comma-separated list of additional MAC addresses that are allowed on the
 interface.
 .RE
 
@@ -5565,7 +5565,7 @@ hardware (\fBbge0\fR in this case) has been removed:
 .sp
 
 .LP
-\fBExample 10 \fRUsing Parseable Output to Capture a Single Field
+\fBExample 10 \fRUsing Parsable Output to Capture a Single Field
 .sp
 .LP
 The following assignment saves the MTU of link \fBnet0\fR to a variable named
@@ -5580,7 +5580,7 @@ The following assignment saves the MTU of link \fBnet0\fR to a variable named
 .sp
 
 .LP
-\fBExample 11 \fRUsing Parseable Output to Iterate over Links
+\fBExample 11 \fRUsing Parsable Output to Iterate over Links
 .sp
 .LP
 The following script displays the state of each link on the system.
diff --git a/usr/src/man/man1m/fbconf_xorg.1m b/usr/src/man/man1m/fbconf_xorg.1m
index a30e134568..ad87c5611a 100644
--- a/usr/src/man/man1m/fbconf_xorg.1m
+++ b/usr/src/man/man1m/fbconf_xorg.1m
@@ -47,7 +47,6 @@ For \fBkfb\fR devices:
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBfbconf_xorg\fR utility configures Frame Buffer devices and some of the
 X11 window system defaults for Xorg by updating the \fBxorg.conf\fR
@@ -89,7 +88,6 @@ These standard \fBxorg.conf\fR files can be written only by the superuser or
 someone with the Primary Administrator role. Consequently, the
 \fBfbconf_xorg\fR program is run with setuid root permission.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported for all frame buffer devices:
 .sp
@@ -130,7 +128,7 @@ the machine-specific \fB/etc/X11/xorg.conf\fR file is opened. If system is
 specified, the global \fB/usr/X11/xorg.conf\fR file is opened. The absolute
 pathname of  a configuration file can be used instead. If the specified file
 does not exist and is to be updated, it will be created. The file system that
-will contain the \fBxorg.conf\fR file must be writeable by someone with
+will contain the \fBxorg.conf\fR file must be writable by someone with
 superuser-like privileges. This option has no effect unless other options are
 specified. The default is \fBmachine\fR.
 .RE
@@ -605,7 +603,6 @@ be issued when the window system is running. The default is \fBdisable\fR.
 .RE
 
 .SH DEFAULTS
-.sp
 .LP
 Certain options have implied default arguments. The default argument is used
 when the option is not present on the \fBfbconf_xorg\fR command line. For
@@ -688,7 +685,6 @@ example% \fBfbconf_xorg -dev kfb0 -res 1280x1024x76\fR
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -722,7 +718,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/fb\fR\fR
@@ -753,7 +748,6 @@ Video mode definitions included in new configuration files.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -769,7 +763,6 @@ Interface Stability	Uncommitted
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfbconfig\fR(1M), \fBsvccfg\fR(1M), \fBattributes\fR(5), \fBkfb\fR(7D),
 \fBfbio\fR(7I)
diff --git a/usr/src/man/man1m/flowadm.1m b/usr/src/man/man1m/flowadm.1m
index c9d5b846d5..860d5f1faa 100644
--- a/usr/src/man/man1m/flowadm.1m
+++ b/usr/src/man/man1m/flowadm.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 FLOWADM 1M "Feb 14, 2009"
+.TH FLOWADM 1M "April 9, 2016"
 .SH NAME
 flowadm \- administer bandwidth resource control and priority for protocols,
 services, containers, and virtual machines
@@ -37,7 +37,6 @@ services, containers, and virtual machines
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBflowadm\fR command is used to create, modify, remove, and show
 networking bandwidth and associated resources for a type of traffic on a
@@ -71,8 +70,7 @@ traffic for more observable and deterministic behavior.
 .LP
 \fBflowadm\fR is implemented as a set of subcommands with corresponding
 options. Options are described in the context of each subcommand.
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 The following subcommands are supported:
 .sp
@@ -162,11 +160,11 @@ header.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format.
+Display using a stable machine-parsable format.
 .RE
 
 .sp
@@ -534,11 +532,11 @@ Flow properties are documented in the "Flow Properties" section, below.
 .sp
 .ne 2
 .na
-\fB\fB-c\fR, \fB--parseable\fR\fR
+\fB\fB-c\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format.
+Display using a stable machine-parsable format.
 .RE
 
 .sp
@@ -656,7 +654,6 @@ Otherwise, display network usage from all flows.
 .RE
 
 .SS "Flow Attributes"
-.sp
 .LP
 The flow operand that identify a flow in a \fBflowadm\fR command is a
 comma-separated list of one or more keyword, value pairs from the list below.
@@ -747,11 +744,9 @@ dsfield=\fIval\fR[:\fIdsfield_mask\fR]
 On a given link, the combinations above are mutually exclusive. An attempt to
 create flows of different combinations will fail.
 .SS "Restrictions"
-.sp
 .LP
 There are individual flow restrictions and flow restrictions per zone.
 .SS "Individual Flow Restrictions"
-.sp
 .LP
 Restrictions on individual flows do not require knowledge of other flows that
 have been added to the link.
@@ -798,13 +793,11 @@ flow16\fR
 .sp
 
 .SS "Flow Restrictions Per Zone"
-.sp
 .LP
 Within a zone, no two flows can have the same name. After adding a flow with
 the link specified, the link will not be required for display, modification, or
 deletion of the flow.
 .SS "Flow Properties"
-.sp
 .LP
 The following flow properties are supported. Note that the ability to set a
 given property to a given value depends on the driver and hardware.
@@ -1004,7 +997,6 @@ Output the same information as above as a plotfile:
 .sp
 
 .SH EXIT STATUS
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -1025,7 +1017,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1041,7 +1032,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBacctadm\fR(1M), \fBdladm\fR(1M), \fBifconfig\fR(1M), \fBprstat\fR(1M),
 \fBroute\fR(1M), \fBattributes\fR(5), \fBdlpi\fR(7P)
diff --git a/usr/src/man/man1m/getdevpolicy.1m b/usr/src/man/man1m/getdevpolicy.1m
index d4dd4cb675..838d392671 100644
--- a/usr/src/man/man1m/getdevpolicy.1m
+++ b/usr/src/man/man1m/getdevpolicy.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 GETDEVPOLICY 1M "Apr 9, 2004"
+.TH GETDEVPOLICY 1M "April 9, 2016"
 .SH NAME
 getdevpolicy \- inspect the system's device policy
 .SH SYNOPSIS
@@ -13,22 +13,19 @@ getdevpolicy \- inspect the system's device policy
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Without arguments, \fBgetdevpolicy\fR outputs the device policy in effect to
 standard output.
 .sp
 .LP
 With arguments, each argument is treated as a pathname to a device and the
-device policy in effect for that specific device is printed preceeded by the
+device policy in effect for that specific device is printed preceded by the
 supplied pathname.
 .SH USAGE
-.sp
 .LP
  The device policy adds access restrictions over and above the file
 permissions.
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -50,7 +47,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -69,7 +65,6 @@ Interface Stability	See below
 .LP
 The invocation is evolving. The output is unstable.
 .SH SEE ALSO
-.sp
 .LP
 \fBadd_drv\fR(1M), \fBrem_drv\fR(1M), \fBupdate_drv\fR(1M),
 \fBattributes\fR(5), \fBprivileges\fR(5), \fBdevfs\fR(7FS)
diff --git a/usr/src/man/man1m/ickey.1m b/usr/src/man/man1m/ickey.1m
index 003dab71d7..10a01df891 100644
--- a/usr/src/man/man1m/ickey.1m
+++ b/usr/src/man/man1m/ickey.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 ICKEY 1M "May 7, 2003"
+.TH ICKEY 1M "April 9, 2016"
 .SH NAME
 ickey \- install a client key for WAN boot
 .SH SYNOPSIS
@@ -23,7 +23,6 @@ ickey \- install a client key for WAN boot
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBickey\fR command is used to install WAN boot keys on a running UNIX
 system so that they can be used the next time the system is installed. You can
@@ -39,13 +38,12 @@ of data in transit.
 .sp
 .LP
 Keys are expected to be presented as strings of hexadecimal digits; they can
-(but need not) be preceeded by a \fB0x\fR or \fB0X\fR.
+(but need not) be preceded by a \fB0x\fR or \fB0X\fR.
 .sp
 .LP
 The \fBickey\fR command has a single option, described below. An argument of
 the type \fB-o\fR\ \fBtype=\fR\fIkeytype\fR is required.
 .SH OPTIONS
-.sp
 .LP
 The \fBickey\fR command the following option.
 .sp
@@ -58,12 +56,10 @@ Delete the key specified by the \fIkeytype\fR argument.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 On success, \fBickey\fR exits with status 0; if a problem occurs, a diagnostic
 message is printed and \fBickey\fR exits with non-zero status.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/openprom\fR\fR
@@ -73,7 +69,6 @@ WAN boot key storage driver
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -89,6 +84,5 @@ Interface Stability	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBssh\fR(1), \fBopenprom\fR(7D),  \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/ikecert.1m b/usr/src/man/man1m/ikecert.1m
index bba87a4b7a..601cb47f68 100644
--- a/usr/src/man/man1m/ikecert.1m
+++ b/usr/src/man/man1m/ikecert.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 IKECERT 1M "Jun 10, 2009"
+.TH IKECERT 1M "April 9, 2016"
 .SH NAME
 ikecert \- manipulates the machine's on-filesystem public-key certificate
 databases
@@ -35,7 +35,6 @@ databases
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBikecert\fR command manipulates the machine's on-filesystem public-key
 certificate databases. See the "Files" section, below.
@@ -73,7 +72,6 @@ repository.
 The only supported PKCS#11 library and hardware is the Sun Cryptographic
 Accelerator 4000.
 .SH OPTIONS
-.sp
 .LP
 Except for \fBtokens\fR, each subcommand requires one option, possibly followed
 by one or more option-specific arguments.
@@ -543,7 +541,6 @@ token with \fBikeadm\fR(1M) once \fBin.iked\fR(1M) is running.
 .RE
 
 .SH PARAMETERS
-.sp
 .LP
 The following parameters are supported:
 .sp
@@ -729,7 +726,6 @@ instance.
 .RE
 
 .SH SECURITY
-.sp
 .LP
 This command can save private keys of a public-private key pair into a file.
 Any exposure of a private key may lead to compromise if the key is somehow
@@ -738,7 +734,7 @@ obtained by an adversary.
 .LP
 The PKCS#11 hardware object functionality can address some of the shortcomings
 of on-disk private keys. Because IKE is a system service, user intervention at
-boot is not desireable. The token's PIN, however, is still needed. The PINfor
+boot is not desirable. The token's PIN, however, is still needed. The PIN for
 the PKCS#11 token, therefore, is stored where normally the on-disk
 cryptographic keys would reside. This design decision is deemed acceptable
 because, with a hardware key store, \fBpossession\fR of the key is still
@@ -813,7 +809,6 @@ example# \fB# ikecert certlocal -kc -m 1024 -t rsa-md5 -T vca0-keystore \e
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -837,7 +832,6 @@ An error occurred. Writes an appropriate error message to standard error.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/inet/secret/ike.privatekeys/*\fR\fR
@@ -880,7 +874,6 @@ Consulted for the pathname of a PKCS#11 library.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -896,7 +889,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBikeadm\fR(1M), \fBin.iked\fR(1M), \fBgetdate\fR(3C), \fBike.config\fR(4),
 \fBattributes\fR(5), \fBpkcs11_softtoken\fR(5)
@@ -909,7 +901,6 @@ Code in C\fR. Second Edition. John Wiley & Sons. New York, NY. 1996.
 RSA Labs, PKCS#11 v2.11: \fICryptographic Token Interface Standards\fR,
 November 2001.
 .SH NOTES
-.sp
 .LP
 The following is the validity date and time syntax when the \fB-F\fR or
 \fB-S\fR flags are used:
diff --git a/usr/src/man/man1m/inetadm.1m b/usr/src/man/man1m/inetadm.1m
index 0164a4391e..e172e5e428 100644
--- a/usr/src/man/man1m/inetadm.1m
+++ b/usr/src/man/man1m/inetadm.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 INETADM 1M "Jul 5, 2007"
+.TH INETADM 1M "April 9, 2016"
 .SH NAME
 inetadm \- observe or configure inetd-controlled services
 .SH SYNOPSIS
@@ -48,7 +48,6 @@ inetadm \- observe or configure inetd-controlled services
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBinetadm\fR utility provides the following capabilities for
 \fBinetd\fR-managed SMF services:
@@ -86,7 +85,6 @@ With no arguments, \fBinetadm\fR lists all services under \fBinetd\fR(1M)
 control, including such attributes as their current run state and whether or
 not they are enabled.
 .SH OPTIONS
-.sp
 .LP
 For options taking one or more FMRI operands (see \fBsmf\fR(5) for a
 description of an FMRI), if the operand specifies a service (instead of a
@@ -94,8 +92,8 @@ service instance), and that service has only a single instance, \fBinetadm\fR
 operates on that instance.
 .sp
 .LP
-If a service name is supplied and it contains more than one instances or a
-pattern is supplied and and it matches more than one instance, a warning
+If a service name is supplied and it contains more than one instance or a
+pattern is supplied and it matches more than one instance, a warning
 message is displayed and that operand is ignored.
 .sp
 .LP
@@ -287,7 +285,6 @@ default  connection_backlog=10
 .in -2
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -319,7 +316,6 @@ Invalid arguments were supplied, such as an ambiguous service FMRI or pattern.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -335,6 +331,5 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBinetd\fR(1M), \fBsvccfg\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
diff --git a/usr/src/man/man1m/inetd.1m b/usr/src/man/man1m/inetd.1m
index c51a4aec29..cf01f8c10e 100644
--- a/usr/src/man/man1m/inetd.1m
+++ b/usr/src/man/man1m/inetd.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 INETD 1M "Jul 5, 2007"
+.TH INETD 1M "April 9, 2016"
 .SH NAME
 inetd \- Solaris Management Facility delegated restarter for inet services
 .SH SYNOPSIS
@@ -19,7 +19,6 @@ inetd \- Solaris Management Facility delegated restarter for inet services
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBinetd\fR is the delegated restarter for internet services for the Service
 Management Facility (SMF). Its basic responsibilities are to manage service
@@ -66,7 +65,6 @@ configuration changes to Internet services within the SMF repository.
 \fBinetadm\fR has the advantage over \fBsvccfg\fR in that it provides an
 Internet/RPC service context.
 .SS "Service States"
-.sp
 .LP
 As part of its service management duties, \fBinetd\fR implements a state
 machine for each of its managed services. The states in this machine are made
@@ -170,7 +168,7 @@ exit this state.
 .sp .6
 .RS 4n
 A service is in this state because it is either malfunctioning and needs
-adminstrator attention or because an administrator has requested it.
+administrator attention or because an administrator has requested it.
 .sp
 Events constituting malfunctioning include: \fBinetd\fR's inability to listen
 on behalf on any of the service's protocols before exceeding the service's bind
@@ -187,7 +185,6 @@ this state.
 .LP
 Use \fBinetadm\fR(1M) to obtain the current state of a managed service.
 .SS "Service Methods"
-.sp
 .LP
 As part of certain state transitions \fBinetd\fR will execute, if supplied, one
 of a set of methods provided by the service. The set of supported methods are:
@@ -273,7 +270,6 @@ The only compulsory method is the \fBinetd_start\fR method. In the absence of
 any of the others, \fBinetd\fR runs no method but behaves as if one was run
 successfully.
 .SS "Service Properties"
-.sp
 .LP
 Configuration for SMF-managed services is stored in the SMF repository. The
 configuration is made up of the basic configuration of a service, the
@@ -645,7 +641,6 @@ were supplied, except that the \fBkill\fR signal is sent only to the parent
 process of the \fBwait\fR-type service's \fBstart\fR method, not to all members
 of its encompassing process contract (see \fBprocess\fR(4)).
 .SS "Configuring Protocols for Sockets-Based Services"
-.sp
 .LP
 When configuring \fBinetd\fR for a sockets-based service, you have the choice,
 depending on what is supported by the service, of the alternatives described
@@ -688,7 +683,6 @@ entry has \fBtcp\fR and the other has \fBtcp6only\fR, or \fBudp\fR plus
 See EXAMPLES for an example of a configuration of a service that supports both
 IPv4 and IPv6.
 .SS "\fBinetd\fR Methods"
-.sp
 .LP
 \fBinetd\fR provides the methods listed below for consumption by the master
 restarter, \fBsvc.startd\fR(1M).
@@ -770,11 +764,9 @@ if it is in the \fBonline\fR state and a re-binding is not necessary, then the
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 No options are supported.
 .SH OPERANDS
-.sp
 .ne 2
 .na
 \fB\fIconfiguration-file\fR\fR
@@ -825,7 +817,6 @@ online         15:52:10 svc:/network/mysvc:stream6
 See \fBsvcs\fR(1) and \fBinetadm\fR(1M) for descriptions of those commands.
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -841,7 +832,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfmd\fR(1M), \fBinetadm\fR(1M), \fBinetconv\fR(1M), \fBsvcadm\fR(1M),
 \fBsvccfg\fR(1M), \fBsvcs\fR(1), \fBsvc.startd\fR(1M), \fBsyslog\fR(3C),
@@ -849,7 +839,6 @@ Interface Stability	Evolving
 \fBgetservbyname\fR(3SOCKET), \fBinetd.conf\fR(4), \fBprocess\fR(4),
 \fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5), \fBsmf_method\fR(5)
 .SH NOTES
-.sp
 .LP
 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
diff --git a/usr/src/man/man1m/ipadm.1m b/usr/src/man/man1m/ipadm.1m
index 1ef5f44174..06e5f87cc2 100644
--- a/usr/src/man/man1m/ipadm.1m
+++ b/usr/src/man/man1m/ipadm.1m
@@ -13,7 +13,7 @@
 .\" Copyright (c) 2013 by Delphix. All rights reserved.
 .\" Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 .\"
-.Dd December 10, 2014
+.Dd April 9, 2016
 .Dt IPADM 1M
 .Os
 .Sh NAME
@@ -185,7 +185,7 @@ The following subcommands are supported:
 .Xc
 Create an IP interface that will handle both IPv4 and IPv6 packets. The
 interface will be enabled as part of the creation process. The IPv4 interface
-will have the address 0.0.0.0. The IPv6 interface will have the adress ::.
+will have the address 0.0.0.0. The IPv6 interface will have the address ::.
 .Bl -tag -width ""
 .It Fl t Ns , Ns Fl -temporary
 Temporary, not persistent across reboots.
diff --git a/usr/src/man/man1m/ipf.1m b/usr/src/man/man1m/ipf.1m
index e61bfba39c..5797e8c28e 100644
--- a/usr/src/man/man1m/ipf.1m
+++ b/usr/src/man/man1m/ipf.1m
@@ -3,7 +3,7 @@
 .\" location.
 .\" Portions Copyright (c) 2009, Sun Microsystems Inc. All Rights Reserved.
 .\" Portions Copyright (c) 2015, Joyent, Inc.
-.TH IPF 1M "Oct 7, 2014"
+.TH IPF 1M "April 9, 2016"
 .SH NAME
 ipf \- alter packet filtering lists for IP packet input and output
 .SH SYNOPSIS
@@ -233,7 +233,7 @@ determining that used to execute options.
 .ad
 .sp .6
 .RS 4n
-To flush entries from the state table, use the \fB-F\fR option in conjuction
+To flush entries from the state table, use the \fB-F\fR option in conjunction
 with either \fBs\fR (removes state information about any non-fully established
 connections) or \fBS\fR (deletes the entire state table). You can specify only
 one of these two options. A fully established connection will show up in
diff --git a/usr/src/man/man1m/ipmpstat.1m b/usr/src/man/man1m/ipmpstat.1m
index f08254a89f..6a9d793c4d 100644
--- a/usr/src/man/man1m/ipmpstat.1m
+++ b/usr/src/man/man1m/ipmpstat.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 IPMPSTAT 1M "Feb 10, 2009"
+.TH IPMPSTAT 1M "April 9, 2016"
 .SH NAME
 ipmpstat \- display IPMP subsystem status
 .SH SYNOPSIS
@@ -13,19 +13,17 @@ ipmpstat \- display IPMP subsystem status
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBipmpstat\fR command concisely displays information about the IPMP
 subsystem. It supports five different output modes, each of which provides a
 different view of the IPMP subsystem (address, group, interface, probe, and
 target), described below. At most one output mode may be specified per
 invocation, and the displayed information is guaranteed to be self-consistent.
-It also provides a parseable output format which may be used by scripts to
+It also provides a parsable output format which may be used by scripts to
 examine the state of the IPMP subsystem. Only basic privileges are needed to
 invoke \fBipmpstat\fR, with the exception of probe mode which requires all
 privileges.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -109,13 +107,12 @@ Display IPMP target information ("target" output mode).
 .ad
 .sp .6
 .RS 4n
-Display using a machine-parseable format, described below. If this option is
+Display using a machine-parsable format, described below. If this option is
 specified, an explicit list of fields must be specified using the \fB-o\fR
 option.
 .RE
 
 .SH OUTPUT MODES
-.sp
 .LP
 The \fBipmpstat\fR utility supports the output modes listed below. Note that
 these modes map to some of the options described above.
@@ -765,7 +762,6 @@ If \fB-o\fR is not specified, all output fields are displayed.
 .RE
 
 .SH OUTPUT FORMAT
-.sp
 .LP
 By default, \fBipmpstat\fR uses a human-friendly tabular format for its output
 modes, where each row contains one or more fields of information about a given
@@ -778,8 +774,8 @@ displayed as "\fB?\fR" and a diagnostic message will be output to standard
 error.
 .sp
 .LP
-Machine-parseable format also uses a tabular format, but is designed to be
-efficient to programmatically parse. Specifically, machine-parseable format
+Machine-parsable format also uses a tabular format, but is designed to be
+efficient to programmatically parse. Specifically, machine-parsable format
 differs from human-friendly format in the following ways:
 .RS +4
 .TP
@@ -813,7 +809,7 @@ If multiple fields are requested, and a literal \fB:\fR or a backslash
 \fBExample 1 \fRObtaining Failure Detection Time of a Specific Interface
 .sp
 .LP
-The following code uses the machine-parseable output format to create a
+The following code uses the machine-parsable output format to create a
 \fBksh\fR function that outputs the failure detection time of a given IPMP IP
 interface:
 
@@ -830,7 +826,6 @@ interface:
 .sp
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -847,7 +842,7 @@ ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
 Interface Stability	Committed
 _
-Machine-Parseable Format	Committed
+Machine-Parsable Format	Committed
 _
 Human-Friendly Format	Not-an-Interface
 .TE
@@ -856,7 +851,6 @@ Human-Friendly Format	Not-an-Interface
 .LP
 \fB/sbin/ipmpstat\fR is not a Committed interface.
 .SH SEE ALSO
-.sp
 .LP
 \fBif_mpadm\fR(1M), \fBifconfig\fR(1M), \fBin.mpathd\fR(1M),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/ipsecconf.1m b/usr/src/man/man1m/ipsecconf.1m
index 5996a27093..4dd2e355d4 100644
--- a/usr/src/man/man1m/ipsecconf.1m
+++ b/usr/src/man/man1m/ipsecconf.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 IPSECCONF 1M "Sep 28, 2009"
+.TH IPSECCONF 1M "April 9, 2016"
 .SH NAME
 ipsecconf \- configure system wide IPsec policy
 .SH SYNOPSIS
@@ -48,7 +48,6 @@ ipsecconf \- configure system wide IPsec policy
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBipsecconf\fR utility configures the IPsec policy for a host or for one
 of its tunnels. Once the policy is configured, all outbound and inbound
@@ -122,7 +121,6 @@ svc:/network/ipsec/policy
 See \fBNOTES\fR for more information on managing IPsec security policy and
 \fBSECURITY\fR for issues in securing \fB/etc/inet/ipsecinit.conf\fR.
 .SH OPTIONS
-.sp
 .LP
 \fBipsecconf\fR supports the following options:
 .sp
@@ -280,7 +278,6 @@ Quiet mode. Suppresses the warning message generated when adding policies.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 Each policy entry contains three parts specified as follows:
 .sp
@@ -1095,7 +1092,6 @@ at the end of all the old entries. See .
 A new entry is considered duplicate of the old entry if an old entry matches
 the same traffic pattern as the new entry. See  for information on duplicates.
 .SH SECURITY
-.sp
 .LP
 If, for example, the policy file comes over the wire from an \fBNFS\fR mounted
 file system, an adversary can modify the data contained in the file, thus
@@ -1379,7 +1375,7 @@ all other entries. \fBNULL\fR pattern matches all the traffic.
 .LP
 The following entry on the host with the link local address
 \fBfe80::a00:20ff:fe21:4483\fR specifies that any outbound traffic between the
-hosts wtih IPv6 link-local addresses \fBfe80::a00:20ff:fe21:4483\fR and
+hosts with IPv6 link-local addresses \fBfe80::a00:20ff:fe21:4483\fR and
 \fBfe80::a00:20ff:felf:e346\fR must be encrypted with \fB3DES\fR and \fBMD5.\fR
 
 .sp
@@ -1582,7 +1578,6 @@ C-prefix/24} ipsec {encr_algs aes encr_auth_algs md5}
 .in -2
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/run/ipsecpolicy.conf\fR\fR
@@ -1615,7 +1610,6 @@ Sample input file for \fBipseconf\fR.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1631,7 +1625,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBauths\fR(1), \fBprofiles\fR(1), \fBsvcprop\fR(1), \fBsvcs\fR(1),
 \fBin.iked\fR(1M), \fBinit\fR(1M), \fBifconfig\fR(1M), \fBipsecalgs\fR(1M),
@@ -1676,7 +1669,6 @@ The Internet Society. 1998.
 Frankel, S. and Kelly, R. Glenn, \fIThe AES Cipher Algorithm and Its Use With
 IPsec\fR. 2001.
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fBBad "string" on line \fIN\fR.\fR
@@ -1735,7 +1727,6 @@ new entry.
 .RE
 
 .SH NOTES
-.sp
 .LP
 IPsec manual keys are managed by the service management facility, \fBsmf\fR(5).
 The services listed below manage the components of IPsec. These services are
diff --git a/usr/src/man/man1m/itadm.1m b/usr/src/man/man1m/itadm.1m
index e3017f3ca7..f57fe25f24 100644
--- a/usr/src/man/man1m/itadm.1m
+++ b/usr/src/man/man1m/itadm.1m
@@ -18,7 +18,7 @@
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
 .\" Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 .\"
-.TH ITADM 1M "Mar 27, 2014"
+.TH ITADM 1M "April 9, 2016"
 .SH NAME
 itadm \- administer iSCSI targets
 .SH SYNOPSIS
@@ -163,7 +163,7 @@ example specifications.
 .in -2
 .sp
 
-.SH SUB-COMMANDS
+.SH SUBCOMMANDS
 .LP
 The following are the \fBitadm\fR subcommands with their options.
 .SS "\fBitadm create-target\fR"
diff --git a/usr/src/man/man1m/kdb5_util.1m b/usr/src/man/man1m/kdb5_util.1m
index 344d36be05..6e7a54ffb5 100644
--- a/usr/src/man/man1m/kdb5_util.1m
+++ b/usr/src/man/man1m/kdb5_util.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 KDB5_UTIL 1M "Oct 29, 2015"
+.TH KDB5_UTIL 1M "April 9, 2016"
 .SH NAME
 kdb5_util \- Kerberos Database maintenance utility
 .SH SYNOPSIS
@@ -15,13 +15,11 @@ kdb5_util \- Kerberos Database maintenance utility
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBkdb5_util\fR utility enables you to create, dump, load, and destroy the
 Kerberos V5 database. You can also use \fBkdb5_util\fR to create a stash file
 containing the Kerberos database master key.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -162,7 +160,6 @@ Directory server connection port.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -311,7 +308,7 @@ be changed.
 .sp .6
 .RS 4n
 Dumps in reverse order. This might recover principals that do not dump
-normally, in cases where database corruption has occured.
+normally, in cases where database corruption has occurred.
 .RE
 
 .sp
@@ -466,7 +463,6 @@ jdb@ACME.COM pak@ACME.COM
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/krb5/principal\fR\fR
@@ -509,7 +505,6 @@ The update log file for incremental propagation.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -525,7 +520,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkpasswd\fR(1), \fBkadmin\fR(1M), \fBkadmind\fR(1M),
 \fBkadmin.local\fR(1M), \fBkdb5_ldap_util\fR(1M), \fBkproplog\fR(1M),
diff --git a/usr/src/man/man1m/kstat.1m b/usr/src/man/man1m/kstat.1m
index ecf696c2b0..8983df7266 100644
--- a/usr/src/man/man1m/kstat.1m
+++ b/usr/src/man/man1m/kstat.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 KSTAT 1M "Jan 9, 2013"
+.TH KSTAT 1M "April 9, 2016"
 .SH NAME
 kstat \- display kernel statistics
 .SH SYNOPSIS
@@ -22,7 +22,6 @@ kstat \- display kernel statistics
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBkstat\fR utility examines the available kernel statistics, or kstats, on
 the system and reports those statistics which match the criteria specified on
@@ -50,7 +49,6 @@ When invoked without any module operands or options, kstat will match all
 defined statistics on the system. Example invocations are provided below. All
 times are displayed as fractional seconds since system boot.
 .SH OPTIONS
-.sp
 .LP
 The tests specified by the following options are logically ANDed, and all
 matching kstats will be selected. A regular expression containing shell
@@ -67,7 +65,7 @@ enclosed in '/' characters.
 \fB\fB-C\fR\fR
 .ad
 .RS 16n
-Displays output in parseable format with a colon as separator.
+Displays output in parsable format with a colon as separator.
 .RE
 
 .sp
@@ -131,7 +129,7 @@ Displays only kstats that match the specified name.
 \fB\fB-p\fR\fR
 .ad
 .RS 16n
-Displays output in parseable format. All example output in this document is
+Displays output in parsable format. All example output in this document is
 given in this format. If this option is not specified, \fBkstat\fR produces
 output in a human-readable, table format.
 .RE
@@ -167,7 +165,6 @@ format (\fBd\fR) or as an alphanumeric representation of the value returned by
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -206,7 +203,6 @@ The number of reports to be printed.
 .RE
 
 .SH EXAMPLES
-.sp
 .LP
 In the following examples, all the command lines in a block produce the same
 output, as shown immediately below. The exact statistics and values will of
@@ -327,7 +323,6 @@ unix:0:system_misc:avenrun_5min 18
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -367,7 +362,6 @@ A fatal error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/kstat\fR\fR
@@ -377,13 +371,11 @@ kernel statistics driver
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdate\fR(1), \fBsh\fR(1), \fBtime\fR(2), \fBgmatch\fR(3GEN),
 \fBkstat\fR(3KSTAT), \fBattributes\fR(5), \fBregex\fR(5), \fBkstat\fR(7D),
 \fBsd\fR(7D), \fBkstat\fR(9S)
 .SH NOTES
-.sp
 .LP
 If the pattern argument contains glob or RE metacharacters which are also
 shell metacharacters, it will be necessary to enclose the pattern with
diff --git a/usr/src/man/man1m/lofiadm.1m b/usr/src/man/man1m/lofiadm.1m
index 259a269f1c..5eede96b52 100644
--- a/usr/src/man/man1m/lofiadm.1m
+++ b/usr/src/man/man1m/lofiadm.1m
@@ -1,786 +1,620 @@
 '\" te
+.\" Copyright 2016 Toomas Soome <tsoome@me.com>
 .\" Copyright 2013 Nexenta Systems, Inc. All rights reserved.
 .\" Copyright (c) 2008, 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 LOFIADM 1M "Aug 28, 2013"
-.SH NAME
-lofiadm \- administer files available as block devices through lofi
-.SH SYNOPSIS
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-k\fR \fIraw_key_file\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-T\fR \fItoken_key\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-T\fR \fItoken_key\fR
-     \fB-k\fR \fIwrapped_key_file\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-e\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR \fB-C\fR \fIalgorithm\fR [\fB-s\fR \fIsegment_size\fR] \fIfile\fR
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR \fB-d\fR \fIfile\fR | \fIdevice\fR
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR \fB-U\fR \fIfile\fR
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [ \fIfile\fR | \fIdevice\fR]
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-\fBlofiadm\fR administers \fBlofi\fR, the loopback file driver. \fBlofi\fR
+.Dd Jun 14, 2016
+.Dt LOFIADM 1M
+.Os
+.Sh NAME
+.Nm lofiadm
+.Nd administer files available as block devices through lofi
+.Sh SYNOPSIS
+.Nm
+.Op Fl r
+.Op Fl l
+.Fl a Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c
+.Ar crypto_algorithm
+.Fl a
+.Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c Ar crypto_algorithm
+.Fl k Ar raw_key_file
+.Fl a  Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c Ar crypto_algorithm
+.Fl T Ar token_key
+.Fl a Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c Ar crypto_algorithm
+.Fl T Ar token_key
+.Fl k Ar wrapped_key_file
+.Fl a Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c Ar crypto_algorithm
+.Fl e
+.Fl a Ar file Op Ar device
+.Nm
+.Fl C Ar algorithm
+.Op Fl s Ar segment_size
+.Ar file
+.Nm
+.Fl d Ar file Ns | Ns Ar device
+.Nm
+.Fl U Ar file
+.Nm
+.Op Ar file Ns | Ns device
+.Sh DESCRIPTION
+.Nm
+administers
+.Sy lofi ,
+the loopback file driver.
+.Sy lofi
 allows a file to be associated with a block device. That file can then be
 accessed through the block device. This is useful when the file contains an
-image of some filesystem (such as a floppy or \fBCD-ROM\fR image), because the
-block device can then be used with the normal system utilities for mounting,
-checking or repairing filesystems. See \fBfsck\fR(1M) and \fBmount\fR(1M).
-.sp
-.LP
-Use \fBlofiadm\fR to add a file as a loopback device, remove such an
+image of some filesystem (such as a floppy or
+.Sy CD-ROM
+image), because the block device can then be used with the normal system
+utilities for mounting, checking or repairing filesystems. See
+.Xr fsck 1M
+and
+.Xr mount 1M .
+.Pp
+Use
+.Nm
+to add a file as a loopback device, remove such an
 association, or print information about the current associations.
-.sp
-.LP
+.Pp
 Encryption and compression options are mutually exclusive on the command line.
 Further, an encrypted file cannot be compressed later, nor can a compressed
 file be encrypted later.
-
-In the global zone, \fBlofiadm\fR can be used on both the global
+.Pp
+In the global zone,
+.Nm
+can be used on both the global
 zone devices and all devices owned by other non-global zones on the system.
-.sp
-.SH OPTIONS
-.sp
-.LP
+.Ss Labeled Devices
+If the command line flag,
+.Fl l ,
+is used while creating a loopack device,
+.Sy lofi
+will create a labeled loopback
+device, and will generate device links in
+.Pa /dev/{dsk,rdsk}
+directories for partitions or slices.
+.Pp
+Before using these devices, users should create or verify
+partitioning by using partition management tools such as
+.Xr format 1M and
+.Xr fdisk 1M .
+Once the device has been appropriately partitioned, the labeled
+device can be used as normal disk to create and mount file systems and to store
+data.  Mappings created by
+.Nm
+are not permanent and not persisted by the system. If power is lost or the system
+is rebooted, then the mappings will need to be created again.
+.Pp
+The partition table requires space from the mapped file.
+.Sy lofi
+does not support converting previously created unlabeled loopback device images
+to labeled loopback devices. If an unlabeled device is used as a labeled device,
+writing to it will corrupt it.
+.Sh OPTIONS
 The following options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-a\fR \fIfile\fR [\fIdevice\fR]\fR
-.ad
-.sp .6
-.RS 4n
-Add \fIfile\fR as a block device.
-.sp
-If \fIdevice\fR is not specified, an available device is picked.
-.sp
-If \fIdevice\fR is specified, \fBlofiadm\fR attempts to assign it to
-\fIfile\fR. \fIdevice\fR must be available or \fBlofiadm\fR will fail. The
-ability to specify a device is provided for use in scripts that wish to
-reestablish a particular set of associations.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-C\fR {\fIgzip\fR | \fIgzip-N\fR | \fIlzma\fR}\fR
-.ad
-.sp .6
-.RS 4n
+.Bl -tag -width Ds
+.It Fl a Ar file Op Ar device
+Add
+.Sy file
+as a block device.
+.Pp
+If
+.Sy device
+is not specified, an available device is picked.
+.Pp
+If
+.Sy device
+is specified,
+.Nm
+attempts to assign it to
+.Sy file .
+.Sy device
+must be available or
+.Nm
+will fail. The ability to specify a device is provided for use in scripts that
+wish to reestablish a particular set of associations.
+A device may not be specified when using a labeled lofi device.
+.It Fl C Ar {gzip | gzip-N | lzma}
 Compress the file with the specified compression algorithm.
-.sp
-The \fBgzip\fR compression algorithm uses the same compression as the
-open-source \fBgzip\fR command. You can specify the \fBgzip\fR level by using
-the value \fBgzip-\fR\fIN\fR where \fIN\fR is 6 (fast) or 9 (best compression
-ratio). Currently, \fBgzip\fR, without a number, is equivalent to \fBgzip-6\fR
-(which is also the default for the \fBgzip\fR command).
-.sp
-\fIlzma\fR stands for the LZMA (Lempel-Ziv-Markov) compression algorithm.
-.sp
+.Pp
+The
+.Sy gzip
+compression algorithm uses the same compression as the open-source
+.Sy gzip
+command. You can specify the
+.Sy gzip
+level by using the value gzip-\fR\fIN\fR where \fIN\fR is 6 (fast) or 9
+(best compression ratio). Currently,
+.Sy gzip ,
+without a number, is equivalent to
+.Sy gzip-6
+(which is also the default for the
+.Sy gzip
+command).
+.Pp
+.Sy lzma
+stands for the LZMA (Lempel-Ziv-Markov) compression algorithm.
+.Pp
 Note that you cannot write to a compressed file, nor can you mount a compressed
 file read/write.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-d\fR \fIfile\fR | \fIdevice\fR\fR
-.ad
-.sp .6
-.RS 4n
-Remove an association by \fIfile\fR or \fIdevice\fR name, if the associated
-block device is not busy, and deallocates the block device.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-r\fR
-.ad
-.sp .6
-.RS 4n
-If the \fB-r\fR option is specified before the \fB-a\fR option, the
-\fIdevice\fR will be opened read-only.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-s\fR \fIsegment_size\fR\fR
-.ad
-.sp .6
-.RS 4n
-The segment size to use to divide the file being compressed. \fIsegment_size\fR
+.It Fl d Ar file Ns | Ns Ar device
+Remove an association by
+.Sy file
+or
+.Sy device
+name, if the associated block device is not busy, and deallocates the block
+device.
+.It Fl l
+This option should be used with
+.Fl a
+option to create labeled loopback device. If created in local zone, the device
+has to be enabled in zone configuration.
+.It Fl r
+If the
+.Fl r
+option is specified before the
+.Fl a
+option, the
+.Sy device
+will be opened read-only.
+.It Fl s Ar segment_size
+The segment size to use to divide the file being compressed.
+.Sy segment_size
 can be an integer multiple of 512.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-U\fR \fIfile\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl U Ar file
 Uncompress a compressed file.
-.RE
-
-.sp
-.LP
+.El
+.Pp
 The following options are used when the file is encrypted:
-.sp
-.ne 2
-.na
-\fB\fB-c\fR \fIcrypto_algorithm\fR\fR
-.ad
-.sp .6
-.RS 4n
+.Bl -tag -width Ds
+.It Fl c Ar crypto_algorithm
 Select the encryption algorithm. The algorithm must be specified when
 encryption is enabled because the algorithm is not stored in the disk image.
-.sp
-If none of \fB-e\fR, \fB-k\fR, or \fB-T\fR is specified, \fBlofiadm\fR prompts
-for a passphrase, with a minimum length of eight characters, to be entered .
+.Pp
+If none of
+.Fl e ,
+.Fl k ,
+or
+.Fl T
+is specified,
+.Nm
+prompts for a passphrase, with a minimum length of eight characters, to be
+entered.
 The passphrase is used to derive a symmetric encryption key using PKCS#5 PBKD2.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-k\fR \fIraw_key_file\fR | \fIwrapped_key_file\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl k Ar raw_key_file | Ar wrapped_key_file
 Path to raw or wrapped symmetric encryption key. If a PKCS#11 object is also
-given with the \fB-T\fR option, then the key is wrapped by that object. If
-\fB-T\fR is not specified, the key is used raw.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-T\fR \fItoken_key\fR\fR
-.ad
-.sp .6
-.RS 4n
+given with the
+.Fl T
+option, then the key is wrapped by that object. If
+.Fl T
+is not specified, the key is used raw.
+.It Fl T Ar token_key
 The key in a PKCS#11 token to use for the encryption or for unwrapping the key
 file.
-.sp
-If \fB-k\fR is also specified, \fB-T\fR identifies the unwrapping key, which
-must be an RSA private key.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-e\fR\fR
-.ad
-.sp .6
-.RS 4n
+.Pp
+If
+.Fl k
+is also specified,
+.Fl T
+identifies the unwrapping key, which must be an RSA private key.
+.It Fl e
 Generate an ephemeral symmetric encryption key.
-.RE
-
-.SH OPERANDS
-.sp
-.LP
+.El
+.Sh OPERANDS
 The following operands are supported:
-.sp
-.ne 2
-.na
-\fB\fIcrypto_algorithm\fR\fR
-.ad
-.sp .6
-.RS 4n
-One of: \fBaes-128-cbc\fR, \fBaes-192-cbc\fR, \fBaes-256-cbc\fR,
-\fBdes3-cbc\fR, \fBblowfish-cbc\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIdevice\fR\fR
-.ad
-.sp .6
-.RS 4n
-Display the file name associated with the block device \fIdevice\fR.
-.sp
+.Bl -tag -width Ds
+.It Ar crypto_algorithm
+One of:
+.Sy aes-128-cbc ,
+.Sy aes-192-cbc ,
+.Sy aes-256-cbc ,
+.Sy des3-cbc ,
+.Sy blowfish-cbc .
+.It Ar device
+Display the file name associated with the block device
+.Sy device .
+.Pp
 Without arguments, print a list of the current associations. Filenames must be
 valid absolute pathnames.
-.sp
+.Pp
 When a file is added, it is opened for reading or writing by root. Any
-restrictions apply (such as restricted root access over \fBNFS\fR). The file is
-held open until the association is removed. It is not actually accessed until
-the block device is used, so it will never be written to if the block device is
-only opened read-only.
-
+restrictions apply (such as restricted root access over
+.Sy NFS Ns ).
+The file is held open until the association is removed. It is not actually
+accessed until the block device is used, so it will never be written to if the
+block device is only opened read-only.
+.Pp
 Note that the filename may appear as "?" if it is not possible to resolve the
 path in the current context (for example, if it's an NFS path in a non-global
 zone).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIfile\fR\fR
-.ad
-.sp .6
-.RS 4n
-Display the block device associated with \fIfile\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIraw_key_file\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Ar file
+Display the block device associated with
+.Sy file .
+.It Ar raw_key_file
 Path to a file of the appropriate length, in bits, to use as a raw symmetric
 encryption key.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fItoken_key\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Ar token_key
 PKCS#11 token object in the format:
-.sp
-.in +2
-.nf
-\fItoken_name\fR:\fImanufacturer_id\fR:\fIserial_number\fR:\fIkey_label\fR
-.fi
-.in -2
-.sp
-
+.Pp
+.Ar token_name Ns : Ns Ar manufacturer_id Ns : Ns Ar serial_number Ns : Ns Ar key_label
+.Pp
 All but the key label are optional and can be empty. For example, to specify a
-token object with only its key label \fBMylofiKey\fR, use:
-.sp
-.in +2
-.nf
--T :::MylofiKey
-.fi
-.in -2
-.sp
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIwrapped_key_file\fR\fR
-.ad
-.sp .6
-.RS 4n
+token object with only its key label
+.Sy MylofiKey ,
+use:
+.Pp
+.Fl T Ar ::: Ns Ar MylofiKey
+.It Ar wrapped_key_file
 Path to file containing a symmetric encryption key wrapped by the RSA private
-key specified by \fB-T\fR.
-.RE
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRMounting an Existing CD-ROM Image
-.sp
-.LP
+key specified by
+.Fl T .
+.El
+.Sh ENVIRONMENT
+See
+.Xr environ 5
+for descriptions of the following environment variables
+that affect the execution of
+.Nm
+:
+.Sy LC_CTYPE ,
+.Sy LC_MESSAGES
+and
+.Sy NLSPATH .
+.Sh EXIT STATUS
+The following exit values are returned:
+.Bl -tag -width Ds
+.It Sy 0
+Successful completion.
+.It Sy >0
+An error occurred.
+.El
+.Sh EXAMPLES
+.Bl -tag -width Ds
+.It Sy Example 1 No Mounting an Existing CD-ROM Image
 You should ensure that Solaris understands the image before creating the
-\fBCD\fR. \fBlofi\fR allows you to mount the image and see if it works.
-
-.sp
-.LP
-This example mounts an existing \fBCD-ROM\fR image (\fBsparc.iso\fR), of the
-\fBRed Hat 6.0 CD\fR which was downloaded from the Internet. It was created
-with the \fBmkisofs\fR utility from the Internet.
-
-.sp
-.LP
-Use \fBlofiadm\fR to attach a block device to it:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /home/mike_s/RH6.0/sparc.iso\fR
+.Sy CD .
+.Sy lofi
+allows you to mount the image and see if it works.
+.Pp
+This example mounts an existing
+.Sy CD-ROM
+image
+.Pf ( Sy sparc.iso Ns ),
+of the
+.Sy Red Hat 6.0 CD
+which was downloaded from the Internet. It was created
+with the
+.Sy mkisofs
+utility from the Internet.
+.Pp
+Use
+.Nm
+to attach a block device to it:
+.Bd -literal
+# lofiadm -a /home/mike_s/RH6.0/sparc.iso
 /dev/lofi/1
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-\fBlofiadm\fR picks the device and prints the device name to the standard
-output. You can run \fBlofiadm\fR again by issuing the following command:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm\fR
+.Ed
+.Pp
+.Nm
+picks the device and prints the device name to the standard
+output. You can run
+.Nm
+again by issuing the following command:
+.Bd -literal
+# lofiadm
 Block Device     File                           Options
 /dev/lofi/1      /home/mike_s/RH6.0/sparc.iso   -
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Or, you can give it one name and ask for the other, by issuing the following
 command:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm /dev/lofi/1\fR
+.Bd -literal
+# lofiadm /dev/lofi/1
 /home/mike_s/RH6.0/sparc.iso
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-Use the \fBmount\fR command to mount the image:
-
-.sp
-.in +2
-.nf
-# \fBmount -F hsfs -o ro /dev/lofi/1 /mnt\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
+Use the
+.Xr mount 1M
+command to mount the image:
+.Bd -literal
+# mount -F hsfs -o ro /dev/lofi/1 /mnt
+.Ed
+.Pp
 Check to ensure that Solaris understands the image:
-
-.sp
-.in +2
-.nf
-# \fBdf -k /mnt\fR
+.Bd -literal
+# df -k /mnt
 Filesystem            kbytes    used   avail capacity  Mounted on
 /dev/lofi/1           512418  512418       0   100%    /mnt
-# \fBls /mnt\fR
+# ls /mnt
 \&./            RedHat/       doc/          ls-lR         rr_moved/
 \&../           TRANS.TBL     dosutils/     ls-lR.gz      sbin@
 \&.buildlog     bin@          etc@          misc/         tmp/
 COPYING       boot/         images/       mnt/          usr@
 README        boot.cat*     kernels/      modules/
 RPM-PGP-KEY   dev@          lib@          proc/
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Solaris can mount the CD-ROM image, and understand the filenames. The image was
-created properly, and you can now create the \fBCD-ROM\fR with confidence.
-
-.sp
-.LP
+created properly, and you can now create the
+.Sy CD-ROM
+with confidence.
+.Pp
 As a final step, unmount and detach the images:
-
-.sp
-.in +2
-.nf
-# \fBumount /mnt\fR
-# \fBlofiadm -d /dev/lofi/1\fR
-# \fBlofiadm\fR
+.Bd -literal
+# umount /mnt
+# lofiadm -d /dev/lofi/1
+# lofiadm
 Block Device             File             Options
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 2 \fRMounting a Floppy Image
-.sp
-.LP
+.Ed
+.It Sy Example 2 No Mounting a Floppy Image
 This is similar to the first example.
-
-.sp
-.LP
-Using \fBlofi\fR to help you mount files that contain floppy images is helpful
+.Pp
+Using
+.Sy lofi
+to help you mount files that contain floppy images is helpful
 if a floppy disk contains a file that you need, but the machine which you are
 on does not have a floppy drive. It is also helpful if you do not want to take
-the time to use the \fBdd\fR command to copy the image to a floppy.
-
-.sp
-.LP
-This is an example of getting to \fBMDB\fR floppy for Solaris on an x86
-platform:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /export/s28/MDB_s28x_wos/latest/boot.3\fR
+the time to use the
+.Sy dd
+command to copy the image to a floppy.
+.Pp
+This is an example of getting to
+.Sy MDB
+floppy for Solaris on an x86 platform:
+.Bd -literal
+# lofiadm -a /export/s28/MDB_s28x_wos/latest/boot.3
 /dev/lofi/1
-# \fBmount -F pcfs /dev/lofi/1 /mnt\fR
-# \fBls /mnt\fR
+# mount -F pcfs /dev/lofi/1 /mnt
+# ls /mnt
 \&./            COMMENT.BAT*  RC.D/         SOLARIS.MAP*
 \&../           IDENT*        REPLACE.BAT*  X/
 APPEND.BAT*   MAKEDIR.BAT*  SOLARIS/
-# \fBumount /mnt\fR
-# \fBlofiadm -d /export/s28/MDB_s28x_wos/latest/boot.3\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 3 \fRMaking a \fBUFS\fR Filesystem on a File
-.sp
-.LP
-Making a \fBUFS\fR filesystem on a file can be useful, particularly if a test
+# umount /mnt
+# lofiadm -d /export/s28/MDB_s28x_wos/latest/boot.3
+.Ed
+.It Sy Example 3 No Making a Sy UFS No Filesystem on a File
+Making a
+.Sy UFS
+filesystem on a file can be useful, particularly if a test
 suite requires a scratch filesystem. It can be painful (or annoying) to have to
 repartition a disk just for the test suite, but you do not have to. You can
-\fBnewfs\fR a file with \fBlofi\fR
-
-.sp
-.LP
+.Sy newfs
+a file with
+.Sy lofi .
+.Pp
 Create the file:
-
-.sp
-.in +2
-.nf
-# \fBmkfile 35m /export/home/test\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-Attach it to a block device. You also get the character device that \fBnewfs\fR
-requires, so \fBnewfs\fR that:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /export/home/test\fR
+.Bd -literal
+# mkfile 35m /export/home/test
+.Ed
+.Pp
+Attach it to a block device. You also get the character device that
+.Sy newfs
+requires, so
+.Sy newfs
+that:
+.Bd -literal
+# lofiadm -a /export/home/test
 /dev/lofi/1
-# \fBnewfs /dev/rlofi/1\fR
-newfs: construct a new file system /dev/rlofi/1: (y/n)? \fBy\fR
+# newfs /dev/rlofi/1
+newfs: construct a new file system /dev/rlofi/1: (y/n)? y
 /dev/rlofi/1:   71638 sectors in 119 cylinders of 1 tracks, 602 sectors
         35.0MB in 8 cyl groups (16 c/g, 4.70MB/g, 2240 i/g)
 super-block backups (for fsck -F ufs -o b=#) at:
  32, 9664, 19296, 28928, 38560, 48192, 57824, 67456,
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-Note that \fBufs\fR might not be able to use the entire file. Mount and use the
-filesystem:
-
-.sp
-.in +2
-.nf
-# \fBmount /dev/lofi/1 /mnt\fR
-# \fBdf -k /mnt\fR
+.Ed
+.Pp
+Note that
+.Sy ufs
+might not be able to use the entire file. Mount and use the filesystem:
+.Bd -literal
+# mount /dev/lofi/1 /mnt
+# df -k /mnt
 Filesystem            kbytes    used   avail capacity  Mounted on
 /dev/lofi/1            33455       9   30101     1%    /mnt
-# \fBls /mnt\fR
+# ls /mnt
 \&./           ../          lost+found/
-# \fBumount /mnt\fR
-# \fBlofiadm -d /dev/lofi/1\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 4 \fRCreating a PC (FAT) File System on a Unix File
-.sp
-.LP
-The following series of commands creates a \fBFAT\fR file system on a Unix
-file. The file is associated with a block device created by \fBlofiadm\fR.
-
-.sp
-.in +2
-.nf
-# \fBmkfile 10M /export/test/testfs\fR
-# \fBlofiadm -a /export/test testfs\fR
+# umount /mnt
+# lofiadm -d /dev/lofi/1
+.Ed
+.It Sy Example 4 No Creating a PC (FAT) File System on a Unix File
+The following series of commands creates a
+.Sy FAT
+file system on a Unix file. The file is associated with a block device created by
+.Nm
+.
+.Bd -literal
+# mkfile 10M /export/test/testfs
+# lofiadm -a /export/test testfs
 /dev/lofi/1
-\fBNote use of\fR rlofi\fB, not\fR lofi\fB, in following command.\fR
-# \fBmkfs -F pcfs -o nofdisk,size=20480 /dev/rlofi/1\fR
-\fBConstruct a new FAT file system on /dev/rlofi/1: (y/n)?\fR y
-# \fBmount -F pcfs /dev/lofi/1 /mnt\fR
-# \fBcd /mnt\fR
-# \fBdf -k .\fR
+.Ed
+.Pp
+Note use of
+.Sy rlofi ,
+not
+.Sy lofi ,
+in following command.
+.Bd -literal
+# mkfs -F pcfs -o nofdisk,size=20480 /dev/rlofi/1
+Construct a new FAT file system on /dev/rlofi/1: (y/n)? y
+# mount -F pcfs /dev/lofi/1 /mnt
+# cd /mnt
+# df -k .
 Filesystem            kbytes    used   avail capacity  Mounted on
 /dev/lofi/1            10142       0   10142     0%    /mnt
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 5 \fRCompressing an Existing CD-ROM Image
-.sp
-.LP
+.Ed
+.It Sy Example 5 No Compressing an Existing CD-ROM Image
 The following example illustrates compressing an existing CD-ROM image
-(\fBsolaris.iso\fR), verifying that the image is compressed, and then
-uncompressing it.
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -C gzip /export/home/solaris.iso\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-Use \fBlofiadm\fR to attach a block device to it:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /export/home/solaris.iso\fR
+.Pf ( Sy solaris.iso Ns ),
+verifying that the image is compressed, and then uncompressing it.
+.Bd -literal
+# lofiadm -C gzip /export/home/solaris.iso
+.Ed
+.Pp
+Use
+.Nm
+to attach a block device to it:
+.Bd -literal
+# lofiadm -a /export/home/solaris.iso
   /dev/lofi/1
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Check if the mapped image is compressed:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm\fR
+.Bd -literal
+# lofiadm
 Block Device      File                            Options
 /dev/lofi/1       /export/home/solaris.iso        Compressed(gzip)
 /dev/lofi/2       /export/home/regular.iso        -
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Unmap the compressed image and uncompress it:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -d /dev/lofi/1\fR
-# \fBlofiadm -U /export/home/solaris.iso\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 6 \fRCreating an Encrypted UFS File System on a File
-.sp
-.LP
+.Bd -literal
+# lofiadm -d /dev/lofi/1
+# lofiadm -U /export/home/solaris.iso
+.Ed
+.It Sy Example 6 No Creating an Encrypted UFS File System on a File
 This example is similar to the example of making a UFS filesystem on a file,
 above.
-
-.sp
-.LP
+.Pp
 Create the file:
-
-.sp
-.in +2
-.nf
-# \fBmkfile 35m /export/home/test\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Bd -literal
+# mkfile 35m /export/home/test
+.Ed
+.Pp
 Attach the file to a block device and specify that the file image is encrypted.
 As a result of this command, you obtain the character device, which is
-subsequently used by \fBnewfs\fR:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -c aes-256-cbc -a /export/home/secrets\fR
-Enter passphrase: \fBMy-M0th3r;l0v3s_m3+4lw4ys!\fR           (\fBnot echoed\fR)
-Re-enter passphrase: \fBMy-M0th3r;l0v3s_m3+4lw4ys!\fR        (\fBnot echoed\fR)
+subsequently used by
+.Sy newfs :
+.Bd -literal
+# lofiadm -c aes-256-cbc -a /export/home/secrets
+Enter passphrase: My-M0th3r;l0v3s_m3+4lw4ys!           (not echoed)
+Re-enter passphrase: My-M0th3r;l0v3s_m3+4lw4ys!        (not echoed)
 /dev/lofi/1
 
-# \fBnewfs /dev/rlofi/1\fR
-newfs: construct a new file system /dev/rlofi/1: (y/n)? \fBy\fR
+# newfs /dev/rlofi/1
+newfs: construct a new file system /dev/rlofi/1: (y/n)? y
 /dev/rlofi/1:   71638 sectors in 119 cylinders of 1 tracks, 602 sectors
        35.0MB in 8 cyl groups (16 c/g, 4.70MB/g, 2240 i/g)
 super-block backups (for fsck -F ufs -o b=#) at:
 32, 9664, 19296, 28928, 38560, 48192, 57824, 67456,
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 The mapped file system shows that encryption is enabled:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm\fR
+.Bd -literal
+# lofiadm
 Block Device    File                     Options
 /dev/lofi/1     /export/home/secrets     Encrypted
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Mount and use the filesystem:
-
-.sp
-.in +2
-.nf
-# \fBmount /dev/lofi/1 /mnt\fR
-# \fBcp moms_secret_*_recipe /mnt\fR
-# \fBls /mnt\fR
-\&./           moms_secret_cookie_recipe    moms_secret_soup_recipe
-\&../          moms_secret_fudge_recipe     moms_secret_stuffing_recipe
+.Bd -literal
+# mount /dev/lofi/1 /mnt
+# cp moms_secret_*_recipe /mnt
+# ls /mnt
+\&./         moms_secret_cookie_recipe    moms_secret_soup_recipe
+\&../        moms_secret_fudge_recipe     moms_secret_stuffing_recipe
 lost+found/  moms_secret_meatloaf_recipe  moms_secret_waffle_recipe
-# \fBumount /mnt\fR
-# \fBlofiadm -d /dev/lofi/1\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+# umount /mnt
+# lofiadm -d /dev/lofi/1
+.Ed
+.Pp
 Subsequent attempts to map the filesystem with the wrong key or the wrong
 encryption algorithm will fail:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -c blowfish-cbc -a /export/home/secrets\fR
-Enter passphrase: \fBmommy\fR                                (\fInot echoed\fR)
-Re-enter passphrase: \fBmommy\fR                             (\fInot echoed\fR)
+.Bd -literal
+# lofiadm -c blowfish-cbc -a /export/home/secrets\fR
+Enter passphrase: mommy                                (not echoed)
+Re-enter passphrase: mommy                             (not echoed)
 lofiadm: could not map file /root/lofi: Invalid argument
-# \fBlofiadm\fR
+# lofiadm
 Block Device    File                    Options
 #
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Attempts to map the filesystem without encryption will succeed, however
 attempts to mount and use the filesystem will fail:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /export/home/secrets\fR
+.Bd -literal
+# lofiadm -a /export/home/secrets
 /dev/lofi/1
-# \fBlofiadm\fR
+# lofiadm
 Block Device    File                     Options
 /dev/lofi/1     /export/home/secrets     -
-# \fBmount /dev/lofi/1 /mnt\fR
+# mount /dev/lofi/1 /mnt
 mount: /dev/lofi/1 is not this fstype
 #
-.fi
-.in -2
-.sp
-
-.SH ENVIRONMENT VARIABLES
-.sp
-.LP
-See \fBenviron\fR(5) for descriptions of the following environment variables
-that affect the execution of \fBlofiadm\fR: \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR
-and \fBNLSPATH\fR.
-.SH EXIT STATUS
-.sp
-.LP
-The following exit values are returned:
-.sp
-.ne 2
-.na
-\fB\fB0\fR\fR
-.ad
-.sp .6
-.RS 4n
-Successful completion.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB>0\fR\fR
-.ad
-.sp .6
-.RS 4n
-An error occurred.
-.RE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBfsck\fR(1M), \fBmount\fR(1M), \fBmount_ufs\fR(1M), \fBnewfs\fR(1M),
-\fBattributes\fR(5), \fBlofi\fR(7D), \fBlofs\fR(7FS)
-.SH NOTES
-.sp
-.LP
+.Ed
+.El
+.Sh SEE ALSO
+.Xr fdisk 1M ,
+.Xr format 1M ,
+.Xr fsck 1M ,
+.Xr mount 1M ,
+.Xr mount_ufs 1M ,
+.Xr newfs 1M ,
+.Xr attributes 5 ,
+.Xr lofi 7D ,
+.Xr lofs 7FS
+.Sh NOTES
 Just as you would not directly access a disk device that has mounted file
 systems, you should not access a file associated with a block device except
-through the \fBlofi\fR file driver. It might also be appropriate to ensure that
+through the
+.Sy lofi
+file driver. It might also be appropriate to ensure that
 the file has appropriate permissions to prevent such access.
-.sp
-.LP
-The abilities of \fBlofiadm\fR, and who can use them, are controlled by the
-permissions of \fB/dev/lofictl\fR. Read-access allows query operations, such as
+.Pp
+The abilities of
+.Nm
+, and who can use them, are controlled by the
+permissions of
+.Pa /dev/lofictl .
+Read-access allows query operations, such as
 listing all the associations. Write-access is required to do any state-changing
-operations, like adding an association. As shipped, \fB/dev/lofictl\fR is owned
-by \fBroot\fR, in group \fBsys\fR, and mode \fB0644\fR, so all users can do
-query operations but only root can change anything. The administrator can give
-users write-access, allowing them to add or delete associations, but that is
-very likely a security hole and should probably only be given to a trusted
-group.
-.sp
-.LP
+operations, like adding an association. As shipped,
+.Pa /dev/lofictl
+is owned by
+.Sy root ,
+in group
+.Sy sys ,
+and mode
+.Sy 0644 ,
+so all users can do query operations but only root can change anything.
+The administrator can give users write-access, allowing them to add or
+delete associations, but that is very likely a security hole and should
+probably only be given to a trusted group.
+.Pp
 When mounting a filesystem image, take care to use appropriate mount options.
-In particular, the \fBnosuid\fR mount option might be appropriate for \fBUFS\fR
+In particular, the
+.Sy nosuid
+mount option might be appropriate for
+.Sy UFS
 images whose origin is unknown. Also, some options might not be useful or
-appropriate, like \fBlogging\fR or \fBforcedirectio\fR for \fBUFS\fR. For
-compatibility purposes, a raw device is also exported along with the block
-device. For example, \fBnewfs\fR(1M) requires one.
-.sp
-.LP
-The output of \fBlofiadm\fR (without arguments) might change in future
-releases.
+appropriate, like
+.Sy logging
+or
+.Sy forcedirectio
+for
+.Sy UFS .
+For compatibility purposes, a raw device is also exported along with the block
+device. For example,
+.Xr newfs 1M
+requires one.
+.Pp
+The output of
+.Nm
+(without arguments) might change in future releases.
diff --git a/usr/src/man/man1m/lpadmin.1m b/usr/src/man/man1m/lpadmin.1m
index 1601d9ef0a..7a601e756b 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 "May 24, 2006"
+.TH LPADMIN 1M "April 9, 2016"
 .SH NAME
 lpadmin \- configure the LP print service
 .SH SYNOPSIS
@@ -29,14 +29,12 @@ lpadmin \- configure the LP print service
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBlpadmin\fR configures the LP print service by defining printers and devices.
 It is used to add and change printers, to remove printers from service, to set
 or change the system default destination, to define alerts for printer faults,
 and to mount print wheels.
 .SH OPTIONS
-.sp
 .LP
 The \fBlpadmin\fR command has options for:
 .RS +4
@@ -83,7 +81,6 @@ one,two,three
 .in -2
 
 .SS "Adding or Changing a Printer"
-.sp
 .LP
 The first form of the \fBlpadmin\fR command (\fBlpadmin\fR \fB-p\fR
 \fIprinter\fR {\fIoptions\fR}) configures a new printer or changes the
@@ -896,7 +893,6 @@ See the \fB/usr/sfw/man/man1m/smbspool.1m\fR man page for details.
 .RE
 
 .SS "Removing a Printer Destination"
-.sp
 .LP
 The \fB-x\fR \fIdest\fR option removes the destination \fIdest\fR (a printer or
 a class), from the \fBLP\fR print service. If \fIdest\fR is a printer and is
@@ -907,14 +903,12 @@ local printers and the scheduler is still running, the scheduler is shut down.
 .LP
 No other \fIoptions\fR are allowed with \fB-x\fR.
 .SS "Setting/Changing the System Default Destination"
-.sp
 .LP
 The \fB-d\fR [\fIdest\fR] option makes \fIdest\fR (an existing printer or
 class) the new system default destination. If \fIdest\fR is not supplied, then
 there is no system default destination. No other \fIoptions\fR are allowed with
 \fB-d\fR.
 .SS "Setting an Alert for a Print Wheel"
-.sp
 .ne 2
 .na
 \fB\fB-S\fR \fIprint-wheel\fR [\fB-A\fR \fIalert-type\fR] [\fB-W\fR
@@ -1035,7 +1029,6 @@ anyone submits a print request for the print wheel when it is not mounted.
 .RE
 
 .SH PREDEFINED OPTIONS USED WITH THE \fB-o\fR OPTION
-.sp
 .LP
 A number of options, described below, are predefined for use with \fB-o\fR.
 These options are used for adjusting printer capabilities, adjusting printer
@@ -1043,7 +1036,6 @@ port characteristics, configuring network printers, and controlling the use of
 banner. The \fB-o\fR also supports an arbitrary \fB\fIkeyword\fR=\fIvalue\fR\fR
 format, which is referred to below as an undefined option.
 .SS "Adjusting Printer Capabilities"
-.sp
 .LP
 The \fBlength\fR, \fBwidth\fR, \fBcpi\fR, and \fBlpi\fR parameters can be used
 in conjunction with the \fB-o\fR option to adjust printer capabilities. The
@@ -1090,7 +1082,6 @@ lpadmin -p \fIprintername\fR -o lpi=\fR
 .sp
 
 .SS "Adjusting Printer Port Characteristics"
-.sp
 .LP
 You use the \fBstty\fR keyword in conjunction with the o option to adjust
 printer port characteristics. The general form of the \fBstty\fR portion of the
@@ -1135,7 +1126,6 @@ The default can be reset by:
 .sp
 
 .SS "Configuring Network Printers"
-.sp
 .LP
 The \fBdest\fR, \fBprotocol\fR, \fBbsdctrl\fR, and \fBtimeout\fR parameters are
 used in conjunction with the \fB-o\fR option to configure network printers. The
@@ -1179,7 +1169,6 @@ lpadmin -p \fIprintername\fR -o timeout=
 .sp
 
 .SS "Controlling the Use of the Banner Page"
-.sp
 .LP
 Use the following commands to control the use of the banner page:
 .sp
@@ -1211,7 +1200,6 @@ The fourth command (\fB-o\fR \fBbanner=never\fR) causes a banner page never to
 be printed, even if a user specifies \fBlp\fR \fB-o\fR \fBbanner\fR. The root
 user can override this command.
 .SS "Undefined Options"
-.sp
 .LP
 The \fB-o\fR option supports the use of arbitrary, user-defined options with
 the following format:
@@ -1249,7 +1237,6 @@ Sets boolean values \fBfoo=true | foo=false\fR.
 .RE
 
 .SH EXAMPLES
-.sp
 .LP
 In the following examples, \fIprtr\fR can be any name up to 14 characters and
 can be the same name as the \fBping\fR(1M) name.
@@ -1291,7 +1278,6 @@ example# \fBaccept \fIprtr\fR\fR
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -1313,7 +1299,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/spool/lp/*\fR\fR
@@ -1350,7 +1335,6 @@ System printer configuration database
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1366,7 +1350,6 @@ Interface Stability	Obsolete
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBenable\fR(1), \fBlp\fR(1), \fBlpstat\fR(1), \fBmail\fR(1), \fBstty\fR(1),
 \fBaccept\fR(1M), \fBlpforms\fR(1M), \fBlpsched\fR(1M), \fBlpsystem\fR(1M),
@@ -1375,7 +1358,6 @@ Interface Stability	Obsolete
 .LP
 \fI\fR
 .SH NOTES
-.sp
 .LP
 When using lpadmin to provide access to a remote printer, remote configuration
 data is stored in \fB/etc/printers.conf\fR. This data includes a \fBbsdaddr\fR
@@ -1385,5 +1367,5 @@ systems. If the data is shared, it is important to make sure that the
 \fBbsdaddr\fR and \fBprinter-uri-supported\fR contain hostname information that
 is correctly resolved on all hosts sharing this data. Also, the
 \fBprinter-uri-supported\fR is the preferred means of accessing remote print
-service. The \fBbsdaddr\fR is supplied for backward compatability with Solaris
+service. The \fBbsdaddr\fR is supplied for backward compatibility with Solaris
 2.6-10 systems.
diff --git a/usr/src/man/man1m/metaset.1m b/usr/src/man/man1m/metaset.1m
index c9d1b81d16..98e9613bca 100644
--- a/usr/src/man/man1m/metaset.1m
+++ b/usr/src/man/man1m/metaset.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 METASET 1M "Mar 4, 2009"
+.TH METASET 1M "April 9, 2016"
 .SH NAME
 metaset \- configure disk sets
 .SH SYNOPSIS
@@ -94,7 +94,6 @@ metaset \- configure disk sets
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBmetaset\fR command administers sets of disks in named disk sets. Named
 disk sets include any disk set that is not in the local set. While disk sets
@@ -200,14 +199,12 @@ convention:
 where \fIsetname\fR is the name of the disk set, and \fIhot_spare_pool\fR is
 the name of the hot spare pool associated with the disk set.
 .SS "Multi-node Environment"
-.sp
 .LP
 To create and work with a disk set in a multi\(emnode environment, \fBroot\fR
 must be a member of Group 14 on all hosts, or the \fB/.rhosts\fR file must
 contain an entry for all other host names. This is not required in a SunCluster
-3.x enviroment.
+3.x environment.
 .SS "Tagged data"
-.sp
 .LP
 Tagged data occurs when there are different versions of a disk set's replicas.
 This tagged data consists of the set owner's nodename, the hardware serial
@@ -236,7 +233,6 @@ take. An error message is displayed, and user intervention is required.
 Use the \fB-q\fR to query the disk set and the \fB-t\fR, \fB-u\fR, and
 \fB-y\fR, options to select the tag and take the disk set. See \fBOPTIONS\fR.
 .SS "Mediator Configuration"
-.sp
 .LP
 SVM provides support for a low-end HA solution consisting of two hosts that
 share only two strings of drives. The hosts in this type of configuration,
@@ -254,7 +250,6 @@ data accessible. See \fBmediator\fR(7D) for further details.
 .LP
 Use the \fB-m\fR option to add or delete a mediator host. See \fBOPTIONS\fR.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -827,7 +822,6 @@ additional hosts added later. The last host cannot be deleted until all of the
 drives within the set have been deleted.
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/lvm/md.tab\fR\fR
@@ -838,7 +832,6 @@ Contains list of metadevice configurations.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -862,7 +855,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -878,7 +870,6 @@ Interface Stability	Stable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBmdmonitord\fR(1M), \fBmetaclear\fR(1M), \fBmetadb\fR(1M),
 \fBmetadetach\fR(1M), \fBmetahs\fR(1M), \fBmetainit\fR(1M),
@@ -891,7 +882,6 @@ Interface Stability	Stable
 .LP
 \fI\fR
 .SH NOTES
-.sp
 .LP
 Disk set administration, including the addition and deletion of hosts and
 drives, requires all hosts in the set to be accessible from the network.
diff --git a/usr/src/man/man1m/mount_nfs.1m b/usr/src/man/man1m/mount_nfs.1m
index 63ce0d4805..1eeb435310 100644
--- a/usr/src/man/man1m/mount_nfs.1m
+++ b/usr/src/man/man1m/mount_nfs.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 MOUNT_NFS 1M "Mar 13, 2016"
+.TH MOUNT_NFS 1M "April 9, 2016"
 .SH NAME
 mount_nfs \- mount remote NFS resources
 .SH SYNOPSIS
@@ -286,7 +286,7 @@ the client. When a file is opened the client sends a request to the server to
 validate the client's local caches. This behavior ensures a file's consistency
 across multiple NFS clients. When \fB-nocto\fR is in effect, the client does
 not perform the flush on close and the request for validation, allowing the
-possiblity of differences among copies of the same file as stored on multiple
+possibility of differences among copies of the same file as stored on multiple
 clients.
 .sp
 This option can be used where it can be guaranteed that accesses to a specified
diff --git a/usr/src/man/man1m/ndmpadm.1m b/usr/src/man/man1m/ndmpadm.1m
index 287c8f8c44..04c3947f4d 100644
--- a/usr/src/man/man1m/ndmpadm.1m
+++ b/usr/src/man/man1m/ndmpadm.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 NDMPADM 1M "Dec 11, 2015"
+.TH NDMPADM 1M "April 9, 2016"
 .SH NAME
 ndmpadm \- administer Network Data Management Protocol activities
 .SH SYNOPSIS
@@ -107,7 +107,7 @@ The following option is supported:
 Display a list of all subcommands and options.
 .RE
 
-.SH SUB-COMMANDS
+.SH SUBCOMMANDS
 .LP
 The \fBndmpadm\fR command supports the subcommands described below.
 .SS "\fBdisable\fR Subcommand"
diff --git a/usr/src/man/man1m/pkgadd.1m b/usr/src/man/man1m/pkgadd.1m
index 2bae037332..29a7d3ae08 100644
--- a/usr/src/man/man1m/pkgadd.1m
+++ b/usr/src/man/man1m/pkgadd.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 PKGADD 1M "Oct 30, 2007"
+.TH PKGADD 1M "April 9, 2016"
 .SH NAME
 pkgadd \- transfer software packages to the system
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ pkgadd \- transfer software packages to the system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBpkgadd\fR transfers the contents of a software package from the distribution
 medium or directory to install it onto the system. Used without the \fB-d\fR
@@ -35,7 +34,7 @@ option, it writes the package to a spool directory instead of installing it.
 .LP
 The \fBpkgadd\fR utility requires an amount of temporary space the size of the
 package that is being installed. \fBpkgadd\fR determines which temporary
-directory to use by checking for the existance of the \fB$TMPDIR\fR environment
+directory to use by checking for the existence of the \fB$TMPDIR\fR environment
 variable. If \fB$TMPDIR\fR is not defined, \fBpkgadd\fR uses \fBP_tmpdir\fR
 from \fBstdio.h\fR. \fBP_tmpdir\fR has a default of \fB/var/tmp/\fR.
 .sp
@@ -83,7 +82,6 @@ datastream of  up to 4 GB.
 The \fB-d\fR, \fB-Y\fR, and \fIpkginst\fR arguments shown in the SYNOPSIS are
 described under OPERANDS, following OPTIONS.
 .SH OPTIONS
-.sp
 .LP
 The supported options are described as follows. The \fB-d\fR \fIdevice\fR
 source specifier is described under OPERANDS, below.
@@ -257,11 +255,9 @@ for more information on alternate methods of specifying a default proxy.
 When executed without options or operands, \fBpkgadd\fR uses
 \fB/var/spool/pkg\fR (the default spool directory).
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .SS "Sources"
-.sp
 .LP
 By default, pkgadd looks in the \fB/var/spool/pkg\fR directory when searching
 for instances of a package to install or spool. Optionally, the source for the
@@ -312,7 +308,6 @@ comma-separated list of package names or the keyword \fBall\fR.
 .RE
 
 .SS "Instances"
-.sp
 .LP
 By default, \fBpkgadd\fR searches the specified source, and presents an
 interactive menu allowing the user to select which package instances found on
@@ -348,7 +343,6 @@ installation or spooling.
 .RE
 
 .SH KEYSTORE LOCATIONS
-.sp
 .LP
 Package and tools such as \fBpkgadd\fR use a set of trusted certificates to
 perform signature validation on any signatures found within the packages. If
@@ -401,7 +395,6 @@ the following locations are successively searched to find the trust store:
 This searching order enables administrators to have a single location for most
 applications, and special certificate locations for certain applications.
 .SH KEYSTORE AND CERTIFICATE FORMATS
-.sp
 .LP
 The packaging utilities, such as \fBpkgtrans\fR, require access to a set of
 keys and certificates in order to sign, and optionally verify, packages.
@@ -424,7 +417,6 @@ and keys into a PKCS#12 keystore. For example, a trusted certificate can be
 exported from Mozilla, and then imported into a PKCS#12 keystore for use with
 \fBpkgadd\fR with the OpenSSL Toolkit.
 .SH PASS PHRASE ARGUMENTS
-.sp
 .LP
 \fBpkgtrans\fR and \fBpkgadd\fR accept password arguments, typically using
 \fB-p\fR to specify the password. These allow the password to be obtained from
@@ -517,7 +509,6 @@ The keyword \fBall\fR specifies that all of the packages found in the
 designated datastream will be installed.
 
 .SH EXIT STATUS
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -598,7 +589,6 @@ Reboot after installation of this package.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .ne 2
 .na
 \fB\fBHTTPPROXY\fR\fR
@@ -632,7 +622,6 @@ setting.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/sadm/install/logs/\fR\fR
@@ -643,7 +632,6 @@ Location where \fBpkgadd\fR logs an instance of software installation.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -659,7 +647,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpkginfo\fR(1), \fBpkgmk\fR(1), \fBpkgparam\fR(1), \fBpkgproto\fR(1),
 \fBpkgtrans\fR(1), \fBinstallf\fR(1M), \fBpkgadm\fR(1M), \fBpkgask\fR(1M),
@@ -672,7 +659,6 @@ Interface Stability	Evolving
 .LP
 \fBhttp://www.openssl.org\fR
 .SH NOTES
-.sp
 .LP
 When transferring a package to a spool directory, the \fB-r\fR, \fB-n\fR, and
 \fB-a\fR options cannot be used.
diff --git a/usr/src/man/man1m/prtfru.1m b/usr/src/man/man1m/prtfru.1m
index e51133385d..fc59f0a4cb 100644
--- a/usr/src/man/man1m/prtfru.1m
+++ b/usr/src/man/man1m/prtfru.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 PRTFRU 1M "May 30, 2002"
+.TH PRTFRU 1M "April 9, 2016"
 .SH NAME
 prtfru \- print FRUID-specific information about the FRUs on a system or domain
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ prtfru \- print FRUID-specific information about the FRUs on a system or domain
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBprtfru\fR utility is used to obtain \fBFRUID\fR data from the system or
 domain. Its output is that of a tree structure echoing the path in the
@@ -26,7 +25,6 @@ well.
 of the \fBFRUID\fR container data. \fBprtfru\fR prints to stdout which may be
 redirected to a file.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -73,9 +71,8 @@ Prints in \fBXML\fR format with a system identifier (SYSTEM) of
 Options \fB-c\fR and \fB-l\fR can be used together to obtain a list of the
 containers.
 .SH OPERANDS
-.sp
 .LP
-The folowing operand is supported:
+The following operand is supported:
 .sp
 .ne 2
 .na
@@ -87,7 +84,6 @@ the name or path/name of a container as displayed in the \fB-l\fR option.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -109,6 +105,5 @@ An error has occurred.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfruadm\fR(1M), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/psradm.1m b/usr/src/man/man1m/psradm.1m
index 917e715b27..9f7113757b 100644
--- a/usr/src/man/man1m/psradm.1m
+++ b/usr/src/man/man1m/psradm.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 PSRADM 1M "Feb 25, 2008"
+.TH PSRADM 1M "April 9, 2016"
 .SH NAME
 psradm \- change processor operational status
 .SH SYNOPSIS
@@ -19,7 +19,6 @@ psradm \- change processor operational status
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpsradm\fR utility changes the operational status of processors. The
 legal states for the processor are \fBon-line\fR, \fBoff-line\fR, \fBspare\fR,
@@ -75,7 +74,6 @@ one or more processors.
 Only users with the \fBPRIV_SYS_RES_CONFIG\fR privilege can use the
 \fBpsradm\fR utility.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -148,7 +146,6 @@ Output a message giving the results of each attempted operation.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -237,7 +234,6 @@ processor bindings from the processes bound to them:
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -259,7 +255,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/wtmpx\fR\fR
@@ -269,12 +264,10 @@ Records logging processor status changes
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpbind\fR(1M), \fBpsrinfo\fR(1M), \fBpsrset\fR(1M), \fBp_online\fR(2),
 \fBprocessor_bind\fR(2), \fBattributes\fR(5)
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fB\fBpsradm: processor 4: Invalid argument\fR\fR
@@ -304,7 +297,7 @@ needed by the system because it provides some essential service.
 .sp .6
 .RS 4n
 The specified processor could not be set \fBno-intr\fR because it is the last
-interruptible processor in the system, or or it is the only processor in the
+interruptible processor in the system, or it is the only processor in the
 system that can service interrupts needed by the system.
 .RE
 
diff --git a/usr/src/man/man1m/route.1m b/usr/src/man/man1m/route.1m
index 711eea3637..60cbf3f1ae 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 "Feb 3, 2009"
+.TH ROUTE 1M "April 9, 2016"
 .SH NAME
 route \- manually manipulate the routing tables
 .SH SYNOPSIS
@@ -40,7 +40,6 @@ route \- manually manipulate the routing tables
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBroute\fR manually manipulates the network routing tables. These tables are
 normally maintained by the system routing daemon, such as \fBin.routed\fR(1M)
@@ -57,15 +56,14 @@ of the programmatic interface discussed in \fBroute\fR(7P).
 can modify routing tables, the \fBRTM_GET\fR operation is allowed for
 non-privileged users.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-f\fR\fR
 .ad
 .RS 15n
 Flush the routing tables of all gateway entries. If you use the \fB-f\fR option
-in conjunction with any of the \fBroute\fR sub-commands, \fBroute\fR flushes
-the gateways before performing the sub-command. Specify the table to flush by
+in conjunction with any of the \fBroute\fR subcommands, \fBroute\fR flushes
+the gateways before performing the subcommand. Specify the table to flush by
 placing the \fBinet\fR or \fBinet6\fR modifier immediately after the \fB-f\fR
 option. If unspecified, flushing IPv4 (\fBinet\fR) routes is the default.
 .RE
@@ -131,7 +129,6 @@ Print additional details in verbose mode.
 .RE
 
 .SS "Subcommands"
-.sp
 .LP
 The following subcommands are supported:
 .sp
@@ -201,7 +198,7 @@ conjunction with the \fB-p\fR option.
 
 .sp
 .LP
-The \fBadd\fR and \fBdelete\fR sub-commands have the following syntax:
+The \fBadd\fR and \fBdelete\fR subcommands have the following syntax:
 .sp
 .in +2
 .nf
@@ -218,7 +215,7 @@ through which packets should be routed. Modifiers described in \fBOPERANDS\fR
 can be placed anywhere on the command line.
 .sp
 .LP
-The \fBget\fR and \fBchange\fR sub-commands have the following syntax:
+The \fBget\fR and \fBchange\fR subcommands have the following syntax:
 .sp
 .in +2
 .nf
@@ -235,7 +232,7 @@ through which packets should be routed. Modifiers described in \fBOPERANDS\fR
 can be placed anywhere on the command line.
 .sp
 .LP
-The \fBmonitor\fR sub-command has the following syntax:
+The \fBmonitor\fR subcommand has the following syntax:
 .sp
 .in +2
 .nf
@@ -245,12 +242,10 @@ route monitor [ -inet | -inet6 ]
 .sp
 
 .SH OPERANDS
-.sp
 .LP
-\fBroute\fR executes its sub-commands on routes to destinations by way of
+\fBroute\fR executes its subcommands on routes to destinations by way of
 gateways.
 .SS "Destinations and Gateways"
-.sp
 .LP
 By default, destination and gateway addresses are interpreted as IPv4
 addresses. All symbolic names are tried first as a host name, using
@@ -259,7 +254,7 @@ addresses. All symbolic names are tried first as a host name, using
 .sp
 .LP
 Including an optional modifier on the command line before the address changes
-how the \fBroute\fR sub-command interprets it.
+how the \fBroute\fR subcommand interprets it.
 .sp
 .LP
 The following modifiers are supported:
@@ -448,7 +443,6 @@ multipathing) group, then requests to add a route will automatically be
 translated to the corresponding IPMP IP interface, and requests to delete or
 change a route on an underlying interface will fail.
 .SS "Routing Flags"
-.sp
 .LP
 Routes have associated flags that influence operation of the protocols when
 sending to destinations matched by the routes. These flags can be set (and in
@@ -603,7 +597,6 @@ sensitivity label.
 .RE
 
 .SS "Compatibility"
-.sp
 .LP
 The modifiers \fBhost\fR and \fBnet\fR are taken to be equivalent to
 \fB-\fR\fBhost\fR and \fB-net\fR\fB\fR. To specify a symbolic address that
@@ -630,7 +623,6 @@ _
 The \fB\fR\fB-ifa\fR \fBhostname\fR modifier is also accepted, but has no
 effect.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/defaultrouter\fR\fR
@@ -658,7 +650,6 @@ List of network names and addresses
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBuname\fR(1), \fBin.ripngd\fR(1M), \fBin.routed\fR(1M), \fBnetstat\fR(1M),
 \fBrouted\fR(1M), \fBioctl\fR(2), \fBgetipnodebyname\fR(3SOCKET),
@@ -666,7 +657,6 @@ List of network names and addresses
 \fBhosts\fR(4), \fBnetworks\fR(4), \fBattributes\fR(5), \fBARP\fR(7P),
 \fBip\fR(7P), \fBroute\fR(7P), \fBrouting\fR(7P)
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fB\fBadd\fR [ \fBhost\fR\||\ \fBnetwork\|]\fR \fIdestination\fR:\fIgateway\fR
@@ -704,7 +694,7 @@ As \fBadd\fR, but when deleting or changing an entry.
 .ad
 .sp .6
 .RS 4n
-When the \fB-f\fR flag is specified, or the \fBflush\fR sub-command is used,
+When the \fB-f\fR flag is specified, or the \fBflush\fR subcommand is used,
 each routing table entry deleted is indicated with a message of this form.
 .RE
 
@@ -763,7 +753,6 @@ process does not have appropriate privileges.
 .RE
 
 .SH NOTES
-.sp
 .LP
 Specifying that destinations are local (with the \fB-interface\fRmodifier)
 assumes that the routers implement \fBproxy ARP\fR, meaning that they respond
diff --git a/usr/src/man/man1m/routeadm.1m b/usr/src/man/man1m/routeadm.1m
index 04bdc4eefe..66e43c8177 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 "Jul 18, 2007"
+.TH ROUTEADM 1M "April 9, 2016"
 .SH NAME
 routeadm \- IP forwarding and routing configuration
 .SH SYNOPSIS
@@ -34,7 +34,6 @@ routeadm \- IP forwarding and routing configuration
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBrouteadm\fR command is used to administer system-wide configuration for
 IP forwarding and routing. IP forwarding is the passing of IP packets from one
@@ -80,7 +79,6 @@ service as appropriate. This conversion process occurs when you issue an enable
 .LP
 The first usage, in the SYNOPSIS above, reports the current configuration.
 .SH OPTIONS
-.sp
 .LP
 The following command-line options are supported:
 .sp
@@ -90,7 +88,7 @@ The following command-line options are supported:
 .ad
 .sp .6
 .RS 4n
-Print the configuration in parseable format. If \fIoption\fR is specified, only
+Print the configuration in parsable format. If \fIoption\fR is specified, only
 the configuration for the specified option or variable is displayed.
 .RE
 
@@ -501,7 +499,6 @@ See \fBin.routed\fR(1M) for details of property names and how they relate to
 daemon behavior.
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -523,7 +520,6 @@ An error occurred while obtaining or modifying the system configuration.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/inet/routing.conf\fR\fR
@@ -533,7 +529,6 @@ Parameters for IP forwarding and routing. (Not to be edited.)
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -549,7 +544,6 @@ Interface Stability	Stable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBifconfig\fR(1M), \fBin.routed\fR(1M), \fBsvcadm\fR(1M), \fBgateways\fR(4),
 \fBattributes\fR(5), \fBsmf\fR(5)
diff --git a/usr/src/man/man1m/sasinfo.1m b/usr/src/man/man1m/sasinfo.1m
index 739d98ee84..3098e2b84d 100644
--- a/usr/src/man/man1m/sasinfo.1m
+++ b/usr/src/man/man1m/sasinfo.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 SASINFO 1M "Jul 10, 2009"
+.TH SASINFO 1M "April 9, 2016"
 .SH NAME
 sasinfo \- Serial Attached SCSI HBA port command line interface
 .SH SYNOPSIS
@@ -43,7 +43,6 @@ sasinfo \- Serial Attached SCSI HBA port command line interface
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsasinfo\fR utility is a command line interface that collects
 administrative information on Serial Attached SCSI-2 (SAS-2) host bus adapter
@@ -53,8 +52,7 @@ that might be connected to those HBA ports.
 .sp
 .LP
 \fBsasinfo\fR is implemented as a set of subcommands, described below.
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 The following subcommands are supported by \fBsasinfo\fR.
 .sp
@@ -120,7 +118,6 @@ including the SAS Management Protocol (SMP) target port.
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 The following options are supported.
 .sp
@@ -717,7 +714,6 @@ OS Device Name: /dev/rdsk/c4t50020F230000B4AFd0s2
 .sp
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -733,6 +729,5 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/sbdadm.1m b/usr/src/man/man1m/sbdadm.1m
index 10468d5f97..5445dff56f 100644
--- a/usr/src/man/man1m/sbdadm.1m
+++ b/usr/src/man/man1m/sbdadm.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 SBDADM 1M "Aug 20, 2009"
+.TH SBDADM 1M "April 9, 2016"
 .SH NAME
 sbdadm \- SCSI Block Disk command line interface
 .SH SYNOPSIS
@@ -33,12 +33,10 @@ sbdadm \- SCSI Block Disk command line interface
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsbdadm\fR command creates and manages SCSI-block-device-based logical
 units that are registered with the SCSI Target Mode Framework (STMF).
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 The \fBsbdadm\fR command supports the subcommands listed below. Note that if
 you enter a question mark as an argument to the command (\fBsbdadm ?\fR),
@@ -169,7 +167,6 @@ The size specified can exceed the size of the file or device represented by
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 \fBsbdadm\fR use the following operands:
 .sp
@@ -230,7 +227,6 @@ Found 2 LU(s)
 .sp
 
 .SH EXIT STATUS
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -251,7 +247,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -267,6 +262,5 @@ Interface Stability	Obsolete Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBstmfadm\fR(1M), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/sendmail.1m b/usr/src/man/man1m/sendmail.1m
index 8fbf6c870b..45945aa83e 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 "Feb 25, 2009"
+.TH SENDMAIL 1M "April 9, 2016"
 .SH NAME
 sendmail \- send mail over the internet
 .SH SYNOPSIS
@@ -23,7 +23,6 @@ sendmail \- send mail over the internet
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsendmail\fR utility sends a message to one or more people, routing the
 message over whatever networks are necessary. \fBsendmail\fR does internetwork
@@ -60,7 +59,6 @@ If a message is found to be undeliverable, it is returned to the sender with
 diagnostics that indicate the location and nature of the failure; or, the
 message is placed in a \fBdead.letter\fR file in the sender's home directory.
 .SS "Service Management"
-.sp
 .LP
 The \fBsendmail\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifiers:
@@ -114,7 +112,6 @@ For the last two, note the difference, as the latter has the \fB":sendmail"\fR
 instance specification, whereas the former does not, thus representing the more
 general service.
 .SS "Enabling Access to Remote Clients"
-.sp
 .LP
 On an unmodified system, access to \fBsendmail\fR by remote clients is enabled
 and disabled through the service management facility (see \fBsmf\fR(5)). In
@@ -154,12 +151,10 @@ Note, however, on a system where any of the \fBsendmail\fR(4) files have been
 customized, setting this property might not have the intended effect. See
 \fBsendmail\fR(4) for details.
 .SS "Automated Rebuilding of Configuration Files"
-.sp
 .LP
 See \fBsendmail\fR(4) for details on which service properties can be set to
 automate (re)building of configuration files when the service is started.
 .SS "Restricting Host Access"
-.sp
 .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
@@ -167,7 +162,6 @@ 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.
 .SS "Startup Options"
-.sp
 .LP
 The \fB/etc/default/sendmail\fR file stores startup options for \fBsendmail\fR
 so that the options are not removed when a host is upgraded. See also
@@ -271,12 +265,10 @@ is not set.
 .RE
 
 .SS "Mail Filter API"
-.sp
 .LP
 \fBsendmail\fR supports a mail filter API called "milter". For more
 information, see \fB/usr/include/libmilter/README\fR and http://www.milter.org
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -545,7 +537,7 @@ Does not do aliasing.
 Tags all addresses being sent as wanting the indicated \fInotifications\fR,
 which consists of the word "NEVER" or a comma-separated list of "SUCCESS",
 "FAILURE", and "DELAY" for successful delivery, failure and a message that is
-stuck in a queue somwhere. The default is "FAILURE,DELAY".
+stuck in a queue somewhere. The default is "FAILURE,DELAY".
 .RE
 
 .sp
@@ -763,7 +755,6 @@ should be used sparingly.
 .RE
 
 .SS "Processing Options"
-.sp
 .LP
 There are a number of "random" options that can be set from a configuration
 file. Options are represented by a single character or by multiple character
@@ -3177,7 +3168,6 @@ long as the \fB/etc/mail/aliases*\fR files are owned by root \fIand\fR root has
 exclusive write permission. If invoked as \fBmailq\fR, \fBsendmail\fR prints
 the contents of the mail queue.
 .SH OPERANDS
-.sp
 .ne 2
 .na
 \fB\fIaddress\fR\fR
@@ -3188,12 +3178,10 @@ address of an intended recipient of the message being sent.
 .RE
 
 .SH USAGE
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBsendmail\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXIT STATUS
-.sp
 .LP
 \fBsendmail\fR returns an exit status describing what it did. The codes are
 defined in \fB/usr/include/sysexits.h\fR.
@@ -3278,7 +3266,6 @@ Message could not be sent immediately, but was queued.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 No environment variables are used. However, sendmail's start-up script, invoked
 by \fBsvcadm\fR(1M), reads \fB/etc/default/sendmail\fR. In this file, if the
@@ -3310,7 +3297,6 @@ for each \fIclient\fR name. This is comparable to running:
 .LP
 on the host \fIserver\fR.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fBdead.letter\fR\fR
@@ -3447,7 +3433,6 @@ Describes the steps needed to compile and run a filter
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsvcs\fR(1), \fBbiff\fR(1B), \fBmail\fR(1), \fBmailq\fR(1), \fBmailx\fR(1),
 \fBnice\fR(1), \fBcheck-hostname\fR(1M), \fBcheck-permissions\fR(1M),
@@ -3476,7 +3461,6 @@ http://www.sendmail.org
 .LP
 http://www.milter.org
 .SH NOTES
-.sp
 .LP
 The \fBsendmail\fR program requires a fully qualified host name when starting.
 A script has been included to help verify if the host name is defined properly
diff --git a/usr/src/man/man1m/smbadm.1m b/usr/src/man/man1m/smbadm.1m
index 3ce3ecf923..9fada6fca3 100644
--- a/usr/src/man/man1m/smbadm.1m
+++ b/usr/src/man/man1m/smbadm.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 SMBADM 1M "Feb 19, 2014"
+.TH SMBADM 1M "April 9, 2016"
 .SH NAME
 smbadm \- configure and manage CIFS local groups and users, and manage domain
 membership
@@ -201,7 +201,7 @@ Specifies the name of the \fBCIFS\fR local group.
 Specifies the name of a Solaris local user.
 .RE
 
-.SH SUB-COMMANDS
+.SH SUBCOMMANDS
 .LP
 The \fBsmbadm\fR command includes these subcommands:
 .sp
@@ -408,7 +408,7 @@ Selected domain controller
 .sp .6
 .RS 4n
 Lookup the SID for the given \fIaccount-name\fR, or lookup the
-\fIaccount-name\fR for the given SID.  This sub-command is
+\fIaccount-name\fR for the given SID.  This subcommand is
 primarily for diagnostic use, to confirm whether the server
 can lookup domain accounts and/or SIDs.
 .RE
diff --git a/usr/src/man/man1m/smtnrhdb.1m b/usr/src/man/man1m/smtnrhdb.1m
index 8b8486213e..74734855e3 100644
--- a/usr/src/man/man1m/smtnrhdb.1m
+++ b/usr/src/man/man1m/smtnrhdb.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 SMTNRHDB 1M "Dec 19, 2008"
+.TH SMTNRHDB 1M "April 9, 2016"
 .SH NAME
 smtnrhdb \- manage entries in the tnrhdb database
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ smtnrhdb \- manage entries in the tnrhdb database
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsmtnrhdb\fR command adds, modifies, deletes, and lists entries in the
 \fBtnrhdb\fR database.
@@ -30,7 +29,6 @@ initialized for the command to succeed (see \fBsmc\fR(1M)). After rebooting the
 Solaris Management Console server, the first \fBsmc\fR connection can time out,
 so you might need to retry the command.
 .SS "Valid Host Addresses and Wildcards"
-.sp
 .LP
 The trusted network software uses a network "longest prefix of matching bits"
 mechanism when looking for a host. The software looks first for the IP address
@@ -56,8 +54,7 @@ addresses, see \fISystem Administration Guide: IP Services\fR.
 The \fBsmtnrhdb\fR command accepts a hostname, IP address, and wildcard address
 with as optional prefix as valid addresses. See \fIsubcommand_args\fR, below,
 for the format of valid addresses.
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 \fBsmtnrhdb\fR \fIsubcommand\fRs are:
 .sp
@@ -109,7 +106,6 @@ administrator must have the \fBsolaris.network.host.write\fR and
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 The \fBsmtnrhdb\fR authentication arguments, \fIauth_args\fR, are derived from
 the \fBsmc\fR arg set. These arguments are the same regardless of which
@@ -119,7 +115,6 @@ subcommand you use.
 The subcommand-specific options, \fIsubcommand_args\fR, must be preceded by the
 \fB--\fR option.
 .SS "\fIauth_args\fR"
-.sp
 .LP
 The valid \fIauth_args\fR are \fB-D\fR, \fB-H\fR, \fB-l\fR, \fB-p\fR, \fB-r\fR,
 and \fB-u\fR; they are all optional. If no \fIauth_args\fR are specified,
@@ -219,7 +214,6 @@ not enter the preceding options, you must still enter the \fB--\fR option.
 .RE
 
 .SS "\fIsubcommand_args\fR"
-.sp
 .LP
 \fBNote:\fR Descriptions and other arg options that contain white spaces must
 be enclosed in double quotes.
@@ -450,7 +444,6 @@ from machine1.ExampleCo.COM was successful.
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -484,7 +477,6 @@ An error occurred while executing the command. An error message displays.
 .RE
 
 .SH FILES
-.sp
 .LP
 The following files are used by the \fBsmtnrhdb\fR command:
 .sp
@@ -498,7 +490,6 @@ Trusted network remote-host database.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -514,14 +505,12 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsmc\fR(1M), \fBnetmasks\fR(4), \fBattributes\fR(5)
 .sp
 .LP
 \fISystem Administration Guide: Security Services\fR
 .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/svccfg.1m b/usr/src/man/man1m/svccfg.1m
index cbb1a7ef29..600a1c85b5 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 "Jun 29, 2009"
+.TH SVCCFG 1M "April 9, 2016"
 .SH NAME
 svccfg \- import, export, and modify service configurations
 .SH SYNOPSIS
@@ -573,7 +573,7 @@ currently selected, its "method_context" property group is used. If the
 option nor the \fB-s\fR option is used, the "start" property group is searched
 for in the currently selected entity and, if an instance is currently selected,
 its parent is also searched. If the "inetd_start" property group is not
-located, it is searched for in a similiar manner.
+located, it is searched for in a similar manner.
 .sp
 Once the property is located, all values which begin with \fIenvvar\fR followed
 by a "=" are removed, and the value "\fIenvvar\fR=\fIvalue\fR" is added. See
@@ -623,7 +623,7 @@ currently selected, its "method_context" property group is used. If the
 option nor the \fB-s\fR option is used, the "start" property group is searched
 for in the currently selected entity and, if an instance is currently selected,
 its parent is also searched. If the "inetd_start" property group is not
-located, it is searched for in a similiar manner.
+located, it is searched for in a similar manner.
 .sp
 Once the property is located, all values which begin with \fIenvvar\fR followed
 by "=" are removed. See \fBsmf_security\fR(5) for the privileges required to
diff --git a/usr/src/man/man1m/th_define.1m b/usr/src/man/man1m/th_define.1m
index 0428555376..1e4d89428c 100644
--- a/usr/src/man/man1m/th_define.1m
+++ b/usr/src/man/man1m/th_define.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 TH_DEFINE 1M "Apr 11, 2001"
+.TH TH_DEFINE 1M "April 9, 2016"
 .SH NAME
 th_define \- create fault injection test harness error specifications
 .SH SYNOPSIS
@@ -40,7 +40,6 @@ th_define \- create fault injection test harness error specifications
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBth_define\fR utility provides an interface to the \fBbus_ops\fR fault
 injection \fBbofi\fR device driver for defining error injection specifications
@@ -95,7 +94,6 @@ the final value for the option is used. If an option is not specified, its
 associated value is set to an appropriate default, which will provide maximal
 error coverage as described below.
 .SH OPTIONS
-.sp
 .LP
 The following options are available:
 .sp
@@ -157,7 +155,7 @@ If \fIacc_types\fR is set to \fBlog\fR, logging will match all \fBPIO\fR
 accesses, interrupts and DMA accesses to and from areas mapped for both reading
 and writing. \fBlog\fR can be combined with other \fIacc_types\fR, in which
 case the matching condition for logging will be restricted to the specified
-addional \fIacc_types\fR. Note that \fBdma_r\fR will match only DMA handles
+additional \fIacc_types\fR. Note that \fBdma_r\fR will match only DMA handles
 mapped for reading only; \fBdma_w\fR will match only DMA handles mapped for
 writing only; \fBdma\fR will match only DMA handles mapped for both reading and
 writing.
@@ -659,7 +657,6 @@ given, a default script is used. This script repeatedly attempts to detach and
 then re-attach the device instance under test.
 .SH EXAMPLES
 .SS "Examples of Error Definitions"
-.sp
 .LP
 \fBth_define -n foo -i 1 -a log\fR
 .sp
@@ -802,7 +799,6 @@ driver occurs, a further ten interrupts are also generated.
 Causes the next interrupt for instance 3 of the \fBfoo\fR driver to be delayed
 by 1024 microseconds.
 .SH NOTES
-.sp
 .LP
 The policy option in the \fBth_define\fR \fB-p\fR syntax determines how a set
 of logged accesses will be converted into the set of error definitions. Each
@@ -813,7 +809,6 @@ an error definition should be created based on the access.
 Any number of policy options can be combined to modify the generated error
 definitions.
 .SS "Bytewise Policies"
-.sp
 .LP
 These select particular I/O transfer sizes. Specifing a byte policy will
 exclude other byte policies that have not been chosen. If none of the byte type
@@ -865,7 +860,6 @@ Create errdefs for repeated byte accesses (\fBddi_rep_get*()\fR)
 .RE
 
 .SS "Frequency of Access Policies"
-.sp
 .LP
 The frequency of access to a location is determined according to the access
 type, location and transfer size (for example, a two-byte read access to
@@ -917,7 +911,6 @@ Create errdefs for locations that are accessed a median frequency.
 .RE
 
 .SS "Policies for Minimizing errdefs"
-.sp
 .LP
 If a transaction is duplicated, either a single or multiple errdefs will be
 written to the test scripts, depending upon the following two policies:
@@ -952,7 +945,6 @@ operators.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkill\fR(1), \fBth_manage\fR(1M), \fBalarm\fR(2),
 \fBddi_check_acc_handle\fR(9F), \fBddi_check_dma_handle\fR(9F)
diff --git a/usr/src/man/man1m/tpmadm.1m b/usr/src/man/man1m/tpmadm.1m
index 77cdde7826..c60b356165 100644
--- a/usr/src/man/man1m/tpmadm.1m
+++ b/usr/src/man/man1m/tpmadm.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 TPMADM 1M "Jul 7, 2009"
+.TH TPMADM 1M "April 9, 2016"
 .SH NAME
 tpmadm \- administer Trusted Platform Module
 .SH SYNOPSIS
@@ -38,7 +38,6 @@ tpmadm \- administer Trusted Platform Module
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 A Trusted Platform Module (TPM) is a hardware component that provides for
 protected key storage and reliable measurements of software used to boot the
@@ -69,8 +68,7 @@ regardless of the privilege level of the calling process. Second, the TPM owner
 is not able to override access controls for data protected by TPM keys. The
 owner can effectively destroy data by re-initializing the TPM, but he cannot
 access data that has been encrypted using TPM keys owned by other users.
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 The following subcommands are used in the form:
 .sp
@@ -170,7 +168,6 @@ storage.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 After completing the requested operation, \fBtpmadm\fR exits with one of the
 following status values.
@@ -205,7 +202,6 @@ Usage error. The \fBtpmadm\fR command was invoked with invalid arguments.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -221,7 +217,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5)
 .sp
diff --git a/usr/src/man/man1m/trapstat.1m b/usr/src/man/man1m/trapstat.1m
index 1c2b8f2263..5ad30a6ba9 100644
--- a/usr/src/man/man1m/trapstat.1m
+++ b/usr/src/man/man1m/trapstat.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 TRAPSTAT 1M "May 11, 2004"
+.TH TRAPSTAT 1M "April 9, 2016"
 .SH NAME
 trapstat \- report trap statistics
 .SH SYNOPSIS
@@ -20,7 +20,6 @@ trapstat \- report trap statistics
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBtrapstat\fR utility gathers and displays run-time trap statistics on
 UltraSPARC-based systems. The default output is a table of trap types and
@@ -28,7 +27,7 @@ UltraSPARC-based systems. The default output is a table of trap types and
 column of the table denoting a \fBCPU\fR. If standard output is a terminal, the
 table contains as many columns of data as can fit within the terminal width; if
 standard output is not a terminal, the table contains at most six columns of
-data. By default, data is gathered and and displayed for all \fBCPU\fRs; if the
+data. By default, data is gathered and displayed for all \fBCPU\fRs; if the
 data cannot fit in a single table, it is printed across multiple tables. The
 set of \fBCPU\fRs for which data is gathered and displayed can be optionally
 specified with the \fB-c\fR or \fB-C\fR option.
@@ -76,7 +75,6 @@ provides in-depth TLB miss information broken down by page size using the
 of that provided by the \fB-t\fR option; only one of \fB-t\fR and \fB-T\fR can
 be specified.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -576,7 +574,6 @@ example# \fBtrapstat -e level-10 -P -r 1000\fR
 .sp
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -593,7 +590,6 @@ Interface Stability
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlockstat\fR(1M), \fBpmap\fR(1), \fBpsrset\fR(1M), \fBpsrinfo\fR(1M),
 \fBpbind\fR(1M), \fBppgsz\fR(1), \fBgetpagesizes\fR(3C)
@@ -604,7 +600,6 @@ Interface Stability
 .LP
 \fIThe SPARC Architecture Manual, Version 9,\fR 1994, Prentice-Hall.
 .SH NOTES
-.sp
 .LP
 When enabled, \fBtrapstat\fR induces a varying probe effect, depending on the
 type of information collected. While the precise probe effect depends upon the
diff --git a/usr/src/man/man1m/ufsdump.1m b/usr/src/man/man1m/ufsdump.1m
index 85edc0e155..10303c00f3 100644
--- a/usr/src/man/man1m/ufsdump.1m
+++ b/usr/src/man/man1m/ufsdump.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 UFSDUMP 1M "Mar 17, 2008"
+.TH UFSDUMP 1M "April 9, 2016"
 .SH NAME
 ufsdump \- incremental file system dump
 .SH SYNOPSIS
@@ -14,10 +14,9 @@ ufsdump \- incremental file system dump
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBufsdump\fR backs up all files specified by \fIfiles_to_dump\fR (usually
-either a whole file system or files within a file sytem changed after a certain
+either a whole file system or files within a file system changed after a certain
 date) to magnetic tape, diskette, or disk file.
 .sp
 .LP
@@ -52,7 +51,6 @@ multi-volume dumps, unless \fBufsdump\fR does not understand the way the device
 detects the end-of-media, or the files are to be restored on a system with an
 older version of the \fBrestore\fR command.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -422,7 +420,6 @@ that have not been backed up within a day are highlighted.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operand is supported:
 .sp
@@ -453,7 +450,6 @@ line.
 If no \fIoptions\fR are given, the default is \fB9uf\fR \fB/dev/rmt/0\fR
 \fIfiles_to_dump\fR.
 .SH USAGE
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBufsdump\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
@@ -488,7 +484,6 @@ example# ufsdump 5fuv /dev/rmt/1 /dev/rdsk/c0t3d0s6
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 While running, \fBufsdump\fR emits many verbose messages. \fBufsdump\fR returns
 the following exit values:
@@ -523,7 +518,6 @@ Abort \(mi no checkpoint attempted.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/rmt/0\fR\fR
@@ -574,7 +568,6 @@ list of file systems
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcpio\fR(1), \fBtar\fR(1), \fBdd\fR(1M), \fBdevnm\fR(1M), \fBfssnap\fR(1M),
 \fBprtvtoc\fR(1M), \fBrmt\fR(1M), \fBshutdown\fR(1M), \fBufsrestore\fR(1M),
@@ -582,16 +575,13 @@ list of file systems
 \fBattributes\fR(5), \fBlargefile\fR(5), \fBst\fR(7D)
 .SH NOTES
 .SS "Read Errors"
-.sp
 .LP
 Fewer than 32 read errors on the file system are ignored.
 .SS "Process Per Reel"
-.sp
 .LP
 Because each reel requires a new process, parent processes for reels that are
 already written hang around until the entire tape is written.
 .SS "Operator Intervention"
-.sp
 .LP
 \fBufsdump\fR requires operator intervention on these conditions: end of
 volume, end of dump, volume write error, volume open error or disk read error
@@ -607,7 +597,6 @@ checkpoints at the start of each volume. If writing that volume fails for some
 reason, \fBufsdump\fR will, with operator permission, restart itself from the
 checkpoint after a defective volume has been replaced.
 .SS "Suggested Dump Schedule"
-.sp
 .LP
 It is vital to perform full, "level \fB0\fR", dumps at regular intervals. When
 performing a full dump, bring the machine down to single-user mode using
@@ -644,7 +633,6 @@ Although the Tuesday through Friday incrementals contain "extra copies" of
 files from Monday, this scheme assures that any file modified during the week
 can be recovered from the previous day's incremental dump.
 .SS "Process Priority of ufsdump"
-.sp
 .LP
 \fBufsdump\fR uses multiple processes to allow it to read from the disk and
 write to the media concurrently. Due to the way it synchronizes between these
@@ -652,7 +640,6 @@ processes, any attempt to run dump with a \fBnice\fR (process priority) of
 `\(mi5' or better will likely make \fBufsdump\fR run \fIslower\fR instead of
 faster.
 .SS "Overlapping Partitions"
-.sp
 .LP
 Most disks contain one or more overlapping slices because slice 2 covers the
 entire disk. The other slices are of various sizes and usually do not overlap.
@@ -667,7 +654,6 @@ entire disk would instead dump only the \fBroot\fR file system on slice 0. To
 dump the entire disk, the user must dump the file systems on each slice
 separately.
 .SH BUGS
-.sp
 .LP
 The \fB/etc/vfstab\fR file does not allow the desired frequency of backup for
 file systems to be specified (as \fB/etc/fstab\fR did). Consequently, the
diff --git a/usr/src/man/man1m/utmpd.1m b/usr/src/man/man1m/utmpd.1m
index 7d5a9b29ee..b47dd23bd9 100644
--- a/usr/src/man/man1m/utmpd.1m
+++ b/usr/src/man/man1m/utmpd.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 UTMPD 1M "Jan 01, 2015"
+.TH UTMPD 1M "April 9, 2016"
 .SH NAME
 utmpd \- utmpx monitoring daemon
 .SH SYNOPSIS
@@ -146,7 +146,7 @@ inhibit or defer access time updates, an unknown amount of error will be
 introduced into the \fButmp\fR \fBDOWN_TIME\fR record's timestamp in the event
 of an uncontrolled shutdown (for example, a crash or loss of power ).
 Controlled shutdowns will update the modify time of \fB/var/adm/wtmpx\fR, which
-will be used on the next boot to determine when the previous shutdown ocurred,
+will be used on the next boot to determine when the previous shutdown occurred,
 regardless of access time deferral or inhibition.
 .sp
 .LP
diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m
index ddf7eb908b..cec17d299e 100644
--- a/usr/src/man/man1m/zfs.1m
+++ b/usr/src/man/man1m/zfs.1m
@@ -28,7 +28,7 @@
 .\" Copyright (c) 2014 Integros [integros.com]
 .\" Copyright 2016 Nexenta Systems, Inc.
 .\"
-.Dd March 20, 2016
+.Dd April 9, 2016
 .Dt ZFS 1M
 .Os
 .Sh NAME
@@ -2459,7 +2459,7 @@ By default, a full stream is generated.
 .It Fl D
 Generate a deduplicated stream. Blocks which would have been sent multiple times
 in the send stream will only be sent once. The receiving system must also
-support this feature to recieve a deduplicated stream. This flag can be used
+support this feature to receive a deduplicated stream. This flag can be used
 regardless of the dataset's
 .Sy dedup
 property, but performance will be much better if the filesystem uses a
@@ -3500,7 +3500,7 @@ M       F       /tank/test/modified
 .Ed
 .El
 .Sh INTERFACE STABILITY
-.Sy Commited .
+.Sy Committed .
 .Sh SEE ALSO
 .Xr gzip 1 ,
 .Xr ssh 1 ,