22 files changed, 498 insertions, 4076 deletions

diff --git a/usr/src/man/man1m/Makefile b/usr/src/man/man1m/Makefile
index dc69b7fae0..a95323906e 100644
--- a/usr/src/man/man1m/Makefile
+++ b/usr/src/man/man1m/Makefile
@@ -105,9 +105,6 @@ _MANFILES=	6to4relay.1m		\
 		dfshares.1m		\
 		dfshares_nfs.1m		\
 		dhcpagent.1m		\
-		dhcpconfig.1m		\
-		dhcpmgr.1m		\
-		dhtadm.1m		\
 		disks.1m		\
 		diskscan.1m		\
 		dispadmin.1m		\
@@ -123,7 +120,6 @@ _MANFILES=	6to4relay.1m		\
 		dscfgadm.1m		\
 		dscfglockd.1m		\
 		dsstat.1m		\
-		dsvclockd.1m		\
 		dtrace.1m		\
 		dumpadm.1m		\
 		editmap.1m		\
@@ -197,7 +193,6 @@ _MANFILES=	6to4relay.1m		\
 		in.chargend.1m		\
 		in.comsat.1m		\
 		in.daytimed.1m		\
-		in.dhcpd.1m		\
 		in.discardd.1m		\
 		in.echod.1m		\
 		in.fingerd.1m		\
@@ -378,7 +373,6 @@ _MANFILES=	6to4relay.1m		\
 		plockstat.1m		\
 		pmadm.1m		\
 		pmconfig.1m		\
-		pntadm.1m		\
 		polkit-is-privileged.1m \
 		pooladm.1m		\
 		poolbind.1m		\
diff --git a/usr/src/man/man1m/dhcpconfig.1m b/usr/src/man/man1m/dhcpconfig.1m
deleted file mode 100644
index ccb4eb6bed..0000000000
--- a/usr/src/man/man1m/dhcpconfig.1m
+++ /dev/null
@@ -1,792 +0,0 @@
-'\" te
-.\"  Copyright (c) 2002 by 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 DHCPCONFIG 1M "Jun 16, 2004"
-.SH NAME
-dhcpconfig \- DHCP service configuration utility
-.SH SYNOPSIS
-.LP
-.nf
-\fBdhcpconfig\fR \fB-D\fR \fB-r\fR \fIresource\fR \fB-p\fR \fIpath\fR [\fB-u\fR \fIuninterpreted\fR]
-     [\fB-l\fR \fIlease_length\fR] [\fB-n\fR ] [\fB-d\fR \fIDNS_domain\fR]
-     [\fB-a\fR \fIDNS_server_addresses\fR] [\fB-h\fR \fIhosts_resource\fR]
-     [\fB-y\fR \fIhosts_domain\fR]
-.fi
-
-.LP
-.nf
-\fBdhcpconfig\fR \fB-R\fR \fIserver_addresses\fR
-.fi
-
-.LP
-.nf
-\fBdhcpconfig\fR \fB-U\fR [\fB-f\fR] [\fB-x\fR] [\fB-h\fR]
-.fi
-
-.LP
-.nf
-\fBdhcpconfig\fR \fB-N\fR \fInetwork_address\fR [\fB-m\fR \fIsubnet_mask\fR] [\fB-b\fR ]
-     [\fB-t\fR \fIrouter_addresses\fR] [\fB-y\fR \fINIS-domain\fR]
-     [\fB-a\fR \fINIS_server_addresses\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhcpconfig\fR \fB-C\fR \fB-r\fR \fIresource\fR \fB-p\fR \fIpath\fR [\fB-f\fR] [\fB-k\fR]
-     [\fB-u\fR \fIuninterpreted\fR]
-.fi
-
-.LP
-.nf
-\fBdhcpconfig\fR \fB-X\fR \fIfilename\fR [\fB-m\fR \fImacro_list\fR] [\fB-o\fR \fIoption_list\fR]
-     [\fB-a\fR \fInetwork_addresses\fR] [\fB-f\fR] [\fB-x\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhcpconfig\fR \fB-I\fR \fIfilename\fR [\fB-f\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhcpconfig\fR \fB-P\fR [\fIparameter\fR[=\fIvalue\fR],]...
-.fi
-
-.LP
-.nf
-\fBdhcpconfig\fR \fB-S\fR [\fB-f\fR] [\fB-e\fR | \fB-d\fR | \fB-r\fR | \fB-q\fR]
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBdhcpconfig\fR command is used to configure and manage the Dynamic Host
-Configuration Protocol (DHCP) service or BOOTP relay services. It is intended
-for use by experienced Solaris system administrators and is designed for ease
-of use in scripts. The \fBdhcpmgr\fR utility is recommended for less
-experienced administrators or those preferring a graphical utility to configure
-and manage the DHCP service or BOOTP relay service.
-.sp
-.LP
-The \fBdhcpconfig\fR command can be run by root, or by other users assigned to
-the DHCP Management profile. See \fBrbac\fR(5) and \fBuser_attr\fR(4).
-.sp
-.LP
-\fBdhcpconfig\fR requires one of the following function flags: \fB-D\fR,
-\fB-R\fR, \fB-U\fR, \fB-N\fR, \fB-C\fR, \fB-X\fR, \fB-I\fR, \fB-P\fR or
-\fB-S\fR.
-.sp
-.LP
-The \fBdhcpconfig\fR menu driven mode is supported in Solaris 8 and previous
-versions of Solaris.
-.SS "Where dhcpconfig Obtains Configuration Information"
-.sp
-.LP
-\fBdhcpconfig\fR scans various configuration files on your Solaris machine for
-information it can use to assign values to options contained in macros it adds
-to the \fBdhcptab\fR configuration table. The following table lists information
-\fBdhcpconfig\fR needs, the source used, and how the information is used:
-.sp
-
-.sp
-.TS
-box;
-l | l | l
-l | l | l .
-\fIInformation\fR	\fISource\fR	\fIWhere Used\fR
-_
-Timezone	System date, timezone settings	\fBLocale\fR macro
-DNS parameters	\fBnsswitch.conf\fR, \fB/etc/resolv.conf\fR	Server macro
-NIS parameters	System domainname, \fBnsswitch.conf\fR, NIS	Network macros
-Subnetmask	T{
-Network interface, \fBnetmasks\fR table in nameservice
-T}	Network macros
-.TE
-
-.sp
-.LP
-If you have not set these parameters on your server machine, you should do so
-before configuring the DHCP server with \fBdhcpconfig\fR. Note that if you
-specify options with the \fBdhcpconfig \fR\fB-D\fR command line, the values you
-supply override the values obtained from the system files.
-.SH OPTIONS
-.sp
-.LP
-The following options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-C\fR\fR
-.ad
-.RS 23n
-Convert to using a new data store, recreating the DHCP data tables in a format
-appropriate to the new data store, and setting up the DHCP server to use the
-new data store.
-.sp
-The following sub-options are required:
-.sp
-.ne 2
-.na
-\fB\fB-p\fR \fIpath_to_data\fR\fR
-.ad
-.RS 20n
-The paths for \fBSUNWfiles\fR and \fBSUNWbinfiles\fR must be absolute
-\fBUNIX\fR pathnames. The path for \fBSUNWnisplus\fR must be a fully specified
-\fBNIS+\fR directory (including the tailing period.) See \fBdhcp_modules\fR(5).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-r\fR \fIdata_resource\fR\fR
-.ad
-.RS 20n
-New data store resource. One of the following must be specified:
-\fBSUNWfiles\fR, \fBSUNWbinfiles\fR, or \fBSUNWnisplus\fR. See
-\fBdhcp_modules\fR(5).
-.RE
-
-The following sub-options are optional:
-.sp
-.ne 2
-.na
-\fB\fB-f\fR\fR
-.ad
-.RS 20n
-Do not prompt for confirmation. If \fB-f\fR is not used, a warning and
-confirmation prompt are issued before the conversion starts.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-k\fR\fR
-.ad
-.RS 20n
-Keep the old DHCP data tables after successful conversion. If any problem
-occurs during conversion, tables are not deleted even if \fB-k\fR sub-option is
-not specified.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-u\fR \fIuninterpreted\fR\fR
-.ad
-.RS 20n
-Data which is ignored by \fBdhcpconfig\fR, but passed on to the datastore for
-interpretation. The private layer provides for module-specific configuration
-information through the use of the \fBRESOURCE_CONFIG \fR keyword.
-Uninterpreted data is stored within \fBRESOURCE_CONFIG\fR keyword of
-\fBdhcpsvc.conf\fR(4). The \fB-u\fR sub-option is not used with the
-\fBSUNWfiles\fR, \fBSUNWbinfiles\fR, and \fBSUNWnisplus\fR data stores. See
-\fBdhcp_modules\fR(5).
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-D\fR\fR
-.ad
-.RS 23n
-Configure the \fBDHCP\fR service.
-.sp
-The following sub-options are required:
-.sp
-.ne 2
-.na
-\fB\fB-r\fR \fIdata_resource\fR\fR
-.ad
-.RS 20n
-One of the following must be specified: \fBSUNWfiles\fR, \fBSUNWbinfiles\fR, or
-\fBSUNWnisplus\fR. Other data stores may be available.See
-\fBdhcp_modules\fR(5).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-p\fR \fIpath\fR\fR
-.ad
-.RS 20n
-The paths for \fBSUNWfiles\fR and \fBSUNWbinfiles\fR must be absolute
-\fBUNIX\fR pathnames. The path for \fBSUNWnisplus\fR must be a fully specified
-\fBNIS+\fR directory (including the tailing period.) . See
-\fBdhcp_modules\fR(5).
-.RE
-
-The following sub-options are optional:
-.sp
-.ne 2
-.na
-\fB\fB-a\fR \fIDNS_servers\fR\fR
-.ad
-.RS 21n
-IP addresses of DNS servers, separated with commas.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-d\fR \fIDNS_domain\fR\fR
-.ad
-.RS 21n
-DNS domain name.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-h\fR \fIhosts_resource\fR\fR
-.ad
-.RS 21n
-Resource in which to place hosts data. Usually, the name service in use on the
-server. Valid values are \fBnisplus\fR, \fBfiles\fR, or \fBdns\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-l\fR \fIseconds\fR\fR
-.ad
-.RS 21n
-Lease length used for addresses not having a specified lease length, in
-seconds.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-n\fR\fR
-.ad
-.RS 21n
-Non-negotiable leases
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-y\fR \fIhosts_domain\fR\fR
-.ad
-.RS 21n
-DNS or NIS+ domain name to be used for hosts data. Valid only if \fBdns\fR or
-\fBnisplus\fR is specified for \fB-h\fR sub-option.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-u\fR \fIuninterpreted\fR\fR
-.ad
-.RS 21n
-Data which is ignored by \fBdhcpconfig\fR, but passed on to the datastore for
-interpretation. The private layer provides for module-specific configuration
-information through the use of the \fBRESOURCE_CONFIG \fR keyword.
-Uninterpreted data is stored within \fBRESOURCE_CONFIG\fR keyword of
-\fBdhcpsvc.conf\fR(4). The \fB-u\fR sub-option is not used with the
-\fBSUNWfiles\fR, \fBSUNWbinfiles\fR, and \fBSUNWnisplus\fR data stores. See
-\fBdhcp_modules\fR(5).
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-I\fR \fIfilename\fR\fR
-.ad
-.RS 23n
-Import data from \fIfilename\fR, containing data previously exported from a
-Solaris DHCP server. Note that after importing, you may have to edit macros to
-specify the correct domain names, and edit network tables to change the owning
-server of addresses in imported networks. Use \fBdhtadm\fR and \fBpntadm\fR to
-do this.
-.sp
-The following sub-options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-f\fR\fR
-.ad
-.RS 6n
-Replace any conflicting data with the data being imported.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-g\fR\fR
-.ad
-.RS 6n
-Signal the daemon to reload the \fBdhcptab\fR once the import has been
-completed.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-N\fR \fInet_address\fR\fR
-.ad
-.RS 23n
-Configure an additional network for DHCP service.
-.sp
-The following sub-options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-a\fR \fINIS_server_addresses\fR\fR
-.ad
-.RS 27n
-List of IP addresses of NIS servers.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-b\fR\fR
-.ad
-.RS 27n
-Network is a point-to-point (PPP) network, therefore no broadcast address
-should be configured. If \fB-\fRb is not used, the network is assumed to be a
-LAN, and the broadcast address is determined using the network address and
-subnet mask.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-g\fR\fR
-.ad
-.RS 27n
-Signal the daemon to reload the \fBdhcptab\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-m\fR \fIxxx.xxx.xxx.xxx\fR\fR
-.ad
-.RS 27n
-Subnet mask for the network; if \fB-m\fR is not used, subnet mask is obtained
-from netmasks.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-t\fR \fIrouter_addresses\fR\fR
-.ad
-.RS 27n
-List of router IP addresses; if not specified, router discovery flag is set.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-y\fR \fINIS_domain_name\fR\fR
-.ad
-.RS 27n
-If NIS is used on this network, specify the NIS domain name.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-P\fR\fR
-.ad
-.RS 23n
-Configure the DHCP service parameters. Each parameter and value are specified
-by the following pattern:
-.sp
-.in +2
-.nf
-\fIparameter\fR[=\fIvalue\fR],\&.\|.\|.
-.fi
-.in -2
-.sp
-
-Where parameter and value are:
-.sp
-.ne 2
-.na
-\fB\fIparameter\fR\fR
-.ad
-.RS 13n
-One of the DHCP service parameters listed in \fBdhcpsvc.conf\fR(4). If the
-corresponding \fIvalue\fR is not specified, the current parameter value is
-displayed. If \fIparameter\fR is not specified, all parameters and current
-values are displayed.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIvalue\fR\fR
-.ad
-.RS 13n
-Optional string to set the servers parameter to if the value is acceptable. If
-the value is missing or is empty (\fB""\fR), the parameter and its current
-value are deleted.
-.RE
-
-After a parameter has changed the DHCP server requires re-starting before you
-can use new parameter values.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-R\fR \fIserver_addresses\fR\fR
-.ad
-.RS 23n
-Configure the BOOTP relay service. BOOTP or DHCP requests are forwarded to the
-list of servers specified.
-.sp
-\fIserver_addresses\fR is a comma separated list of hostnames and/or IP
-addresses.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-S\fR\fR
-.ad
-.RS 23n
-Control the DHCP service.
-.sp
-The following sub-options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-d\fR\fR
-.ad
-.RS 6n
- Disable and stop the DHCP service.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-e\fR\fR
-.ad
-.RS 6n
-Enable and start the DHCP service.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-q\fR\fR
-.ad
-.RS 6n
-Display the state of the DHCP service. The state is encoded into the exit
-status.
-.sp
-.in +2
-.nf
-0    DHCP service disabled and stopped
-1    DHCP service enabled and stopped
-2    DHCP service disabled and running
-3    DHCP service enabled and running
-.fi
-.in -2
-.sp
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-r\fR\fR
-.ad
-.RS 6n
-Enable and restart the DHCP service.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-U\fR\fR
-.ad
-.RS 23n
-Unconfigure the DHCP service or BOOTP relay service.
-.sp
-The following sub-options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-f\fR\fR
-.ad
-.RS 6n
-Do not prompt for confirmation. If \fB-f\fR is not used, a warning and
-confirmation prompt is issued.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-h\fR\fR
-.ad
-.RS 6n
-Delete hosts entries from name service.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-x\fR\fR
-.ad
-.RS 6n
-Delete the \fBdhcptab\fR and network tables.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-X\fR \fIfilename\fR\fR
-.ad
-.RS 23n
-Export data from the DHCP data tables, saving to \fIfilename\fR, to move the
-data to another Solaris DHCP server.
-.sp
-The following sub-options are optional:
-.sp
-.ne 2
-.na
-\fB\fB-a\fR \fInetworks_to_export\fR\fR
-.ad
-.RS 25n
-List of networks whose addresses should be exported, or the keyword ALL to
-specify all networks. If \fB-a\fR is not specified, no networks are exported.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-g\fR \fR
-.ad
-.RS 25n
-Signal the daemon to reload the \fBdhcptab\fR after the export has been
-completed.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-m\fR \fImacros_to_export\fR\fR
-.ad
-.RS 25n
-List of macros to export, or the keyword \fBALL\fR to specify all macros. If
-\fB-m\fR is not specified, no macros are exported.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-o\fR \fIoptions_to_export\fR\fR
-.ad
-.RS 25n
-List of options to export, or the keyword \fBALL\fR to specify all options. If
-\fB-o\fR is not specified, no options are exported.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-x\fR\fR
-.ad
-.RS 25n
-Delete the data from this server after it is exported. If \fB-x\fR is not
-specified you are in effect copying the data.
-.RE
-
-.RE
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRConfiguring DHCP Service with Binary Files Data Store
-.sp
-.LP
-The following command configures DHCP service, using the binary files data
-store, in the DNS domain \fBacme.eng\fR, with a lease time of 28800 seconds (8
-hours),
-
-.sp
-.in +2
-.nf
-example# dhcpconfig -D -r SUNWbinfiles -p /var/dhcp -l 28800\e
-             -d acme.eng -a 120.30.33.4 -h dns -y acme.eng
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 2 \fRConfiguring BOOTP Relay Agent
-.sp
-.LP
-The following command configures the DHCP daemon as a BOOTP relay agent, which
-forwards BOOTP and DHCP requests to the servers having the IP addresses
-120.30.33.7 and 120.30.42.132:
-
-.sp
-.in +2
-.nf
-example# dhcpconfig -R 120.30.33.7,120.30.42.132
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 3 \fRUnconfiguring DHCP Service
-.sp
-.LP
-The following command unconfigures the DHCP service, with confirmation, and
-deletes the DHCP data tables and host table entries:
-
-.sp
-.in +2
-.nf
-example# dhcpconfig -U -x -h
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 4 \fRConfiguring a Network for DHCP Service
-.sp
-.LP
-The following command configures an additional LAN network for DHCP service,
-specifying that clients should use router discovery and providing the NIS
-domain name and NIS server address:
-
-.sp
-.in +2
-.nf
-example# dhcpconfig -N 120.30.171.0 -y east.acme.eng.com\e
-             -a 120.30.33.4
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 5 \fRConverting to SUNWnisplus Data Store
-.sp
-.LP
-The following command converts a DHCP server from using a text or binary files
-data store to a NIS+ data store, deleting the old data store's DHCP tables:
-
-.sp
-.in +2
-.nf
-example# dhcpconfig -C -r SUNWnisplus -p whatever.com.
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 6 \fRExporting a Network, Macros, and Options from a DHCP Server
-.sp
-.LP
-The following command exports one network (\fB120.30.171.0\fR) and its
-addresses, the macro \fB120.30.171.0\fR, and the options \fBmotd\fR and
-\fBPSptr\fRfrom a DHCP server, saves the exported data in file
-\fB/export/var/120301710_data\fR, and deletes the exported data from the
-server.
-
-.sp
-.in +2
-.nf
-example# dhcpconfig -X /var/dhcp/120301710_export
-     -a 120.30.171.0 -m 120.30.171.0 -o motd,PSptr
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 7 \fRImporting Data on a DHCP Server
-.sp
-.LP
-The following command imports DHCP data from a file,
-\fB/net/golduck/export/var/120301710_data\fR, containing data previously
-exported from a Solaris DHCP server, overwrites any conflicting data on the
-importing server, and signals the daemon to reload the \fBdhcptab\fR once the
-import is completed:
-
-.sp
-.in +2
-.nf
-example# dhcpconfig -I /net/golduck/export/var/120301710_data -f -g
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 8 \fRSetting DHCP Server Parameters
-.sp
-.LP
- The following command sets the number of minutes that the DHCP server waits
-before timing out when updating DNS information on DHCP clients to five
-minutes.
-
-.sp
-.in +2
-.nf
-example# example# dhcpconfig -P UPDATE_TIMEOUT=5
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 9 \fRRe-starting the DHCP server
-.sp
-.LP
-The following command stops and re-starts the DHCP server.
-
-.sp
-.in +2
-.nf
-example#  example# dhcpconfig -S -r
-DHCP server stopped
-DHCP server started
-.fi
-.in -2
-.sp
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Evolving
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBdhcpmgr\fR(1M), \fBdhtadm\fR(1M), \fBin.dhcpd\fR(1M), \fBpntadm\fR(1M),
-\fBdhcp_network\fR(4), \fBdhcptab\fR(4), \fBdhcpsvc.conf\fR(4),
-\fBnsswitch.conf\fR(4), \fBresolv.conf\fR(4), \fBuser_attr\fR(4),
-\fBattributes\fR(5), \fBdhcp\fR(5), \fBdhcp_modules\fR(5), \fBrbac\fR(5)
-.sp
-.LP
-\fI\fR
diff --git a/usr/src/man/man1m/dhcpmgr.1m b/usr/src/man/man1m/dhcpmgr.1m
deleted file mode 100644
index f90906b7b6..0000000000
--- a/usr/src/man/man1m/dhcpmgr.1m
+++ /dev/null
@@ -1,164 +0,0 @@
-'\" te
-.\" Copyright (c) 2001 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 DHCPMGR 1M "Mar 13, 2001"
-.SH NAME
-dhcpmgr \- graphical interface for managing DHCP service
-.SH SYNOPSIS
-.LP
-.nf
-\fB/usr/sadm/admin/bin/dhcpmgr\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-\fBdhcpmgr\fR is a graphical user interface which enables you to manage the
-Dynamic Host Configuration Protocol (\fBDHCP\fR) service on the local system.
-It performs the functions of the \fBdhcpconfig\fR, \fBdhtadm\fR, and
-\fBpntadm\fR command line utilities. You must be \fBroot\fR to use
-\fBdhcpmgr\fR. The \fBdhcpmgr\fR Help, available from the \fBHelp\fR menu,
-contains detailed information about using the tool.
-.SH USAGE
-.sp
-.LP
-You can perform the following tasks using \fBdhcpmgr\fR:
-.sp
-.ne 2
-.na
-\fBConfigure DHCP service\fR
-.ad
-.sp .6
-.RS 4n
-Use \fBdhcpmgr\fR to configure the DHCP daemon as a \fBDHCP\fR server, and
-select the data store to use for storing network configuration tables..
-.RE
-
-.sp
-.ne 2
-.na
-\fBConfigure BOOTP relay service\fR
-.ad
-.sp .6
-.RS 4n
-Use \fBdhcpmgr\fR to configure the DHCP daemon as a \fBBOOTP\fR relay.
-.RE
-
-.sp
-.ne 2
-.na
-\fBManage DHCP or BOOTP relay service\fR
-.ad
-.sp .6
-.RS 4n
-Use \fBdhcpmgr\fR to start, stop, enable, disable or unconfigure the \fBDHCP\fR
-service or \fBBOOTP\fR relay service, or change DHCP server parameters.
-.RE
-
-.sp
-.ne 2
-.na
-\fBManage DHCP addresses\fR
-.ad
-.sp .6
-.RS 4n
-Use \fBdhcpmgr\fR to add, modify, or delete \fBIP\fR addresses leased by the
-\fBDHCP\fR service.
-.RE
-
-.sp
-.ne 2
-.na
-\fBManage DHCP macros\fR
-.ad
-.sp .6
-.RS 4n
-Use \fBdhcpmgr\fR to add, modify or delete macros used to supply configuration
-parameters to \fBDHCP\fR clients.
-.RE
-
-.sp
-.ne 2
-.na
-\fBManage DHCP options\fR
-.ad
-.sp .6
-.RS 4n
-Use \fBdhcpmgr\fR to add, modify or delete options used to define parameters
-deliverable through \fBDHCP\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fBConvert to a new DHCP data store\fR
-.ad
-.sp .6
-.RS 4n
-Use \fBdhcpmgr\fR to configure the DHCP server to use a different data store,
-and convert the DHCP data to the format used by the new data store.
-.RE
-
-.sp
-.ne 2
-.na
-\fBMove DHCP data to another server\fR
-.ad
-.sp .6
-.RS 4n
-Use \fBdhcpmgr\fR to export data from one Solaris DHCP server and import data
-onto another Solaris DHCP server.
-.RE
-
-.SH EXIT STATUS
-.sp
-.LP
-The following exit values are returned:
-.sp
-.ne 2
-.na
-\fB\fB0\fR \fR
-.ad
-.RS 13n
-Successful completion.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBnon-zero\fR \fR
-.ad
-.RS 13n
-An error occurred.
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Evolving
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBdhcpconfig\fR(1M), \fBdhtadm\fR(1M), \fBpntadm\fR(1M), \fBin.dhcpd\fR(1M),
-\fBdhcpsvc.conf\fR(4), \fBdhcp_network\fR(4), \fBdhcptab\fR(4),
-\fBattributes\fR(5), \fBdhcp\fR(5), \fBdhcp_modules\fR(5)
-.sp
-.LP
-\fI\fR
-.sp
-.LP
-\fI\fR
diff --git a/usr/src/man/man1m/dhtadm.1m b/usr/src/man/man1m/dhtadm.1m
deleted file mode 100644
index 9ff782808e..0000000000
--- a/usr/src/man/man1m/dhtadm.1m
+++ /dev/null
@@ -1,658 +0,0 @@
-'\" te
-.\"  Copyright (c) 2002 by 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 DHTADM 1M "Aug 28, 2004"
-.SH NAME
-dhtadm \- DHCP configuration table management utility
-.SH SYNOPSIS
-.LP
-.nf
-\fBdhtadm\fR \fB-C\fR [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-A\fR \fB-s\fR \fIsymbol_name\fR \fB-d\fR \fIdefinition\fR [\fB-r\fR \fIresource\fR]
-     [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-A\fR \fB-m\fR \fImacro_name\fR \fB-d\fR \fIdefinition\fR [\fB-r\fR \fIresource\fR]
-     [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-M\fR \fB-s\fR \fIsymbol_name\fR \fB-d\fR \fIdefinition\fR [\fB-r\fR \fIresource\fR]
-     [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-M\fR \fB-s\fR \fIsymbol_name\fR \fB-n\fR \fInew_name\fR [\fB-r\fR \fIresource\fR]
-     [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-M\fR \fB-m\fR \fImacro_name\fR \fB-n\fR \fInew_name\fR [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR]
-     [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-M\fR \fB-m\fR \fImacro_name\fR \fB-d\fR \fIdefinition\fR [\fB-r\fR \fIresource\fR]
-     [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-M\fR \fB-m\fR \fImacro_name\fR \fB-e\fR \fIsymbol=value\fR [\fB-r\fR \fIresource\fR]
-     [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-D\fR \fB-s\fR \fIsymbol_name\fR [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR]
-     [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-D\fR \fB-m\fR \fImacro_name\fR [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR]
-     [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-P\fR [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-R\fR [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] [\fB-g\fR]
-.fi
-
-.LP
-.nf
-\fBdhtadm\fR \fB-B\fR [\fB-v\fR] [\fIbatchfile\fR] [\fB-g\fR]
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-\fBdhtadm\fR manages the Dynamic Host Configuration Protocol (\fBDHCP\fR)
-service configuration table, \fBdhcptab\fR. You can use it to add, delete, or
-modify \fBDHCP\fR configuration macros or options or view the table. For a
-description of the table format, see \fBdhcptab\fR(4).)
-.sp
-.LP
-The \fBdhtadm\fR command can be run by root, or by other users assigned to the
-DHCP Management profile. See \fBrbac\fR(5) and \fBuser_attr\fR(4).
-.sp
-.LP
-After you make changes with \fBdhtadm\fR, you should issue a \fBSIGHUP\fR to
-the DHCP server, causing it to read the \fBdhcptab\fR and pick up the changes.
-Do this using the \fB-g\fR option.
-.SH OPTIONS
-.sp
-.LP
-One of the following function flags must be specified with the \fBdhtadm\fR
-command: \fB-A\fR, \fB-B\fR, \fB-C\fR, \fB-D\fR, \fB-M\fR, \fB-P\fR or
-\fB-R\fR.
-.sp
-.LP
-The following options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-A\fR \fR
-.ad
-.RS 27n
-Add a symbol or macro definition to the \fBdhcptab\fR table.
-.sp
-The following sub-options are required:
-.sp
-.ne 2
-.na
-\fB\fB-d\fR \fIdefinition\fR\fR
-.ad
-.RS 18n
-Specify a macro or symbol definition.
-.sp
-\fIdefinition\fR must be enclosed in single quotation marks. For macros, use
-the form \fB-d\fR
-\fB\&':\fIsymbol\fR=\fIvalue\fR:\fIsymbol\fR=\fIvalue\fR:'\fR. Enclose a
-\fIvalue\fR that contains colons in double quotation marks. For symbols, the
-definition is a series of fields that define a symbol's characteristics. The
-fields are separated by commas. Use the form \fB-d\fR
-\fB\&'\fIcontext\fR,\fIcode\fR,\fItype\fR,\fIgranularity\fR,\fImaximum\fR'\fR.
-See \fBdhcptab\fR(4) for information about these fields.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-m\fR \fImacro_name\fR\fR
-.ad
-.RS 18n
-Specify the name of the macro to be added.
-.sp
-The \fB-d\fR option must be used with the \fB-m\fR option. The \fB-s\fR option
-cannot be used with the \fB-m\fR option.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-s\fR \fIsymbol_name\fR\fR
-.ad
-.RS 18n
-Specify the name of the symbol to be added.
-.sp
-The \fB-d\fR option must be used with the \fB-s\fR option. The \fB-m\fR option
-cannot be used with the \fB-s\fR option.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-B\fR\fR
-.ad
-.RS 27n
-Batch process \fBdhtadm\fR commands. \fBdhtadm\fR reads from the specified file
-or from standard input a series of \fBdhtadm\fR commands and execute them
-within the same process. Processing many \fBdhtadm\fR commands using this
-method is much faster than running an executable batchfile itself. Batch mode
-is recommended for using \fBdhtadm\fR in scripts.
-.sp
-The following sub-option is optional:
-.sp
-.ne 2
-.na
-\fB\fB-v\fR\fR
-.ad
-.RS 6n
-Display commands to standard output as they are processed.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-C\fR \fR
-.ad
-.RS 27n
-Create the \fBDHCP\fR service configuration table, \fBdhcptab\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-D\fR \fR
-.ad
-.RS 27n
-Delete a symbol or macro definition.
-.sp
-The following sub-options are required:
-.sp
-.ne 2
-.na
-\fB\fB-m\fR \fImacro_name\fR\fR
-.ad
-.RS 18n
-Delete the specified macro.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-s\fR \fIsymbol_name\fR\fR
-.ad
-.RS 18n
-Delete the specified symbol.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-g\fR \fR
-.ad
-.RS 27n
-Signal the DHCP daemon to reload the \fBdhcptab\fR after successful completion
-of the operation.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-M\fR \fR
-.ad
-.RS 27n
-Modify an existing symbol or macro definition.
-.sp
-The following sub-options are required:
-.sp
-.ne 2
-.na
-\fB\fB-d\fR \fIdefinition\fR\fR
-.ad
-.RS 17n
-Specify a macro or symbol definition to modify.
-.sp
-The definition must be enclosed in single quotation marks. For macros, use the
-form \fB-d\fR \fB\&':\fIsymbol\fR=\fIvalue\fR:\fIsymbol\fR=\fIvalue\fR:'\fR.
-Enclose a \fIvalue\fR that contains colons in double quotation marks. For
-symbols, the definition is a series of fields that define a symbol's
-characteristics. The fields are separated by commas. Use the form \fB-d\fR
-\fB\&'\fIcontext\fR,\fIcode\fR,\fItype\fR,\fIgranularity\fR,\fImaximum\fR'\fR.
-See \fBdhcptab\fR(4) for information about these fields.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-e\fR\fR
-.ad
-.RS 17n
-This sub-option uses the \fIsymbol\fR \fB=\fR\fIvalue\fR argument. Use it to
-edit a \fIsymbol\fR/\fIvalue\fR pair within a macro. To add a symbol which does
-not have an associate value, enter:
-.sp
-.in +2
-.nf
-\fIsymbol\fR\fB=_NULL_VALUE_\fR
-.fi
-.in -2
-.sp
-
-To delete a symbol definition from a macro, enter:
-.sp
-.in +2
-.nf
-\fIsymbol\fR\fB=\fR
-.fi
-.in -2
-.sp
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-m\fR\fR
-.ad
-.RS 17n
-This sub-option uses the \fImacro_name\fR argument. The \fB-n\fR, \fB-d\fR, or
-\fB-e\fR sub-options are legal companions for this sub-option..
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-n\fR\fR
-.ad
-.RS 17n
-This sub-option uses the \fInew_name\fR argument and modifies the name of the
-object specified by the \fB-m\fR or \fB-s\fR sub-option. It is not limited to
-macros. . Use it to specify a new macro name or symbol name.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-s\fR\fR
-.ad
-.RS 17n
-This sub-option uses the \fIsymbol_name\fR argument. Use it to specify a
-symbol. The \fB-d\fR sub-option is a legal companion.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-p\fR\fI path\fR \fR
-.ad
-.RS 27n
-Override the \fBdhcpsvc.conf\fR(4) configuration value for \fBPATH=\fR with
-\fIpath\fR. See \fBdhcpsvc.conf\fR(4) for more details regarding \fIpath\fR.
-See \fBdhcp_modules\fR(5) for information regarding data storage modules for
-the \fBDHCP\fR service.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-P\fR \fR
-.ad
-.RS 27n
-Print (display) the \fBdhcptab\fR table.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-r\fR\fI data_store_resource\fR \fR
-.ad
-.RS 27n
-Override the \fBdhcpsvc.conf\fR(4) configuration value for \fBRESOURCE=\fR with
-the \fIdata_store_resource\fR specified. See \fBdhcpsvc.conf\fR(4) for more
-details on resource type. See\fI\fR for more information about adding support
-for other data stores. See \fBdhcp_modules\fR(5) for information regarding data
-storage modules for the \fBDHCP\fR service.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-R\fR \fR
-.ad
-.RS 27n
-Remove the \fBdhcptab\fR table.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-u\fR\fI uninterpreted\fR\fR
-.ad
-.RS 27n
-Data which is ignored by \fBdhtadm\fR, but passed to currently configured
-public module, to be interpreted by the data store. The private layer provides
-for module-specific configuration information through the use of the
-\fBRESOURCE_CONFIG\fR keyword. Uninterpreted data is stored within
-\fBRESOURCE_CONFIG\fR keyword of \fBdhcpsvc.conf\fR(4). See
-\fBdhcp_modules\fR(5) for information regarding data storage modules for the
-DHCP service.
-.RE
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRCreating the \fBDHCP\fR Service Configuration Table
-.sp
-.LP
-The following command creates the \fBDHCP\fR service configuration table,
-\fBdhcptab\fR:
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-C\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 2 \fRAdding a Symbol Definition
-.sp
-.LP
-The following command adds a \fBVendor\fR option symbol definition for a new
-symbol called \fBMySym\fR to the \fBdhcptab\fR table in the \fBSUNWfiles\fR
-resource in the \fB/var/mydhcp\fR directory:
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-A\fR \fB-s\fR MySym
-   \fB-d\fR 'Vendor=SUNW.PCW.LAN,20,IP,1,0'
-   \fB-r\fR SUNWfiles \fB-p\fR /var/mydhcp
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 3 \fRAdding a Macro Definition
-.sp
-.LP
-The following command adds the \fBaruba\fR macro definition to the
-\fBdhcptab\fR table. Note that symbol/value pairs are bracketed with colons
-(\fB:\fR).
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-A\fR \fB-m\fR aruba \e
-     \fB-d\fR ':Timeserv=10.0.0.10 10.0.0.11:DNSserv=10.0.0.1:'
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 4 \fRModifying a Macro Definition
-.sp
-.LP
-The following command modifies the \fBLocale\fR macro definition, setting the
-value of the \fBUTCOffst\fR symbol to 18000 seconds. Note that any macro
-definition which includes the definition of the \fBLocale\fR macro inherits
-this change.
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-M\fR \fB-m\fR Locale \fB-e\fR 'UTCOffst=18000'
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 5 \fRDeleting a Symbol
-.sp
-.LP
-The following command deletes the \fBTimeserv\fR symbol from the \fBaruba\fR
-macro. Any macro definition which includes the definition of the \fBaruba\fR
-macro inherits this change.
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-M\fR \fB-m\fR aruba \fB-e\fR 'Timeserv='
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 6 \fRAdding a Symbol to a Macro
-.sp
-.LP
-The following command adds the \fBHostname\fR symbol to the \fBaruba\fR macro.
-Note that the \fBHostname\fR symbol takes no value, and thus requires the
-special value \fB_NULL_VALUE_\fR. Note also that any macro definition which
-includes the definition of the \fBaruba\fR macro inherits this change.
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-M\fR \fB-m\fR aruba \fB-e\fR 'Hostname=_NULL_VALUE_'
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 7 \fRRenaming a Macro
-.sp
-.LP
-The following command renames the \fBLocale\fR macro to \fBMyLocale\fR. Note
-that any \fBInclude\fR statements in macro definitions which include the
-\fBLocale\fR macro also need to be changed.
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-M\fR \fB-m\fR Locale \fB-n\fR MyLocale
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 8 \fRDeleting a Symbol Definition
-.sp
-.LP
-The following command deletes the \fBMySym\fR symbol definition. Note that any
-macro definitions which use \fBMySym\fR needs to be modified.
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-D\fR \fB-s\fR MySym
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 9 \fRRemoving a dhcptab
-.sp
-.LP
-The following command removes the \fBdhcptab\fR table in the NIS+ directory
-specified.
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-R\fR \fB-r\fR SUNWnisplus \fB-p\fR Test.Nis.Plus.
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 10 \fRPrinting a dhcptab
-.sp
-.LP
-The following command prints to standard output the contents of the
-\fBdhcptab\fR that is located in the data store and path indicated in the
-\fBdhcpsvc.conf\fR file:.
-
-.sp
-.in +2
-.nf
-# dhtadm \fB-P\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 11 \fRExecuting dhtadm in Batch Mode
-.sp
-.LP
-The following command runs a series of \fBdhtadm\fR commands contained in a
-batch file and signals the daemon to reload the \fBdhcptab\fR once the commands
-have been executed: :
-
-.sp
-.in +2
-.nf
-# dhtadm -B addmacros -g
-.fi
-.in -2
-.sp
-
-.SH EXIT STATUS
-.sp
-.ne 2
-.na
-\fB\fB0\fR \fR
-.ad
-.RS 6n
-Successful completion.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB1\fR \fR
-.ad
-.RS 6n
-Object already exists.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB2\fR \fR
-.ad
-.RS 6n
-Object does not exist.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB3\fR \fR
-.ad
-.RS 6n
-Non-critical error.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB4\fR \fR
-.ad
-.RS 6n
-Critical error.
-.RE
-
-.SH FILES
-.sp
-.ne 2
-.na
-\fB\fB/etc/inet/dhcpsvc.conf\fR \fR
-.ad
-.RS 27n
-
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Evolving
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBdhcpconfig\fR(1M), \fBdhcpmgr\fR(1M), \fBin.dhcpd\fR(1M),
-\fBdhcpsvc.conf\fR(4), \fBdhcp_network\fR(4), \fBdhcptab\fR(4), \fBhosts\fR(4),
-\fBuser_attr\fR(4), \fBattributes\fR(5), \fBdhcp\fR(5),
-\fBdhcp_modules\fR(5)\fBrbac\fR(5)
-.sp
-.LP
-\fI\fR
-.sp
-.LP
-\fI\fR
-.sp
-.LP
-Alexander, S., and R. Droms, \fIDHCP Options and BOOTP Vendor Extensions\fR,
-RFC 1533, Lachman Technology, Inc., Bucknell University, October 1993.
-.sp
-.LP
-Droms, R., \fIInteroperation Between DHCP and BOOTP\fR, RFC 1534, Bucknell
-University, October 1993.
-.sp
-.LP
-Droms, R., \fIDynamic Host Configuration Protocol\fR, RFC 1541, Bucknell
-University, October 1993.
-.sp
-.LP
-Wimer, W., \fIClarifications and Extensions for the Bootstrap Protocol\fR, RFC
-1542, Carnegie Mellon University, October 1993.
diff --git a/usr/src/man/man1m/dsvclockd.1m b/usr/src/man/man1m/dsvclockd.1m
deleted file mode 100644
index 3fec91a004..0000000000
--- a/usr/src/man/man1m/dsvclockd.1m
+++ /dev/null
@@ -1,82 +0,0 @@
-'\" te
-.\" Copyright (c) 2001, 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 DSVCLOCKD 1M "Dec 3, 2001"
-.SH NAME
-dsvclockd \- DHCP service lock daemon
-.SH SYNOPSIS
-.LP
-.nf
-\fB/usr/lib/inet/dsvclockd\fR [\fB-d\fR 1 | 2] [\fB-f\fR ] [\fB-v\fR]
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBdsvclockd\fR daemon is a lock manager that works in conjunction with the
-Dynamic Host Configuration Protocol (\fBDHCP\fR) Data Service Library
-(\fBlibdhcpsvc\fR). It provides shared or exclusive access to the
-\fBdhcp_network\fR(4) and \fBdhcptab\fR(4) tables. This service is used by the
-\fBSUNWbinfiles\fR and \fBSUNWfiles\fR \fBDHCP\fR data store modules. See
-\fBdhcp_modules\fR(5).
-.sp
-.LP
-\fBdsvclockd\fR is started on demand by \fBlibdhcpsvc\fR. The \fBdsvclockd\fR
-daemon should be started manually only if command line options need to be
-specified.
-.SH OPTIONS
-.sp
-.LP
-The following options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-d\fR \fB1\fR | \fB2\fR\fR
-.ad
-.RS 12n
-Set debug level. Two levels of debugging are currently available, \fB1\fR and
-\fB2\fR. Level \fB2\fR is more verbose.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-f\fR\fR
-.ad
-.RS 12n
-Run in the foreground instead of as a daemon process. When this option is used,
-messages are sent to standard error instead of to \fBsyslog\fR(3C).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-v\fR\fR
-.ad
-.RS 12n
-Provide verbose output.
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Unstable
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBsyslog\fR(3C), \fBdhcp_network\fR(4), \fBdhcptab\fR(4),
-\fBdhcp_modules\fR(5), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/in.dhcpd.1m b/usr/src/man/man1m/in.dhcpd.1m
deleted file mode 100644
index 09152473f2..0000000000
--- a/usr/src/man/man1m/in.dhcpd.1m
+++ /dev/null
@@ -1,496 +0,0 @@
-'\" te
-.\"  Copyright (c) 2004 by 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 IN.DHCPD 1M "Aug 10, 2004"
-.SH NAME
-in.dhcpd \- Dynamic Host Configuration Protocol server
-.SH SYNOPSIS
-.LP
-.nf
-\fB/usr/lib/inet/in.dhcpd\fR  [\fB-denv\fR] [\fB-h\fR \fIrelay_hops\fR] [\fB-i\fR \fIinterface,\fR ...]
- [\fB-l\fR \fIsyslog_local_facility\fR] [\fB-b\fR automatic | manual]
- [\fB-o\fR \fIDHCP_offer_time\fR] [\fB-t\fR \fIdhcptab_rescan_interval\fR]
-.fi
-
-.LP
-.nf
-\fB/usr/lib/inet/in.dhcpd\fR  [\fB-dv\fR] [\fB-h\fR \fIrelay_hops\fR] [\fB-i\fR \fIinterface,\fR]...
- [\fB-l\fR \fIsyslog_local_facility\fR] \fB-r\fR \fIIP_address\fR | \fIhostname,\fR ...
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-\fBin.dhcpd\fR is a daemon that responds to Dynamic Host Configuration Protocol
-(\fBDHCP\fR) requests and optionally to \fBBOOTP\fR protocol requests. The
-daemon forks a copy of itself that runs as a background process. It must be run
-as root. The daemon has two run modes, \fBDHCP\fR server (with optional
-\fBBOOTP\fR compatibility mode) and \fBBOOTP\fR relay agent mode.
-.sp
-.LP
-The first line in the \fBSYNOPSIS\fR section illustrates the options available
-in the DHCP/BOOTP server mode. The second line in the SYNOPSIS section
-illustrates the options available when the daemon is run in \fBBOOTP\fR relay
-agent mode.
-.sp
-.LP
-The \fBDHCP\fR and \fBBOOTP\fR protocols are used to provide configuration
-parameters to Internet hosts. Client machines are allocated their \fBIP\fR
-addresses as well as other host configuration parameters through this
-mechanism.
-.sp
-.LP
-The \fBDHCP\fR/\fBBOOTP\fR daemon manages two types of \fBDHCP\fR data tables:
-the \fBdhcptab\fR configuration table and the DHCP network tables.
-.sp
-.LP
-See \fBdhcptab\fR(4) regarding the dhcptab configuration table and
-\fBdhcp_network\fR(4) regarding the \fBDHCP\fR network tables.
-.sp
-.LP
-The \fBdhcptab\fR contains macro definitions defined using a \fBtermcap\fR-like
-syntax which permits network administrators to define groups of \fBDHCP\fR
-configuration parameters to be returned to clients. However, a \fBDHCP/BOOTP\fR
-server always returns hostname, network broadcast address, network subnet mask,
-and \fBIP\fR maximum transfer unit (\fBMTU\fR) if requested by a client
-attached to the same network as the server machine. If those options have not
-been explicitly configured in the \fBdhcptab\fR, \fBin.dhcpd\fR returns
-reasonable default values.
-.sp
-.LP
-The \fBdhcptab\fR is read at startup, upon receipt of a \fBSIGHUP\fR signal, or
-periodically as specified by the \fB-t\fR option. A \fBSIGHUP\fR (sent using
-the command \fBsvcadm refresh network/dhcp-server\fR) causes the DHCP/BOOTP
-daemon to reread the \fBdhcptab\fR within an interval from \fB0\fR-\fB60\fR
-seconds (depending on where the DHCP daemon is in its polling cycle). For busy
-servers, users should run \fBsvcadm restart network/dhcp-server\fR to force the
-\fBdhcptab\fR to be reread.
-.sp
-.LP
-The DHCP network tables contain mappings of client identifiers to \fBIP\fR
-addresses. These tables are named after the network they support and the
-datastore used to maintain them.
-.sp
-.LP
-The DHCP network tables are consulted during runtime. A client request received
-from a network for which no DHCP network table exists is ignored.
-.sp
-.LP
-This command may change in future releases of Solaris software. Scripts,
-programs, or procedures that use this command might need modification when
-upgrading to future Solaris software releases.The command line options provided
-with the \fBin.dhcpd\fR daemon are used only for the current session, and
-include only some of the server options you can set. The \fBdhcpsvc.conf\fR(4)
-contains all the server default settings, and can be modified by using the
-\fBdhcpmgr\fR utility. See \fBdhcpsvc.conf\fR(4) for more details.
-.SH OPTIONS
-.sp
-.LP
-The following options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-b\fR \fB automatic | manual\fR\fR
-.ad
-.sp .6
-.RS 4n
-This option enables \fBBOOTP\fR compatibility mode, allowing the \fBDHCP\fR
-server to respond to \fBBOOTP\fR clients. The option argument specifies whether
-the \fBDHCP\fR server should automatically allocate permanent lease \fBIP\fR
-addresses to requesting \fBBOOTP\fR clients if the clients are not registered
-in the DHCP network tables (\fBautomatic\fR) or respond only to \fBBOOTP\fR
-clients who have been manually registered in the DHCP network tables (\fB
-manual\fR). This option only affects \fBDHCP\fR server mode.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-d\fR\fR
-.ad
-.sp .6
-.RS 4n
-Debugging mode. The daemon remains as a foreground process, and displays
-verbose messages as it processes \fBDHCP\fR and/or \fBBOOTP\fR datagrams.
-Messages are displayed on the current TTY. This option can be used in both
-DHCP/BOOTP server mode and \fBBOOTP\fR relay agent mode.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-h\fR\fI relay_hops\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specifies the maximum number of relay agent hops that can occur before the
-daemon drops the DHCP/BOOTP datagram. The default number of relay agent hops is
-4. This option affects both DHCP/BOOTP server mode and \fBBOOTP\fR relay agent
-mode.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-i\fR\fI interface, .\|.\|.\fR\fR
-.ad
-.sp .6
-.RS 4n
-Selects the network interfaces that the daemon should monitor for DHCP/BOOTP
-datagrams. The daemon ignores DHCP/BOOTP datagrams on network interfaces not
-specified in this list. This option is only useful on machines that have
-multiple network interfaces. If this option is not specified, then the daemon
-listens for DHCP/BOOTP datagrams on all network interfaces. The option argument
-consists of a comma-separated list of interface names. It affects both
-DHCP/BOOTP server and \fBBOOTP\fR relay agent run modes.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-l\fR \fIsyslog_local_facility\fR\fR
-.ad
-.sp .6
-.RS 4n
-The presence of this option turns on transaction logging for the \fBDHCP\fR
-server or \fBBOOTP\fR relay agent. The value specifies the \fBsyslog\fR local
-facility (an integer from \fB0\fR to \fB7\fR inclusive) the DHCP daemon should
-use for tagging the transactions. Using a facility separate from the
-\fBLOG_DAEMON\fR facility allows the network administrator to capture these
-transactions separately from other DHCP daemon events for such purposes as
-generating transaction reports. See \fBsyslog\fR(3C), for details about local
-facilities. Transactions are logged using a record with 9 space-separated
-fields as follows:
-.RS +4
-.TP
-1.
-Protocol:
-.sp
-.in +2
-.nf
-  Relay mode:     "BOOTP"
-  Server mode:    "BOOTP" or "DHCP" based upon client
-                       type.
-.fi
-.in -2
-.sp
-
-.RE
-.RS +4
-.TP
-2.
-Type:
-.sp
-.in +2
-.nf
-Relay mode:     "RELAY-CLNT", "RELAY-SRVR"
-Server mode:    "ASSIGN", "EXTEND", "RELEASE",
-                    "DECLINE", "INFORM", "NAK" "ICMP-ECHO."
-.fi
-.in -2
-.sp
-
-.RE
-.RS +4
-.TP
-3.
-Transaction time: absolute time in seconds (unix time)
-.RE
-.RS +4
-.TP
-4.
-Lease time:
-.sp
-.in +2
-.nf
-Relay mode:     Always 0.
-Server mode:    0 for ICMP-ECHO events, absolute time in
-                    seconds (unix time)  otherwise
-.fi
-.in -2
-.sp
-
-.RE
-.RS +4
-.TP
-5.
-Source IP address: Dotted Internet form
-.LP
-.nf
-Relay mode:     Relay interface IP on RELAY-CLNT,  INADDR_ANY on RELAY-SRVR. Server mode:    Client IP.
-.fi
-
-.RE
-.RS +4
-.TP
-6.
-Destination IP address: Dotted Internet form
-.LP
-.nf
-Relay mode:     Client IP on RELAY-CLNT, Server IP on RELAY-SRVR. Server mode:    Server IP.
-.fi
-
-.RE
-.RS +4
-.TP
-7.
-Client Identifier: Hex representation (0-9, A-F)
-.LP
-.nf
-Relay mode:     MAC address                          Server mode:    BOOTP - MAC address; DHCP - client id
-.fi
-
-.RE
-.RS +4
-.TP
-8.
-Vendor Class identifier (white space converted to
-periods (.)).
-.LP
-.nf
-Relay mode:     Always "N/A" Server mode:    Vendor class ID tokenized by  converting white space characters  to periods (.)
-.fi
-
-.RE
-.RS +4
-.TP
-9.
-MAC address: Hex representation (0-9, A-F)
-.LP
-.nf
-Relay mode:     MAC address Server mode:    MAC address
-.fi
-
-.RE
-The format of this record is subject to change between releases.
-.sp
-Transactions are logged to the console if daemon is in debug mode (\fB-d\fR).
-.sp
-Logging transactions impact daemon performance.
-.sp
-It is suggested that you periodically rotate the DHCP transaction log file to
-keep it from growing until it fills the filesystem. This can be done in a
-fashion similar to that used for the general system message log
-\fB/var/adm/messages\fR and is best accomplished using the facilities provided
-by \fBlogadm\fR(1M).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-n\fR\fR
-.ad
-.sp .6
-.RS 4n
-Disable automatic duplicate \fBIP\fR address detection. When this option is
-specified, the \fBDHCP\fR server does not attempt to verify that an \fBIP
-address it is about to\fR offer a client is not in use. By default, the
-\fBDHCP\fR server pings an \fBIP\fR address before offering it to a DHCP/BOOTP
-client, to verify that the address is not in use by another machine.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-o\fR\fI DHCP_offer_time\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specifies the number of seconds the \fBDHCP\fR server should cache the offers
-it has extended to discovering \fBDHCP\fR clients. The default setting is
-\fB10\fR seconds. On slow network media, this value can be increased to
-compensate for slow network performance. This option affects only \fBDHCP\fR
-server mode.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-r\fR\fI IP_address | hostname, .\|.\|.\fR\fR
-.ad
-.sp .6
-.RS 4n
-This option enables \fBBOOTP\fR relay agent mode. The option argument specifies
-a comma-separated list of \fBIP\fR addresses or hostnames of \fBDHCP\fR or
-\fBBOOTP\fR servers to which the relay agent is to forward \fBBOOTP\fR
-requests. When the daemon is started in this mode, any \fBDHCP\fR tables are
-ignored, and the daemon simply acts as a \fBBOOTP\fR relay agent.
-.sp
-A \fBBOOTP\fR relay agent listens to \fBUDP\fR port 68, and forwards
-\fBBOOTP\fR request packets received on this port to the destinations specified
-on the command line. It supports the \fBBROADCAST\fR flag described in
-\fBRFC\fR 1542. A \fBBOOTP\fR relay agent can run on any machine that has
-knowledge of local routers, and thus does not have to be an Internet gateway
-machine.
-.sp
-Note that the proper entries must be made to the \fBnetmasks\fR database so
-that the \fBDHCP\fR server being served by the \fBBOOTP\fR relay agents can
-identify the subnet mask of the foreign BOOTP/DHCP client's network. See
-\fBnetmasks\fR(4) for the format and use of this database.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-t\fR\fI dhcptab_rescan_interval\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specifies the interval in minutes that the \fBDHCP\fR server should use to
-schedule the automatic rereading of the \fBdhcptab\fR information. Typically,
-you would use this option if the changes to the \fBdhcptab\fR are relatively
-frequent. Once the contents of the \fBdhcptab\fR have stabilized, you can turn
-off this option to avoid needless reinitialization of the server.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-v\fR\fR
-.ad
-.sp .6
-.RS 4n
-Verbose mode. The daemon displays more messages than in the default mode. Note
-that verbose mode can reduce daemon efficiency due to the time taken to display
-messages. Messages are displayed to the current \fBTTY\fR if the debugging
-option is used; otherwise, messages are logged to the \fBsyslogd\fR facility.
-This option can be used in both DHCP/BOOTP server mode and \fBBOOTP\fR relay
-agent mode.
-.RE
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRStarting a \fBDHCP\fR Server in \fBBOOTP\fR Compatibility Mode
-.sp
-.LP
-The following command starts a \fBDHCP\fR server in \fBBOOTP\fR compatibility
-mode, permitting the server to automatically allocate permanent \fBIP\fR
-addresses to \fBBOOTP\fR clients which are not registered in the server's
-table; limits the server's attention to incoming datagrams on network devices
-\fBle2\fR and \fBtr0\fR; drops \fBBOOTP\fR packets whose hop count exceeds 2;
-configures the \fBDHCP\fR server to cache extended \fBDHCP\fR offers for 15
-seconds; and schedules \fBdhcptab\fR rescans to occur every 10 minutes:
-
-.sp
-.in +2
-.nf
-\fB# in.dhcpd \fR\fB-i\fR\fB le2,tr0 \fR\fB-h\fR\fB 2 \fR\fB-o\fR\fB 15 \fR\fB-t\fR\fB 10 \fR\fB-b\fR\fB automatic\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 2 \fRStarting the Daemon in \fBBOOTP\fR Relay Agent Mode
-.sp
-.LP
-The following command starts the daemon in \fBBOOTP\fR relay agent mode,
-registering the hosts \fBbladerunner\fR and \fB10.0.0.5\fR as relay
-destinations, with debugging and verbose modes enabled, and drops \fBBOOTP\fR
-packets whose hop count exceeds 5:
-
-.sp
-.in +2
-.nf
-\fB# in.dhcpd \fR\fB-d\fR\fB \fR\fB-v\fR\fB \fR\fB-h\fR\fB 5 \fR\fB-r\fR\fB bladerunner,10.0.0.5\fR
-.fi
-.in -2
-.sp
-
-.SH FILES
-.sp
-.ne 2
-.na
-\fB\fB/etc/inet/dhcpsvc.conf\fR\fR
-.ad
-.sp .6
-.RS 4n
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/init/hosts\fR\fR
-.ad
-.sp .6
-.RS 4n
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/usr/lib/inet/dhcp/nsu/rfc2136.so.1\fR\fR
-.ad
-.sp .6
-.RS 4n
-
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Evolving
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBsvcs\fR(1), \fBcron\fR(1M), \fBdhcpmgr\fR(1M), \fBdhtadm\fR(1M),
-\fBinetadm\fR(1M), \fBinetd\fR(1M), \fBlogadm\fR(1M), \fBpntadm\fR(1M),
-\fBsvcadm\fR(1M), \fBsyslogd\fR(1M), \fBsyslog\fR(3C), \fBdhcpsvc.conf\fR(4),
-\fBdhcp_network\fR(4), \fBdhcptab\fR(4), \fBethers\fR(4), \fBhosts\fR(4),
-\fBnetmasks\fR(4), \fBnsswitch.conf\fR(4), \fBattributes\fR(5), \fBdhcp\fR(5),
-\fBsmf\fR(5)
-.sp
-.LP
-\fI\fR
-.sp
-.LP
-Alexander, S., and R. Droms, \fIDHCP Options and BOOTP Vendor Extensions\fR,
-RFC 2132, Silicon Graphics, Inc., Bucknell University, March 1997.
-.sp
-.LP
-Droms, R., \fIInteroperation Between DHCP and BOOTP\fR, RFC 1534, Bucknell
-University, October 1993.
-.sp
-.LP
-Droms, R., \fIDynamic Host Configuration Protocol\fR, RFC 2131, Bucknell
-University, March 1997.
-.sp
-.LP
-Wimer, W., \fIClarifications and Extensions for the Bootstrap Protocol\fR, RFC
-1542, Carnegie Mellon University, October 1993.
-.SH NOTES
-.sp
-.LP
-The \fBin.dhcpd\fR service is managed by the service management facility,
-\fBsmf\fR(5), under the service identifier:
-.sp
-.in +2
-.nf
-svc:/network/dhcp-server
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-Administrative actions on this service, such as enabling, disabling, or
-requesting restart, can be performed using \fBsvcadm\fR(1M). Responsibility for
-initiating and restarting this service is delegated to \fBinetd\fR(1M). Use
-\fBinetadm\fR(1M) to make configuration changes and to view configuration
-information for this service. The service's status can be queried using the
-\fBsvcs\fR(1) command.
diff --git a/usr/src/man/man1m/pntadm.1m b/usr/src/man/man1m/pntadm.1m
deleted file mode 100644
index f50b753dd8..0000000000
--- a/usr/src/man/man1m/pntadm.1m
+++ /dev/null
@@ -1,737 +0,0 @@
-'\" te
-.\"  Copyright (c) 2003 by 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 PNTADM 1M "Jan 9, 2004"
-.SH NAME
-pntadm \- DHCP network table management utility
-.SH SYNOPSIS
-.LP
-.nf
-\fBpntadm\fR \fB-C\fR [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] \fInetwork\fR
-.fi
-
-.LP
-.nf
-\fBpntadm\fR \fB-A\fR \fIname_IP_address\fR [\fB-c\fR \fIcomment\fR] [\fB-e\fR \fImm/dd/yyyy\fR]
-     [\fB-f\fR \fInum\fR | \fIkeywords\fR] [\fB-h\fR \fIclient_hostname\fR]
-     [\fB-i\fR [\fB-a\fR] \fIclient_ID\fR] [\fB-m\fR [\fB-y\fR] \fImacro\fR] [\fB-s\fR \fIserver\fR]
-     [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR] [\fB-u\fR \fIuninterpreted\fR] \fInetwork\fR
-.fi
-
-.LP
-.nf
-\fBpntadm\fR \fB-M\fR \fIname_IP_address\fR [\fB-c\fR \fIcomment\fR] [\fB-e\fR \fImm/dd/yyyy\fR]
-     [\fB-f\fR \fInum\fR | \fIkeywords\fR] [\fB-h\fR \fIclient_hostname\fR]
-     [\fB-i\fR [\fB-a\fR] \fIclient\fR \fI ID\fR] [\fB-m\fR [\fB-y\fR] \fImacro\fR]
-     [\fB-n\fR \fInew_client_IP_address\fR] [\fB-s\fR \fIserver\fR] [\fB-r\fR \fIresource\fR]
-     [\fB-p\fR \fIpath\fR] [\fB-u\fR uninterpreted] \fInetwork\fR
-.fi
-
-.LP
-.nf
-\fBpntadm\fR \fB-D\fR \fIname_IP_address\fR [\fB-y\fR] [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR]
-     [\fB-u\fR uninterpreted] \fInetwork\fR
-.fi
-
-.LP
-.nf
-\fBpntadm\fR \fB-P\fR [\fB-v\fR] [\fB-x\fR] [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR]
-     [\fB-u\fR uninterpreted] \fInetwork\fR
-.fi
-
-.LP
-.nf
-\fBpntadm\fR \fB-R\fR [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR] [\fB-u\fR uninterpreted] \fInetwork\fR
-.fi
-
-.LP
-.nf
-\fBpntadm\fR \fB-L\fR [\fB-r\fR \fIresource\fR] [\fB-p\fR \fIpath\fR] [\fB-u\fR uninterpreted]
-.fi
-
-.LP
-.nf
-\fBpntadm\fR \fB-B\fR [\fB-v\fR] [\fIbatchfile\fR]
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBpntadm\fR command is used to manage the Dynamic Host Configuration
-Protocol (\fBDHCP\fR) network tables. It is used to add and remove networks
-under \fBDHCP\fR management, and add, delete, or modify IP address records
-within network tables, or to view tables. For a description of the format of
-\fBDHCP\fR network tables, see \fBdhcp_network\fR(4).
-.sp
-.LP
-\fBpntadm\fR can be run as root or by other users assigned to the \fBDHCP\fR
-Management profile. See \fBrbac\fR(5) and \fBuser_attr\fR(4).
-.sp
-.LP
-If the networks you want to add are subnetted, you need to update the
-\fBnetmasks\fR(4) table.
-.sp
-.LP
-One of the following options (function flags) must be specified with the
-\fBpntadm\fR command: \fB-A\fR, \fB-B\fR, \fB-C\fR, \fB-D\fR, \fB-L\fR,
-\fB-M\fR, \fB-P\fR, or\fB-R\fR.
-.SH OPTIONS
-.sp
-.LP
-The following options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-A\fR\fI name_IP_address\fR\fR
-.ad
-.RS 26n
-Add a client entry with hostname or client IP address, \fIname_IP_address\fR,
-to the named \fBDHCP\fR network table.
-.sp
-The following sub-options are optional:
-.sp
-.ne 2
-.na
-\fB\fB-c\fR \fIcomment\fR\fR
-.ad
-.RS 22n
-Comment text. The default is \fINULL\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-e\fR \fImm/dd/yyyy\fR\fR
-.ad
-.RS 22n
-Absolute lease. The default is \fB0\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-f\fR \fInum\fR | \fIkeywords\fR\fR
-.ad
-.RS 22n
-Flag value. The default is \fB00\fR.
-.sp
-The flag (\fB-f\fR) option can be specified either as a single number denoting
-the intended flag value, or as a series of the following keywords, combined
-using the plus (\fB+\fR) symbol:
-.sp
-.ne 2
-.na
-\fB\fBDYNAMIC\fR or \fB00\fR\fR
-.ad
-.RS 19n
-Server manager's assignment.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBPERMANENT\fR or \fB01\fR\fR
-.ad
-.RS 19n
-Lease on entry is permanent.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBMANUAL\fR or \fB02\fR\fR
-.ad
-.RS 19n
-Administrator managed assignment.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBUNUSABLE\fR or \fB04\fR\fR
-.ad
-.RS 19n
-Entry is not valid.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBBOOTP\fR or \fB08\fR\fR
-.ad
-.RS 19n
-Entry reserved for \fBBOOTP\fR clients.
-.RE
-
-For a more detailed description of the flag values, see \fBdhcp_network\fR(4).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-h\fR \fIclient_hostname\fR\fR
-.ad
-.RS 22n
-Client hostname. The default is NULL.
-.sp
-When the \fB-h\fR option is used in this mode, the \fIclient_hostname\fR is
-added to the hosts table within the resource used for storing host names
-(files, NIS+ or DNS). The command will fail if this \fIclient_hostname\fR is
-already present in the hosts table.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-i\fR \fIclient_ID\fR [\fB-a\fR]\fR
-.ad
-.RS 22n
-Client identifier [\fB-a\fR]. The default is \fB00\fR.
-.sp
-The \fB-i\fR option modified with \fB-a\fR specifies that the client identifier
-is in \fBASCII\fR format, and thus needs to be converted to hexadecimal format
-before insertion into the table.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-m\fR \fImacro\fR [\fB-y\fR]\fR
-.ad
-.RS 22n
-Macro name. Default is UNKNOWN.
-.sp
-The \fB-m\fR option modified with \fB-y\fR verifies the existence of the named
-macro in the \fBdhcptab\fR table before adding the entry.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-s\fR \fIserver\fR\fR
-.ad
-.RS 22n
-Server IP or name. Default is system name (\fBuname\fR \fB-n\fR).
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-B\fR\fR
-.ad
-.RS 26n
-Activate batch mode. \fBpntadm\fR will read from the specified file or from
-standard input a series of \fBpntadm\fR commands and execute them within the
-same process. Processing many \fBpntadm\fR commands using this method is much
-faster than running an executable batchfile itself. Batch mode is recommended
-for using \fBpntadm\fR in scripts.
-.sp
-The following sub-option is optional:
-.sp
-.ne 2
-.na
-\fB\fB-v\fR\fR
-.ad
-.RS 6n
-Display commands to standard output as they are processed.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-C\fR\fR
-.ad
-.RS 26n
-Create the \fBDHCP\fR network table for the network specified by \fInetwork\fR.
-See . For details, see \fBdhcp_network\fR(4) and \fBnetworks\fR(4).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-D\fR \fI name_IP_address\fR\fR
-.ad
-.RS 26n
-Delete the specified client entry with hostname or client IP address,
-\fIname_IP_address\fR, in the named \fBDHCP\fR network table. (See
-\fBdhcp_network\fR(4).)
-.sp
-The following sub-option is optional:
-.sp
-.ne 2
-.na
-\fB\fB-y\fR\fR
-.ad
-.RS 6n
-Remove associated host table entry. The \fB-y\fR option requests that all
-hostnames associated with the \fBIP\fR address in the hosts table in the
-resource be removed.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-L\fR\fR
-.ad
-.RS 26n
-List the \fBDHCP\fR network tables presently configured, one per line, on
-standard output. If none are found, no output is printed and an exit status of
-\fB0\fR is returned.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-M\fR \fI name_IP_address\fR\fR
-.ad
-.RS 26n
-Modify the specified client entry with hostname or client IP address,
-\fIname_IP_address\fR, in the named \fBDHCP\fR network table. See
-\fBdhcp_network\fR(4). The default for the sub-options is what they currently
-are set to.
-.sp
-The following sub-options are optional.
-.sp
-.ne 2
-.na
-\fB\fB-c\fR \fIcomment\fR\fR
-.ad
-.RS 29n
-New comment text.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-e\fR \fImm/dd/yy\fR\fR
-.ad
-.RS 29n
-New absolute lease expiration date. Time defaults to 12:00 AM of the day
-specified.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-f\fR \fInum\fR | \fIkeyboard\fR\fR
-.ad
-.RS 29n
-New flag value, see explanation following the description of the \fB-A\fR
-option.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-h\fR \fIhost_name\fR\fR
-.ad
-.RS 29n
-New client hostname.
-.sp
-The \fB-h\fR option allows you to change the current \fIhostname\fR associated
-with the \fBIP\fR address or to add a new \fIhostname\fR to the hosts table if
-an entry associated with this \fBIP\fR address does not exist.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-i\fR \fIclient_ID\fR\fR
-.ad
-.RS 29n
-New client identifier [\fB-a\fR].
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-m\fR \fImacro\fR [\fB-y\fR]\fR
-.ad
-.RS 29n
-Macro name defined in \fBdhcptab\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-n \fR \fInew_client_IP_address\fR\fR
-.ad
-.RS 29n
-New \fBIP\fR address.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-s\fR \fIserver\fR\fR
-.ad
-.RS 29n
-New server \fBIP\fR or name.
-.RE
-
- For more detailed description of the sub-options and flag values, see
-\fBdhcp_network\fR(4).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-P\fR\fR
-.ad
-.RS 26n
-Display the named \fBDHCP\fR network table.
-.sp
-The following sub-options are optional:
-.sp
-.ne 2
-.na
-\fB\fB-v\fR\fR
-.ad
-.RS 6n
-Display lease time in full verbose format and resolve IP addresses for the
-clients and server to hostnames.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-x\fR\fR
-.ad
-.RS 6n
-Display lease time in raw format.
-.RE
-
-These flag codes are used with the \fB-P\fR sub-options:
-.sp
-
-.sp
-.TS
-l l l
-l l l .
-\fB-v\fR	\fB-x\fR	Description
-D	00	DYNAMIC
-P	01	PERMANENT
-M	02	MANUAL
-U	04	UNUSABLE
-B	08	BOOTP
-.TE
-
-See \fBdhcp_network\fR(4) for information on these sub-options and associated
-flag codes.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-p\fR\fI path\fR\fR
-.ad
-.RS 26n
-Override the \fBdhcpsvc.conf\fR(4) configuration value for data store resource
-path, \fIpath\fR See \fBdhcpsvc.conf\fR(4)
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-R\fR\fR
-.ad
-.RS 26n
-Remove the named DHCP network table. See \fBdhcp_network\fR(4).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-r\fR \fIdata_store_resource\fR\fR
-.ad
-.RS 26n
-Override the \fB/etc/inet/dhcpsvc.conf\fR configuration value for
-\fBRESOURCE=\fR with the \fIdata_store_resource\fR specified. See the
-\fBdhcpsvc.conf\fR(4) man page for more details on resource type, and the
-\fI\fR for more information about adding support for other data stores.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-u\fR uninterpreted\fR
-.ad
-.RS 26n
-Data which will be ignored by \fBpntadm\fR, but passed to the currently
-configured public module to be interpreted by the data store. This might be
-used for a database account name or other authentication or authorization
-parameters required by a particular data store.
-.RE
-
-.SH OPERANDS
-.sp
-.LP
-The following operand is supported:
-.sp
-.ne 2
-.na
-\fB\fInetwork\fR\fR
-.ad
-.RS 11n
-The network address or network name which corresponds to the \fBdhcp network\fR
-table. See \fBdhcp_network\fR(4).
-.RE
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRCreating a Table for the \fB10.0.0.0\fR DHCP Network
-.sp
-.LP
-The following command creates a table for the \fB10.0.0.0\fR (subnetted to
-class C) \fBDHCP\fR network table. Note that if you have an alias for this
-network in your \fBnetworks\fR(4) table, you can use that value rather than the
-dotted Internet Address notation.
-
-.sp
-.in +2
-.nf
-example# \fBpntadm -C 10.0.0.0\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 2 \fRAdding an Entry to the \fB10.0.0.0\fR Table
-.sp
-.LP
-The following command adds an entry to the \fB10.0.0.0\fR table in the
-\fBfiles\fR resource in the \fB/var/mydhcp\fR directory:
-
-.sp
-.in +2
-.nf
-example# \fBpntadm -r SUNWfiles -p /var/mydhcp -A 10.0.0.1 10.0.0.0\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 3 \fRModifying the \fB10.0.0.1\fR Entry of the \fB10.0.0.0\fR Table
-.sp
-.LP
-The following command modifies the \fB10.0.0.1\fR entry of the \fB10.0.0.0\fR
-table, changing the macro name to \fBGreen\fR, setting the flags field to
-\fBMANUAL\fR and \fBPERMANENT:\fR
-
-.sp
-.in +2
-.nf
-example# \fBpntadm -M 10.0.0.1 -m Green -f 'PERMANENT+MANUAL' 10.0.0.0\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 4 \fRChanging the \fB10.0.0.1\fR Entry to \fB10.0.0.2\fR
-.sp
-.LP
-The following command changes the \fB10.0.0.1\fR entry to \fB10.0.0.2\fR,
-making an entry in the \fBhosts\fR(4) table called \fBmyclient\fR:
-
-.sp
-.in +2
-.nf
-example# \fBpntadm -M 10.0.0.1 -n 10.0.0.2 -h myclient 10.0.0.0\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 5 \fRSetting the Client \fBID\fR as \fBASCII\fR
-.sp
-.LP
-The following command sets the client \fBID\fR as \fBASCII\fR
-\fBaruba.foo.com\fR for the \fBmyclient\fR entry:
-
-.sp
-.in +2
-.nf
-example# \fBpntadm -M myclient -i 'aruba.foo.com' -a 10.0.0.0\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 6 \fRDeleting the \fBmyclient\fREntry from the \fB10.0.0.0\fR Table
-.sp
-.LP
-The following command deletes the \fBmyclient\fR (\fB10.0.0.2\fR) entry from
-the \fB10.0.0.0\fR table:
-
-.sp
-.in +2
-.nf
-example# \fBpntadm -D myclient 10.0.0.0\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 7 \fRRemoving the Named DHCP Network Table
-.sp
-.LP
-The following command removes the named \fBDHCP\fR network table in the NIS+
-directory specified:
-
-.sp
-.in +2
-.nf
-example# \fBpntadm -r SUNWnisplus -p Test.Nis.Plus. -R 10.0.0.0\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 8 \fRListing the Configured DHCP Network Tables
-.sp
-.LP
-The following command lists the configured DHCP network tables:
-
-.sp
-.in +2
-.nf
-example# \fBpntadm -L\fR
-192.168.0.0
-10.0.0.0
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 9 \fRExecuting \fBpntadm\fR Commands in Batch Mode
-.sp
-.LP
-The following command runs a series of \fBpntadm\fR commands contained in a
-batch file:
-
-.sp
-.in +2
-.nf
-example# \fBpntadm -B addclients\fR
-.fi
-.in -2
-.sp
-
-.SH EXIT STATUS
-.sp
-.ne 2
-.na
-\fB\fB0\fR\fR
-.ad
-.RS 5n
-Successful completion.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB1\fR\fR
-.ad
-.RS 5n
-Object already exists.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB2\fR\fR
-.ad
-.RS 5n
-Object does not exist.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB3\fR\fR
-.ad
-.RS 5n
-Non-critical error.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB4\fR\fR
-.ad
-.RS 5n
-Critical error.
-.RE
-
-.SH FILES
-.sp
-.ne 2
-.na
-\fB\fB/etc/inet/dhcpsvc.conf\fR\fR
-.ad
-.RS 26n
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/inet/hosts\fR\fR
-.ad
-.RS 26n
-
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Evolving
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBdhcpconfig\fR(1M), \fBdhcpmgr\fR(1M), \fBdhcp_network\fR(4), ,
-\fBdhcpsvc.conf\fR(4), \fBdhcptab\fR(4), \fBhosts\fR(4), \fBnetmasks\fR(4),
-\fBnetworks\fR(4), \fBuser_attr\fR(4), \fBattributes\fR(5), \fBdhcp\fR(5),
-\fBdhcp_modules\fR(5), \fBrbac\fR(5)
-.sp
-.LP
-\fI\fR
-.sp
-.LP
-\fI\fR
-.sp
-.LP
-Alexander, S., and R. Droms, \fIDHCP Options and BOOTP Vendor Extensions\fR,
-RFC 1533, Lachman Technology, Inc., Bucknell University, October 1993.
-.sp
-.LP
-Droms, R., \fIInteroperation Between DHCP and BOOTP\fR, RFC 1534, Bucknell
-University, October 1993.
-.sp
-.LP
-Droms, R., \fIDynamic Host Configuration Protocol\fR, RFC 1541, Bucknell
-University, October 1993.
-.sp
-.LP
-Wimer, W., \fIClarifications and Extensions for the Bootstrap Protocol\fR, RFC
-1542, Carnegie Mellon University, October 1993.
diff --git a/usr/src/man/man3c/Makefile b/usr/src/man/man3c/Makefile
index a2e6e99cbc..17be98f410 100644
--- a/usr/src/man/man3c/Makefile
+++ b/usr/src/man/man3c/Makefile
@@ -498,8 +498,12 @@ MANFILES= 	__fbufsize.3c					\
 	 	wait3.3c					\
 	 	waitpid.3c					\
 	 	walkcontext.3c					\
+		wcpcpy.3c					\
 	 	wcrtomb.3c					\
+		wcscasecmp.3c					\
 	 	wcscoll.3c					\
+		wcsdup.3c					\
+		wcslen.3c					\
 	 	wcsftime.3c					\
 	 	wcsrtombs.3c					\
 	 	wcsstr.3c					\
@@ -1239,7 +1243,9 @@ MANLINKS=	FD_CLR.3c				\
 	 	watoi.3c				\
 	 	watol.3c				\
 	 	watoll.3c				\
+		wcpncpy.3c				\
 	 	wcrtomb_l.3c				\
+		wcscasecmp_l.3c				\
 	 	wcscat.3c				\
 	 	wcschr.3c				\
 	 	wcscmp.3c				\
@@ -1247,10 +1253,12 @@ MANLINKS=	FD_CLR.3c				\
 	 	wcscpy.3c				\
 	 	wcscspn.3c				\
 	 	wcsetno.3c				\
-	 	wcslen.3c				\
+		wcsncasecmp.3c				\
+		wcsncasecmp_l.3c			\
 	 	wcsncat.3c				\
 	 	wcsncmp.3c				\
 	 	wcsncpy.3c				\
+	 	wcsnlen.3c				\
 		wcsnrtombs.3c				\
 		wcsnrtombs_l.3c				\
 	 	wcspbrk.3c				\
@@ -2236,11 +2244,19 @@ backtrace_symbols.3c			:= LINKSRC = walkcontext.3c
 backtrace_symbols_fd.3c			:= LINKSRC = walkcontext.3c
 printstack.3c				:= LINKSRC = walkcontext.3c
 
+wcpncpy.3c				:= LINKSRC = wcpcpy.3c
+
 wcrtomb_l.3c				:= LINKSRC = wcrtomb.3c
 
+wcscasecmp_l.3c				:= LINKSRC = wcscasecmp.3c
+wcsncasecmp.3c				:= LINKSRC = wcscasecmp.3c
+wcsncasecmp_l.3c			:= LINKSRC = wcscasecmp.3c
+
 wcscoll_l.3c				:= LINKSRC = wcscoll.3c
 wscoll.3c				:= LINKSRC = wcscoll.3c
 
+wcsnlen.3c				:= LINKSRC = wcslen.3c
+
 wcsnrtombs.3c				:= LINKSRC = wcsrtombs.3c
 wcsnrtombs_l.3c				:= LINKSRC = wcsrtombs.3c
 wcsrtombs_l.3c				:= LINKSRC = wcsrtombs.3c
@@ -2265,7 +2281,6 @@ wcschr.3c				:= LINKSRC = wcstring.3c
 wcscmp.3c				:= LINKSRC = wcstring.3c
 wcscpy.3c				:= LINKSRC = wcstring.3c
 wcscspn.3c				:= LINKSRC = wcstring.3c
-wcslen.3c				:= LINKSRC = wcstring.3c
 wcsncat.3c				:= LINKSRC = wcstring.3c
 wcsncmp.3c				:= LINKSRC = wcstring.3c
 wcsncpy.3c				:= LINKSRC = wcstring.3c
diff --git a/usr/src/man/man3c/wcpcpy.3c b/usr/src/man/man3c/wcpcpy.3c
new file mode 100644
index 0000000000..b4a5ecad8e
--- /dev/null
+++ b/usr/src/man/man3c/wcpcpy.3c
@@ -0,0 +1,116 @@
+.\"
+.\" This file and its contents are supplied under the terms of the
+.\" Common Development and Distribution License ("CDDL"), version 1.0.
+.\" You may only use this file in accordance with the terms of version
+.\" 1.0 of the CDDL.
+.\"
+.\" A full copy of the text of the CDDL should have accompanied this
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
+.\"
+.\"
+.\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
+.\"
+.Dd "Jul 27, 2014"
+.Dt WCPCPY 3C
+.Os
+.Sh NAME
+.Nm wcpcpy ,
+.Nm wcpncpy
+.Nd copy a wide-character string and return a pointer to its end
+.Sh SYNOPSIS
+.In wchar.h
+.
+.Ft "wchar_t *"
+.Fo wcpcpy
+.Fa "wchar_t *restrict ws1"
+.Fa "const wchar_t *restrict ws2"
+.Fc
+.
+.Ft "wchar_t *"
+.Fo wcpncpy
+.Fa "wchar_t *restrict ws1"
+.Fa "const wchar_t *restrict ws2"
+.Fa "size_t n"
+.Fc
+.
+.Sh DESCRIPTION
+The
+.Fn wcpcpy
+and
+.Fn wcpncpy
+functions copy the wide-character string pointed to by
+.Fa ws2
+into the location pointed to by
+.Fa ws1 .
+They stop copying after a null wide-character is copied, or in the case
+of
+.Fn wcpncpy ,
+after
+.Fa n
+wide-characters have been copied. If
+.Fa ws2
+contains fewer than
+.Fa n
+wide-characters, then the
+.Fn wcpncpy
+function pads wide-characters to the end of the destination
+.Fa ws1
+until exactly
+.Fa n
+wide-characters have been written.
+.Lp
+In the case of
+.Fn wcpncpy
+a terminating null wide-character will
+.Em not
+be written if the length of
+.Fa ws2
+exceeds
+.Fa n .
+.Lp
+If
+.Fa ws1
+and
+.Fa ws2
+overlap, the result is undefined.
+.Lp
+The
+.Fn wcpcpy
+and
+.Fn wcpncpy
+functions are the wide-character equivalents of
+.Fn stpcpy
+and
+.Fn stpncpy ,
+respectively.
+.Sh RETURN VALUES
+The
+.Fn wcpcpy
+and
+.Fn wcpncpy
+functions return a pointer to the last wide-character written.  In the
+case of
+.Fn wcpncpy
+this will always be equal to
+.Po Fa ws1 Li + Fa n Li \(mi 1 Pc .
+.Sh ERRORS
+None.
+.Sh INTERFACE STABILITY
+.Sy Standard .
+.Sh MT-LEVEL
+.Sy MT-Safe .
+.Sh SEE ALSO
+.Xr stpcpy 3C ,
+.Xr stpncpy 3C ,
+.Xr wcscpy 3C ,
+.Xr wcsncpy 3C ,
+.Xr wchar.h 3HEAD ,
+.Xr standards 5
+.Sh STANDARDS
+The
+.Fn wcpcpy
+and
+.Fn wcpncpy
+functions were introduced in
+.St -p1003.1-2008 .
diff --git a/usr/src/man/man3c/wcscasecmp.3c b/usr/src/man/man3c/wcscasecmp.3c
new file mode 100644
index 0000000000..6a6aca9922
--- /dev/null
+++ b/usr/src/man/man3c/wcscasecmp.3c
@@ -0,0 +1,158 @@
+.\"
+.\" This file and its contents are supplied under the terms of the
+.\" Common Development and Distribution License ("CDDL"), version 1.0.
+.\" You may only use this file in accordance with the terms of version
+.\" 1.0 of the CDDL.
+.\"
+.\" A full copy of the text of the CDDL should have accompanied this
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
+.\"
+.\"
+.\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
+.\"
+.Dd "Nov 4, 2014"
+.Dt WCSCASECMP 3C
+.Os
+.Sh NAME
+.Nm wcscasecmp ,
+.Nm wcscasecmp_l ,
+.Nm wcsncasecmp ,
+.Nm wcsncasecmp_l
+.Nd case-insensitive wide-character string comparison
+.Sh SYNOPSIS
+.In wchar.h
+.
+.Ft int
+.Fo wcscasecmp
+.Fa "const wchar_t *ws1"
+.Fa "const wchar_t *ws2"
+.Fc
+.
+.Ft int
+.Fo wcscasecmp_l
+.Fa "const wchar_t *ws1"
+.Fa "const wchar_t *ws2"
+.Fa "locale_t loc"
+.Fc
+.
+.Ft int
+.Fo wcsncasecmp
+.Fa "const wchar_t *ws1"
+.Fa "const wchar_t *ws2"
+.Fa "size_t n"
+.Fc
+.
+.Ft int
+.Fo wcsncasecmp_l
+.Fa "const wchar_t *ws1"
+.Fa "const wchar_t *ws2"
+.Fa "size_t n"
+.Fa "locale_t loc"
+.Fc
+.Sh DESCRIPTION
+These functions perform case-insensitive comparison of wide-character
+strings
+.Fa ws1
+and
+.Fa ws2 .
+Pairs of wide-characters from each of
+.Fa ws1
+and
+.Fa ws2
+are compared consecutively, ignoring differences in case (if the
+.\"POSIX\." locale upper case characters are treated as lower case).  If
+the two values are different, the comparision stops and either
+a negative value is returned if the character from
+.Fa ws1
+is less than that from
+.Fa ws2 ,
+or a positive is returned if the character from
+.Fa ws1
+is greater than that from
+.Fa ws2 .
+The comparison also stops if both characters are null wide-characters,
+or, in the case of
+.Fn wcsncasecmp
+and
+.Fn wcsncasecmp_l ,
+after
+.Fa n
+comparisons have been made without finding a difference.  In either of
+these two cases, 0 is returned.
+.Lp
+The
+.Fn wcscasecmp
+and
+.Fn wcsncasecmp
+functions use the
+.Dv LC_CTYPE
+category of the current locale to determine case.  The
+.Fn wcscasecmp_l
+and
+.Fn wcsncasecmp_l
+functions use the
+.Dv LC_CTYPE
+category of the locale pointed to by
+.Fa loc
+to determine case.
+.Lp
+Passing
+.Dv LC_GLOBAL_LOCALE
+for
+.Fa loc
+results in undefined behavior.
+.Lp
+The
+.Fn wcscasecmp ,
+.Fn wcsncasecmp ,
+.Fn wcscasecmp_l ,
+and
+.Fn wcsncasecmp_l
+functions are the wide-character equivalents of the
+.Fn strcasecmp ,
+.Fn strncasecmp ,
+.Fn strcasemp_l ,
+and
+.Fn strncasecmp_l
+functions, respectively.
+.Sh RETURN VALUES
+These functions return a negative value if, ignoring case,
+.Fa ws1
+is less than
+.Fa ws1 ,
+or a positive value  if
+.Fa ws1
+is greater than
+.Fa ws2 ,
+or 0 if the both
+.Fa ws1
+and
+.Fa ws2
+are the same.
+.Sh ERRORS
+None.
+.Sh INTERFACE STABILITY
+.Sy Standard .
+.Sh MT-LEVEL
+.Sy MT-Safe .
+.Sh SEE ALSO
+.Xr newlocale 3C ,
+.Xr setlocale 3C ,
+.Xr strcasecmp 3C ,
+.Xr strcasecmp_l 3C ,
+.Xr strncasecmp 3C ,
+.Xr strncasecmp_l 3C ,
+.Xr uselocale 3C ,
+.Xr wchar.h 3HEAD ,
+.Xr locale 5 ,
+.Xr standards 5
+.Sh STANDARDS
+The
+.Fn wcscasecmp ,
+.Fn wcsncasecmp ,
+.Fn wcscasecmp_l ,
+and
+.Fn wcsncasecmp_l
+functions were introduced in
+.St -p1003.1-2008 .
diff --git a/usr/src/man/man3c/wcsdup.3c b/usr/src/man/man3c/wcsdup.3c
new file mode 100644
index 0000000000..80113744a9
--- /dev/null
+++ b/usr/src/man/man3c/wcsdup.3c
@@ -0,0 +1,73 @@
+.\"
+.\" This file and its contents are supplied under the terms of the
+.\" Common Development and Distribution License ("CDDL"), version 1.0.
+.\" You may only use this file in accordance with the terms of version
+.\" 1.0 of the CDDL.
+.\"
+.\" A full copy of the text of the CDDL should have accompanied this
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
+.\"
+.\"
+.\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
+.\"
+.Dd "Nov 4, 2014"
+.Dt WCSDUP 3C
+.Os
+.Sh NAME
+.Nm wcsdup
+.Nd duplicate wide-character string
+.Sh SYNOPSIS
+.In wchar.h
+.
+.Ft wchar_t
+.Fo wcsdup
+.Fa "const wchar_t *string"
+.Fc
+.
+.Sh DESCRIPTION
+The
+.Fn wcsdup
+function duplicates a wide-character
+.Fa string ,
+allocating sufficient memory to store the copy, and then
+copying from
+.Fa string .
+The resulting copy is returned.  It may be deallocated with
+.Xr free 3C
+when it is no longer needed.  The
+.Fn wcsdup
+function is the wide-character equivalent of
+.Xr strdup 3C .
+.Sh RETURN VALUES
+On success, the function
+.Fn wcsdup
+returns the newly allocated copy of the string; on failure it
+returns
+.Dv NULL
+and sets
+.Va errno .
+.Sh ERRORS
+The
+.Fn wcsdup
+function will fail if:
+.Bl -tag -width Er
+.It Er ENOMEM
+Insufficient memory was available to create the copy.
+.El
+.Sh INTERFACE STABILITY
+.Sy Standard .
+.Sh MT-LEVEL
+.Sy MT-Safe .
+.Sh SEE ALSO
+.Xr free 3C ,
+.Xr strdup 3C ,
+.Xr wcslen 3C ,
+.Xr wchar.h 3HEAD ,
+.Xr locale 5 ,
+.Xr standards 5
+.Sh STANDARDS
+The
+.Fn wcsdup
+function was introduced in
+.St -p1003.1-2008 .
diff --git a/usr/src/man/man3c/wcslen.3c b/usr/src/man/man3c/wcslen.3c
new file mode 100644
index 0000000000..71a4bde897
--- /dev/null
+++ b/usr/src/man/man3c/wcslen.3c
@@ -0,0 +1,94 @@
+.\"
+.\" This file and its contents are supplied under the terms of the
+.\" Common Development and Distribution License ("CDDL"), version 1.0.
+.\" You may only use this file in accordance with the terms of version
+.\" 1.0 of the CDDL.
+.\"
+.\" A full copy of the text of the CDDL should have accompanied this
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
+.\"
+.\"
+.\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
+.\"
+.Dd "Nov 4, 2014"
+.Dt WCSLEN 3C
+.Os
+.Sh NAME
+.Nm wcslen ,
+.Nm wcsnlen
+.Nd get length of wide-character string
+.Sh SYNOPSIS
+.In wchar.h
+.
+.Ft size_t
+.Fo wcslen
+.Fa "const wchar_t *string"
+.Fc
+.
+.Ft size_t
+.Fo wcsnlen
+.Fa "const wchar_t *string"
+.Fa "size_t maxlen"
+.Fc
+.
+.Sh DESCRIPTION
+The
+.Fn wcslen
+and
+.Fn wcsnlen
+functions count the number of wide-characters that are present in
+.Fa string .
+They stop counting when they encounter a null wide-character.
+The terminating null wide-character is not included in the count.
+.Lp
+Additionally,
+.Fn wcsnlen
+stops counting after it has counted
+.Fa maxlen
+wide-characters.
+.Lp
+The
+.Fn wcslen
+and
+.Fn wcsnlen
+functions are the wide-character equivalents of
+.Xr strlen 3C
+and
+.Xr strnlen 3C ,
+respectively.
+.Sh RETURN VALUES
+The
+.Fn wcslen
+function returns the length of
+.Fa string .
+The
+.Fn wcsnlen
+function returns the smaller of the length of
+.Fa string
+and
+.Fa maxlen .
+.Sh ERRORS
+None.
+.Sh INTERFACE STABILITY
+.Sy Standard .
+.Sh MT-LEVEL
+.Sy MT-Safe .
+.Sh SEE ALSO
+.Xr free 3C ,
+.Xr strlen 3C ,
+.Xr strnlen 3C ,
+.Xr wchar.h 3HEAD ,
+.Xr locale 5 ,
+.Xr standards 5
+.Sh STANDARDS
+The
+.Fn wcslen
+function was introduced in
+.St -xpg4
+and standardized in
+.St -isoC-99 .
+The
+.Fn wcsnlen
+function was introduced in
+.St -p1003.1-2008 .
diff --git a/usr/src/man/man3c/wcstring.3c b/usr/src/man/man3c/wcstring.3c
index 72a3098f9b..d4d3f3e953 100644
--- a/usr/src/man/man3c/wcstring.3c
+++ b/usr/src/man/man3c/wcstring.3c
@@ -1,4 +1,5 @@
 '\" te
+.\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"  Copyright (c) 1992, X/Open Company Limited  All Rights Reserved  Portions Copyright (c) 2002, Sun Microsystems, Inc.  All Rights Reserved
 .\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission to reproduce portions of its copyrighted documentation. Original documentation from The Open Group can be obtained online at
 .\" http://www.opengroup.org/bookstore/.
@@ -7,10 +8,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 WCSTRING 3C "Aug 14, 2002"
+.TH WCSTRING 3C "Aug 15, 2014"
 .SH NAME
 wcstring, wcscat, wscat, wcsncat, wsncat, wcscmp, wscmp, wcsncmp, wsncmp,
-wcscpy, wscpy, wcsncpy, wsncpy, wcslen, wslen, wcschr, wschr, wcsrchr, wsrchr,
+wcscpy, wscpy, wcsncpy, wsncpy, wslen, wcschr, wschr, wcsrchr, wsrchr,
 windex, wrindex, wcspbrk, wspbrk, wcswcs, wcsspn, wsspn, wcscspn, wscspn,
 wcstok, wstok \- wide-character string operations
 .SH SYNOPSIS
@@ -50,11 +51,6 @@ wcstok, wstok \- wide-character string operations
 
 .LP
 .nf
-\fBsize_t\fR \fBwcslen\fR(\fBconst wchar_t *\fR\fIws\fR);
-.fi
-
-.LP
-.nf
 \fBwchar_t *\fR\fBwcschr\fR(\fBconst wchar_t *\fR\fIws\fR, \fBwchar_t\fR \fIwc\fR);
 .fi
 
@@ -208,7 +204,6 @@ wcstok, wstok \- wide-character string operations
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 These functions operate on wide-character strings terminated by \fBwchar_t\fR
 \fINULL\fR characters. During appending or copying, these routines do not check
@@ -216,7 +211,6 @@ for an overflow condition of the receiving string. In the following, \fIws\fR,
 \fIws1\fR, and \fIws2\fR point to wide-character strings terminated by a
 \fBwchar_t NULL\fR.
 .SS "wcscat(\|), wscat(\|)"
-.sp
 .LP
 The \fBwcscat()\fR and \fBwscat()\fR functions append a copy of the
 wide-character string pointed to by \fIws2\fR (including the terminating null
@@ -226,7 +220,6 @@ wide-character code at the end of \fIws1\fR. If copying takes place between
 objects that overlap, the behavior is undefined. Both functions return
 \fIs1\fR; no return value is reserved to indicate an error.
 .SS "wcsncat(\|), wsncat(\|)"
-.sp
 .LP
 The \fBwcsncat()\fR and \fBwsncat()\fR functions append not more than \fIn\fR
 wide-character codes (a null wide-character code and wide-character codes that
@@ -237,7 +230,6 @@ end of \fIws1\fR. A terminating null wide-character code is always appended to
 the result. Both functions return \fIws1\fR; no return value is reserved to
 indicate an error.
 .SS "wcscmp(\|), wscmp(\|)"
-.sp
 .LP
 The \fBwcscmp()\fR and \fBwscmp()\fR functions compare the wide-character
 string pointed to by \fIws1\fR to the wide-character string pointed to by
@@ -248,7 +240,6 @@ integer greater than, equal to, or less than zero, if the wide-character string
 pointed to by \fIws1\fR is greater than, equal to, or less than the
 wide-character string pointed to by \fIws2\fR.
 .SS "wcsncmp(\|), wsncmp(\|)"
-.sp
 .LP
 The \fBwcsncmp()\fR and \fBwsncmp()\fR functions compare not more than \fIn\fR
 wide-character codes (wide-character codes that follow a null wide character
@@ -261,7 +252,6 @@ than zero, if the possibly null-terminated array pointed to by \fIws1\fR is
 greater than, equal to, or less than the possibly null-terminated array pointed
 to by \fIws2\fR.
 .SS "wcscpy(\|), wscpy(\|)"
-.sp
 .LP
 The \fBwcscpy()\fR and \fBwscpy()\fR functions copy the wide-character string
 pointed to by \fIws2\fR (including the terminating null wide-character code)
@@ -269,7 +259,6 @@ into the array pointed to by \fIws1\fR. If copying takes place between objects
 that overlap, the behavior is undefined. Both functions return \fIws1\fR; no
 return value is reserved to indicate an error.
 .SS "wcsncpy(\|), wsncpy(\|)"
-.sp
 .LP
 The \fBwcsncpy()\fR and \fBwsncpy()\fR functions  copy not more than \fIn\fR
 wide-character codes (wide-character codes that follow a null wide character
@@ -280,15 +269,13 @@ wide-character string that is shorter than \fIn\fR wide-character codes, null
 wide-character codes are appended to the copy in the array pointed to by
 \fIws1\fR, until a total \fIn\fR wide-character codes are written. Both
 functions return \fI ws1\fR; no return value is reserved to indicate an error.
-.SS "wcslen(\|), wslen(\|)"
-.sp
+.SS "wslen(\|)"
 .LP
-The \fBwcslen()\fR and \fBwslen()\fR functions compute the number of
+The \fBwslen()\fR function computes the number of
 wide-character codes in the wide-character string to which \fIws\fR points, not
-including the terminating null wide-character code. Both functions return
+including the terminating null wide-character code. It returns
 \fIws\fR; no return value is reserved to indicate an error.
 .SS "wcschr(\|), wschr(\|)"
-.sp
 .LP
 The \fBwcschr()\fR and \fBwschr()\fR functions locate the first occurrence of
 \fIwc\fR in the wide-character string pointed to by \fIws\fR. The value of
@@ -298,7 +285,6 @@ The terminating null wide-character code is considered to be part of the
 wide-character string. Upon completion, both functions return a pointer to the
 wide-character code, or a null pointer if the wide-character code is not found.
 .SS "wcsrchr(\|), wsrchr(\|)"
-.sp
 .LP
 The \fBwcsrchr()\fR and \fBwsrchr()\fR functions locate the last occurrence of
 \fIwc\fR in the wide-character string pointed to by \fIws\fR. The value of
@@ -309,12 +295,10 @@ wide-character string. Upon successful completion, both functions return a
 pointer to the wide-character code, or a null pointer if \fIwc\fR does not
 occur in the wide-character string.
 .SS "windex(\|), wrindex(\|)"
-.sp
 .LP
 The \fBwindex()\fR and \fBwrindex()\fR functions behave the same as
 \fBwschr()\fR and \fBwsrchr()\fR, respectively.
 .SS "wcspbrk(\|), wspbrk(\|)"
-.sp
 .LP
 The \fBwcspbrk()\fR and \fBwspbrk()\fR functions locate the first occurrence in
 the wide character string pointed to by \fIws1\fR of any wide-character code
@@ -322,7 +306,6 @@ from the wide-character string pointed to by \fIws2\fR. Upon successful
 completion, the function returns a pointer to the wide-character code, or a
 null pointer if no wide-character code from \fIws2\fR occurs in \fIws1\fR.
 .SS "wcswcs(\|)"
-.sp
 .LP
 The \fBwcswcs()\fR function locates the first occurrence in the wide-character
 string pointed to by \fIws1\fR of the sequence of wide-character codes
@@ -332,7 +315,6 @@ returns a pointer to the located wide-character string, or a null pointer if
 the wide-character string is not found. If \fIws2\fR points to a wide-character
 string with zero length, the function returns \fIws1\fR.
 .SS "wcsspn(\|), wsspn(\|)"
-.sp
 .LP
 The \fBwcsspn()\fR and \fBwsspn()\fR functions compute the length of the
 maximum initial segment of the wide-character string pointed to by \fIws1\fR
@@ -340,7 +322,6 @@ which consists entirely of wide-character codes from the wide-character string
 pointed to by \fIws2\fR. Both functions return the length \fIws1\fR; no return
 value is reserved to indicate an error.
 .SS "wcscspn(\|), wscspn(\|)"
-.sp
 .LP
 The \fBwcscspn()\fR and \fBwscspn()\fR functions compute the length of the
 maximum initial segment of the wide-character string pointed to by \fIws1\fR
@@ -349,26 +330,22 @@ wide-character string pointed to by \fIws2\fR. Both functions return the length
 of the initial substring of \fIws1\fR; no return value is reserved to indicate
 an error.
 .SS "wcstok(\|), wstok(\|)"
-.sp
 .LP
 A sequence of calls to the \fBwcstok()\fR and \fBwstok()\fR functions break the
 wide-character string pointed to by \fIws1\fR into a sequence of tokens, each
 of which is delimited by a wide-character code from the wide-character string
 pointed to by \fIws2\fR.
 .SS "Default and other standards"
-.sp
 .LP
 The third argument points to a caller-provided \fBwchar_t\fR pointer into which
 the \fBwcstok()\fR function stores information necessary for it to continue
 scanning the same wide-character string. This argument is not available with
 the XPG4 and SUS versions of \fBwcstok()\fR, nor is it available with the
 \fBwstok()\fR function.  See \fBstandards\fR(5).
-.sp
 .LP
 The first call in the sequence has \fIws1\fR as its first argument, and is
 followed by calls with a null pointer as their first argument. The separator
 string pointed to by \fIws2\fR may be different from call to call.
-.sp
 .LP
 The first call in the sequence searches the wide-character string pointed to by
 \fIws1\fR for the first wide-character code that is \fInot\fR contained in the
@@ -376,7 +353,6 @@ current separator string pointed to by \fIws2\fR. If no such wide-character
 code is found, then there are no tokens in the wide-character string pointed to
 by \fIws1\fR, and \fBwcstok()\fR and \fBwstok()\fR return a null pointer. If
 such a wide-character code is found, it is the start of the first token.
-.sp
 .LP
 The \fBwcstok()\fR and \fBwstok()\fR functions then search from that point for
 a wide-character code that \fIis\fR contained in the current separator string.
@@ -386,17 +362,14 @@ for a token will return a null pointer. If such a wide-character code is found,
 it is overwritten by a null wide character, which terminates the current token.
 The \fBwcstok()\fR and \fBwstok()\fR functions save a pointer to the following
 wide-character code, from which the next search for a token will start.
-.sp
 .LP
 Each subsequent call, with a null pointer as the value of the first argument,
 starts searching from the saved pointer and behaves as described above.
-.sp
 .LP
 Upon successful completion, both functions return a pointer to the first
 wide-character code of a token. Otherwise, if there is no token, a null pointer
 is returned.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -416,15 +389,20 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBmalloc\fR(3C), \fBstring\fR(3C), \fBwcswidth\fR(3C), \fBwcwidth\fR(3C),
-\fBattributes\fR(5), \fBstandards\fR(5)
+\fBmalloc\fR(3C),
+\fBstring\fR(3C),
+\fBwcscasecmp\fR(3C),
+\fBwcsdup\fR(3C),
+\fBwcslen\fR(3C),
+\fBwcswidth\fR(3C),
+\fBwcwidth\fR(3C),
+\fBattributes\fR(5),
+\fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fBwcscat()\fR, \fBwcsncat()\fR, \fBwcscmp()\fR, \fBwcsncmp()\fR,
-\fBwcscpy()\fR, \fBwcsncpy()\fR, \fBwcslen()\fR, \fBwcschr()\fR,
+\fBwcscpy()\fR, \fBwcsncpy()\fR, \fBwcschr()\fR,
 \fBwcsrchr()\fR, \fBwcspbrk()\fR, \fBwcswcs()\fR, \fBwcsspn()\fR,
 \fBwcscspn()\fR, and \fBwcstok()\fR functions are Standard. The \fBwscat()\fR,
 \fBwsncat()\fR, \fBwscmp()\fR, \fBwsncmp()\fR, \fBwscpy()\fR, \fBwsncpy()\fR,
diff --git a/usr/src/man/man3head/wchar.h.3head b/usr/src/man/man3head/wchar.h.3head
index c1906acbb5..00c2a27652 100644
--- a/usr/src/man/man3head/wchar.h.3head
+++ b/usr/src/man/man3head/wchar.h.3head
@@ -1,4 +1,5 @@
 '\" te
+.\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\" Copyright (c) 2001, The IEEE and The Open Group. All Rights Reserved. Portions Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
 .\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission to reproduce portions of its copyrighted documentation. Original documentation from The Open Group can be obtained online at
 .\" http://www.opengroup.org/bookstore/.
@@ -7,7 +8,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 WCHAR.H 3HEAD "Sep 10, 2004"
+.TH WCHAR.H 3HEAD "Aug 15, 2014"
 .SH NAME
 wchar.h, wchar \- wide-character handling
 .SH SYNOPSIS
@@ -17,7 +18,6 @@ wchar.h, wchar \- wide-character handling
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The <\fBwchar.h\fR> header defines the following types:
 .sp
@@ -115,7 +115,6 @@ The maximum value representable by an object of type \fBwchar_t\fR.
 .RS 13n
 The minimum value representable by an object of type \fBwchar_t\fR.
 .RE
-
 .sp
 .ne 2
 .na
@@ -134,23 +133,16 @@ functions to indicate end-of-file.
 .RS 13n
 As described in <\fBstddef.h\fR>.
 .RE
-
-.sp
 .LP
 The tag \fBtm\fR is declared as naming an incomplete structure type, the
 contents of which are described in the header <\fBtime.h\fR>.
-.sp
 .LP
 Inclusion of the <\fBwchar.h\fR> header can make visible all symbols from the
 headers <\fBctype.h\fR>,  <\fBstring.h\fR>, <\fBstdarg.h\fR>, <\fBstddef.h\fR>,
 <\fBstdio.h\fR>, <\fBstdlib.h\fR>, and <\fBtime.h\fR>.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
-
-.sp
 .TS
 box;
 c | c
@@ -161,14 +153,18 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBgetconf\fR(1), \fBbtowc\fR(3C), \fBconfstr\fR(3C), \fBfgetwc\fR(3C),
 \fBgetws\fR(3C), \fBfputwc\fR(3C), \fBfputws\fR(3C), \fBfwide\fR(3C),
 \fBfwprintf\fR(3C), \fBfwscanf\fR(3C), \fBgetwc\fR(3C), \fBgetwchar\fR(3C),
 \fBiswalpha\fR(3C), \fBiswctype\fR(3C), \fBmbsinit\fR(3C), \fBmbrlen\fR(3C),
 \fBmbrtowc\fR(3C), \fBmbsrtowcs\fR(3C), \fBtowlower\fR(3C), \fBtowupper\fR(3C),
-\fBungetwc\fR(3C), \fBvfwprintf\fR(3C), \fBwcrtomb\fR(3C), \fBwcsrtombs\fR(3C),
+\fBungetwc\fR(3C), \fBvfwprintf\fR(3C),
+\fBwcpcpy\fR(3C),
+\fBwcrtomb\fR(3C),
+\fBwcscasecmp\fR(3C),
+\fBwcsdup\fR(3C),
+\fBwcslen\fR(3C),
+\fBwcsrtombs\fR(3C),
 \fBwcstring\fR(3C), \fBwcsstr\fR(3C), \fBwcstod\fR(3C), \fBwcscoll\fR(3C),
 \fBwcsftime\fR(3C), \fBwcstol\fR(3C), \fBwcstoul\fR(3C), \fBwcswidth\fR(3C),
 \fBwcsxfrm\fR(3C), \fBwctob\fR(3C), \fBwctype\fR(3C), \fBwcwidth\fR(3C),
diff --git a/usr/src/man/man3lib/libc.3lib b/usr/src/man/man3lib/libc.3lib
index ab8eb92f24..38f86d50c8 100644
--- a/usr/src/man/man3lib/libc.3lib
+++ b/usr/src/man/man3lib/libc.3lib
@@ -5,11 +5,10 @@
 .\"  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]
 .\" Copyright 2011 by Delphix.  All rights reserved.
-.TH LIBC 3LIB "Jul 1, 2014"
+.TH LIBC 3LIB "Aug 15, 2014"
 .SH NAME
 libc \- C library
 .SH DESCRIPTION
-.sp
 .LP
 Functions in this library provide various facilities defined by System V, ANSI
 C, POSIX, and so on.  See \fBstandards\fR(5). In addition, those facilities
@@ -17,7 +16,6 @@ previously defined in the internationalization and the wide-character libraries
 are now defined in this library, as are the facilities previously defined in
 the multithreading libraries, \fBlibthread\fR and \fBlibpthread\fR.
 .SH INTERFACES
-.sp
 .LP
 The shared object \fBlibc.so.1\fR provides the public interfaces defined below.
 See \fBIntro\fR(3) for additional information on shared object interfaces.
@@ -770,13 +768,16 @@ l l .
 \fBwaitid\fR	\fBwaitpid\fR
 \fBwalkcontext\fR	\fBwarn\fR
 \fBwarnx\fR	\fBwatoll\fR
+\fBwcpcpy\fR	\fBwcpncpy\fR
 \fBwcrtomb\fR	\fBwcrtomb_l\fR
+\fBwcscasecmp\fR	\fBwcscasecmp_l\fR
 \fBwcscat\fR
 \fBwcschr\fR	\fBwcscmp\fR
 \fBwcscoll\fR	\fBwcscoll_l\fR
-\fBwcscpy\fR
-\fBwcscspn\fR	\fBwcsftime\fR
+\fBwcscpy\fR	\fBwcscspn\fR
+\fBwcsdup\fR	\fBwcsftime\fR
 \fBwcslen\fR	\fBwcsncat\fR
+\fBwcsncasecmp\fR	\fBwcsncasecmp_l\fR
 \fBwcsncmp\fR	\fBwcsncpy\fR
 \fBwcsnrtombs\fR	\fBwcsnrtombs_l\fR
 \fBwcspbrk\fR	\fBwcsrchr\fR
@@ -937,7 +938,6 @@ l l .
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/lib/libc.so.1\fR\fR
@@ -976,7 +976,6 @@ symbols
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -991,17 +990,14 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpvs\fR(1), \fBIntro\fR(2), \fBIntro\fR(3), \fBattributes\fR(5),
 \fBlf64\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 The synonyms compatibility library, \fBc_synonyms.so.1\fR, provides a mechanism
 to support old applications and libraries that were mistakenly built using
 now-obsolete synonym symbols from \fBlibc\fR.
-.sp
 .LP
 Before the advent of direct binding (-B direct) \fBlibc\fR provided many
 functions with two names.  For example, \fBgetpwent()\fR and \fB_getpwent()\fR.
@@ -1010,7 +1006,6 @@ leading-underscore symbol was intended to be used by system libraries in order
 to avoid conflicting with an application that might define its own version of
 \fBgetpwent()\fR with completely different semantics. Standard-conforming
 applications may not define and use function names with leading underscores.
-.sp
 .LP
 Solaris system libraries are now built with direct binding. This means that a
 system library that calls \fBgetpwent()\fR will bind directly to the instance
@@ -1019,7 +1014,6 @@ linked defines a different \fBgetpwent()\fR for its own use. The application
 binds to its instance of \fBgetpwent()\fR and there is no resulting conflict.
 The direct binding mechanism is equally available to libraries not delivered
 with Solaris.
-.sp
 .LP
 As a result of this evolution, most of the leading-underscore synonym symbols
 have been removed from \fBlibc\fR.  This means that applications that call
@@ -1050,7 +1044,6 @@ $ LD_PRELOAD=c_synonyms.so.1 ./application
 .in -2
 .sp
 
-.sp
 .LP
 The synonyms compatibility library is intended neither to enable the generation
 of applications that call the obsolete leading-underscore synonym functions,
diff --git a/usr/src/man/man4/Makefile b/usr/src/man/man4/Makefile
index 33b3cd7a92..d179643b98 100644
--- a/usr/src/man/man4/Makefile
+++ b/usr/src/man/man4/Makefile
@@ -57,9 +57,6 @@ _MANFILES=	Intro.4				\
 		devices.4			\
 		dfstab.4			\
 		dhcp_inittab.4			\
-		dhcp_network.4			\
-		dhcpsvc.conf.4			\
-		dhcptab.4			\
 		dialups.4			\
 		dir_ufs.4			\
 		driver.conf.4			\
diff --git a/usr/src/man/man4/dhcp_network.4 b/usr/src/man/man4/dhcp_network.4
deleted file mode 100644
index 19ecaa41ab..0000000000
--- a/usr/src/man/man4/dhcp_network.4
+++ /dev/null
@@ -1,235 +0,0 @@
-'\" te
-.\"  Copyright (c) 2001 by 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 DHCP_NETWORK 4 "Mar 5, 2004"
-.SH NAME
-dhcp_network \- DHCP network tables
-.SH DESCRIPTION
-.sp
-.LP
-The Dynamic Host Configuration Protocol (\fBDHCP\fR) network tables are used to
-map the client identifiers of \fBDHCP\fR clients to \fBIP\fR addresses and the
-associated configuration parameters of that address. One \fBDHCP\fR network
-table exists for each network served by the \fBDHCP\fR server, and each table
-is named using the network's \fBIP\fR address. There is no table or file with
-the name \fBdhcp_network\fR.
-.sp
-.LP
-The \fBDHCP\fR network tables can exist as \fBASCII\fR text files, binary text
-files, or \fBNIS+\fR tables, depending on the data store used. Since the format
-of the file could change, the preferred method of managing the \fBDHCP\fR
-network tables is through the use of \fBdhcpmgr\fR(1M) or the \fBpntadm\fR(1M)
-command.
-.sp
-.LP
-The \fBdhcp_network\fR file is used as a policy mechanism for whether
-\fBin.dhcpd\fR(1M) leases addresses on a given network. If the \fBDHCP\fR
-server is not serving leases or information to a network, there should be no
-\fBdhcp_network\fR file for that network. To set the \fBDHCP\fR server in
-\fBinformational\fR mode, where it responds to \fBINFORM\fR messages but does
-not lease addresses on that network, create an empty \fBdhcp_network\fR file
-for that network. For normal operations, where the \fBDHCP\fR server both
-leases addresses and responds to \fBINFORM\fR packets, create a
-\fBdhcp_network\fR file using \fBdhcpmgr\fR(1M) or \fBpntadm\fR(1M) and
-populate it with leasable addresses.
-.sp
-.LP
-The format of the records in a \fBDHCP\fR network table depends on the data
-store used to maintain the table. However, an entry in a \fBDHCP\fR network
-table must contain the following fields:
-.sp
-.ne 2
-.na
-\fB\fBClient_ID\fR \fR
-.ad
-.RS 14n
-The client identifier field, \fBClient_ID\fR, is an \fBASCII\fR hexadecimal
-representation of the unique octet string value of the \fBDHCP\fR Client
-Identifier Option (code 61) which identifies a \fBDHCP\fR client. In the
-absence of the \fBDHCP\fR Client Identifier Option, the \fBDHCP\fR client is
-identified using the form given below for \fBBOOTP\fR clients. The number of
-characters in this field must be an even number, with a maximum length of 64
-characters. Valid characters are \fB0\fR \fB-\fR \fB9\fR and \fBA\fR-\fBF\fR.
-Entries with values of \fB00\fR are freely available for dynamic allocation to
-requesting clients. \fBBOOTP\fR clients are identified by the concatenation of
-the network's hardware type (as defined by \fBRFC\fR 1340, titled "Assigned
-Numbers") and the client's hardware address. For example, the following
-\fBBOOTP\fR client has a hardware type of '\fB01\fR' (10mb ethernet) and a
-hardware address of \fB8:0:20:11:12:b7\fR, so its client identifier would be:
-\fB010800201112B7\fR
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBFlags\fR \fR
-.ad
-.RS 14n
-The \fBFlags\fR field is a decimal value, the bit fields of which can have a
-combination of the following values:
-.sp
-.ne 2
-.na
-\fB\fB1 (PERMANENT)\fR \fR
-.ad
-.RS 18n
-Evaluation of the \fBLease\fR field is turned off (lease is permanent). If this
-bit is not set, Evaluation of the \fBLease\fR field is enabled and the
-\fBLease\fR is \fBDYNAMIC.\fR
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB2 (MANUAL)\fR \fR
-.ad
-.RS 18n
-This entry has a manual client \fBID\fR binding (cannot be reclaimed by
-\fBDHCP\fR server). Client will not be allocated another address.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB4 (UNUSABLE)\fR \fR
-.ad
-.RS 18n
-When set, this value means that either through \fBICMP\fR echo or client
-\fBDECLINE,\fR this address has been found to be unusable. Can also be used by
-the network administrator to \fIprevent\fR a certain client from booting, if
-used in conjunction with the \fBMANUAL\fR flag.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB8 (BOOTP)\fR \fR
-.ad
-.RS 18n
-This entry is reserved for allocation to \fBBOOTP\fR clients only.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBClient_IP\fR \fR
-.ad
-.RS 14n
-The \fBClient_IP\fR field holds the \fBIP\fR address for this entry. This value
-must be unique in the database.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBServer_IP\fR \fR
-.ad
-.RS 14n
-This field holds the \fBIP\fR address of the \fBDHCP\fR server which \fIowns\fR
-this client \fBIP\fR address, and thus is responsible for initial allocation to
-a requesting client. On a multi-homed DHCP server, this IP address must be the
-first address returned by \fBgethostbyname\fR(3NSL).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLease\fR \fR
-.ad
-.RS 14n
-This numeric field holds the entry's absolute lease expiration time, and is in
-seconds since \fBJanuary 1, 1970\fR. It can be decimal, or hexadecimal (if
-\fB0x\fR prefixes number). The special value \fB-1\fR is used to denote a
-permanent lease.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBMacro\fR \fR
-.ad
-.RS 14n
-This \fBASCII\fR text field contains the \fBdhcptab\fR macro name used to look
-up this entry's configuration parameters in the \fBdhcptab\fR(4) database.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBComment\fR \fR
-.ad
-.RS 14n
-This \fBASCII\fR text field contains an optional comment.
-.RE
-
-.SS "TREATISE ON LEASES"
-.sp
-.LP
-This section describes how the \fBDHCP/BOOTP\fR server calculates a client's
-configuration lease using information contained in the \fBdhcptab\fR(4) and
-\fBDHCP\fR network tables. The server consults the \fBLeaseTim\fR and
-\fBLeaseNeg\fR symbols in the \fBdhcptab\fR, and the \fBFlags\fR and
-\fBLease\fR fields of the chosen IP address record in the \fBDHCP\fR network
-table.
-.sp
-.LP
-The server first examines the \fBFlags\fR field for the identified \fBDHCP\fR
-network table record. If the \fBPERMANENT\fR flag is on, then the client's
-lease is considered permanent.
-.sp
-.LP
-If the \fBPERMANENT\fR flag is not on, the server checks if the client's lease
-as represented by the \fBLease\fR field in the network table record has
-expired. If the lease is not expired, the server checks if the client has
-requested a new lease. If the \fBLeaseNeg\fR symbol has not been included in
-the client's \fBdhcptab\fR parameters, then the client's requested lease
-extension is ignored, and the lease is set to be the time remaining as shown by
-the \fBLease\fR field. If the \fBLeaseNeg\fR symbol \fIhas\fR been included,
-then the server will extend the client's lease to the value it requested if
-this requested lease is less than or equal to the current time plus the value
-of the client's \fBLeaseTim\fR \fBdhcptab\fR parameter.
-.sp
-.LP
-If the client's requested lease is greater than policy allows (value of
-\fBLeaseTim\fR), then the client is given a lease equal to the current time
-plus the value of \fBLeaseTim\fR. If \fBLeaseTim\fR is not set, then the
-default \fBLeaseTim\fR value is one hour.
-.sp
-.LP
-For more information about the \fBdhcptab\fR symbols, see \fBdhcptab\fR(4).
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for a description of the following attribute:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Evolving
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBdhcpconfig\fR(1M), \fBdhcpmgr\fR(1M), \fBdhtadm\fR(1M), \fBin.dhcpd\fR(1M),
-\fBpntadm\fR(1M), \fBdhcptab\fR(4), \fBdhcp\fR(5), \fBdhcp_modules\fR(5),
-\fBattributes\fR(5)
-.sp
-.LP
-\fISolaris DHCP Service Developer\&'s Guide\fR
-.sp
-.LP
-\fISystem Administration Guide: IP Services\fR
-.sp
-.LP
-Reynolds, J. and J. Postel, \fIAssigned Numbers\fR, STD 2, RFC 1340,
-USC/Information Sciences Institute, July 1992.
diff --git a/usr/src/man/man4/dhcpsvc.conf.4 b/usr/src/man/man4/dhcpsvc.conf.4
deleted file mode 100644
index 821a5c14cf..0000000000
--- a/usr/src/man/man4/dhcpsvc.conf.4
+++ /dev/null
@@ -1,289 +0,0 @@
-'\" te
-.\"  Copyright (c) 2003 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 DHCPSVC.CONF 4 "Jun 26, 2003"
-.SH NAME
-dhcpsvc.conf \- file containing service configuration parameters for the DHCP
-service
-.SH DESCRIPTION
-.sp
-.LP
-The \fBdhcpsvc.conf\fR file resides in directory \fB/etc/inet\fR and contains
-parameters for specifying Dynamic Host Configuration Protocol (\fBDHCP\fR)
-service configuration settings, including the type and location of \fBDHCP\fR
-data store used.
-.sp
-.LP
-The description of the \fBdhcpsvc.conf\fR file in this man page is
-informational only. The preferred method of setting or modifying values within
-the \fBdhcpsvc.conf\fR file is by using \fBdhcpconfig\fR(1M) or the
-\fBdhcpmgr\fR(1M) utility. Do not edit the \fBdhcpsvc.conf\fR file.
-.sp
-.LP
-The \fBdhcpsvc.conf\fR file format is \fBASCII\fR; comment lines begin with the
-crosshatch (\fB#\fR) character. Parameters consist of a keyword followed by an
-equals (\fB=\fR) sign followed by the parameter value, of the form:
-.sp
-.in +2
-.nf
-\fIKeyword\fR=\fIValue\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-The following \fIKeyword\fR and \fIValue\fR parameters are supported:
-.sp
-.ne 2
-.na
-\fBBOOTP_COMPAT\fR
-.ad
-.RS 28n
-String. \fBautomatic\fR or \fBmanual\fR. Enables support of \fBBOOTP\fR
-clients. Default is no \fBBOOTP\fR. Value selects \fBBOOTP\fR address
-allocation method. \fBautomatic\fR to support all BOOTP clients, \fBmanual\fR
-to support only registered \fBBOOTP\fR clients. \fBserver\fR mode only
-parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBCACHE_TIMEOUT\fR
-.ad
-.RS 28n
-Integer. Number of seconds the server caches data from data store. Used to
-improve performance. Default is 10 seconds. \fBserver\fR mode only parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBCONVER\fR
-.ad
-.RS 28n
-Integer. Container version. Used by DHCP administrative tools to identify which
-version of the public module is being used to administer the data store.
-\fBCONVER\fR should \fBnot\fR be changed manually.
-.RE
-
-.sp
-.ne 2
-.na
-\fBDAEMON_ENABLED\fR
-.ad
-.RS 28n
-\fBTRUE\fR/\fBFALSE\fR. If \fBTRUE\fR, the DHCP daemon can be run. If
-\fBFALSE\fR, DHCP daemon process exits immediately if the daemon is started.
-Default is \fBTRUE\fR. Generic parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBHOSTS_DOMAIN\fR
-.ad
-.RS 28n
-String. Defines name service domain that DHCP administration tools use when
-managing the hosts table. Valid only when \fBHOSTS_RESOURCE\fR is set to
-\fBnisplus\fR or \fBdns\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fBHOSTS_RESOURCE\fR
-.ad
-.RS 28n
-String. Defines what name service resource should be used by the DHCP
-administration tools when managing the hosts table. Current valid values are
-\fBfiles\fR, \fBnisplus\fR, and \fBdns\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fBICMP_VERIFY\fR
-.ad
-.RS 28n
-\fBTRUE\fR/\fBFALSE\fR. Toggles \fBICMP\fR echo verification of IP addresses.
-Default is \fBTRUE\fR. \fBserver\fR mode only parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBINTERFACES\fR
-.ad
-.RS 28n
-String. Comma-separated list of interface names to listen to. Generic
-parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBLOGGING_FACILITY\fR
-.ad
-.RS 28n
-Integer. Local facility number (\fB0\fR-\fB7\fR inclusive) to log \fBDHCP\fR
-events to. Default is not to log transactions. Generic parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBOFFER_CACHE_TIMEOUT\fR
-.ad
-.RS 28n
-Integer. Number of seconds before \fBOFFER\fR cache timeouts occur. Default is
-\fB10\fR seconds. \fBserver\fR mode only parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBOWNER_IP\fR
-.ad
-.RS 28n
-String. List of supplemental ownership addresses  that will be used by the DHCP
-server in determining the \fBdhcp_network\fR records that are under its
-management. Addresses are in the dotted Internet form of an IPv4 address.
-Primary value is the IP address associated with the system's primary interface
-(\fInodename\fR == \fIhostname\fR). Server-mode-only parameter. Note that using
-\fBOWNER_IP\fR has some performance impact, thus using a large number might not
-be advisable.
-.RE
-
-.sp
-.ne 2
-.na
-\fBPATH\fR
-.ad
-.RS 28n
-Path to DHCP data tables within the data store specified by the RESOURCE
-parameter. The value of the \fBPATH\fR keyword is specific to the RESOURCE.
-.RE
-
-.sp
-.ne 2
-.na
-\fBRELAY_DESTINATIONS\fR
-.ad
-.RS 28n
-String. Comma-separated list of host names and/or \fBIP\fR addresses of relay
-destinations. \fBrelay\fR mode only parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBRELAY_HOPS \fR
-.ad
-.RS 28n
-Integer. Max number of \fBBOOTP\fR relay hops before packet is dropped. Default
-is \fB4\fR. Generic parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBRESCAN_INTERVAL\fR
-.ad
-.RS 28n
-Integer. Number of minutes between automatic \fBdhcptab\fR rescans. Default is
-not to do rescans. \fBserver\fR mode only parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBRESOURCE\fR
-.ad
-.RS 28n
-Data store resource used. Use this parameter to name the public module. See the
-\fBPATH\fR keyword in \fBdhcp_modules\fR(5).
-.RE
-
-.sp
-.ne 2
-.na
-\fBRESOURCE_CONFIG\fR
-.ad
-.RS 28n
-String. The private layer provides for module-specific configuration
-information through the use of the \fBRESOURCE_CONFIG\fR keyword. See
-\fBdhcp_modules\fR(5).
-.sp
-Providers can access \fBRESOURCE_CONFIG\fR using the configure function by
-specifying an optional service provider layer API function:
-.sp
-.in +2
-.nf
-int configure(const char *configp);
-.fi
-.in -2
-
-If this function is defined by the public module provider, it is called during
-module load time by the private layer, with the contents of the
-\fBRESOURCE_CONFIG\fR string acquired by the administrative interface (in the
-case of the \fBdhcpmgr\fR, through the use of a public module-specific java
-bean extending the \fBdhcpmgr\fR to provide a configuration dialog for this
-information.
-.RE
-
-.sp
-.ne 2
-.na
-\fBRUN_MODE\fR
-.ad
-.RS 28n
-\fBserver\fR or \fBrelay\fR. Selects daemon run mode. Default is \fBserver\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fBSECONDARY_SERVER_TIMEOUT\fR
-.ad
-.RS 28n
-Integer. The number of seconds a secondary server waits for a primary server to
-respond before responding itself. Default is \fB20\fR seconds. This is a server
-mode only parameter.
-.RE
-
-.sp
-.ne 2
-.na
-\fBUPDATE_TIMEOUT\fR
-.ad
-.RS 28n
-Integer. Number of seconds to wait for a response from the DNS server before
-timing out. If this parameter is present, the DHCP daemon updates DNS on behalf
-of DHCP clients, and waits the number of seconds specified for a response
-before timing out. You can use \fBUPDATE_TIMEOUT\fR without specifying a number
-to enable DNS updates with the default timeout of 15 seconds. If this parameter
-is not present, the DHCP daemon does not update DNS for DHCP clients.
-.RE
-
-.sp
-.ne 2
-.na
-\fBVERBOSE\fR
-.ad
-.RS 28n
-\fBTRUE\fR/\fBFALSE\fR. Toggles verbose mode, determining amount of status and
-error messages reported by the daemon. Default is \fBFALSE\fR. Set to
-\fBTRUE\fR only for debugging. Generic parameter.
-.RE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBdhcpmgr\fR(1M), \fBin.dhcpd\fR(1M), \fBdhcp\fR(5), \fBdhcp_modules\fR(5)
-.sp
-.LP
-\fISystem Administration Guide: IP Services\fR
diff --git a/usr/src/man/man4/dhcptab.4 b/usr/src/man/man4/dhcptab.4
deleted file mode 100644
index a2e82c150a..0000000000
--- a/usr/src/man/man4/dhcptab.4
+++ /dev/null
@@ -1,394 +0,0 @@
-'\" te
-.\"  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 DHCPTAB 4 "Mar 15, 2002"
-.SH NAME
-dhcptab \- DHCP configuration parameter table
-.SH DESCRIPTION
-.sp
-.LP
-The \fBdhcptab\fR configuration table allows network administrators to organize
-groups of configuration parameters as macro definitions, which can then be
-referenced in the definition of other useful macros. These macros are then used
-by the \fBDHCP\fR server to return their values to \fBDHCP\fR and \fBBOOTP\fR
-clients.
-.sp
-.LP
-The preferred method of managing the \fBdhcptab\fR is through the  use of the
-\fBdhcpmgr\fR(1M) or \fBdhtadm\fR(1M) utility. The description of \fBdhcptab\fR
-entries included in this manual page is intended for informational purposes
-only, and should not be used to manually edit entries.
-.sp
-.LP
-You can view the contents of the \fBdhcptab\fR using the DHCP manager's tabs
-for Macros and Options, or using the \fBdhtadm -P\fR command.
-.SS "Syntax of dhcptab Entries"
-.sp
-.LP
-The format of a \fBdhcptab\fR table depends on the data store used to maintain
-it. However, any \fBdhcptab\fR must contain the following fields in each
-record:
-.sp
-.ne 2
-.na
-\fB\fBName\fR\fR
-.ad
-.RS 9n
-This field identifies the macro or symbol record and is used as a search key
-into the \fBdhcptab\fR table. The name of a macro or symbol must consist of
-\fBASCII\fR characters, with the length limited to 128 characters. Names can
-include spaces, except at the end of the name. The name is not case-sensitive.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBType\fR\fR
-.ad
-.RS 9n
-This field specifies the type of record and is used as a search key into the
-\fBdhcptab\fR. Currently, there are only two legal values for \fBType\fR:
-.sp
-.ne 2
-.na
-\fB\fBm\fR\fR
-.ad
-.RS 5n
-This record is a \fBDHCP\fR macro definition.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBs\fR\fR
-.ad
-.RS 5n
-This record is a \fBDHCP\fR symbol definition. It is used to define vendor and
-site-specific options.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBValue\fR\fR
-.ad
-.RS 9n
-This field contains the value for the specified type of record. For the \fBm\fR
-type, the value will consist of a series of symbol=value pairs, separated by
-the colon (\fB:\fR) character. For the \fBs\fR type, the value will consist of
-a series of fields, separated by a comma (\fB,\fR), which define a symbol's
-characteristics. Once defined, a symbol can be used in macro definitions.
-.RE
-
-.SS "Symbol Characteristics"
-.sp
-.LP
-The Value field of a symbols definition contain the following fields describing
-the characteristics of a symbol:
-.sp
-.ne 2
-.na
-\fB\fBContext\fR\fR
-.ad
-.RS 15n
-This field defines the context in which the symbol definition is to be used. It
-can have one of the following values:
-.sp
-.ne 2
-.na
-\fB\fBSite\fR\fR
-.ad
-.RS 27n
-This symbol defines a site-specific option, codes 128-254.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBVendor=Client Class ...\fR\fR
-.ad
-.RS 27n
-This symbol defines a vendor-specific option, codes 1-254. The Vendor context
-takes \fBASCII\fR string arguments which identify the client class that this
-vendor option is associated with. Multiple client class names can be specified,
-separated by white space. Only those clients whose client class matches one of
-these values will see this option. For Sun machines, the Vendor client class
-matches the value returned by the command \fBuname -i\fR on the client, with
-periods replacing commas.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBCode\fR\fR
-.ad
-.RS 15n
-This field specifies the option code number associated with this symbol. Valid
-values are 128-254 for site-specific options, and 1-254 for vendor-specific
-options.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBType\fR\fR
-.ad
-.RS 15n
-This field defines the type of data expected as a value for this symbol, and is
-not case-sensitive. Legal values are:
-.sp
-.ne 2
-.na
-\fB\fBASCII\fR\fR
-.ad
-.RS 11n
-\fBNVT ASCII\fR text. Value is enclosed in double-quotes (\fB"\fR). Granularity
-setting has no effect on symbols of this type, since \fBASCII\fR strings have a
-natural granularity of one (1).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBBOOLEAN\fR\fR
-.ad
-.RS 11n
-No value is associated with this data type. Presence of symbols of this type
-denote boolean \fBTRUE,\fR whereas absence denotes \fBFALSE.\fR Granularity and
-Miximum values have no meaning for symbols of this type.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBIP\fR\fR
-.ad
-.RS 11n
-Dotted decimal form of an Internet address. Multi-IP address granularity is
-supported.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBNUMBER\fR\fR
-.ad
-.RS 11n
-An unsigned number with a supported granularity of \fB1\fR, \fB2\fR, \fB4\fR,
-and \fB8\fR octets.
-.sp
-Valid \fBNUMBER\fR types are: \fBUNUMBER8\fR, \fBSNUMBER8\fR, \fBUNUMBER16\fR,
-\fBSNUMBER16\fR, \fBUNUMBER32\fR, \fBSNUMBER32\fR, \fBUNUMBER64\fR, and
-\fBSNUMBER64\fR. See \fBdhcp_inittab\fR(4) for details.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBOCTET\fR\fR
-.ad
-.RS 11n
-Uninterpreted \fBASCII\fR representation of binary data. The client identifier
-is one example of an \fBOCTET\fR string. Valid characters are \fB0\fR-\fB9\fR,
-\fBa\fR-\fBf\fR, \fBA\fR-\fBF\fR. One \fBASCII\fR character represents one
-nibble (4 bits), thus two \fBASCII\fR characters are needed to represent an 8
-bit quantity. The granularity setting has no effect on symbols of this type,
-since \fBOCTET\fR strings have a natural granularity of one (\fB1\fR).
-.sp
-For example, to encode a sequence of bytes with decimal values \fB77\fR,
-\fB82\fR, \fB5\fR, \fB240\fR, \fB14\fR, the option value would be encoded as
-\fB4d5205f00e\fR. A macro which supplies a value for option code \fB78\fR,
-\fBSLP_DA\fR, with a \fB0\fR Mandatory byte and Directory Agents at
-\fB192.168.1.5\fR and \fB192.168.0.133\fR  would appear in the \fBdhcptab\fR
-as:
-.sp
-.in +2
-.nf
-slpparams
-Macro
-:SLP_DA=00c0a80105c0a80085:
-.fi
-.in -2
-
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBGranularity\fR\fR
-.ad
-.RS 15n
-This value specifies how many objects of \fBType\fR define a single
-\fBinstance\fR of the symbol value. For example, the static route option is
-defined to be a variable list of routes. Each route consists of two \fBIP\fR
-addresses, so the \fBType\fR is defined to be \fBIP\fR, and the data's
-granularity is defined to be \fB2\fR \fBIP\fR addresses. The granularity field
-affects the \fBIP\fR and \fBNUMBER\fR data types.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBMaximum\fR\fR
-.ad
-.RS 15n
-This value specifies the maximum items of \fBGranularity\fR which are
-permissible in a definition using this symbol. For example, there can only be
-one \fBIP\fR address specified for a subnet mask, so the  \fBMaximum\fR number
-of items in this case is one (\fB1\fR). A  \fBMaximum\fR value of zero
-(\fB0\fR) means that a variable number of items is permitted.
-.RE
-
-.sp
-.LP
-The following example defines a site-specific option (symbol) called
-\fBMystatRt\fR, of code \fB130\fR, type \fBIP,\fR and granularity \fB2\fR, and
-a \fBMaximum\fR of \fB0\fR. This definition corresponds to the internal
-definition of the static route option (\fBStaticRt\fR).
-.sp
-.in +2
-.nf
-MystatRt s Site,130,IP,2,0
-.fi
-.in -2
-
-.sp
-.LP
-The following example demonstrates how a SLP Service Scope symbol
-(\fBSLP_SS\fR) with a scope value of \fBhappy\fR and mandatory byte set to
-\fB0\fR is encoded. The first octet of the option is the Mandatory octet, which
-is set either to \fB0\fR or \fB1\fR. In this example, it is set to \fB0
-(00)\fR. The balance of the value is the hexidecimal ASCII code numbers
-representing the name \fBhappy\fR, that is, \fB6861707079\fR.
-.sp
-.in +2
-.nf
-SLP_SS=006861707079
-.fi
-.in -2
-
-.SS "Macro Definitions"
-.sp
-.LP
-The following example illustrates a macro defined using the \fBMystatRt\fR site
-option symbol just defined:
-.sp
-.in +2
-.nf
-10netnis m :MystatRt=3.0.0.0 10.0.0.30:
-.fi
-.in -2
-
-.sp
-.LP
-Macros can be specified in the \fBMacro\fR field in \fBDHCP\fR network tables
-(see \fBdhcp_network\fR(4)), which will bind particular macro definitions to
-specific \fBIP addresses.\fR
-.sp
-.LP
-Up to four macro definitions are consulted by the \fBDHCP\fR server to
-determine the options that are returned to the requesting client.
-.sp
-.LP
-These macros are processed in the following order:
-.sp
-.ne 2
-.na
-\fB\fBClient Class\fR\fR
-.ad
-.RS 21n
-A macro named using the \fBASCII\fR representation of the client class (e.g.
-\fBSUNW.Ultra-30\fR) is searched for in the \fBdhcptab\fR. If found, its
-symbol/value pairs will be selected for delivery to the client. This mechanism
-permits the network administrator to select configuration parameters to be
-returned to all clients of the same class.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBNetwork\fR\fR
-.ad
-.RS 21n
-A macro named by the dotted Internet form of the network address of the
-client's network (for example, \fB10.0.0.0\fR) is searched for in the
-\fBdhcptab\fR. If found, its symbol/value pairs will be combined with those of
-the \fBClient Class\fR macro. If a symbol exists in both macros, then the
-\fBNetwork\fR macro value overrides the value defined in the \fBClient Class\fR
-macro. This mechanism permits the network administrator to select configuration
-parameters to be returned to all clients on the same network.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBIP Address\fR\fR
-.ad
-.RS 21n
-This macro may be named anything, but must be specified in the \fBDHCP\fR
-network table for the IP address record assigned to the requesting client. If
-this macro is found in the \fBdhcptab\fR, then its symbol/value pairs will be
-combined with those of the \fBClient Class\fR macro and the \fBNetwork\fR
-macro. This mechanism permits the network administrator to select configuration
-parameters to be returned to clients using a particular \fBIP\fR address. It
-can also be used to deliver a macro defined to include "server-specific"
-information by including this macro definition in all \fBDHCP\fR network table
-entries owned by a specific server.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBClient Identifier\fR\fR
-.ad
-.RS 21n
-A macro named by the \fBASCII\fR representation of the client's unique
-identifier as shown in the \fBDHCP\fR network table (see
-\fBdhcp_network\fR(4)). If found, its symbol/value pairs are combined to the
-sum of the \fBClient Class\fR, \fBNetwork\fR, and \fBIP Address\fR macros. Any
-symbol collisions are replaced with those specified in the client identifier
-macro. The client mechanism permits the network administrator to select
-configuration parameters to be returned to a particular client, regardless of
-what network that client is connected to.
-.RE
-
-.sp
-.LP
-Refer to \fISystem Administration Guide: IP Services\fR for more information
-about macro processing.
-.sp
-.LP
-Refer to the \fBdhcp_inittab\fR(4) man page for more information about symbols
-used in Solaris DHCP.
-.SH SEE ALSO
-.sp
-.LP
-\fBdhcpmgr\fR(1M), \fBdhtadm\fR(1M), \fBin.dhcpd\fR(1M), \fBdhcp_inittab\fR(4),
-\fBdhcp_network\fR(4), \fBdhcp\fR(5)
-.sp
-.LP
-\fISystem Administration Guide: IP Services\fR
-.sp
-.LP
-Alexander, S., and R. Droms, \fIDHCP Options and BOOTP Vendor Extensions\fR,
-RFC 2132, Silicon Graphics, Inc., Bucknell University, March 1997.
-.sp
-.LP
-Droms, R., \fIInteroperation Between DHCP and BOOTP\fR, RFC 1534, Bucknell
-University, October 1993.
-.sp
-.LP
-Droms, R., \fIDynamic Host Configuration Protocol\fR, RFC 2131, Bucknell
-University, March 1997.
-.sp
-.LP
-Wimer, W., \fIClarifications and Extensions for the Bootstrap Protocol\fR, RFC
-1542, Carnegie Mellon University, October 1993.
diff --git a/usr/src/man/man5/Makefile b/usr/src/man/man5/Makefile
index 868e22eaf0..466d5c0f16 100644
--- a/usr/src/man/man5/Makefile
+++ b/usr/src/man/man5/Makefile
@@ -41,7 +41,6 @@ MANFILES=	Intro.5			\
 		crypt_unix.5		\
 		device_clean.5		\
 		dhcp.5			\
-		dhcp_modules.5		\
 		environ.5		\
 		epoll.5			\
 		eqn.5			\
diff --git a/usr/src/man/man5/dhcp.5 b/usr/src/man/man5/dhcp.5
index b6370b7cc5..6a662bd6b1 100644
--- a/usr/src/man/man5/dhcp.5
+++ b/usr/src/man/man5/dhcp.5
@@ -1,13 +1,13 @@
 '\" te
+.\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\" Copyright (c) 2001, 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 DHCP 5 "Jan 5, 2007"
+.TH DHCP 5 "Aug 15, 2014"
 .SH NAME
 dhcp \- Dynamic Host Configuration Protocol
 .SH DESCRIPTION
-.sp
 .LP
 Dynamic Host Configuration Protocol (\fBDHCP\fR) enables host systems in a
 \fBTCP/IP\fR network to be configured automatically for the network as they
@@ -15,28 +15,23 @@ boot. \fBDHCP\fR uses a client/server mechanism: servers store configuration
 information for clients, and provide that information upon a client's request.
 The information can include the client's \fBIP\fR address and information about
 network services available to the client.
-.sp
 .LP
-This manual page provides a brief summary of the Solaris \fBDHCP\fR
+This manual page provides a brief summary of the \fBDHCP\fR
 implementation.
-.SS "Solaris DHCP Client"
-.sp
+.SS "DHCP Client"
 .LP
-The Solaris DHCP client is implemented as background daemon,
+The DHCP client is implemented as background daemon,
 \fBdhcpagent\fR(1M).
-.sp
 .LP
 For IPv4, this daemon is started automatically during bootup if there exists at
 least one \fBdhcp.\fR\fIinterface\fR file in \fB/etc\fR. Only interfaces with a
 corresponding \fB\fR\fB/etc/dhcp.\fR\fB\fIinterface\fR\fR file are
 automatically configured during boot.
-.sp
 .LP
 For IPv6, this daemon is started automatically when commanded by \fBin.ndpd\fR
 (based on IPv6 Routing Advertisement messages). No
 \fB/etc/dhcp\fR.\fIinterface\fR file is necessary, but such a file can be used
 to specify an interface as "primary," provided that IPv4 DHCP is also in use.
-.sp
 .LP
 Network parameters needed for system configuration during bootup are extracted
 from the information received by the daemon through the use of the
@@ -44,80 +39,30 @@ from the information received by the daemon through the use of the
 changing the tunables in the \fB/etc/default/dhcpagent\fR file. The daemon is
 controlled by the \fBifconfig\fR(1M) utility. Check the status of the daemon
 using the \fBnetstat\fR(1M) and \fBifconfig\fR(1M) commands.
-.SS "Solaris DHCP Server"
-.sp
-.LP
-The Solaris \fBDHCP\fR server is implemented as a background daemon,
-\fBin.dhcpd\fR(1M). This daemon can deliver network configuration information
-to either \fBBOOTP\fR or \fBDHCP\fR clients. The Solaris \fBDHCP\fR service can
-be managed using the \fBdhcpmgr\fR(1M) \fBGUI\fR or the command line utilities
-\fBdhcpconfig\fR(1M), \fBdhtadm\fR(1M), and \fBpntadm\fR(1M).
-.SS "DHCP Configuration Tables"
-.sp
-.LP
-The Solaris \fBDHCP\fR server stores client configuration information in the
-following two types of tables:
-.sp
-.ne 2
-.na
-\fB\fBdhcptab\fR tables\fR
-.ad
-.RS 23n
-Contain macros and options (also known as symbols), used to construct a package
-of configuration information to send to each \fBDHCP\fR client. There exists
-only one \fBdhcptab\fR for the \fBDHCP\fR service. The \fBdhcptab\fR(4) can be
-viewed and modified using the \fBdhtadm\fR(1M) command or \fBdhcpmgr\fR(1M)
-graphical utility. See \fBdhcptab\fR(4) for more information about the syntax
-of \fBdhcptab\fR records. See \fBdhcp_inittab\fR(4) for more information about
-the \fBDHCP\fR options and symbols.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBDHCP\fR network tables\fR
-.ad
-.RS 23n
-\fBDHCP\fR network tables, which contain mappings of client \fBID\fRs to
-\fBIP\fR addresses and parameters associated with those addresses. Network
-tables are named with the \fBIP\fR address of the network, and can be created,
-viewed, and modified using the \fBpntadm\fR command or \fBdhcpmgr\fR graphical
-utility. See \fBdhcp_network\fR(4) for more information about network tables.
-.RE
-
 .SH SEE ALSO
-.sp
 .LP
-\fBdhcpinfo\fR(1), \fBdhcpagent\fR(1M), \fBdhcpconfig\fR(1M),
-\fBdhcpmgr\fR(1M), \fBdhtadm\fR(1M), \fBifconfig\fR(1M), \fBin.dhcpd\fR(1M),
-\fBin.ndpd\fR(1M), \fBnetstat\fR(1M), \fBpntadm\fR(1M), \fBsyslog\fR(3C),
+\fBdhcpinfo\fR(1), \fBdhcpagent\fR(1M),
+\fBifconfig\fR(1M),
+\fBin.ndpd\fR(1M), \fBnetstat\fR(1M),
+\fBsyslog\fR(3C),
 \fBdhcp_network\fR(4), \fBdhcptab\fR(4), \fBdhcpsvc.conf\fR(4),
 \fBdhcp_inittab\fR(4), \fBndpd.conf\fR(4), \fBdhcp_modules\fR(5)
-.sp
-.LP
-\fISolaris DHCP Service Developer\&'s Guide\fR
-.sp
 .LP
 Alexander, S., and R. Droms. \fIRFC 2132, DHCP Options and BOOTP Vendor
 Extensions\fR. Silicon Graphics, Inc. Bucknell University. March 1997.
-.sp
 .LP
 Droms, R. \fIRFC 1534, Interoperation Between DHCP and BOOTP\fR. Bucknell
 University. October 1993.
-.sp
 .LP
 Droms, R. \fIRFC 2131, Dynamic Host Configuration Protocol\fR. Bucknell
 University. March 1997.
-.sp
 .LP
 Wimer, W. \fIRFC 1542, Clarifications and Extensions for the Bootstrap
 Protocol\fR. Carnegie Mellon University. October 1993.
-.sp
 .LP
 Lemon, T. and B. Sommerfeld. \fIRFC 4361, Node-specific Client Identifiers for
 Dynamic Host Configuration Protocol Version Four (DHCPv4)\fR. Nominum and Sun
 Microsystems. February 2006.
-.sp
 .LP
 Droms, R. \fIRFC 3315, Dynamic Host Configuration Protocol for IPv6
 (DHCPv6)\fR. Cisco Systems. July 2003.
diff --git a/usr/src/man/man5/dhcp_modules.5 b/usr/src/man/man5/dhcp_modules.5
deleted file mode 100644
index 79b32b93ee..0000000000
--- a/usr/src/man/man5/dhcp_modules.5
+++ /dev/null
@@ -1,89 +0,0 @@
-'\" te
-.\" Copyright (c) 2003, 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 DHCP_MODULES 5 "Jan 24, 2003"
-.SH NAME
-dhcp_modules \- data storage modules for the DHCP service
-.SH DESCRIPTION
-.sp
-.LP
-This man page describes the characteristics of data storage modules (public
-modules) for use by the Solaris Dynamic Host Configuration Protocol
-(\fBDHCP\fR) service.
-.sp
-.LP
-Public modules are the part of the \fBDHCP\fR service architecture that
-encapsulate the details of storing \fBDHCP\fR service data in a data storage
-service. Examples of data storage services are \fBNIS+\fR, Oracle, and
-\fBufs\fR file systems.
-.sp
-.LP
-Public modules are dynamic objects which can be shipped separately from the
-Solaris \fBDHCP\fR service. Once installed, a public module is visible to the
-\fBDHCP\fR service, and can be selected for use by the service through the
-\fBDHCP\fR service management interfaces (\fBdhcpmgr\fR(1M),
-\fBdhcpconfig\fR(1M), \fBdhtadm\fR(1M), and \fBpntadm\fR(1M)).
-.sp
-.LP
-Public modules may be provided by Sun Microsystems, Inc or by third parties.
-.sp
-.LP
-The Solaris \fBDHCP\fR service management architecture provides a mechanism for
-plugging in public module-specific administration functionality into the
-\fBdhcpmgr\fR(1M) and \fBdhcpconfig\fR(1M) utilities. This functionality is in
-the form of a Java Bean, which is provided by the public module vendor. This
-Java Bean collects public module-specific configuration from the user (you) and
-provides it to the Solaris \fBDHCP\fR service.
-.sp
-.LP
-The Solaris \fBDHCP\fR service bundles three modules with the service, which
-are described below. There are three \fBdhcpsvc.conf\fR(4) \fBDHCP\fR service
-configuration parameters pertaining to public modules: \fBRESOURCE\fR,
-\fBPATH\fR, and \fBRESOURCE_CONFIG\fR. See \fBdhcpsvc.conf\fR(4) for more
-information about these parameters.
-.SS "SUNWfiles"
-.sp
-.LP
-This module stores its data in \fBASCII\fR files. Although the format is
-\fBASCII\fR, hand-editing is discouraged. It is useful for \fBDHCP\fR service
-environments that support several hundred to a couple thousand of clients and
-lease times are a few hours or more.
-.sp
-.LP
-This module's data may be shared between \fBDHCP\fR servers through the use of
-\fBNFS\fR.
-.SS "SUNWbinfiles"
-.sp
-.LP
-This module stores its data in binary files. It is useful for \fBDHCP\fR
-service environments with many networks and many thousands of clients. This
-module provides an order of magnitude increase in performance and capacity over
-SUNWfiles.
-.sp
-.LP
-This module's data cannot be shared between \fBDHCP\fR servers.
-.SS "SUNWnisplus"
-.sp
-.LP
-This module stores its data within a \fBNIS+\fR domain. It is useful in
-environments where \fBNIS+\fR is already deployed and facilitates sharing among
-multiple \fBDHCP\fR servers. This module suports several hundred to a few
-thousand clients with lease times of several hours or more.
-.sp
-.LP
-The \fBNIS+\fR service should be hosted on a machine with ample \fBCPU\fR
-power, memory, and disk space, as the load on \fBNIS+\fR is significant when it
-is used to store \fBDHCP\fR data. Periodic checkpointing of the \fBNIS+\fR
-service is necessary in order to roll the transaction logs and keep the
-\fBNIS+\fR service operating at its highest efficiency. See \fBnisping\fR(1M)
-and \fBcrontab\fR(1) for more information.
-.SH SEE ALSO
-.sp
-.LP
-\fBcrontab\fR(1), \fBdhcpconfig\fR(1M), \fBdhcpmgr\fR(1M), \fBdhtadm\fR(1M),
-\fBnisping\fR(1M), \fBpntadm\fR(1M), \fBdhcpsvc.conf\fR(4), \fBdhcp\fR(5)
-.sp
-.LP
-\fISolaris DHCP Service Developer\&'s Guide\fR