10 files changed, 41 insertions, 282 deletions
diff --git a/usr/src/man/man4/admin.4 b/usr/src/man/man4/admin.4
index c7090f9b04..9163dfc5fb 100644
--- a/usr/src/man/man4/admin.4
+++ b/usr/src/man/man4/admin.4
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ADMIN 4 "Mar 2, 2017"
+.TH ADMIN 4 "May 13, 2017"
 .SH NAME
 admin \- installation defaults file
 .SH DESCRIPTION
@@ -303,10 +303,8 @@ Abort installation if package dependencies are not met.
 \fB\fBrdepend\fR\fR
 .ad
 .RS 30n
-Controls resolution if other packages depend on the package to be removed. Also
-determines behavior if registered products components to be removed. See
-\fBlibwsreg\fR(3LIB) and \fBprodreg\fR(1M) for a definition of product
-components. Options are:
+Controls resolution if other packages depend on the package to be removed.
+Options are:
 .sp
 .ne 2
 .na
@@ -389,7 +387,7 @@ basic privileges of the unprivileged user \fBnoaccess\fR.
 If this parameter is not present or has a null value, the user \fBnoaccess\fR
 is assumed. Likewise, if this parameter is set to anything other than the
 values described here, a warning is issued, and \fBnoaccess\fR is assumed.
-\fBrscriptalt\fR is not present in the default  \fBadmin\fR file,
+\fBrscriptalt\fR is not present in the default \fBadmin\fR file,
 \fB/var/sadm/install/admin/default\fR. In this case, request scripts are run as
 the user \fBnoaccess\fR.
 .RE
@@ -474,8 +472,7 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBpkgadd\fR(1M), \fBprodreg\fR(1M), \fBlibwsreg\fR(3LIB), \fBpkginfo\fR(4),
-\fBattributes\fR(5), \fBzones\fR(5)
+\fBpkgadd\fR(1M), \fBpkginfo\fR(4), \fBattributes\fR(5), \fBzones\fR(5)
 .SH NOTES
 .LP
 The value \fBask\fR should not be defined in an \fBadmin\fR file that will be
diff --git a/usr/src/man/man4/bootparams.4 b/usr/src/man/man4/bootparams.4
index 6106d9e5b0..082fc6f4b3 100644
--- a/usr/src/man/man4/bootparams.4
+++ b/usr/src/man/man4/bootparams.4
@@ -1,9 +1,10 @@
 '\" te
+.\" Copyright 2017 Peter Tribble
 .\" Copyright (C) 2002, Sun Microsystems, Inc. All Rights Reserved
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH BOOTPARAMS 4 "Jul 22, 2004"
+.TH BOOTPARAMS 4 "May 13, 2017"
 .SH NAME
 bootparams \- boot parameter data base
 .SH SYNOPSIS
@@ -13,7 +14,6 @@ bootparams \- boot parameter data base
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBbootparams\fR file contains a list of client entries that diskless
 clients use for booting. Diskless booting clients retrieve this information by
@@ -152,7 +152,7 @@ ns=hoot:nisplus(255.255.255.0)
 
 .sp
 .LP
-An \fBns\fR entry forces \fBsysidtool\fR(1M) to use the specified name service.
+An \fBns\fR entry forces \fBsysidtool\fR to use the specified name service.
 By default, \fBsysidtool\fR uses \fBNIS+\fR in preference to \fBNIS\fR or
 \fBLDAP\fR if it can find an \fBNIS+\fR server for the system's domain on the
 subnet. An \fBns\fR entry might be necessary if you are trying to set up a
@@ -208,7 +208,6 @@ ns=otis:nisplus(255.255.255.0) term=:xterms domain=eu.cte.work.com
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/bootparams\fR\fR
@@ -218,10 +217,13 @@ ns=otis:nisplus(255.255.255.0) term=:xterms domain=eu.cte.work.com
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBrpc.bootparamd\fR(1M), \fBsysidtool\fR(1M), \fBnsswitch.conf\fR(4)
+\fBrpc.bootparamd\fR(1M), \fBnsswitch.conf\fR(4)
 .SH NOTES
+.LP
+The \fBNIS+\fR, \fBsysidtool\fR, and jumpstart facilities are not present in
+illumos. They are documented here solely for users who wish to use illumos as
+a jumpstart server for older Solaris releases.
 .sp
 .LP
 Solaris diskless clients use the keywords \fBroot\fR and \fBrootopts\fR to look
diff --git a/usr/src/man/man4/hosts_access.4 b/usr/src/man/man4/hosts_access.4
index 7452c14b07..1a8f493667 100644
--- a/usr/src/man/man4/hosts_access.4
+++ b/usr/src/man/man4/hosts_access.4
@@ -3,7 +3,7 @@
 .\" Modified for Solaris to to add the Solaris stability classification,
 .\" and to add a note about source availability.
 .\"
-.TH HOSTS_ACCESS 4 "April 9, 2016"
+.TH HOSTS_ACCESS 4 "May 13, 2017"
 .SH NAME
 hosts_access \- format of host access control files
 .SH DESCRIPTION
@@ -108,7 +108,7 @@ Matches any host whose name does not contain a dot character.
 .IP UNKNOWN
 Matches any user whose name is unknown, and matches any host whose name
 \fIor\fR address are unknown.  This pattern should be used with care:
-host names may be unavailable due to temporary name server problems. A
+host names may be unavailable due to temporary name server problems.  A
 network address will be unavailable when the software cannot figure out
 what type of network it is talking to.
 .IP KNOWN
@@ -394,6 +394,5 @@ l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 =
 Interface Stability	Committed
-Source for tcp_wrappers is available in the SUNWtcpdS package.
 .TE
 .\" End Sun update
diff --git a/usr/src/man/man4/init.d.4 b/usr/src/man/man4/init.d.4
index 94477bb677..c0ae9654c0 100644
--- a/usr/src/man/man4/init.d.4
+++ b/usr/src/man/man4/init.d.4
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH INIT.D 4 "Aug 17, 2005"
+.TH INIT.D 4 "May 13, 2017"
 .SH NAME
 init.d \- initialization and termination scripts for changing init states
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ init.d \- initialization and termination scripts for changing init states
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fB/etc/init.d\fR is a directory containing initialization and termination
 scripts for changing init states. These scripts are linked when appropriate to
@@ -88,12 +87,10 @@ is executed by \fB/etc/rc2.d/S68netdaemon start\fR when init state 2 is entered
 and by \fB/etc/rc0.d/K67netdaemon stop\fR when shutting the system down.
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsvcs\fR(1), \fBinit\fR(1M), \fBsvc.startd\fR(1M), \fBsvccfg\fR(1M),
 \fBsmf\fR(5)
 .SH NOTES
-.sp
 .LP
 Solaris now provides an expanded mechanism, which includes automated restart,
 for applications historically started via the init script mechanism. The
@@ -108,9 +105,3 @@ On earlier Solaris releases, a script named with a suffix of '.sh' would be
 sourced, allowing scripts to modify the environment of other scripts executed
 later. This behavior is no longer supported; for altering the environment in
 which services are run, see the \fBsetenv\fR subcommand in \fBsvccfg\fR(1M).
-.sp
-.LP
-\fB/sbin/rc2\fR has references to the obsolescent \fBrc.d\fR directory. These
-references are for compatibility with old \fBINSTALL\fR scripts. New
-\fBINSTALL\fR scripts should use the \fBinit.d\fR directory for related
-executables. The same is true for the \fBshutdown.d\fR directory.
diff --git a/usr/src/man/man4/pci.4 b/usr/src/man/man4/pci.4
index 6d5b2c27cf..7df0d6be9a 100644
--- a/usr/src/man/man4/pci.4
+++ b/usr/src/man/man4/pci.4
@@ -3,11 +3,10 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PCI 4 "May 13, 2005"
+.TH PCI 4 "May 13, 2017"
 .SH NAME
 pci, pcie \- configuration files for PCI and PCI Express device drivers
 .SH DESCRIPTION
-.sp
 .LP
 The Peripheral Component Interconnect (PCI) bus is a little endian bus. PCI
 Express (PCIe) and PCI-X are successors to PCI. All three types of devices
@@ -239,7 +238,6 @@ device. As before, the logical bus is identified by the pathname of the parent
 of the device. The device has a device number of 2, and a function number of 1.
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -255,7 +253,6 @@ Architecture	SPARC, x86
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdriver.conf\fR(4), \fBattributes\fR(5), \fBddi_intr_add_handler\fR(9F),
 \fBddi_prop_lookup\fR(9F), \fBddi_regs_map_setup\fR(9F)
@@ -265,11 +262,7 @@ Architecture	SPARC, x86
 .sp
 .LP
 \fIIEEE 1275 PCI Bus Binding\fR
-.sp
-.LP
-http://playground.sun.com/1275/bindings/pci/pci-express.txt
 .SH NOTES
-.sp
 .LP
 PCIe devices support an extended configuration space unavailable to PCI
 devices. While PCIe devices can be operated using a PCI device driver,
diff --git a/usr/src/man/man4/pkginfo.4 b/usr/src/man/man4/pkginfo.4
index 59d4b17eec..bff96a2d38 100644
--- a/usr/src/man/man4/pkginfo.4
+++ b/usr/src/man/man4/pkginfo.4
@@ -1,14 +1,14 @@
 '\" te
+.\" Copyright 2017 Peter Tribble
 .\" Copyright (c) 2003, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 1989 AT&T
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PKGINFO 4 "Mar 24, 2006"
+.TH PKGINFO 4 "May 13, 2017"
 .SH NAME
 pkginfo \- package characteristics file
 .SH DESCRIPTION
-.sp
 .LP
 \fBpkginfo\fR is an \fBASCII\fR file that describes the characteristics of the
 package along with information that helps control the flow of installation. It
@@ -124,8 +124,8 @@ company's stock symbol.
 Text that specifies the current version associated with the software package.
 The maximum length is 256 \fBASCII\fR characters and the first character cannot
 be a left parenthesis. The \fBpkgmk\fR(1) tool can be used to create or modify
-this value when actually building the package. Current Solaris software
-practice is to assign this parameter monotonically increasing Dewey decimal
+this value when actually building the package. Traditional Solaris
+practice was to assign this parameter monotonically increasing Dewey decimal
 values of the form:
 .sp
 .in +2
@@ -304,49 +304,6 @@ default \fBISA\fR (instruction set architecture) is set to the value of the
 .sp
 .ne 2
 .na
-\fB\fBSUNW_LOC\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solaris-only optional parameter used to indicate a software package containing
-localization files for a given product or application. The parameter value is a
-comma-separated list of locales supported by a package. It is only used for
-packages containing localization files, typically the message catalogues. The
-allowable values for this string field are those found in the table of Standard
-Locale Names located in the \fIInternational Language Environments Guide\fR.
-.sp
-.in +2
-.nf
-SUNW_LOC="<\fIlocale_name\fR>,<\fIlocale_name\fR>,..,\e
-<\fIlocale_name\fR>"
-.fi
-.in -2
-
-where
-.sp
-.in +2
-.nf
-<\fIlocale_name\fR>::= <\fIlanguage\fR>[_<\fIterritory\fR>]\e
-[.<\fIcodeset\fR>]
-<\fIlanguage\fR>::= the set of names from ISO 639
-<\fIterritory\fR>::= the set of territories specified
-in ISO 3166
-<\fIcodeset\fR>::= is a string corresponding to the coded
-character set
-.fi
-.in -2
-
-Since a value of C specifies the traditional UNIX system behavior (American
-English, en_US), packages belonging to the C locale are viewed as non-localized
-packages, and thus must not have \fBSUNW_LOC\fR and \fBSUNW_PKGLIST\fR included
-in their \fBpkginfo\fR file. See also the \fBSUNW_LOC\fR parameter in
-\fBpackagetoc\fR(4) and \fBsetlocale\fR(3C) for more information. This keyword
-is not recognized by the add-on software utility Software Manager.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fBSUNW_PKG_DIR\fR\fR
 .ad
 .sp .6
@@ -605,54 +562,6 @@ non-global zones.
 .sp
 .ne 2
 .na
-\fB\fBSUNW_PKGLIST\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solaris-only optional parameter used to associate a localization package to the
-package(s) from which it is derived. It is required whenever the \fBSUNW_LOC\fR
-parameter is defined. This parameter value is an comma-separated list of
-package abbreviations of the form:
-.sp
-.in +2
-.nf
-SUNW_PKGLIST="\fIpkg1\fR[\fI:version\fR],\fIpkg2\fR[:\fIversion\fR],..."
-.fi
-.in -2
-
-where \fIversion\fR (if specified) should match the version string in the base
-package specified (see \fBVERSION\fR parameter in this manual page). When in
-use, \fBSUNW_PKGLIST\fR helps determine the order of package installation. The
-packages listed in the parameter are installed before the localization package
-in question is installed. When left blank, \fBSUNW_PKGLIST="\|"\fR, the package
-is assumed to be required for the locale to function correctly. See the
-\fBSUNW_PKGLIST\fR parameter in \fBpackagetoc\fR(4) for more information. This
-keyword is not recognized by the add-on software utility Software Manager.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBSUNW_PKGTYPE\fR\fR
-.ad
-.sp .6
-.RS 4n
-Solaris-only parameter for Sun internal use only. Required for packages part of
-the Solaris operating environment releases which install into the \fB/\fR,
-\fB/usr\fR, \fB/usr/kvm\fR, and \fB/usr/openwin\fR file systems. The Solaris
-operating environment installation software must know which packages are part
-of which file system to properly install a server/client configuration. The
-currently allowable values for this parameter are \fBroot\fR, \fBusr\fR,
-\fBkvm\fR, and \fBow\fR. If no \fBSUNW_PKGTYPE\fR parameter is present, the
-package is assumed to be of \fBBASEDIR=\fR\fI/opt\fR. \fBSUNW_PKGTYPE\fR is
-optional only for packages which install into the \fB/opt\fR name space as is
-the case for the majority of Solaris add-on software. See the
-\fBSUNW_PKGTYPE\fR parameter in \fBpackagetoc\fR(4) for further information.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fBSUNW_PKGVERS\fR\fR
 .ad
 .sp .6
@@ -666,7 +575,7 @@ SUNW_PKGVERS="<\fIsunw_package_version\fR>"
 .fi
 .in -2
 
-where <\fIunw_package_version\fR> has the form \fIx.y[.z]\fR and \fIx\fR,
+where <\fIsunw_package_version\fR> has the form \fIx.y[.z]\fR and \fIx\fR,
 \fIy\fR, and z are integers. For packages built for this release and previous
 releases, use \fBSUNW_PKGVERS="\fI1.0\fR"\fR.
 .RE
@@ -680,7 +589,7 @@ releases, use \fBSUNW_PKGVERS="\fI1.0\fR"\fR.
 .RS 4n
 Solaris-only parameter indicating the name of the product this package is a
 part of or comprises (maximum length of 256 \fBASCII\fR characters). A few
-examples of currently used \fBSUNW_PRODNAME\fR values are: \fB"SunOS"\fR,
+examples of \fBSUNW_PRODNAME\fR values are: \fB"SunOS"\fR,
 \fB"OpenWindows"\fR, and \fB"Common Desktop Environment"\fR.
 .RE
 
@@ -737,79 +646,8 @@ of 256 \fBASCII\fR characters).
 .sp
 .LP
 For further discussion of the zones-related parameters described above, see
-\fISystem Administration Guide:  Virtualization Using the Solaris Operating
+\fISystem Administration Guide: Virtualization Using the Solaris Operating
 System\fR.
-.SH ENVIRONMENT VARIABLES
-.sp
-.LP
-The following environment variables are available only to package class action
-scripts and to checkinstall, preinstall, postinstall scripts.
-.sp
-.ne 2
-.na
-\fB\fBSUNW_PKG_INSTALL_ZONENAME\fR\fR
-.ad
-.sp .6
-.RS 4n
-This variable is set only during the initial installation of a zone.
-.sp
-If this variable is not set, the system does not support the \fBzones\fR(5)
-feature. In this case, the package is being installed to or removed from a
-system that is not configured for zones.
-.sp
-If the variable is set, and equal to \fBglobal\fR, the package is being
-installed to or removed from the global zone.
-.sp
-If the variable is set and not equal to \fBglobal\fR, the package is being
-installed to or removed from the non-global zone named by the contents of the
-environment variable \fB${\fR\fBSUNW_PKG_INSTALL_ZONENAME\fR\fB}\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBPKG_INIT_INSTALL\fR\fR
-.ad
-.sp .6
-.RS 4n
-This variable is set only during an initial installation of Solaris, such as
-installing Solaris from a CD, DVD, or net install image.
-.sp
-If this variable is set and equal to \fBTRUE\fR, then the package is being
-installed as part of an initial installation of Solaris.
-.sp
-If this variable is not set, or set and not equal to \fBTRUE\fR, then the
-package is not being installed as part of an initial installation of Solaris.
-.RE
-
-.sp
-.LP
-The following code excerpt illustrates the semantics of the preceding
-environment variables.
-.sp
-.in +2
-.nf
-if [ $PKG_INIT_INSTALL != "" ] ; then
-        # Package being installed as part of initial
-        # installation of Solaris.
-
-elif [ $SUNW_PKG_INSTALL_ZONENAME != "" ] ; then
-
-    if [ $SUNW_PKG_INSTALL_ZONENAME != "global" ] ; then
-         # Package being installed as part of initial installation
-         # of non-global zone $SUNW_PKG_INSTALL_ZONENAME
-    else
-         # Package being installed as part of initial installation
-         # of a global zone.
-    fi
-
-else
-    # Package not being installed as part of initial installation of
-    # Solaris and package not being installed as part of initial
-    # installation of non-global zone.
-fi
-.fi
-.in -2
 
 .SH EXAMPLES
 .LP
@@ -823,7 +661,6 @@ Here is a sample \fBpkginfo\fR file:
 .nf
 SUNW_PRODNAME="SunOS"
 SUNW_PRODVERS="5.5"
-SUNW_PKGTYPE="usr"
 SUNW_PKG_ALLZONES=false
 SUNW_PKG_HOLLOW=false
 PKG="SUNWesu"
@@ -841,7 +678,6 @@ RSTATES="S 2"
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -887,35 +723,21 @@ SUNW_PRODVERS	Evolving
 _
 SUNW_PKGVERS	Evolving
 _
-SUNW_PKGTYPE	Unstable
-_
-SUNW_LOC	Evolving
-_
-SUNW_PKGLIST	Evolving
-_
 SUNW_PKG_DIR	Evolving
-_
-PKG_INIT_INSTALL	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBisalist\fR(1), \fBlimit\fR(1), \fBpkgmk\fR(1), \fBuname\fR(1),
-\fBinit\fR(1M), \fBsetlocale\fR(3C), \fBclustertoc\fR(4), \fBorder\fR(4),
-\fBpackagetoc\fR(4), \fBpkgmap\fR(4), \fBattributes\fR(5), \fBzones\fR(5)
+\fBinit\fR(1M), \fBpkgmap\fR(4), \fBattributes\fR(5), \fBzones\fR(5)
 .sp
 .LP
 \fIApplication Packaging Developer\&'s Guide\fR
 .sp
 .LP
-\fIInternational Language Environments Guide\fR
-.sp
-.LP
-\fISystem Administration Guide:  Virtualization Using the Solaris Operating
+\fISystem Administration Guide: Virtualization Using the Solaris Operating
 System\fR
 .SH NOTES
-.sp
 .LP
 Developers can define their own installation parameters by adding a definition
 to this file. A developer-defined parameter must begin with a capital letter.
diff --git a/usr/src/man/man4/power.conf.4 b/usr/src/man/man4/power.conf.4
index b07fd633d3..0fdb2be5ad 100644
--- a/usr/src/man/man4/power.conf.4
+++ b/usr/src/man/man4/power.conf.4
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH POWER.CONF 4 "Feb 27, 2009"
+.TH POWER.CONF 4 "May 13, 2017"
 .SH NAME
 power.conf \- Power Management configuration information file
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ power.conf \- Power Management configuration information file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpower.conf\fR file is used by the Power Management configuration program
 \fBpmconfig\fR(1M), to initialize the settings for Power Management. If you
@@ -21,12 +20,6 @@ make changes to this file, you must run \fBpmconfig\fR(1M) manually for the
 changes to take effect.
 .sp
 .LP
-The \fBdtpower\fR(1M) GUI allows the configuration of a subset of parameters
-allowed by this file. For ease-of-use, it is recommended that you use
-\fBdtpower\fR(1M) to configure the parameters. See the \fBEXAMPLES\fR section
-for information on disabling Power Management.
-.sp
-.LP
 Power Management addresses two specific management scenarios: management of
 individual devices and management of the whole system. An individual device is
 power managed if the device supports multiple power levels and if the device
@@ -37,7 +30,6 @@ power when the device is idle.
 All entries in the \fBpower.conf\fR file are processed in the order that they
 occur in the file.
 .SS "Automatic Device Power Management"
-.sp
 .LP
 Devices with drivers that use the automatic device Power Management interfaces
 are automatically power managed if the \fBautopm\fR entry is enabled. The
@@ -459,7 +451,6 @@ Once every device is at its lowest possible power state, additional power
 savings can be obtained by putting the system into a sleep state (if the
 platform hardware is capable of doing so).
 .SS "S3 Support"
-.sp
 .LP
 Because of reliability problems encountered in BIOS implementations of X86
 systems not produced by Sun Microsystems, by default, only X86 workstation
@@ -492,7 +483,6 @@ The system does not support entry into S3 state.
 .RE
 
 .SS "Automatic Entry Into S3"
-.sp
 .LP
 If supported by your platform, an autoS3 entry can be used to enable or disable
 automatic entry into the S3 state. When in the S3 state, the power button,
@@ -538,7 +528,6 @@ The system does not automatically enter the S3 state.
 .RE
 
 .SS "System Power Management"
-.sp
 .LP
 The system Power Management entries control Power Management of the entire
 system using the suspend-resume feature. When the system is suspended, the
@@ -765,13 +754,7 @@ autopm disable
 .LP
 Then run \fBpmconfig\fR or reboot. See \fBpmconfig\fR(1M) for more information.
 
-.sp
-.LP
-You can also use \fBdtpower\fR to disable automatic device Power Management.
-See \fBdtpower\fR(1M) for more information.
-
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -787,19 +770,14 @@ Interface stability 	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBpmconfig\fR(1M), \fBpowerd\fR(1M), \fBsys-unconfig\fR(1M), \fBuadmin\fR(2),
+\fBpmconfig\fR(1M), \fBpowerd\fR(1M), \fBuadmin\fR(2),
 \fBlibdevinfo\fR(3LIB), \fBattributes\fR(5), \fBcpr\fR(7), \fBldterm\fR(7M),
 \fBpm\fR(7D), \fBpm-components\fR(9P), \fBremovable-media\fR(9P)
 .sp
 .LP
 \fIWriting Device Drivers\fR
-.sp
-.LP
-\fISolaris Common Desktop Environment: User\&'s Guide\fR
 .SH NOTES
-.sp
 .LP
 SPARC desktop models first shipped after October 1, 1995 and before July 1,
 1999 comply with the United States Environmental Protection Agency's \fIEnergy
@@ -807,8 +785,7 @@ Star Memorandum of Understanding #2\fR guidelines and have \fBautoshutdown\fR
 enabled by default after 30 minutes of system idleness. This is achieved by
 \fBdefault\fR keyword of \fBautoshutdown\fR entry behave as \fBshutdown\fR for
 these machines. The user is prompted to confirm this default behavior at system
-installation reboot, or during the first reboot after the system is
-unconfigured by \fBsys-unconfig\fR(1M).
+installation reboot.
 .sp
 .LP
 SPARC desktop models first shipped after July 1, 1999 comply with the United
@@ -834,11 +811,8 @@ Absence of a property indicates no Energy Star guidelines are applicable to
 your machine.
 .sp
 .LP
-System Power Management ( suspend-resume) is currently supported only on a
-limited set of hardware platforms. See the \fISolaris Common Desktop
-Environment: User\&'s Guide\fR for a complete list of platforms that support
-system Power Management. See \fBuname\fR(2) to programmatically determine if
-the machine supports suspend-resume.
+System Power Management (suspend-resume) is currently supported only on a
+limited set of hardware platforms.
 .sp
 .LP
 Sun X86 desktop models first shipped after July 1, 1999 fall within United
diff --git a/usr/src/man/man4/sendmail.4 b/usr/src/man/man4/sendmail.4
index 3476f4981f..917bd8d5c4 100644
--- a/usr/src/man/man4/sendmail.4
+++ b/usr/src/man/man4/sendmail.4
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SENDMAIL 4 "May 8, 2008"
+.TH SENDMAIL 4 "May 13, 2017"
 .SH NAME
 sendmail, sendmail.cf, submit.cf \- sendmail configuration files
 .SH SYNOPSIS
@@ -18,7 +18,6 @@ sendmail, sendmail.cf, submit.cf \- sendmail configuration files
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsendmail.cf\fR and \fBsubmit.cf\fR files are the configuration files for
 \fBsendmail\fR(1M). Starting with version 8.12 of \fBsendmail\fR, which was
@@ -222,7 +221,6 @@ You do not need to restart \fBsendmail\fR for changes to \fBsubmit.cf\fR to
 take effect.  Steps 4 and 5 can be automated. See \fBAutomated Rebuilding of
 Configuration Files\fR below.
 .SS "Enabling Access to Remote Clients"
-.sp
 .LP
 The \fBsendmail\fR(1M) man page describes how the \fBconfig/local_only\fR
 property can be set to \fBtrue\fR or \fBfalse\fR to disallow or allow,
@@ -261,11 +259,10 @@ Each property, if set, results in the corresponding \fB\&.mc\fR file being used
 to (re)build the matching \fB\&.cf\fR file when the service is started.
 .sp
 .LP
-These properties persist across upgrades and patches. To prevent a patch or
-upgrade from clobbering your \fB\&.cf\fR file, or renaming it to
-\fB\&.cf.old\fR, you can set the desired  properties instead.
+These properties persist across updates. To prevent an update
+from clobbering your \fB\&.cf\fR file, or renaming it to
+\fB\&.cf.old\fR, you can set the desired properties instead.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/mail/cf/README\fR\fR
@@ -275,7 +272,6 @@ Describes \fBsendmail\fR configuration files.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -291,7 +287,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBmake\fR(1S), \fBps\fR(1), \fBsendmail\fR(1M), \fBsvcadm\fR(1M),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man4/timezone.4 b/usr/src/man/man4/timezone.4
index c59b91434c..84ed9d5556 100644
--- a/usr/src/man/man4/timezone.4
+++ b/usr/src/man/man4/timezone.4
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH TIMEZONE 4 "Feb 18, 2003"
+.TH TIMEZONE 4 "May 13, 2017"
 .SH NAME
 timezone \- default timezone data base
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ timezone \- default timezone data base
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The timezone file contains information regarding the default timezone for each
 host in a domain. Alternatively, a single default line for the entire domain
@@ -34,10 +33,8 @@ relative to the directory \fB/usr/share/lib/zoneinfo\fR.
 .sp
 .LP
 This file is not actually referenced by any system software; it is merely used
-as a source file to construct the \fBNIS\fR \fBtimezone.byname\fR map. This map
-is read by \fBsysidtool\fR(1M) to initialize the timezone of the client system
-at installation time. For more information, see the \fISolaris Express
-Installation Guide: Basic Installations\fR.
+as a source file to construct the \fBNIS\fR \fBtimezone.byname\fR map, which
+was used by the installer in older releases of Solaris.
 .sp
 .LP
 The \fBtimezone\fR file does not set the timezone environment variable
@@ -59,7 +56,6 @@ US/Eastern          East.Sun.COM #Sun East Coast
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/timezone\fR\fR
@@ -69,9 +65,5 @@ US/Eastern          East.Sun.COM #Sun East Coast
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBsysidtool\fR(1M), \fBTIMEZONE\fR(4)
-.sp
 .LP
-\fISolaris Express Installation Guide: Basic Installations\fR
+\fBTIMEZONE\fR(4)
diff --git a/usr/src/man/man4/user_attr.4 b/usr/src/man/man4/user_attr.4
index 8051f24f97..3de85c52f5 100644
--- a/usr/src/man/man4/user_attr.4
+++ b/usr/src/man/man4/user_attr.4
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH USER_ATTR 4 "Feb 25, 2017"
+.TH USER_ATTR 4 "May 13, 2017"
 .SH NAME
 user_attr \- extended user attributes database
 .SH SYNOPSIS
@@ -275,9 +275,7 @@ privileges. Note that you specify privileges as they are displayed by
 \fBprivileges\fR(5) as \fBPRIV_FILE_CHOWN\fR.
 .sp
 .LP
-Privileges are specified through the Solaris Management Console
-(\fBsmc\fR(1M)), the recommended method, or, on the command line, for users,
-through\fBusermod\fR(1M). See \fBusermod\fR(1M) for examples of commands that
+See \fBusermod\fR(1M) for examples of commands that
 modify privileges and their subsequent effect on \fBuser_attr\fR.
 .SH EXAMPLES
 .LP
@@ -353,10 +351,6 @@ The command-line syntax is Committed. The output is Uncommitted.
 \fBprof_attr\fR(4), \fBproject\fR(4), \fBattributes\fR(5), \fBprivileges\fR(5)
 .sp
 .LP
-See the \fBdtstyle\fR(1X), \fBlabel_encodings\fR(4), and \fBlabels\fR(5) man
-pages in the \fISolaris Trusted Extensions Reference Manual\fR.
-.sp
-.LP
 \fISystem Administration Guide: Security Services\fR
 .SH NOTES
 .LP