summaryrefslogtreecommitdiff
path: root/usr/src/man/man1m
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/man/man1m')
-rw-r--r--usr/src/man/man1m/dladm.1m85
-rw-r--r--usr/src/man/man1m/ipf.1m12
-rw-r--r--usr/src/man/man1m/luxadm.1m21
-rw-r--r--usr/src/man/man1m/picld.1m18
-rw-r--r--usr/src/man/man1m/plockstat.1m15
-rw-r--r--usr/src/man/man1m/vmstat.1m20
-rw-r--r--usr/src/man/man1m/zpool.1m15
7 files changed, 103 insertions, 83 deletions
diff --git a/usr/src/man/man1m/dladm.1m b/usr/src/man/man1m/dladm.1m
index ffe36dfa07..77bf045e08 100644
--- a/usr/src/man/man1m/dladm.1m
+++ b/usr/src/man/man1m/dladm.1m
@@ -42,12 +42,12 @@
.\"
.\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
.\" Copyright 2017 Joyent, Inc.
+.\" Copyright 2020 RackTop Systems, Inc.
.\"
-.TH DLADM 1M "Dec 6, 2017"
+.TH DLADM 1M "May 4, 2020"
.SH NAME
dladm \- administer data links
.SH SYNOPSIS
-.LP
.nf
\fBdladm show-link\fR [\fB-P\fR] [\fB-s\fR [\fB-i\fR \fIinterval\fR]] [[\fB-p\fR] \fB-o\fR \fIfield\fR[,...]] [\fIlink\fR]
\fBdladm rename-link\fR [\fB-R\fR \fIroot-dir\fR] [\fB-z\fR \fIzonename\fR] \fIlink\fR \fInew-link\fR
@@ -189,7 +189,6 @@ dladm \- administer data links
.fi
.SH DESCRIPTION
-.LP
The \fBdladm\fR command is used to administer data-links. A data-link is
represented in the system as a \fBSTREAMS DLPI\fR (v2) interface which can be
plumbed under protocol stacks such as \fBTCP/IP\fR. Each data-link relies on
@@ -356,7 +355,6 @@ other hosts. For more information on overlay devices, see \fBoverlay\fR(5).
.RE
.SS "Options"
-.LP
Each \fBdladm\fR subcommand has its own set of options. However, many of the
subcommands have the following as a common option:
.sp
@@ -371,7 +369,6 @@ deletion, or renaming-should apply.
.RE
.SS "SUBCOMMANDS"
-.LP
The following subcommands are supported:
.sp
.ne 2
@@ -4872,7 +4869,6 @@ display network usage for all links.
.RE
.SS "Parsable Output Format"
-.LP
Many \fBdladm\fR subcommands have an option that displays output in a
machine-parsable format. The output format is one or more lines of colon
(\fB:\fR) delimited fields. The fields displayed are specific to the subcommand
@@ -4888,7 +4884,6 @@ by using shell \fBread\fR(1) functions with the environment variable
\fBIFS=:\fR (see \fBEXAMPLES\fR, below). Note that escaping is not done when
you request only a single field.
.SS "General Link Properties"
-.LP
The following general link properties are supported:
.sp
.ne 2
@@ -5275,7 +5270,6 @@ currently running on the system. By default, the zone binding is as per
.RE
.SS "Wifi Link Properties"
-.LP
The following \fBWiFi\fR link properties are supported. Note that the ability
to set a given property to a given value depends on the driver and hardware.
.sp
@@ -5327,7 +5321,6 @@ is no fixed speed.
.RE
.SS "Ethernet Link Properties"
-.LP
The following MII Properties, as documented in \fBieee802.3\fR(5), are
supported in read-only mode:
.RS +4
@@ -5488,6 +5481,75 @@ capabilities allowed by the device and the link partner.
.sp
.ne 2
.na
+\fB\fBen_fec_cap\fR\fR
+.ad
+.sp .6
+.RS 4n
+Sets the Forward Error Correct (FEC) code(s) to be advertised by the
+device.
+Valid values are:
+.sp
+.ne 2
+.na
+\fB\fBnone\fR\fR
+.ad
+.sp .6
+.RS 4n
+Allow the device not to use FEC.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBauto\fR\fR
+.ad
+.sp .6
+.RS 4n
+The device will automatically decide which FEC code to use.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBrs\fR\fR
+.ad
+.sp .6
+.RS 4n
+Allow Reed-Solomon FEC code.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBbase-r\fR\fR
+.ad
+.sp .6
+.RS 4n
+Allow Base-R (also known as FireCode) code.
+.RE
+
+Valid input is either \fBauto\fR as a single value, or a comma separated
+combination of \fBnone\fR, \fBrs\fR and \fBbase-r\fR.
+The default value is \fBauto\fR.
+.sp
+.LP
+Note the actual FEC settings and combinations are constrained by the
+capabilities allowed by the device and the link partner.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBadv_fec_cap\fR\fR
+.ad
+.sp .6
+.RS 4n
+(read only) The current negotiated Forward Error Correction code.
+.RE
+
+.sp
+.ne 2
+.na
\fB\fBsecondary-macs\fR\fR
.ad
.sp .6
@@ -5542,7 +5604,6 @@ The default value is \fBvlanonly\fR.
.RE
.SS "IP Tunnel Link Properties"
-.LP
The following IP tunnel link properties are supported.
.sp
.ne 2
@@ -5569,7 +5630,6 @@ default value is 4. A value of 0 disables the encapsulation limit.
.RE
.SH EXAMPLES
-.LP
\fBExample 1 \fRConfiguring an Aggregation
.sp
.LP
@@ -6044,7 +6104,6 @@ interface. See \fBifconfig\fR(1M) for a description of how IPv6 addresses are
configured on 6to4 tunnel links.
.SH ATTRIBUTES
-.LP
See \fBattributes\fR(5) for descriptions of the following attributes:
.sp
.LP
@@ -6077,7 +6136,6 @@ Interface Stability Committed
.TE
.SH SEE ALSO
-.LP
\fBacctadm\fR(1M), \fBautopush\fR(1M), \fBifconfig\fR(1M), \fBipsecconf\fR(1M),
\fBndd\fR(1M), \fBpsrset\fR(1M), \fBwpad\fR(1M), \fBzonecfg\fR(1M),
\fBattributes\fR(5), \fBieee802.3\fR(5), \fBoverlay\fR(5), \fBdlpi\fR(7P)
@@ -6092,7 +6150,6 @@ T. Lemon, B. Sommerfeld. February 2006. \fIRFC 4361: Node-specific Client
Identifiers for Dynamic Host Configuration Protocol Version Four (DHCPv4)\fR.
The Internet Society. January 2006.
.SH NOTES
-.LP
The preferred method of referring to an aggregation in the aggregation
subcommands is by its link name. Referring to an aggregation by its integer
\fIkey\fR is supported for backward compatibility, but is not necessary. When
diff --git a/usr/src/man/man1m/ipf.1m b/usr/src/man/man1m/ipf.1m
index 5797e8c28e..121556e83c 100644
--- a/usr/src/man/man1m/ipf.1m
+++ b/usr/src/man/man1m/ipf.1m
@@ -3,11 +3,10 @@
.\" location.
.\" Portions Copyright (c) 2009, Sun Microsystems Inc. All Rights Reserved.
.\" Portions Copyright (c) 2015, Joyent, Inc.
-.TH IPF 1M "April 9, 2016"
+.TH IPF 1M "May 17, 2020"
.SH NAME
ipf \- alter packet filtering lists for IP packet input and output
.SH SYNOPSIS
-.LP
.nf
\fBipf\fR [\fB-6AdDEGInoPRrsvVyzZ\fR] [\fB-l\fR block | pass | nomatch]
[\fB-T\fR \fIoptionlist\fR] [\fB-F\fR i | o | a | s | S] \fB-f\fR \fIfilename\fR
@@ -15,7 +14,6 @@ ipf \- alter packet filtering lists for IP packet input and output
.fi
.SH DESCRIPTION
-.LP
The \fBipf\fR utility is part of a suite of commands associated with the
Solaris IP Filter feature. See \fBipfilter\fR(5).
.sp
@@ -34,7 +32,6 @@ matching the order in which they appear when given to \fBipf\fR.
\fB/dev/ipl\fR, and \fB/dev/ipstate\fR. The default permissions of these files
require \fBipf\fR to be run as root for all operations.
.SS "Enabling Solaris IP Filter Feature"
-.LP
Solaris IP Filter is installed with the Solaris operating system. However,
packet filtering is not enabled by default. Use the following procedure to
activate the Solaris IP Filter feature.
@@ -61,7 +58,7 @@ See \fBipnat\fR(4).
4.
(Optional) Create an address pool configuration file. See \fBippool\fR(4).
.sp
-Create an \fBipool.conf\fR file if you want to refer to a group of addresses as
+Create an \fBippool.conf\fR file if you want to refer to a group of addresses as
a single address pool. If you want the address pool configuration file to be
loaded at boot time, create a file called \fB/etc/ipf/ippool.conf\fR in which
to put the address pool. If you do not want the address pool configuration file
@@ -158,7 +155,6 @@ If you reboot your system, the IPfilter configuration is automatically
activated.
.RE
.SH OPTIONS
-.LP
The following options are supported:
.sp
.ne 2
@@ -469,7 +465,6 @@ affect fragment or state statistics.
.RE
.SH ZONES
-.LP
Each non-global zone has two ipfilter instances: the in-zone ipfilter, which
can be controlled from both the zone itself and the global zone, and the
Global Zone-controlled (GZ-controlled) instance, which can only be controlled
@@ -525,7 +520,6 @@ Contains numerous IP Filter examples.
.RE
.SH ATTRIBUTES
-.LP
See \fBattributes\fR(5) for descriptions of the following attributes:
.sp
@@ -540,7 +534,6 @@ Interface Stability Committed
.TE
.SH SEE ALSO
-.LP
\fBipfstat\fR(1M), \fBipmon\fR(1M), \fBipnat\fR(1M), \fBippool\fR(1M),
\fBsvcadm\fR(1M), \fBsvc.ipfd\fR(1M), \fBipf\fR(4), \fBipnat\fR(4),
\fBippool\fR(4), \fBattributes\fR(5), \fBipfilter\fR(5), \fBzones(5)\fR
@@ -548,6 +541,5 @@ Interface Stability Committed
.LP
\fI\fR
.SH DIAGNOSTICS
-.LP
Needs to be run as root for the packet filtering lists to actually be affected
inside the kernel.
diff --git a/usr/src/man/man1m/luxadm.1m b/usr/src/man/man1m/luxadm.1m
index 71fc381a8c..4bd782458b 100644
--- a/usr/src/man/man1m/luxadm.1m
+++ b/usr/src/man/man1m/luxadm.1m
@@ -3,18 +3,16 @@
.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LUXADM 1M "May 13, 2017"
+.TH LUXADM 1M "May 17, 2020"
.SH NAME
luxadm \- administer Sun Fire 880 storage subsystem and FC_AL devices
.SH SYNOPSIS
-.LP
.nf
\fBluxadm\fR [\fIoptions\fR]... \fIsubcommand\fR [\fIoptions\fR]... \fIenclosure\fR
[,\fIdev\fR] | \fIpathname\fR...
.fi
.SH DESCRIPTION
-.LP
The \fBluxadm\fR program is an administrative command that manages the
\fBSENA\fR, Sun Fire 880 internal storage subsystem, and individual Fiber
Channel Arbitrated Loop (\fBFC_AL\fR) devices. \fBluxadm\fR performs a variety
@@ -36,7 +34,6 @@ of the \fBSENA\fR enclosure, and an optional identifier for the particular
device in the enclosure. The individual \fBFC_AL\fR devices may be specified by
entering the \fBWWN\fR for the device or a port to the device.
.SS "Pathname"
-.LP
Specify the device or controller by either a complete physical pathname or a
complete logical pathname.
.sp
@@ -120,7 +117,6 @@ and a typical logical pathname is:
.sp
.SS "Enclosure"
-.LP
For \fBSENA,\fR a device may be identified by its enclosure name and slotname:
.br
.in +2
@@ -169,7 +165,6 @@ the disk slot number in the Sun Fire 880 internal storage subsystem, \fB0\fR -
See \fBdisks\fR(1M) and \fBdevlinks\fR(1M) for additional information on
logical names for disks and subsystems.
.SH OPTIONS
-.LP
The following options are supported by all subcommands:
.sp
.ne 2
@@ -194,7 +189,6 @@ Verbose mode.
Options that are specific to particular subcommands are described with the
subcommand in the \fBUSAGE\fR section.
.SH OPERANDS
-.LP
The following operands are supported:
.sp
.ne 2
@@ -315,7 +309,7 @@ pathname.
When the \fBSENA's\fR download is complete, the \fBSENA\fR will be reset and
the downloaded code executed. If no filename is specified, the default prom
image will be used. The default prom image for the \fBSENA\fR is in the
-directory \fBusr/lib/locale/C/LC_MESSAGES\fR and is named \fBibfirmware\fR
+directory \fB/usr/lib/locale/C/LC_MESSAGES\fR and is named \fBibfirmware\fR
.sp
When the Sun Fire 880 internal storage subsystem's download is complete, the
subsystem resets and the downloaded code begins execution. The default firmware
@@ -746,7 +740,6 @@ Spin down the specified disks in a SENA.
.RE
.SS "SENA, Sun Fire 880 Internal Storage Subsystem, and Individual FC_AL Drive Expert Mode Subcommands"
-.LP
The following subcommands are for expert use only, and are applicable only to
the \fBSENA\fR, Sun Fire 880 internal storage subsystem, and fiber channel
loops. They should only be used by users that are knowledgeable about the
@@ -867,7 +860,6 @@ the loop that contains the device specified by the enclosure or pathname.
.RE
.SS "Other Expert Mode Subcommands"
-.LP
See \fBNOTES\fR for limitations of these subcommands. They should only be used
by users that are knowledgeable about the systems they are managing.
.sp
@@ -955,7 +947,6 @@ Put the specified device online.
.RE
.SH EXAMPLES
-.LP
\fBExample 1 \fRDisplaying the \fBSENA\fRs and Individual FC_AL Devices on a
System
.sp
@@ -1207,11 +1198,9 @@ example# \fBluxadm release /dev/rdsk/c1t8d0s2\fR
.sp
.SH ENVIRONMENT VARIABLES
-.LP
See \fBenviron\fR(5) for a description of the \fBLANG\fR environment variable
that affects the execution of \fBluxadm\fR.
.SH EXIT STATUS
-.LP
The following exit values are returned:
.sp
.ne 2
@@ -1234,7 +1223,7 @@ An error occurred.
.SH FILES
.ne 2
.na
-\fB\fBusr/lib/firmware/fc_s/fc_s_fcode\fR\fR
+\fB\fB/usr/lib/firmware/fc_s/fc_s_fcode\fR\fR
.ad
.sp .6
.RS 4n
@@ -1244,7 +1233,7 @@ An error occurred.
.sp
.ne 2
.na
-\fB\fBusr/lib/locale/C/LC_MESSAGES/ibfirmware\fR\fR
+\fB\fB/usr/lib/locale/C/LC_MESSAGES/ibfirmware\fR\fR
.ad
.sp .6
.RS 4n
@@ -1252,11 +1241,9 @@ An error occurred.
.RE
.SH SEE ALSO
-.LP
\fBdevlinks\fR(1M), \fBdisks\fR(1M), \fBattributes\fR(5), \fBenviron\fR(5),
\fBses\fR(7D)
.SH NOTES
-.LP
Currently, only some device drivers
support hot plugging. If hot plugging is attempted on a disk or bus where it is
not supported, an error message of the form:
diff --git a/usr/src/man/man1m/picld.1m b/usr/src/man/man1m/picld.1m
index debb8bf9af..d233fb7444 100644
--- a/usr/src/man/man1m/picld.1m
+++ b/usr/src/man/man1m/picld.1m
@@ -3,18 +3,15 @@
.\" 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 PICLD 1M "Aug 10, 2004"
+.TH PICLD 1M "May 16, 2020"
.SH NAME
picld \- PICL daemon
.SH SYNOPSIS
-.LP
.nf
\fB/usr/lib/picl/picld\fR
.fi
.SH DESCRIPTION
-.sp
-.LP
The Platform Information and Control Library (\fBPICL\fR) provides a mechanism
to publish platform-specific information for clients to access in a
platform-independent way. \fBpicld\fR maintains and controls access to the
@@ -29,8 +26,6 @@ information. After the plug-in modules are initialized, the daemon opens the
\fBPICL\fR daemon door to service client requests to access information in the
\fBPICL\fR tree.
.SS "PICL Tree"
-.sp
-.LP
The \fBPICL\fR tree is the repository of all the nodes and properties created
by the plug-in modules to represent the platform configuration. Every node in
the \fBPICL\fR tree is an instance of a well-defined \fBPICL\fR class. The name
@@ -42,15 +37,13 @@ nodes in the \fBPICL\fR tree have well-known names. For example, the name of
the root node of the \fBPICL\fR tree is \fB/\fR and the name of the root node
of the sub-tree containing platform device nodes is \fBplatform\fR.
.SS "PICL plug-in Modules"
-.sp
-.LP
The \fBPICL\fR plug-in modules are shared objects that publish
platform-specific data in the \fBPICL\fR tree. They are located in well-known
directories so that the daemon can locate and load them.
.sp
.LP
Plug-in modules are located in one of the following plug-in directories
-depending on the plaform-specific nature of the data that they collect and
+depending on the platform-specific nature of the data that they collect and
publish:
.sp
.in +2
@@ -92,11 +85,8 @@ environmental information in the \fBPICL\fR tree so clients can access them.
Clients use the \fBlibpicl\fR(3PICL) interface to send requests to \fBpicld\fR
for accessing the \fBPICL\fR tree.
.SH EXIT STATUS
-.sp
-.LP
\fBpicld\fR does not return an exit status.
.SH FILES
-.sp
.ne 2
.na
\fB\fB/var/run/picld_door\fR\fR
@@ -115,14 +105,10 @@ for accessing the \fBPICL\fR tree.
.RE
.SH SEE ALSO
-.sp
-.LP
\fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBdlopen\fR(3C), \fBlibpicl\fR(3PICL),
\fBlibpicltree\fR(3PICLTREE), \fBpicld_log\fR(3PICLTREE),
\fBpicld_plugin_register\fR(3PICLTREE), \fBattributes\fR(5), \fBsmf\fR(5)
.SH NOTES
-.sp
-.LP
The \fBpicld\fR service is managed by the service management facility,
\fBsmf\fR(5), under the service identifier:
.sp
diff --git a/usr/src/man/man1m/plockstat.1m b/usr/src/man/man1m/plockstat.1m
index d1dca3ce03..5c22d6cfaf 100644
--- a/usr/src/man/man1m/plockstat.1m
+++ b/usr/src/man/man1m/plockstat.1m
@@ -3,11 +3,10 @@
.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PLOCKSTAT 1M "Dec 10, 2017"
+.TH PLOCKSTAT 1M "May 23, 2020"
.SH NAME
plockstat \- report user-level lock statistics
.SH SYNOPSIS
-.LP
.nf
\fBplockstat\fR [\fB-vACHV\fR] [\fB-n\fR \fIcount\fR] [\fB-s\fR \fIdepth\fR] [\fB-e\fR \fIsecs\fR]
[\fB-x\fR \fIarg\fR [=val]] \fIcommand\fR [\fIarg\fR]...
@@ -20,7 +19,6 @@ plockstat \- report user-level lock statistics
.fi
.SH DESCRIPTION
-.LP
The \fBplockstat\fR utility gathers and displays user-level locking statistics.
By default, \fBplockstat\fR monitors all lock contention events, gathers
frequency and timing data about those events, and displays the data in
@@ -35,10 +33,9 @@ process specified with the \fB-p\fR option completes.
it invokes to trace events of interest. This imposes a small but measurable
performance overhead on the processes being observed. Users must have the
\fBdtrace_proc\fR privilege and have permission to observe a particular process
-with \fBplockstat\fR. Refer to the \fI\fR for more information about DTrace
-security features.
+with \fBplockstat\fR. Refer to the \fIDynamic Tracing Guide\fR for more
+information about DTrace security features.
.SH OPTIONS
-.LP
The following options are supported:
.sp
.ne 2
@@ -130,12 +127,11 @@ the option name and value with an equals sign (\fB=\fR).
\fB\fB-V\fR\fR
.ad
.RS 16n
-Print the Dtrace commands used to gather the data. The output can then be used
+Print the DTrace commands used to gather the data. The output can then be used
directly with the \fBdtrace\fR(1M) command.
.RE
.SH OPERANDS
-.LP
The following operands are supported:
.sp
.ne 2
@@ -183,7 +179,6 @@ Duration specified as a positive integer number of seconds.
.RE
.SH EXIT STATUS
-.LP
The following exit values are returned:
.sp
.ne 2
@@ -204,7 +199,6 @@ An error occurred.
.RE
.SH ATTRIBUTES
-.LP
See \fBattributes\fR(5) for descriptions of the following attributes:
.sp
@@ -222,7 +216,6 @@ Interface Stability See below.
.LP
The command-line syntax is Evolving. The human-readable output is Unstable.
.SH SEE ALSO
-.LP
\fBdtrace\fR(1M), \fBlockstat\fR(1M), \fBmutex_init\fR(3C),
\fBpthread_mutex_lock\fR(3C), \fBpthread_rwlock_rdlock\fR(3C),
\fBpthread_rwlock_wrlock\fR(3C), \fBpthread_rwlock_unlock\fR(3C),
diff --git a/usr/src/man/man1m/vmstat.1m b/usr/src/man/man1m/vmstat.1m
index 5c53b020fa..166ef42ae9 100644
--- a/usr/src/man/man1m/vmstat.1m
+++ b/usr/src/man/man1m/vmstat.1m
@@ -3,17 +3,15 @@
.\" 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 VMSTAT 1M "April 14, 2015"
+.TH VMSTAT 1M "May 6, 2020"
.SH NAME
vmstat \- report virtual memory statistics
.SH SYNOPSIS
-.LP
.nf
\fBvmstat\fR [\fB-ipqsS\fR] [\fB-T\fR u | d] [\fIdisks\fR] [\fIinterval\fR [\fIcount\fR]]
.fi
.SH DESCRIPTION
-.LP
\fBvmstat\fR reports virtual memory statistics regarding kernel thread, virtual
memory, disk, trap, and \fBCPU\fR activity.
.sp
@@ -46,9 +44,8 @@ output, in one of the following forms:
.sp
.LP
-See \fI\fR for device naming conventions for disks.
+See \fBdisks\fR(1M) for device naming conventions for disks.
.SH OPTIONS
-.LP
The following options are supported:
.sp
.ne 2
@@ -150,7 +147,7 @@ File system page-frees.
.RE
When executed in a \fBzone\fR and if the pools facility is active, all of the
-above only report actitivity on the processors in the processor set of the
+above only report activity on the processors in the processor set of the
\fBzone\fR's pool.
.RE
@@ -196,7 +193,6 @@ time. See \fBtime\fR(2). Specify \fBd\fR for standard date format. See
.RE
.SH OPERANDS
-.LP
The following operands are supported:
.sp
.ne 2
@@ -232,7 +228,6 @@ to the \fB-i\fR and \fB-s\fR options.
.RE
.SH EXAMPLES
-.LP
\fBExample 1 \fRUsing \fBvmstat\fR
.sp
.LP
@@ -454,7 +449,7 @@ system calls
.RE
When executed in a \fBzone\fR and if the pools facility is active, all of the
-above only report actitivity on the processors in the processor set of the
+above only report activity on the processors in the processor set of the
\fBzone\fR's pool.
.RE
@@ -494,12 +489,11 @@ idle time
.RE
When executed in a \fBzone\fR and if the pools facility is active, all of the
-above only report actitivity on the processors in the processor set of the
+above only report activity on the processors in the processor set of the
\fBzone\fR's pool.
.RE
.SH ATTRIBUTES
-.LP
See \fBattributes\fR(5) for descriptions of the following attributes:
.sp
@@ -517,11 +511,9 @@ Interface Stability See below.
.LP
Invocation is evolving. Human readable output is unstable.
.SH SEE ALSO
-.LP
-\fBdate\fR(1), \fBsar\fR(1), \fBiostat\fR(1M), \fBmpstat\fR(1M), \fBsar\fR(1M),
+\fBdate\fR(1), \fBsar\fR(1), \fBdisks\fR(1M), \fBiostat\fR(1M), \fBmpstat\fR(1M), \fBsar\fR(1M),
\fBtime\fR(2), \fBattributes\fR(5)
.SH NOTES
-.LP
The sum of CPU utilization might vary slightly from 100 because of rounding
errors in the production of a percentage figure.
.sp
diff --git a/usr/src/man/man1m/zpool.1m b/usr/src/man/man1m/zpool.1m
index 5a793062f2..6d291ba46a 100644
--- a/usr/src/man/man1m/zpool.1m
+++ b/usr/src/man/man1m/zpool.1m
@@ -28,7 +28,7 @@
.\" Copyright 2020 Joyent, Inc.
.\" Copyright (c) 2012 Cyril Plisko. All Rights Reserved.
.\"
-.Dd August 30, 2019
+.Dd April 29, 2020
.Dt ZPOOL 1M
.Os
.Sh NAME
@@ -61,6 +61,7 @@
.Op Fl B
.Op Fl m Ar mountpoint
.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
+.Oo Fl o Cm feature@ Ns Ar feature Ns = Ns Ar value Oc Ns ...
.Oo Fl O Ar file-system-property Ns = Ns Ar value Oc Ns ...
.Op Fl R Ar root
.Op Fl t Ar tempname
@@ -1045,6 +1046,7 @@ another host, and resuming I/O could result in pool damage.
.Op Fl B
.Op Fl m Ar mountpoint
.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
+.Oo Fl o Cm feature@ Ns Ar feature Ns = Ns Ar value Oc Ns ...
.Oo Fl O Ar file-system-property Ns = Ns Ar value Oc Ns ...
.Op Fl R Ar root
.Op Fl t Ar tempname
@@ -1175,6 +1177,17 @@ Sets the given pool properties.
See the
.Sx Properties
section for a list of valid properties that can be set.
+.It Fl o Cm feature@ Ns Ar feature Ns = Ns Ar value
+Sets the given pool feature.
+See
+.Xr zpool-features 5
+for a list of valid features that can be set.
+.Pp
+.Ar value
+can either be
+.Sy disabled
+or
+.Sy enabled .
.It Fl O Ar file-system-property Ns = Ns Ar value
Sets the given file system properties in the root file system of the pool.
See the