[illumos-gate merge]release-20200116

commit 6554ec17858060401cf0f52e78b57fec69f7842d
    12195 acpidump failed under EFI
commit 00f7aa5b4350768e529a41a31488f44902224fcf
    12186 The n2rng man page incorrectly refers to n2cp
commit 005be40cf09c8b0bcf2de631893dae837ff4cb8a
    12188 libfmd_adm: Wrong prerequisites for generated files
commit b0858fdc3790ef1d1f955bd584621c6fd539050d
    11522 illumos-gate has some runtime dependencies on Python 2.7
    12192 python3 modules treat strings incorrectly

1 files changed, 25 insertions, 43 deletions

diff --git a/usr/src/man/man7d/n2rng.7d b/usr/src/man/man7d/n2rng.7d
index 881ef18348..e851b7bd9e 100644
--- a/usr/src/man/man7d/n2rng.7d
+++ b/usr/src/man/man7d/n2rng.7d
@@ -1,27 +1,24 @@
 '\" te
 .\" Copyright (c) 2009 Sun Microsystems, Inc.  All Rights Reserved.
+.\" Copyright (c) 2020 Peter Tribble.
 .\" 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 N2RNG 7D "Apr 15, 2009"
+.TH N2RNG 7D "Jan 12, 2020"
 .SH NAME
 n2rng \- Ultra-SPARC T2 random number generator device driver
 .SH DESCRIPTION
-.sp
-.LP
 The \fBn2rng\fR device driver is a multi-threaded, loadable hardware driver
-supporting hardware assisted random numbers. This support is built into the
-Ultra-SPARC T2 CMT processor.
+supporting hardware assisted random numbers.
+This support is built into the Ultra-SPARC T2 and later processors.
 .sp
 .LP
 The \fBn2rng\fR driver requires the presence of the Solaris Cryptographic
 Framework to enable applications and kernel clients to access the provided
 services.
 .SH CONFIGURATION
-.sp
-.LP
 You configure the \fBn2rng\fR driver by defining properties in
-\fB/platform/sun4v/kernel/drv/n2cp.conf\fR which override the default settings.
+\fB/platform/sun4v/kernel/drv/n2rng.conf\fR which override the default settings.
 The following property is supported:
 .sp
 .ne 2
@@ -29,16 +26,16 @@ The following property is supported:
 \fBnostats\fR
 .ad
 .RS 28n
-Disables the generation of statistics. The nostats property may be used to help
-prevent traffic analysis, however, this may inhibit support personnel.
+Disables the generation of statistics.
+The nostats property may be used to help prevent traffic analysis, however,
+this may inhibit support personnel.
 .RE
 
 .SH CRYPTO STATISTICS
-.sp
-.LP
-Solaris crypto drivers must implement statistics variables. Statistics are
-reported by \fBn2rng\fR using  the \fBkstat\fR(7D) and \fBkstat\fR(9S)
-mechanisms. The \fBn2rng\fR driver maintains the following statistics:
+Solaris crypto drivers must implement statistics variables.
+Statistics reported by \fBn2rng\fR may be read using the \fBkstat\fR(1M)
+utility.
+The \fBn2rng\fR driver maintains the following statistics:
 .sp
 .ne 2
 .na
@@ -67,12 +64,10 @@ Number of bytes read from the RNG device.
 .RE
 
 .SH KERNEL STATISTICS
-.sp
-.LP
-The \fBn2rng\fR  driver tallies  a set of kernel driver statistics when in the
-Control domain. Statistics are reported by \fBn2rng\fR using  the
-\fBkstat\fR(7D) and \fBkstat\fR(9S) mechanisms. All statistics are maintained
-as unsigned, and all are 64 bits.
+The \fBn2rng\fR driver tallies a set of kernel driver statistics when in the
+Control domain.
+Statistics reported by \fBn2rng\fR may be read using the \fBkstat\fR(1M)
+utility.
 .sp
 .ne 2
 .na
@@ -106,7 +101,7 @@ Bias setting for noise cell 1 of RNG \fIn\fR.
 \fBrng(n)-cell1-entropy\fR
 .ad
 .RS 28n
-Entropy value for noise cell 1 of RNG n.
+Entropy value for noise cell 1 of RNG \fIn\fR.
 .RE
 
 .sp
@@ -121,7 +116,7 @@ Bias setting for noise cell 2 of RNG \fIn\fR.
 .sp
 .ne 2
 .na
-\fBrng(n)-cell3-entropy\fR
+\fBrng(n)-cell2-entropy\fR
 .ad
 .RS 28n
 Entropy value for noise cell 2 of RNG \fIn\fR.
@@ -133,33 +128,30 @@ Entropy value for noise cell 2 of RNG \fIn\fR.
 \fBrng(n)-state\fR
 .ad
 .RS 28n
-State of rng number n (online, offline, error,  health check).
+State of rng number n (online, offline, error, health check).
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
-\fB\fB/platform/sun4v/kernel/drv/sparcv9/n2cp\fR\fR
+\fB/platform/sun4v/kernel/drv/sparcv9/n2rng\fR
 .ad
 .sp .6
 .RS 4n
-64-bit ELF kernel driver.
+Device driver (SPARC)
 .RE
 
 .sp
 .ne 2
 .na
-\fB\fB/platform/sun4v/kernel/drv/n2rng.conf\fR\fR
+\fB/platform/sun4v/kernel/drv/n2rng.conf\fR
 .ad
 .sp .6
 .RS 4n
-Configuration file.
+Driver configuration file
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -172,18 +164,8 @@ ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
 Architecture	SPARC
 _
-Interface stability 	Committed
+Interface stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
-\fBcryptoadm\fR(1M), \fBkstat\fR(1M), \fBprinters.conf\fR(4),
-\fBattributes\fR(5)
-.sp
-.LP
-\fISolaris Cryptographic Framework - Solaris Software Developer Collection\fR
-.sp
-.LP
-\fISolaris Security for Developer's Guide - Solaris Software Developer
-Collection\fR
+\fBcryptoadm\fR(1M), \fBkstat\fR(1M), \fBattributes\fR(5)