[illumos-gate merge]

commit feb562904dda8e3f95142866f81038eaef927433
    14303 libipadm depends on libipmp
commit 338d6fc1b322c01b220f204edde962e843478a78
    14258 The manual should follow RFC 2606
commit eabc1bc5e61dbfdd2fc3cb588315c864d621d500
    14274 fix a few broken pkg aliases

Conflicts:
    usr/src/uts/intel/os/driver_aliases

1 files changed, 6 insertions, 11 deletions

diff --git a/usr/src/man/man4/bootparams.4 b/usr/src/man/man4/bootparams.4
index 082fc6f4b3..50c582efff 100644
--- a/usr/src/man/man4/bootparams.4
+++ b/usr/src/man/man4/bootparams.4
@@ -1,20 +1,18 @@
 '\" te
-.\" Copyright 2017 Peter Tribble
+.\" Copyright 2021 Peter Tribble
 .\" Copyright (C) 2002, Sun Microsystems, Inc. All Rights Reserved
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH BOOTPARAMS 4 "May 13, 2017"
+.TH BOOTPARAMS 4 "November 22, 2021"
 .SH NAME
 bootparams \- boot parameter data base
 .SH SYNOPSIS
-.LP
 .nf
 \fB/etc/bootparams\fR
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBbootparams\fR file contains a list of client entries that diskless
 clients use for booting. Diskless booting clients retrieve this information by
 issuing requests to a server running the \fBrpc.bootparamd\fR(1M) program. The
@@ -99,7 +97,7 @@ colon. For example:
 .sp
 .in +2
 .nf
-client1 domain=bldg1.workco.com
+client1 domain=bldg1.example.com
 .fi
 .in -2
 .sp
@@ -114,7 +112,7 @@ between the end of the path (\fBroot\fR) and the keyword \fBdomain\fR:
 .sp
 .in +2
 .nf
-client1 root=server1:/export/client1/root domain=bldg1.workco.com
+client1 root=server1:/export/client1/root domain=bldg1.example.com
 .fi
 .in -2
 .sp
@@ -170,7 +168,6 @@ specify the name service.
 .LP
 The \fBns\fR keyword can be set in \fBadd_install_client\fR or by Host Manager.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRSample \fBbootparams\fR Entry
 .sp
 .LP
@@ -180,7 +177,7 @@ Here is an example of an entry in the \fBbootparams\fR file:
 .in +2
 .nf
 	client1 root=server1:/export/client1/root rootopts=:vers=2 \e
-		domain=bldg1.workco.com
+		domain=bldg1.example.com
 	client2 root=server2:/export/client2/root ns=:nis
 	client3 root=server2:/export/client3/root ns=watson:
 	client4 root=server2:/export/client4/root \e
@@ -202,7 +199,7 @@ installation of diskless clients that do not have displays.
 mozart root=haydn:/export/install/sparc/os/latest/Solaris_9/boot \e
 install=haydn:/export/install/sparc/os/8.1/latest boottype=:in \e
 install_config=haydn:/usr/local/share/lib/jump-net \e
-ns=otis:nisplus(255.255.255.0) term=:xterms domain=eu.cte.work.com
+ns=otis:nisplus(255.255.255.0) term=:xterms domain=eu.cte.example.com
 .fi
 .in -2
 .sp
@@ -217,10 +214,8 @@ ns=otis:nisplus(255.255.255.0) term=:xterms domain=eu.cte.work.com
 .RE
 
 .SH SEE ALSO
-.LP
 \fBrpc.bootparamd\fR(1M), \fBnsswitch.conf\fR(4)
 .SH NOTES
-.LP
 The \fBNIS+\fR, \fBsysidtool\fR, and jumpstart facilities are not present in
 illumos. They are documented here solely for users who wish to use illumos as
 a jumpstart server for older Solaris releases.