24 files changed, 80 insertions, 195 deletions
diff --git a/usr/src/man/man1m/add_drv.1m b/usr/src/man/man1m/add_drv.1m
index c017280317..8376e3326e 100644
--- a/usr/src/man/man1m/add_drv.1m
+++ b/usr/src/man/man1m/add_drv.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ADD_DRV 1M "Dec 1, 2005"
+.TH ADD_DRV 1M "May 13, 2017"
 .SH NAME
 add_drv \- add a new device driver to the system
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ add_drv \- add a new device driver to the system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBadd_drv\fR command is used to inform the system about newly installed
 device drivers.
@@ -42,7 +41,6 @@ In some cases, adding a new driver may require a reconfiguration boot. See the
 Aliases might require quoting (with double-quotes) if they contain numbers. See
 \fBEXAMPLES\fR.
 .SS "The \fB/etc/minor_perm\fR File"
-.sp
 .LP
 \fBadd_drv\fR and \fBupdate_drv\fR(1M) read the \fB/etc/minor_perm\fR file to
 obtain permission information. The permission specified is applied to matching
@@ -87,9 +85,9 @@ are set to \fB0600\fR permission, owned by \fBuucp\fR, with group \fBuucp\fR.
 In the third line the \fBkmem\fR device exported by the \fBmm\fR driver is set
 to \fB0640\fR permission, owned by \fBroot\fR, with group \fBbin\fR.
 .SS "Running \fBadd_drv\fR from a \fBpostinstall\fR Script"
-.sp
 .LP
-When running \fBadd_drv\fR from within the context of a package's postinstall
+When running \fBadd_drv\fR from within the context of a legacy SVR4
+package's postinstall
 script, you must consider whether the package is being added to a system image
 or to a running system. When a package is being installed on a system image,
 the \fBBASEDIR\fR variable refers to the image's base directory. In this
@@ -137,16 +135,14 @@ fi
 .LP
 The \fB-b\fR option is described below.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-b\fR \fIbasedir\fR\fR
 .ad
 .RS 26n
 Installs the driver on the system with a root directory of \fIbasedir\fR rather
-than installing on the system executing \fBadd_drv\fR. This option is typically
-used in package post-installation scripts when the package is not being
-installed on the system executing the \fBpkgadd\fR command. The system using
+than installing on the system executing \fBadd_drv\fR. This option was typically
+used in package post-installation scripts. The system using
 \fIbasedir\fR as its root directory must reboot to complete the driver
 installation.
 .LP
@@ -430,11 +426,9 @@ example# add_drv -i '"pci10c5,25"' smc
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 \fBadd_drv\fR returns \fB0\fR on success and \fB1\fR on failure.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv\fR\fR
@@ -585,7 +579,6 @@ device privileges
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBboot\fR(1M), \fBchmod\fR(1), \fBdevfsadm\fR(1M), \fBkernel\fR(1M),
 \fBmodinfo\fR(1M), \fBrem_drv\fR(1M), \fBupdate_drv\fR(1M),
@@ -595,7 +588,6 @@ device privileges
 .LP
 \fI\fR
 .SH NOTES
-.sp
 .LP
 It is possible to add a driver for a device already being managed by a
 different driver, where the driver being added appears in the device's
@@ -639,7 +631,6 @@ alias is optional when used from the command line. However, when using
 \fBadd_drv\fR from packaging scripts, you should continue to use double quotes
 to specify an alias.
 .SH BUGS
-.sp
 .LP
 Previous versions of \fBadd_drv\fR accepted a pathname for \fIdevice_driver\fR.
 This feature is no longer supported and results in failure.
diff --git a/usr/src/man/man1m/datadm.1m b/usr/src/man/man1m/datadm.1m
index 00051afab3..929714d912 100644
--- a/usr/src/man/man1m/datadm.1m
+++ b/usr/src/man/man1m/datadm.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DATADM 1M "Jun 18, 2004"
+.TH DATADM 1M "May 13, 2017"
 .SH NAME
 datadm \- maintain DAT static registry file
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ datadm \- maintain DAT static registry file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBdatadm\fR utility maintains the DAT static registry file,
 \fBdat.conf\fR(4).
@@ -30,7 +29,6 @@ a system after its installation. You can use \fBdatadm\fR to update the
 interface adapters for all the service providers currently installed is
 regenerated.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -174,7 +172,6 @@ ibd2 u1.2 nonthreadsafe default udapl_tavor.so.1 SUNW.1.0 ""
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/dat/dat.conf\fR\fR
@@ -184,7 +181,6 @@ DAT static registry file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -200,7 +196,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBpkgadd\fR(1M), \fBpkgrm\fR(1M), \fBlibdat\fR(3LIB), \fBdat.conf\fR(4),
-\fBservice_provider.conf\fR(4). \fBattributes\fR(5)
+\fBlibdat\fR(3LIB), \fBdat.conf\fR(4),
+\fBservice_provider.conf\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/domainname.1m b/usr/src/man/man1m/domainname.1m
index 6888511393..98f59f378f 100644
--- a/usr/src/man/man1m/domainname.1m
+++ b/usr/src/man/man1m/domainname.1m
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DOMAINNAME 1M "Feb 25, 2017"
+.TH DOMAINNAME 1M "May 13, 2017"
 .SH NAME
 domainname \- set or display name of the current domain
 .SH SYNOPSIS
@@ -90,7 +90,7 @@ guidance as to appropriate corrective action.
 \fBsvcs\fR(1),
 \fBcheck-hostname\fR(1M), \fBhostconfig\fR(1M), \fBnamed\fR(1M),
 \fBsendmail\fR(1M), \fBsvcadm\fR(1M), \fBypinit\fR(1M),
-\fBsys-unconfig\fR(1M), \fBaliases\fR(4), \fBdefaultdomain\fR(4),
+\fBaliases\fR(4), \fBdefaultdomain\fR(4),
 \fBhosts\fR(4), \fBnsswitch.conf\fR(4), \fBpasswd\fR(4), \fBattributes\fR(5),
 \fBrbac\fR(5), \fBsmf\fR(5)
 .SH NOTES
diff --git a/usr/src/man/man1m/fssnap_ufs.1m b/usr/src/man/man1m/fssnap_ufs.1m
index 51211e2611..ca58f36e3f 100644
--- a/usr/src/man/man1m/fssnap_ufs.1m
+++ b/usr/src/man/man1m/fssnap_ufs.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FSSNAP_UFS 1M "Jan 29, 2007"
+.TH FSSNAP_UFS 1M "May 13, 2017"
 .SH NAME
 fssnap_ufs \- create a temporary snapshot of a UFS file system
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ fssnap_ufs \- create a temporary snapshot of a UFS file system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBfssnap\fR command queries, creates, or deletes a temporary snapshot of a
 \fBUFS\fR file system. A snapshot is a point-in-time image of a file system
@@ -45,7 +44,6 @@ file system that is being captured in a snapshot. The backing-store file(s) can
 reside on any type of file system, including another \fBUFS\fR file system or
 an \fBNFS\fR-mounted file system.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -278,7 +276,6 @@ Both devices are always created. This option affects only the output.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -468,7 +465,6 @@ they will have names of the form \fIfile\fR (for the first file), \fIfile\fR.1,
 \fIfile\fR.2, and so forth.
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -496,15 +492,9 @@ An error occurred.
 The script-readable output mode is a stable interface that can be added to, but
 will not change. All other interfaces are subject to change.
 .SH SEE ALSO
-.sp
 .LP
 \fBmlock\fR(3C), \fBattributes\fR(5)
-.sp
-.LP
-See the \fBntpd\fR man page, delivered in the \fBSUNWntpu\fR package (not a
-SunOS man page).
 .SH NOTES
-.sp
 .LP
 The \fBfssnap\fR device files should be treated like a regular disk block or
 character device.
@@ -512,14 +502,14 @@ character device.
 .LP
 The association between a file system and the snapshot is lost when the
 snapshot is deleted or the system reboots. Snapshot persistence across reboots
-is not currently supported.
+is not supported.
 .sp
 .LP
 To avoid unnecessary performance impacts, perform the snapshot and system
 backup when the system is least active.
 .sp
 .LP
-It is not possible to perform a snapshot of a file system if any of  the
+It is not possible to perform a snapshot of a file system if any of the
 following conditions are true:
 .RS +4
 .TP
@@ -539,7 +529,7 @@ The file system contains a local swap file
 .el o
 The file system is used as backing store by an application that uses
 \fBmlock\fR(3C) to lock its pages. Typically, these are real time applications,
-such as \fBntpd\fR (delivered in the \fBSUNWntpu\fR package).
+such as \fBntpd\fR.
 .RE
 .sp
 .LP
diff --git a/usr/src/man/man1m/idsconfig.1m b/usr/src/man/man1m/idsconfig.1m
index e4e15290a6..adb5081a09 100644
--- a/usr/src/man/man1m/idsconfig.1m
+++ b/usr/src/man/man1m/idsconfig.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IDSCONFIG 1M "Oct 18, 2001"
+.TH IDSCONFIG 1M "May 13, 2017"
 .SH NAME
 idsconfig \- prepare an iPlanet Directory Server (iDS) to be populated with
 data and serve LDAP clients
@@ -15,12 +15,11 @@ data and serve LDAP clients
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Use the \fBidsconfig\fR tool to set up an iPlanet Directory Server (iDS). You
 can specify the input configuration file with the \fB-i\fR option on the
 command line. Alternatively, the tool will prompt the user for configuration
-information. The input configuration  file is created by \fBidsconfig\fR with
+information. The input configuration file is created by \fBidsconfig\fR with
 the \fB-o\fR option on a previous run.
 .sp
 .LP
@@ -37,7 +36,6 @@ appropriate security precautions.
 You should back up the directory server's configuration and data prior to
 running this command.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -47,7 +45,7 @@ The following options are supported:
 .ad
 .RS 24n
 Specify the file name for \fBidsconfig\fR to use as a configuration file.  This
-file will be read by \fBidsconfig\fR, and the values  in the file will be used
+file will be read by \fBidsconfig\fR, and the values in the file will be used
 to configure the server.  Do not manually edit \fIinput_configfile\fR. The
 \fIinput_configfile\fR is only partially validated, as \fBidsconfig\fR assumes
 that the file was created by a previous invocation of the command.
@@ -72,7 +70,6 @@ Verbose output.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -140,7 +137,6 @@ example# \fBidsconfig -v -i config.1\fR
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -162,7 +158,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -178,9 +173,8 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBldap\fR(1), \fBldapadd\fR(1), \fBldapdelete\fR(1), \fBldaplist\fR(1),
 \fBldapmodify\fR(1), \fBldapmodrdn\fR(1), \fBldapsearch\fR(1),
 \fBldap_cachemgr\fR(1M), \fBldapaddent\fR(1M), \fBldapclient\fR(1M),
-\fBsuninstall\fR(1M), \fBresolv.conf\fR(4), \fBattributes\fR(5)
+\fBresolv.conf\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/inetd.1m b/usr/src/man/man1m/inetd.1m
index cf01f8c10e..6b360cec6f 100644
--- a/usr/src/man/man1m/inetd.1m
+++ b/usr/src/man/man1m/inetd.1m
@@ -4,9 +4,9 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH INETD 1M "April 9, 2016"
+.TH INETD 1M "May 13, 2017"
 .SH NAME
-inetd \- Solaris Management Facility delegated restarter for inet services
+inetd \- Service Management Facility delegated restarter for inet services
 .SH SYNOPSIS
 .LP
 .nf
@@ -540,10 +540,8 @@ wrappers facility and its configuration files is External. As the TCP wrappers
 facility is not controlled by Sun, intra-release incompatibilities are not
 uncommon. See \fBattributes\fR(5).
 .sp
-For more information about configuring TCP wrappers, you can refer to the
-\fBtcpd(1M)\fR and \fBhosts_access(4)\fR man pages, which are delivered as part
-of the Solaris operating system at \fB/usr/sfw/man\fR. These pages are not part
-of the standard Solaris man pages, available at \fB/usr/man\fR.
+For more information about configuring TCP wrappers, refer to
+\fBtcpd\fR(1M) and \fBhosts_access\fR(4).
 .sp
 \fBtcp_wrappers\fR is equivalent to the previous inetd's
 \fB/etc/default/inetd\fR property \fBENABLE_TCPWRAPPERS\fR.
@@ -843,7 +841,7 @@ Interface Stability	Evolving
 The \fBinetd\fR daemon performs the same function as, but is implemented
 significantly differently from, the daemon of the same name in Solaris 9 and
 prior Solaris operating system releases. In the current Solaris release,
-\fBinetd\fR is part of the Solaris Management Facility (see \fBsmf\fR(5)) and
+\fBinetd\fR is part of the Service Management Facility (see \fBsmf\fR(5)) and
 will run only within that facility.
 .sp
 .LP
diff --git a/usr/src/man/man1m/ldap_cachemgr.1m b/usr/src/man/man1m/ldap_cachemgr.1m
index c4089a78f6..3709d5d50b 100644
--- a/usr/src/man/man1m/ldap_cachemgr.1m
+++ b/usr/src/man/man1m/ldap_cachemgr.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LDAP_CACHEMGR 1M "Oct 7, 2008"
+.TH LDAP_CACHEMGR 1M "May 13, 2017"
 .SH NAME
 ldap_cachemgr \- LDAP daemon to manage client configuration for LDAP based
 Network Information Service lookups
@@ -14,7 +14,6 @@ Network Information Service lookups
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBldap_cachemgr\fR daemon is a process that provides an up-to-date
 configuration cache for LDAP naming services. It is started during multi-user
@@ -46,7 +45,6 @@ The \fBldap_cachemgr\fR daemon also acts as its own administration tool. If an
 instance of \fBldap_cachemgr\fR is already running, commands are passed
 transparently to the running version.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -104,7 +102,6 @@ example# pkill -HUP ldap_cachemgr
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/ldap/cachemgr.log\fR\fR
@@ -131,21 +128,18 @@ be modified manually. Their content is not guaranteed to be human readable. Use
 .RE
 
 .SH WARNINGS
-.sp
 .LP
 The \fBldap_cachemgr\fR utility is included in the current Solaris release on
 an uncommitted basis only. It is subject to change or removal in a future minor
 release.
 .SH SEE ALSO
-.sp
 .LP
 \fBldap\fR(1), \fBldapadd\fR(1), \fBldapdelete\fR(1), \fBldaplist\fR(1),
 \fBldapmodify\fR(1), \fBldapmodrdn\fR(1), \fBldapsearch\fR(1), \fBpkill\fR(1),
 \fBsvcs\fR(1), \fBidsconfig\fR(1M), \fBldapaddent\fR(1M), \fBldapclient\fR(1M),
-\fBsuninstall\fR(1M), \fBsvcadm\fR(1M), \fBsignal.h\fR(3HEAD),
+\fBsvcadm\fR(1M), \fBsignal.h\fR(3HEAD),
 \fBresolv.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fBldap_cachemgr\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifier:
diff --git a/usr/src/man/man1m/ldapaddent.1m b/usr/src/man/man1m/ldapaddent.1m
index 38821a0b16..2fd88040df 100644
--- a/usr/src/man/man1m/ldapaddent.1m
+++ b/usr/src/man/man1m/ldapaddent.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LDAPADDENT 1M "Mar 6, 2017"
+.TH LDAPADDENT 1M "May 13, 2017"
 .SH NAME
 ldapaddent \- create LDAP entries from corresponding /etc files
 .SH SYNOPSIS
@@ -551,7 +551,7 @@ Interface Stability	Committed
 .LP
 \fBldap\fR(1), \fBldaplist\fR(1), \fBldapmodify\fR(1), \fBldapmodrdn\fR(1),
 \fBldapsearch\fR(1), \fBidsconfig\fR(1M), \fBldapclient\fR(1M),
-\fBsuninstall\fR(1M), \fBnsswitch.conf\fR(4), \fBattributes\fR(5)
+\fBnsswitch.conf\fR(4), \fBattributes\fR(5)
 .sp
 .LP
 \fI\fR
diff --git a/usr/src/man/man1m/lpadmin.1m b/usr/src/man/man1m/lpadmin.1m
index 7a601e756b..c509eafe2e 100644
--- a/usr/src/man/man1m/lpadmin.1m
+++ b/usr/src/man/man1m/lpadmin.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LPADMIN 1M "April 9, 2016"
+.TH LPADMIN 1M "May 13, 2017"
 .SH NAME
 lpadmin \- configure the LP print service
 .SH SYNOPSIS
@@ -889,7 +889,7 @@ For example:
 .in -2
 .sp
 
-See the \fB/usr/sfw/man/man1m/smbspool.1m\fR man page for details.
+See the \fBsmbspool\fR man page for details.
 .RE
 
 .SS "Removing a Printer Destination"
diff --git a/usr/src/man/man1m/luxadm.1m b/usr/src/man/man1m/luxadm.1m
index 524527f222..0892d542e7 100644
--- a/usr/src/man/man1m/luxadm.1m
+++ b/usr/src/man/man1m/luxadm.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LUXADM 1M "Sep 24, 2003"
+.TH LUXADM 1M "May 13, 2017"
 .SH NAME
 luxadm \- administer Sun Fire 880 storage subsystem and FC_AL devices
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ luxadm \- administer Sun Fire 880 storage subsystem and FC_AL devices
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBluxadm\fR program is an administrative command that manages the
 \fBSENA\fR, Sun Fire 880 internal storage subsystem, and individual Fiber
@@ -37,7 +36,6 @@ of the \fBSENA\fR enclosure, and an optional identifier for the particular
 device in the enclosure. The individual \fBFC_AL\fR devices may be specified by
 entering the \fBWWN\fR for the device or a port to the device.
 .SS "Pathname"
-.sp
 .LP
 Specify the device or controller by either a complete physical pathname or a
 complete logical pathname.
@@ -122,7 +120,6 @@ and a typical logical pathname is:
 .sp
 
 .SS "Enclosure"
-.sp
 .LP
 For \fBSENA,\fR a device may be identified by its enclosure name and slotname:
 .br
@@ -172,7 +169,6 @@ the disk slot number in the Sun Fire 880 internal storage subsystem, \fB0\fR -
 See \fBdisks\fR(1M) and \fBdevlinks\fR(1M) for additional information on
 logical names for disks and subsystems.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported by all subcommands:
 .sp
@@ -198,7 +194,6 @@ Verbose mode.
 Options that are specific to particular subcommands are described with the
 subcommand in the \fBUSAGE\fR section.
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -244,7 +239,6 @@ subsystem, or disk device. \fIpathname\fR can also be the \fBWWN\fR of a
 
 .SH USAGE
 .SS "Subcommands"
-.sp
 .ne 2
 .na
 \fB\fBdisplay\fR \fIenclosure\fR[,\fIdev\fR]\|.\|.\|.\||
@@ -752,7 +746,6 @@ Spin down the specified disks in a SENA.
 .RE
 
 .SS "SENA, Sun Fire 880 Internal Storage Subsystem, and Individual FC_AL Drive Expert Mode Subcommands"
-.sp
 .LP
 The following subcommands are for expert use only, and are applicable only to
 the \fBSENA\fR, Sun Fire 880 internal storage subsystem, and fiber channel
@@ -874,7 +867,6 @@ the loop that contains the device specified by the enclosure or pathname.
 .RE
 
 .SS "Other Expert Mode Subcommands"
-.sp
 .LP
 See \fBNOTES\fR for limitations of these subcommands. They should only be used
 by users that are knowledgeable about the systems they are managing.
@@ -1215,12 +1207,10 @@ example# \fBluxadm release /dev/rdsk/c1t8d0s2\fR
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 See \fBenviron\fR(5) for a description of the \fBLANG\fR environment variable
 that affects the execution of \fBluxadm\fR.
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -1242,7 +1232,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fBusr/lib/firmware/fc_s/fc_s_fcode\fR\fR
@@ -1263,26 +1252,12 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdevlinks\fR(1M), \fBdisks\fR(1M), \fBattributes\fR(5), \fBenviron\fR(5),
 \fBses\fR( 7D)
-.sp
-.LP
-\fISENA Array Installation and Service Manual\fR (p/n 802-7573).
-.sp
-.LP
-\fIRAID Manager 6.1 Installation and Support Guide Answerbook\fR
-.sp
-.LP
-\fIRAID Manager 6.1 User's Guide Answerbook\fR
 .SH NOTES
-.sp
 .LP
-See the \fISENA Array Installation and Service Manual\fR for additional
-information on the \fBSENA.\fR Refer to \fITutorial for SCSI use of IEEE
-Company_ID\fR, R. Snively, for additional information regarding the \fBIEEE\fR
-extended \fBWWN.\fR See \fBSEE ALSO\fR. Currently, only some device drivers
+Currently, only some device drivers
 support hot plugging. If hot plugging is attempted on a disk or bus where it is
 not supported, an error message of the form:
 .sp
diff --git a/usr/src/man/man1m/powerd.1m b/usr/src/man/man1m/powerd.1m
index 6b95512ddd..85e74a838a 100644
--- a/usr/src/man/man1m/powerd.1m
+++ b/usr/src/man/man1m/powerd.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH POWERD 1M "Oct 15, 1999"
+.TH POWERD 1M "May 13, 2017"
 .SH NAME
 powerd \- power manager daemon
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ powerd \- power manager daemon
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpowerd\fR daemon is started by \fBpmconfig\fR(1M) to monitor system
 activity and perform an automatic shutdown using the suspend-resume feature.
@@ -26,7 +25,6 @@ prior to suspend.
 Immediately prior to system shutdown, the daemon notifies \fBsyslogd\fR(1M) of
 the shutdown, which broadcasts a notification.
 .SH OPTIONS
-.sp
 .LP
 The following option is supported:
 .sp
@@ -40,7 +38,6 @@ No broadcast mode. The daemon silently shuts down the system without notifying
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/power.conf\fR\fR
@@ -50,7 +47,6 @@ Power Management configuration information file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -66,9 +62,8 @@ Interface Stability 	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBpmconfig\fR(1M), \fBdtpower\fR(1M), \fBsyslogd\fR(1M), \fBpower.conf\fR(4),
+\fBpmconfig\fR(1M), \fBsyslogd\fR(1M), \fBpower.conf\fR(4),
 \fBattributes\fR(5), \fBcpr\fR(7), \fBpm\fR(7D)
 .sp
 .LP
diff --git a/usr/src/man/man1m/powertop.1m b/usr/src/man/man1m/powertop.1m
index cedab13ae2..8307bdf330 100644
--- a/usr/src/man/man1m/powertop.1m
+++ b/usr/src/man/man1m/powertop.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH POWERTOP 1M "May 19, 2009"
+.TH POWERTOP 1M "May 13, 2017"
 .SH NAME
 powertop \- report and analyze events that affect power management
 .SH SYNOPSIS
@@ -13,12 +13,11 @@ powertop \- report and analyze events that affect power management
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBPowerTOP\fR is an observability tool that shows how effectively the system
 is taking advantage of the CPU's power management features. By running the tool
 on an otherwise idle system, the user can see for how long the CPU is running
-at dif- ferent power states. Ideally, an unutilized (idle) system spends 100%
+at different power states. Ideally, an unutilized (idle) system spends 100%
 of its time running at the lowest power state, but because of background user
 and kernel activity (random software periodically waking to poll status), idle
 systems can consume more power than they should.
@@ -49,8 +48,8 @@ management perspective.
 .sp
 .LP
 PowerTOP allows you to freeze each of its three subwindows, enabling you to
-better analyze each subwindow's contents.  when you have three different DTrace
-scripts running at the same time, freezing subwindows lowers CPU consumption .
+better analyze each subwindow's contents.  When you have three different DTrace
+scripts running at the same time, freezing subwindows lowers CPU consumption.
 This feature is activated by pressing the \fBi\fR, \fBf\fR, or \fBe\fR key
 while the tool running.  Pressing one of these keys freezes the idle,
 frequency, or event report, respectively. Pressing it once more, unfreezes it.
@@ -63,7 +62,6 @@ transitions might or might not be accurate as the physical CPU can be shared by
 different virtual CPUs. Both wakeup count and event report displays information
 regarding the current virtualized environment.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -177,7 +175,6 @@ The following command runs PowerTOP and only displays data for CPU 3:
 .sp
 
 .SH EXIT STATUS
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -208,7 +205,6 @@ Incorrect usage.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -226,16 +222,11 @@ Interface Stability	Volatile
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkstat\fR(1M), \fBpmconfig\fR(1M), \fBpowerd\fR(1M), \fBpsrinfo\fR(1M),
 \fBuadmin\fR(2), \fBlibdevinfo\fR(3LIB), \fBattributes\fR(5), \fBxVM\fR(5),
 \fBcpr\fR(7), \fBpm\fR(7D), \fBpm-components\fR(9P), \fBremovable-media\fR(9P)
-.sp
-.LP
-Among non-SunOS man pages, \fBxscreensaver(1)\fR and \fBdtpower(1M)\fR.
 .SH USAGE
-.sp
 .LP
 You must have \fBDTrace\fR privileges to run \fBPowerTOP\fR and root
 (superuser) privileges or assume the Primary Administrator role for the tool to
diff --git a/usr/src/man/man1m/route.1m b/usr/src/man/man1m/route.1m
index 60cbf3f1ae..3cafaee41a 100644
--- a/usr/src/man/man1m/route.1m
+++ b/usr/src/man/man1m/route.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ROUTE 1M "April 9, 2016"
+.TH ROUTE 1M "May 13, 2017"
 .SH NAME
 route \- manually manipulate the routing tables
 .SH SYNOPSIS
@@ -114,9 +114,7 @@ option is ignored unless used in conjunction with the \fB-p\fR option. When
 \fB-R\fR is specified, route changes are applied only to the list of saved
 routes to be used at startup, \fBnot\fR to the network routing tables. In
 addition, certain checks, such as the existence of network interfaces used with
-\fB-ifp\fR, are skipped. This can be useful from within JumpStart scripts,
-where the root directory of the system being modified is in a location other
-than \fB/\fR.
+\fB-ifp\fR, are skipped.
 .RE
 
 .sp
diff --git a/usr/src/man/man1m/routeadm.1m b/usr/src/man/man1m/routeadm.1m
index 66e43c8177..a3496050e6 100644
--- a/usr/src/man/man1m/routeadm.1m
+++ b/usr/src/man/man1m/routeadm.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ROUTEADM 1M "April 9, 2016"
+.TH ROUTEADM 1M "May 13, 2017"
 .SH NAME
 routeadm \- IP forwarding and routing configuration
 .SH SYNOPSIS
@@ -99,9 +99,7 @@ the configuration for the specified option or variable is displayed.
 .ad
 .sp .6
 .RS 4n
-Specify an alternate root directory where \fBrouteadm\fR applies changes. This
-can be useful from within JumpStart scripts, where the root directory of the
-system being modified is mounted elsewhere.
+Specify an alternate root directory where \fBrouteadm\fR applies changes.
 .LP
 Note -
 .sp
@@ -161,7 +159,7 @@ routing daemon service.
 .RS 4n
 Change property value of property \fIkey\fR to \fIvalue\fR in routing
 application property group for the SMF routing daemon service. For multi-valued
-properties, the  property name can be used multiple times in the modify
+properties, the property name can be used multiple times in the modify
 operation, and each associated value will be added.
 .RE
 
diff --git a/usr/src/man/man1m/rpc.smserverd.1m b/usr/src/man/man1m/rpc.smserverd.1m
index 0aa17afb1b..ba618d60e3 100644
--- a/usr/src/man/man1m/rpc.smserverd.1m
+++ b/usr/src/man/man1m/rpc.smserverd.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RPC.SMSERVERD 1M "Mar 1, 2007"
+.TH RPC.SMSERVERD 1M "May 13, 2017"
 .SH NAME
 rpc.smserverd \- removable media device server
 .SH SYNOPSIS
@@ -13,16 +13,14 @@ rpc.smserverd \- removable media device server
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBrpc.smserverd\fR is a server that handles requests from client
-applications, such as volume management software, for access to removable media
-devices. In addition to volume management software, \fBrmformat\fR(1) and the
-CDE Filemanager (when performing removable media operations) are
-\fBrpc.smserverd\fR clients. The \fBrpc.smserverd\fR daemon is started by
+applications, such as volume management software or \fBrmformat\fR(1),
+for access to removable media
+devices. The \fBrpc.smserverd\fR daemon is started by
 \fBinetd\fR(1M) when a client makes a call to a Solaris-internal library to
 access a SCSI, IDE, or USB device. The daemon is not started if a client
-attempts to access a  floppy or PCMCIA device. Once started, the daemon remains
+attempts to access a floppy or PCMCIA device. Once started, the daemon remains
 active until such time as it is idle for three minutes or more.
 .sp
 .LP
@@ -30,12 +28,10 @@ The \fBrpc.smserverd\fR daemon is provided for the exclusive use of the client
 applications mentioned above. It has no external, customer-accessible
 interfaces, including no configuration file.
 .SH SEE ALSO
-.sp
 .LP
-\fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBsvcadm\fR(1M),
-\fBattributes\fR(5), \fBsmf\fR(5)
+\fBrmformat\fR(1), \fBsvcs\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M),
+\fBsvcadm\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fBrpc.smserverd\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifier:
diff --git a/usr/src/man/man1m/rpcbind.1m b/usr/src/man/man1m/rpcbind.1m
index 556bd78f93..afd563c146 100644
--- a/usr/src/man/man1m/rpcbind.1m
+++ b/usr/src/man/man1m/rpcbind.1m
@@ -5,7 +5,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RPCBIND 1M "Feb 13, 2015"
+.TH RPCBIND 1M "May 13, 2017"
 .SH NAME
 rpcbind \- universal addresses to RPC program number mapper
 .SH SYNOPSIS
@@ -247,11 +247,8 @@ TCP wrappers is External.
 .SH SEE ALSO
 .LP
 \fBsmf\fR(5), \fBrpcinfo\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
-\fBrpcbind\fR(3NSL), \fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5)
-.sp
-.LP
-For information on the TCP wrappers facility, see the \fBhosts_access(4)\fR man
-page available in the \fBSUNWtcpd\fR package.
+\fBrpcbind\fR(3NSL), \fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5),
+\fBhosts_access\fR(4)
 .SH NOTES
 .LP
 Terminating \fBrpcbind\fR with \fBSIGKILL\fR prevents the warm-start files from
diff --git a/usr/src/man/man1m/sar.1m b/usr/src/man/man1m/sar.1m
index 8641182475..854e8d5b4a 100644
--- a/usr/src/man/man1m/sar.1m
+++ b/usr/src/man/man1m/sar.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SAR 1M "Aug 20, 2004"
+.TH SAR 1M "May 13, 2017"
 .SH NAME
 sar, sa1, sa2, sadc \- system activity report package
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ sar, sa1, sa2, sadc \- system activity report package
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 System activity data can be accessed at the special request of a user (see
 \fBsar\fR(1)) and automatically, on a routine basis, as described here. The
@@ -93,7 +92,6 @@ during the working day:
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/tmp/sa.adrfl\fR\fR
@@ -134,16 +132,14 @@ Daily report file
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBcrontab\fR(1), \fBsag\fR(1), \fBsar\fR(1), \fBsvcs\fR(1), \fBtimex\fR(1),
+\fBcrontab\fR(1), \fBsar\fR(1), \fBsvcs\fR(1), \fBtimex\fR(1),
 \fBiostat\fR(1M), \fBsvcadm\fR(1M), \fBvmstat\fR(1M), \fBattributes\fR(5),
 \fBsmf\fR(5)
 .sp
 .LP
 \fI\fR
 .SH NOTES
-.sp
 .LP
 The \fBsar\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifier:
diff --git a/usr/src/man/man1m/sendmail.1m b/usr/src/man/man1m/sendmail.1m
index 45945aa83e..dff3a81c36 100644
--- a/usr/src/man/man1m/sendmail.1m
+++ b/usr/src/man/man1m/sendmail.1m
@@ -6,7 +6,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SENDMAIL 1M "April 9, 2016"
+.TH SENDMAIL 1M "May 13, 2017"
 .SH NAME
 sendmail \- send mail over the internet
 .SH SYNOPSIS
@@ -158,9 +158,7 @@ automate (re)building of configuration files when the service is started.
 .LP
 \fBsendmail\fR uses TCP Wrappers to restrict access to hosts. It uses the
 service name of \fBsendmail\fR for \fBhosts_access()\fR. For more information
-on TCP Wrappers, see \fBtcpd\fR(1M) and \fBhosts_access\fR(4) in the
-\fBSUNWtcpd\fR package. \fBtcpd\fR(1M) and \fBhosts_access\fR(4) are not part
-of the Solaris man pages.
+on TCP Wrappers, see \fBtcpd\fR(1M) and \fBhosts_access\fR(4).
 .SS "Startup Options"
 .LP
 The \fB/etc/default/sendmail\fR file stores startup options for \fBsendmail\fR
@@ -3440,10 +3438,7 @@ Describes the steps needed to compile and run a filter
 \fBfork\fR(2), \fBgetpwnam\fR(3C), \fBgetusershell\fR(3C),
 \fBresolver\fR(3RESOLV), \fBaliases\fR(4), \fBhosts\fR(4), \fBsendmail\fR(4),
 \fBshells\fR(4), \fBattributes\fR(5), \fBlargefile\fR(5), \fBsmf\fR(5),
-\fBrandom\fR(7D)
-.sp
-.LP
-\fBtcpd\fR(1M), \fBhosts_access\fR(4) in the \fBSUNWtcpd\fR package.
+\fBrandom\fR(7D), \fBtcpd\fR(1M), \fBhosts_access\fR(4)
 .sp
 .LP
 \fBRFC\fR 2821 \fISimple Mail Transfer Protocol\fR, John Klensin, April 2001.
diff --git a/usr/src/man/man1m/svccfg.1m b/usr/src/man/man1m/svccfg.1m
index 600a1c85b5..989e4a68db 100644
--- a/usr/src/man/man1m/svccfg.1m
+++ b/usr/src/man/man1m/svccfg.1m
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SVCCFG 1M "April 9, 2016"
+.TH SVCCFG 1M "May 13, 2017"
 .SH NAME
 svccfg \- import, export, and modify service configurations
 .SH SYNOPSIS
@@ -149,7 +149,7 @@ Uses \fIrepfile\fR as a repository. By default, \fBsvccfg\fR(1M) uses the
 system repository.
 .sp
 Use repository only with files from the identical version of Solaris, including
-patches, that you are currently running. Do not use this subcommand with the
+updates, that you are currently running. Do not use this subcommand with the
 system repository, \fB/etc/svc/repository.db\fR.
 .RE
 
diff --git a/usr/src/man/man1m/tnctl.1m b/usr/src/man/man1m/tnctl.1m
index 351f399d67..77817db9ec 100644
--- a/usr/src/man/man1m/tnctl.1m
+++ b/usr/src/man/man1m/tnctl.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH TNCTL 1M "Mar 6, 2008"
+.TH TNCTL 1M "May 13, 2017"
 .SH NAME
 tnctl \- configure Trusted Extensions network parameters
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ tnctl \- configure Trusted Extensions network parameters
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBtnctl\fR provides an interface to manipulate trusted network parameters in
 the Solaris kernel.
@@ -24,8 +23,8 @@ the Solaris kernel.
 As part of Solaris Trusted Extensions initialization, \fBtnctl\fR is run in the
 global zone by an \fBsmf\fR(5) script during system boot. The \fBtnctl\fR
 command is not intended to be used during normal system administration.
-Instead, if a local trusted networking database file is modified without using
-the Solaris Management Console, the administrator first issues
+Instead, if a local trusted networking database file is modified,
+the administrator first issues
 \fBtnchkdb\fR(1M) to check the syntax, and then refreshes the kernel copy with
 this command:
 .sp
@@ -41,7 +40,6 @@ this command:
 See \fBWARNINGS\fR about the risks of changing remote host and template
 information on a running system.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-d\fR\fR
@@ -94,7 +92,7 @@ Turn on verbose mode.
 .ad
 .sp .6
 .RS 4n
-Update the kernel remote-host cache on the local host for  the specified
+Update the kernel remote-host cache on the local host for the specified
 \fIhost\fR or, if a template name is given, change the kernel's cache to use
 the specified \fItemplate\fR. If \fIprefix\fR is not specified, then an implied
 prefix length is determined according to the rules used for interpreting the
@@ -167,7 +165,6 @@ reload MLPs for a non-global zone, reboot the zone:
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -183,7 +180,6 @@ Interface Stability	Uncommitted
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/security/tsol/tnrhdb\fR\fR
@@ -224,7 +220,6 @@ Configuration file for the name service switch
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBtninfo\fR(1M), \fBtnd\fR(1M),
 \fBtnchkdb\fR(1M), \fBzoneadm\fR(1M), \fBnsswitch.conf\fR(4),
@@ -234,12 +229,10 @@ Configuration file for the name service switch
 \fIHow to Synchronize Kernel Cache With Network Databases\fR in \fISolaris
 Trusted Extensions Administrator\&'s Procedures\fR
 .SH WARNINGS
-.sp
 .LP
 Changing a template while the network is up can change the security view of an
 undetermined number of hosts.
 .SH NOTES
-.sp
 .LP
 The functionality described on this manual page is available only if the system
 is configured with Trusted Extensions.
diff --git a/usr/src/man/man1m/usermod.1m b/usr/src/man/man1m/usermod.1m
index 5ddf6ae88d..fd337ca082 100644
--- a/usr/src/man/man1m/usermod.1m
+++ b/usr/src/man/man1m/usermod.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USERMOD 1M "Feb 25, 2017"
+.TH USERMOD 1M "May 13, 2017"
 .SH NAME
 usermod \- modify a user's login information on the system
 .SH SYNOPSIS
@@ -341,8 +341,7 @@ jdoe::::type=normal;defaultpriv=basic,!proc_session;limitpriv=all
 .sp
 .LP
 The following command assigns a role to a user. The role must have been created
-prior to this command, either through use of the Solaris Management Console GUI
-or through \fBroleadd\fR(1M).
+prior to this command, see \fBroleadd\fR(1M).
 
 .sp
 .in +2
@@ -581,5 +580,5 @@ network nameservice. However \fBusermod\fR will verify the uniqueness of user
 name and user \fBID\fR against the external nameservice.
 .sp
 .LP
-The \fBusermod\fR utility uses the \fB/etc/datemsk\fR file, available with
-SUNWaccr, for date formatting.
+The \fBusermod\fR utility uses the \fB/etc/datemsk\fR file
+for date formatting.
diff --git a/usr/src/man/man1m/ypbind.1m b/usr/src/man/man1m/ypbind.1m
index 5e8101b686..1cd12276e9 100644
--- a/usr/src/man/man1m/ypbind.1m
+++ b/usr/src/man/man1m/ypbind.1m
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH YPBIND 1M "Feb 25, 2017"
+.TH YPBIND 1M "May 13, 2017"
 .SH NAME
 ypbind \- NIS binder process
 .SH SYNOPSIS
@@ -26,7 +26,7 @@ Administrative tools are described in \fBypinit\fR(1M), \fBypwhich\fR(1), and
 \fBypbind\fR is a daemon process that is activated at system startup time from
 the \fBsvc:/network/nis/client:default\fR service. By default, it is invoked as
 \fBypbind\fR \fB-broadcast\fR. \fBypbind\fR runs on all client machines that
-are set up to use \fBNIS\fR. See \fBsysidtool\fR(1M). The function of
+are set up to use \fBNIS\fR. The function of
 \fBypbind\fR is to remember information that lets all \fBNIS\fR client
 processes on a node communicate with some \fBNIS\fR server process.
 \fBypbind\fR must run on every machine which has \fBNIS\fR client processes.
@@ -36,10 +36,10 @@ running somewhere on the network.
 .LP
 The information \fBypbind\fR remembers is called a \fIbinding\fR \(em the
 association of a domain name with a \fBNIS\fR server. The process of binding is
-driven by client requests.  As a request for  an unbound domain comes in, if
-started with the \fB-broadcast\fR option, the \fBypbind\fR process  broadcasts
+driven by client requests.  As a request for an unbound domain comes in, if
+started with the \fB-broadcast\fR option, the \fBypbind\fR process broadcasts
 on the net trying to find an \fBNIS\fR server, a \fBypserv\fR process
-serving the domain. Since the binding is established by broadcasting,  there
+serving the domain. Since the binding is established by broadcasting, there
 must be at least one \fBNIS\fR server on the net. If started without the
 \fB-broadcast\fR option, \fBypbind\fR process steps through the list of
 \fBNIS\fR servers that was created by \fBypinit\fR \fB-c\fR for the requested
@@ -75,7 +75,7 @@ work, \fBypbind\fR must have been invoked with flags \fB-ypset\fR or
 .ad
 .sp .6
 .RS 4n
-Send a broadcast datagram using \fBUDP/IP\fR  that requests the information
+Send a broadcast datagram using \fBUDP/IP\fR that requests the information
 needed to bind to a specific \fBNIS\fR server. This option is analogous to
 \fBypbind\fR with no options in earlier Sun releases and is recommended for
 ease of use.
@@ -134,9 +134,9 @@ File in which it is recommended that NIS servers be listed.
 \fBattributes\fR(5), \fBsmf\fR(5)
 .SH NOTES
 .LP
-\fBypbind\fR supports multiple domains. The  \fBypbind\fR process can maintain
+\fBypbind\fR supports multiple domains. The \fBypbind\fR process can maintain
 bindings to several domains and their servers, the default domain is the one
-specified by the  \fBdomainname\fR(1M) command at startup time.
+specified by the \fBdomainname\fR(1M) command at startup time.
 .sp
 .LP
 The \fB-broadcast\fR option works only on the \fBUDP\fR transport. It is
diff --git a/usr/src/man/man1m/zoneadm.1m b/usr/src/man/man1m/zoneadm.1m
index 1ddfc1356a..145e6cc893 100644
--- a/usr/src/man/man1m/zoneadm.1m
+++ b/usr/src/man/man1m/zoneadm.1m
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ZONEADM 1M "Sep 8, 2015"
+.TH ZONEADM 1M "May 13, 2017"
 .SH NAME
 zoneadm \- administer zones
 .SH SYNOPSIS
@@ -666,13 +666,3 @@ svc:/system/zones:default
 Administrative actions on this service, such as enabling, disabling, or
 requesting restart, can be performed using \fBsvcadm\fR(1M). The service's
 status can be queried using the \fBsvcs\fR(1) command.
-.sp
-.LP
-The act of installing a new non-global zone is a fresh installation of the
-Solaris operating system. A new installation of Solaris must not require
-interaction with the user (that is, it must be "hands off"). Because of this,
-packages installed in the global zone and all non-global zones cannot contain
-request scripts (see \fBpkgask\fR(1M)). If a package did have a request script,
-then the creation of a non-global zone could not be done without user
-intervention. Any package that contains a request script is added to the global
-zone only. See \fBpkgadd\fR(1M).
diff --git a/usr/src/man/man1m/zonecfg.1m b/usr/src/man/man1m/zonecfg.1m
index 5371592ade..8182046544 100644
--- a/usr/src/man/man1m/zonecfg.1m
+++ b/usr/src/man/man1m/zonecfg.1m
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ZONECFG 1M "Jun 6, 2016"
+.TH ZONECFG 1M "May 13, 2017"
 .SH NAME
 zonecfg \- set up zone configuration
 .SH SYNOPSIS
@@ -1517,8 +1517,8 @@ other zones configured on the system.
 
 .sp
 .LP
-The IP addresses and routing is configured inside the new zone using
-\fBsysidtool\fR(1M).
+The IP addresses and routing should be configured inside the new zone using
+the normal networking administration tools such as \fBipadm\fR(1M).
 
 .sp
 .in +2
@@ -1883,7 +1883,7 @@ Interface Stability	Volatile
 .LP
 \fBppriv\fR(1), \fBprctl\fR(1), \fBzlogin\fR(1), \fBkstat\fR(1M),
 \fBmount\fR(1M), \fBpooladm\fR(1M), \fBpoolcfg\fR(1M), \fBpoold\fR(1M),
-\fBrcapd\fR(1M), \fBrctladm\fR(1M), \fBsvcadm\fR(1M), \fBsysidtool\fR(1M),
+\fBrcapd\fR(1M), \fBrctladm\fR(1M), \fBsvcadm\fR(1M), \fBipadm\fR(1M),
 \fBzfs\fR(1M), \fBzoneadm\fR(1M), \fBpriv_str_to_set\fR(3C),
 \fBkstat\fR(3KSTAT), \fBvfstab\fR(4), \fBattributes\fR(5), \fBbrands\fR(5),
 \fBfnmatch\fR(5), \fBlx\fR(5), \fBprivileges\fR(5), \fBresource_controls\fR(5),