Attachment 104759 Details for Bug 144984 – file.diff

[patch] file.diff

file.diff (text/plain), 146.32 KB, created by Martin Matuska on 2010-03-23 21:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2010-03-23 21:30:01 UTC

Size: 146.32 KB

patch

obsolete

>Index: cddl/contrib/opensolaris/cmd/zfs/zfs.8
>===================================================================
>--- cddl/contrib/opensolaris/cmd/zfs/zfs.8	(revision 205535)
>+++ cddl/contrib/opensolaris/cmd/zfs/zfs.8	(working copy)
>@@ -1,24 +1,9 @@
> '\" te
>-.\" CDDL HEADER START
>-.\"
>-.\" 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]
>-.\"
>-.\" CDDL HEADER END
>-.\" Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
>-.TH zfs 1M "8 Apr 2008" "SunOS 5.11" "System Administration Commands"
>+.\" Copyright (c) 2009 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 zfs 1M "14 Feb 2009" "SunOS 5.11" "System Administration Commands"
> .SH NAME
> zfs \- configures ZFS file systems
> .SH SYNOPSIS
>@@ -44,7 +29,8 @@
> 
> .LP
> .nf
>-\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] \fIfilesystem@snapname\fR|\fIvolume@snapname\fR
>+\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]... 
>+      \fIfilesystem@snapname\fR|\fIvolume@snapname\fR
> .fi
> 
> .LP
>@@ -54,7 +40,7 @@
> 
> .LP
> .nf
>-\fBzfs\fR \fBclone\fR [\fB-p\fR] \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
>+\fBzfs\fR \fBclone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
> .fi
> 
> .LP
>@@ -65,7 +51,7 @@
> .LP
> .nf
> \fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR 
>-    \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
>+     \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
> .fi
> 
> .LP
>@@ -81,23 +67,23 @@
> .LP
> .nf
> \fBzfs\fR \fBlist\fR [\fB-rH\fR] [\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]]
>-    [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
>+     [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
> .fi
> 
> .LP
> .nf
>-\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ...
>+\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|snapshot ...
> .fi
> 
> .LP
> .nf
> \fBzfs\fR \fBget\fR [\fB-rHp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-s\fR \fIsource\fR[,...]] "\fIall\fR" | \fIproperty\fR[,...]
>-     \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
>+      \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
> .fi
> 
> .LP
> .nf
>-\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR ...
>+\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR ...
> .fi
> 
> .LP
>@@ -132,12 +118,12 @@
> 
> .LP
> .nf
>-\fBzfs\fR \fBunshare\fR  \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
>+\fBzfs\fR \fBunshare\fR \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
> .fi
> 
> .LP
> .nf
>-\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fB-iI\fR] \fIsnapshot\fR] \fIsnapshot\fR
>+\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
> .fi
> 
> .LP
>@@ -153,7 +139,7 @@
> .LP
> .nf
> \fBzfs\fR \fBallow\fR [\fB-ldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] \fIperm\fR|\fI@setname\fR[,...] 
>-    \fIfilesystem\fR|\fIvolume\fR
>+     \fIfilesystem\fR|\fIvolume\fR
> .fi
> 
> .LP
>@@ -174,7 +160,7 @@
> .LP
> .nf
> \fBzfs\fR \fBunallow\fR [\fB-rldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] [\fIperm\fR|@\fIsetname\fR[,... ]] 
>-    \fIfilesystem\fR|\fIvolume\fR
>+     \fIfilesystem\fR|\fIvolume\fR
> .fi
> 
> .LP
>@@ -192,20 +178,10 @@
> \fBzfs\fR \fBunallow\fR [\fB-r\fR] \fB-s\fR @setname [\fIperm\fR|@\fIsetname\fR[,... ]] \fIfilesystem\fR|\fIvolume\fR
> .fi
> 
>-.LP
>-.nf
>-\fBzfs\fR \fBjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR
>-.fi
>-.LP
>-.nf
>-\fBzfs\fR \fBunjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR
>-.fi
>-
> .SH DESCRIPTION
> .sp
> .LP
>-The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A
>-dataset is identified by a unique path within the \fBZFS\fR namespace. For example:
>+The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A dataset is identified by a unique path within the \fBZFS\fR namespace. For example:
> .sp
> .in +2
> .nf
>@@ -226,9 +202,9 @@
> .na
> \fB\fIfile system\fR\fR
> .ad
>-.RS 15n
>-.rt  
>-A standard \fBPOSIX\fR file system. \fBZFS\fR file systems can be mounted within the standard file system namespace and behave like any other file system.
>+.sp .6
>+.RS 4n
>+A \fBZFS\fR dataset of type "filesystem" that can be mounted within the standard system namespace and behaves like other file systems. While \fBZFS\fR file systems are designed to be \fBPOSIX\fR compliant, known issues exist that prevent compliance in some cases. Applications that depend on standards conformance might fail due to nonstandard behavior when checking file system free space.
> .RE
> 
> .sp
>@@ -237,8 +213,8 @@
> .na
> \fB\fIvolume\fR\fR
> .ad
>-.RS 15n
>-.rt  
>+.sp .6
>+.RS 4n
> A logical volume exported as a raw or block device. This type of dataset should only be used under special circumstances. File systems are typically used in most environments. Volumes cannot be used in a non-global zone.
> .RE
> 
>@@ -248,8 +224,8 @@
> .na
> \fB\fIsnapshot\fR\fR
> .ad
>-.RS 15n
>-.rt  
>+.sp .6
>+.RS 4n
> A read-only version of a file system or volume at a given point in time. It is specified as \fIfilesystem@name\fR or \fIvolume@name\fR.
> .RE
> 
>@@ -272,20 +248,17 @@
> Snapshots can have arbitrary names. Snapshots of volumes can be cloned or rolled back, but cannot be accessed independently.
> .sp
> .LP
>-File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir"
>-property.
>+File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir" property.
> .SS "Clones"
> .sp
> .LP
> A clone is a writable volume or file system whose initial contents are the same as another dataset. As with snapshots, creating a clone is nearly instantaneous, and initially consumes no additional space.
> .sp
> .LP
>-Clones can only be created from a snapshot. When a snapshot is cloned, it creates an implicit dependency between the parent and child. Even though the clone is created somewhere else in the dataset hierarchy, the original snapshot cannot be destroyed as long as a clone exists. The "origin"
>-property exposes this dependency, and the \fBdestroy\fR command lists any such dependencies, if they exist.
>+Clones can only be created from a snapshot. When a snapshot is cloned, it creates an implicit dependency between the parent and child. Even though the clone is created somewhere else in the dataset hierarchy, the original snapshot cannot be destroyed as long as a clone exists. The "origin" property exposes this dependency, and the \fBdestroy\fR command lists any such dependencies, if they exist.
> .sp
> .LP
>-The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone
>-was created from.
>+The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone was created from.
> .SS "Mount Points"
> .sp
> .LP
>@@ -301,8 +274,7 @@
> A file system mountpoint property of "none" prevents the file system from being mounted.
> .sp
> .LP
>-If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage
>-the file system, and the administrator is responsible for mounting and unmounting the file system.
>+If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage the file system, and the administrator is responsible for mounting and unmounting the file system.
> .SS "Zones"
> .sp
> .LP
>@@ -312,8 +284,7 @@
> The physical properties of an added file system are controlled by the global administrator. However, the zone administrator can create, modify, or destroy files within the added file system, depending on how the file system is mounted.
> .sp
> .LP
>-A dataset can also be delegated to a non-global zone by using zonecfg's "\fBadd dataset\fR" subcommand. You cannot delegate a dataset to one zone and the children of the same dataset to another zone. The zone administrator can change properties of the dataset or
>-any of its children. However, the "quota" property is controlled by the global administrator.
>+A dataset can also be delegated to a non-global zone by using zonecfg's "\fBadd dataset\fR" subcommand. You cannot delegate a dataset to one zone and the children of the same dataset to another zone. The zone administrator can change properties of the dataset or any of its children. However, the "quota" property is controlled by the global administrator.
> .sp
> .LP
> A \fBZFS\fR volume can be added as a device to a non-global zone by using zonecfg's "\fBadd device\fR" subcommand. However, its physical properties can only be modified by the global administrator.
>@@ -329,15 +300,13 @@
> .SS "Native Properties"
> .sp
> .LP
>-Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior,
>-but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section.
>+Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior, but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section.
> .sp
> .LP
>-Every dataset has a set of properties that export statistics about the dataset as well as control various behavior. Properties are inherited from the parent unless overridden by the child. Snapshot properties can not be edited; they always inherit their inheritable properties. Properties
>-that are not applicable to snapshots are not displayed.
>+Every dataset has a set of properties that export statistics about the dataset as well as control various behavior. Properties are inherited from the parent unless overridden by the child. Some properties only apply to certain types of datasets (file systems, volumes or snapshots).
> .sp
> .LP
>-The values of numeric properties can be specified using the following human-readable suffixes (for example, "k", "KB", "M", "Gb", etc, up to Z for zettabyte). The following are all valid (and equal) specifications: 
>+The values of numeric properties can be specified using human-readable suffixes (for example, "k", "KB", "M", "Gb", etc, up to Z for zettabyte). The following are all valid (and equal) specifications: 
> .sp
> .in +2
> .nf
>@@ -360,8 +329,7 @@
> .ad
> .sp .6
> .RS 4n
>-The amount of space available to the dataset and all its children, assuming that there is no other activity in the pool. Because space is shared within a pool, availability can be limited by any number of factors, including physical pool size, quotas, reservations, or other datasets
>-within the pool.
>+The amount of space available to the dataset and all its children, assuming that there is no other activity in the pool. Because space is shared within a pool, availability can be limited by any number of factors, including physical pool size, quotas, reservations, or other datasets within the pool.
> .sp
> This property can also be referred to by its shortened column name, "avail".
> .RE
>@@ -418,8 +386,7 @@
> .ad
> .sp .6
> .RS 4n
>-The amount of data that is accessible by this dataset, which may or may not be shared with other datasets in the pool. When a snapshot or clone is created, it initially references the same amount of space as the file system or snapshot it was created from, since its contents are
>-identical.
>+The amount of data that is accessible by this dataset, which may or may not be shared with other datasets in the pool. When a snapshot or clone is created, it initially references the same amount of space as the file system or snapshot it was created from, since its contents are identical.
> .sp
> This property can also be referred to by its shortened column name, "refer".
> .RE
>@@ -432,7 +399,7 @@
> .ad
> .sp .6
> .RS 4n
>-The type of dataset: "filesystem", "volume", "snapshot", or "clone".
>+The type of dataset: "filesystem", "volume", or "snapshot".
> .RE
> 
> .sp
>@@ -443,11 +410,9 @@
> .ad
> .sp .6
> .RS 4n
>-The amount of space consumed by this dataset and all its descendents. This is the value that is checked against this dataset's quota and reservation. The space used does not include this dataset's reservation, but does take into account the reservations of any descendent datasets.
>-The amount of space that a dataset consumes from its parent, as well as the amount of space that are freed if this dataset is recursively destroyed, is the greater of its space used and its reservation.
>+The amount of space consumed by this dataset and all its descendents. This is the value that is checked against this dataset's quota and reservation. The space used does not include this dataset's reservation, but does take into account the reservations of any descendent datasets. The amount of space that a dataset consumes from its parent, as well as the amount of space that are freed if this dataset is recursively destroyed, is the greater of its space used and its reservation.
> .sp
>-When snapshots (see the "Snapshots" section) are created, their space is initially shared between the snapshot and the file system, and possibly with previous snapshots. As the file system changes, space that was previously shared becomes unique to the snapshot, and counted in
>-the snapshot's space used. Additionally, deleting snapshots can increase the amount of space unique to (and used by) other snapshots.
>+When snapshots (see the "Snapshots" section) are created, their space is initially shared between the snapshot and the file system, and possibly with previous snapshots. As the file system changes, space that was previously shared becomes unique to the snapshot, and counted in the snapshot's space used. Additionally, deleting snapshots can increase the amount of space unique to (and used by) other snapshots.
> .sp
> The amount of space used, available, or referenced does not take into account pending changes. Pending changes are generally accounted for within a few seconds. Committing a change to a disk using \fBfsync\fR(3c) or \fBO_SYNC\fR does not necessarily guarantee that the space usage information is updated immediately.
> .RE
>@@ -456,12 +421,66 @@
> .ne 2
> .mk
> .na
>+\fBusedby*\fR
>+.ad
>+.sp .6
>+.RS 4n
>+The \fBusedby*\fR snapshots decompose the "used" properties into the various reasons that space is used. Specifically, \fBused\fR = \fBusedbychildren\fR + \fBusedbydataset\fR + \fBusedbyrefreservation\fR +, \fBusedbysnapshots\fR. These properties are only available for datasets created on zpool "version 13" pools.
>+.RE
>+
>+.sp
>+.ne 2
>+.mk
>+.na
>+\fBusedbychildren\fR
>+.ad
>+.sp .6
>+.RS 4n
>+The amount of space used by children of this dataset, which would be freed if all the dataset's children were destroyed.
>+.RE
>+
>+.sp
>+.ne 2
>+.mk
>+.na
>+\fBusedbydataset\fR
>+.ad
>+.sp .6
>+.RS 4n
>+The amount of space used by this dataset itself, which would be freed if the dataset were destroyed (after first removing any \fBrefreservation\fR and destroying any necessary snapshots or descendents).
>+.RE
>+
>+.sp
>+.ne 2
>+.mk
>+.na
>+\fBusedbyrefreservation\fR
>+.ad
>+.sp .6
>+.RS 4n
>+The amount of space used by a \fBrefreservation\fR set on this dataset, which would be freed if the \fBrefreservation\fR was removed.
>+.RE
>+
>+.sp
>+.ne 2
>+.mk
>+.na
>+\fBusedbysnapshots\fR
>+.ad
>+.sp .6
>+.RS 4n
>+The amount of space consumed by snapshots of this dataset. In particular, it is the amount of space that would be freed if all of this dataset's snapshots were destroyed. Note that this is not simply the sum of the snapshots' "used" properties because space can be shared by multiple snapshots
>+.RE
>+
>+.sp
>+.ne 2
>+.mk
>+.na
> \fBvolblocksize=\fIblocksize\fR\fR
> .ad
> .sp .6
> .RS 4n
>-For volumes, specifies the block size of the volume. The \fBblocksize\fR cannot be changed once the volume has been written, so it should be set at volume creation time. The default \fBblocksize\fR for volumes is 8 Kbytes. Any power of 2 from 512 bytes
>-to 128 Kbytes is valid.
>+For volumes, specifies the block size of the volume. The \fBblocksize\fR cannot be changed once the volume has been written, so it should be set at volume creation time. The default \fBblocksize\fR for volumes is 8 Kbytes. Any power of 2 from 512 bytes to 128 Kbytes is valid.
> .sp
> This property can also be referred to by its shortened column name, "volblock".
> .RE
>@@ -473,15 +492,13 @@
> .ne 2
> .mk
> .na
>-\fBaclinherit=\fBdiscard\fR | \fBnoallow\fR | \fBrestricted\fR | \fBpassthrough\fR\fR
>+\fBaclinherit=\fBdiscard\fR | \fBnoallow\fR | \fBrestricted\fR | \fBpassthrough\fR | \fBpassthrough-x\fR\fR
> .ad
> .sp .6
> .RS 4n
>-Controls how \fBACL\fR entries are inherited when files and directories are created. A file system with an "aclinherit" property of "\fBdiscard\fR" does not inherit any \fBACL\fR entries. A file system with an "aclinherit"
>-property value of "\fBnoallow\fR" only inherits inheritable \fBACL\fR entries that specify "deny" permissions. The property value "\fBrestricted\fR" (the default) removes the "\fBwrite_acl\fR" and "\fBwrite_owner\fR" permissions when the \fBACL\fR entry is inherited. A file system with an "aclinherit" property value of "\fBpassthrough\fR" inherits all inheritable \fBACL\fR entries without any modifications made to the \fBACL\fR entries when they are inherited.
>+Controls how \fBACL\fR entries are inherited when files and directories are created. A file system with an "aclinherit" property of "\fBdiscard\fR" does not inherit any \fBACL\fR entries. A file system with an "aclinherit" property value of "\fBnoallow\fR" only inherits inheritable \fBACL\fR entries that specify "deny" permissions. The property value "\fBrestricted\fR" (the default) removes the "\fBwrite_acl\fR" and "\fBwrite_owner\fR" permissions when the \fBACL\fR entry is inherited. A file system with an "aclinherit" property value of "\fBpassthrough\fR" inherits all inheritable \fBACL\fR entries without any modifications made to the \fBACL\fR entries when they are inherited. A file system with an "aclinherit" property value of "\fBpassthrough-x\fR" has the same meaning as "\fBpassthrough\fR", except that the \fBowner@\fR, \fBgroup@\fR, and \fBeveryone@\fR \fBACE\fRs inherit the execute permission only if the file creation mode also requests the execute bit.
> .sp
>-When the property value is set to "\fBpassthrough\fR," files are created with a mode determined by the inheritable \fBACE\fRs. If no inheritable \fBACE\fRs exist that affect the mode, then the mode is set in accordance to the requested mode
>-from the application.
>+When the property value is set to "\fBpassthrough\fR," files are created with a mode determined by the inheritable \fBACE\fRs. If no inheritable \fBACE\fRs exist that affect the mode, then the mode is set in accordance to the requested mode from the application.
> .RE
> 
> .sp
>@@ -492,9 +509,7 @@
> .ad
> .sp .6
> .RS 4n
>-Controls how an \fBACL\fR is modified during \fBchmod\fR(2). A file system with an "aclmode" property of "\fBdiscard\fR"
>-deletes all \fBACL\fR entries that do not represent the mode of the file. An "aclmode" property of "\fBgroupmask\fR" (the default) reduces user or group permissions. The permissions are reduced, such that they are no greater than the group permission
>-bits, unless it is a user entry that has the same \fBUID\fR as the owner of the file or directory. In this case, the \fBACL\fR permissions are reduced so that they are no greater than owner permission bits. A file system with an "aclmode" property of "\fBpassthrough\fR" indicates that no changes are made to the \fBACL\fR other than generating the necessary \fBACL\fR entries to represent the new mode of the file or directory.
>+Controls how an \fBACL\fR is modified during \fBchmod\fR(2). A file system with an "aclmode" property of "\fBdiscard\fR" deletes all \fBACL\fR entries that do not represent the mode of the file. An "aclmode" property of "\fBgroupmask\fR" (the default) reduces user or group permissions. The permissions are reduced, such that they are no greater than the group permission bits, unless it is a user entry that has the same \fBUID\fR as the owner of the file or directory. In this case, the \fBACL\fR permissions are reduced so that they are no greater than owner permission bits. A file system with an "aclmode" property of "\fBpassthrough\fR" indicates that no changes are made to the \fBACL\fR other than generating the necessary \fBACL\fR entries to represent the new mode of the file or directory.
> .RE
> 
> .sp
>@@ -505,8 +520,7 @@
> .ad
> .sp .6
> .RS 4n
>-Controls whether the access time for files is updated when they are read. Turning this property off avoids producing write traffic when reading files and can result in significant performance gains, though it might confuse mailers and other similar utilities. The default value
>-is "on".
>+Controls whether the access time for files is updated when they are read. Turning this property off avoids producing write traffic when reading files and can result in significant performance gains, though it might confuse mailers and other similar utilities. The default value is "on".
> .RE
> 
> .sp
>@@ -517,12 +531,9 @@
> .ad
> .sp .6
> .RS 4n
>-If this property is set to "\fBoff\fR", the file system cannot be mounted, and is ignored by "\fBzfs mount -a\fR". Setting this property to "\fBoff\fR" is similar to setting the "mountpoint"
>-property to "\fBnone\fR", except that the dataset still has a normal "mountpoint" property, which can be inherited. Setting this property to "\fBoff\fR" allows datasets to be used solely as a mechanism to inherit properties. One example
>-of setting canmount=\fBoff\fR is to have two datasets with the same mountpoint, so that the children of both datasets appear in the same directory, but might have different inherited characteristics.
>+If this property is set to "\fBoff\fR", the file system cannot be mounted, and is ignored by "\fBzfs mount -a\fR". Setting this property to "\fBoff\fR" is similar to setting the "mountpoint" property to "\fBnone\fR", except that the dataset still has a normal "mountpoint" property, which can be inherited. Setting this property to "\fBoff\fR" allows datasets to be used solely as a mechanism to inherit properties. One example of setting canmount=\fBoff\fR is to have two datasets with the same mountpoint, so that the children of both datasets appear in the same directory, but might have different inherited characteristics.
> .sp
>-When the "\fBnoauto\fR" option is set, a dataset can only be mounted and unmounted explicitly. The dataset is not mounted automatically when the dataset is created or imported, nor is it mounted by the "\fBzfs mount -a\fR" command or unmounted
>-by the "\fBzfs unmount -a\fR" command. 
>+When the "\fBnoauto\fR" option is set, a dataset can only be mounted and unmounted explicitly. The dataset is not mounted automatically when the dataset is created or imported, nor is it mounted by the "\fBzfs mount -a\fR" command or unmounted by the "\fBzfs unmount -a\fR" command. 
> .sp
> This property is not inherited.
> .RE
>@@ -535,8 +546,7 @@
> .ad
> .sp .6
> .RS 4n
>-Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity
>-checking on user data. Disabling checksums is NOT a recommended practice.
>+Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity checking on user data. Disabling checksums is NOT a recommended practice.
> .RE
> 
> .sp
>@@ -547,9 +557,7 @@
> .ad
> .sp .6
> .RS 4n
>-Controls the compression algorithm used for this dataset. The "lzjb" compression algorithm is optimized for performance while providing decent data compression. Setting compression to "on" uses the "lzjb" compression algorithm. The "gzip"
>-compression algorithm uses the same compression as the \fBgzip\fR(1) command. You can specify the "gzip" level by using the value "gzip-\fIN\fR" where \fIN\fR is
>-an integer from 1 (fastest) to 9 (best compression ratio). Currently, "gzip" is equivalent to "gzip-6" (which is also the default for \fBgzip\fR(1)).
>+Controls the compression algorithm used for this dataset. The "lzjb" compression algorithm is optimized for performance while providing decent data compression. Setting compression to "on" uses the "lzjb" compression algorithm. The "gzip" compression algorithm uses the same compression as the \fBgzip\fR(1) command. You can specify the "gzip" level by using the value "gzip-\fIN\fR" where \fIN\fR is an integer from 1 (fastest) to 9 (best compression ratio). Currently, "gzip" is equivalent to "gzip-6" (which is also the default for \fBgzip\fR(1)).
> .sp
> This property can also be referred to by its shortened column name "compress".
> .RE
>@@ -562,8 +570,7 @@
> .ad
> .sp .6
> .RS 4n
>-Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool, for example, mirroring or raid-z. The copies are stored on different disks, if possible. The space used by multiple copies is charged to the associated
>-file and dataset, changing the "used" property and counting against quotas and reservations.
>+Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool, for example, mirroring or raid-z. The copies are stored on different disks, if possible. The space used by multiple copies is charged to the associated file and dataset, changing the "used" property and counting against quotas and reservations.
> .sp
> Changing this property only affects newly-written data. Therefore, set this property at file system creation time by using the "\fB-o\fR copies=" option.
> .RE
>@@ -600,8 +607,7 @@
> .RS 4n
> Controls the mount point used for this file system. See the "Mount Points" section for more information on how this property is used. 
> .sp
>-When the mountpoint property is changed for a file system, the file system and any children that inherit the mount point are unmounted. If the new value is "legacy", then they remain unmounted. Otherwise, they are automatically remounted in the new location if the property was
>-previously "legacy" or "none", or if they were mounted before the property was changed. In addition, any shared file systems are unshared and shared in the new location.
>+When the mountpoint property is changed for a file system, the file system and any children that inherit the mount point are unmounted. If the new value is "legacy", then they remain unmounted. Otherwise, they are automatically remounted in the new location if the property was previously "legacy" or "none", or if they were mounted before the property was changed. In addition, any shared file systems are unshared and shared in the new location.
> .RE
> 
> .sp
>@@ -612,19 +618,29 @@
> .ad
> .sp .6
> .RS 4n
>-Controls whether the file system should be mounted with "\fBnbmand\fR" (Non Blocking mandatory locks). This is used for \fBCIFS\fR clients. 	Changes to this property only take effect when the file system is umounted and remounted. See \fBmount\fR(1M) for more information on "\fBnbmand\fR" mounts.
>+Controls whether the file system should be mounted with "\fBnbmand\fR" (Non Blocking mandatory locks). This is used for \fBCIFS\fR clients. Changes to this property only take effect when the file system is umounted and remounted. See \fBmount\fR(1M) for more information on "\fBnbmand\fR" mounts.
> .RE
> 
> .sp
> .ne 2
> .mk
> .na
>+\fBprimarycache=\fIall\fR | \fInone\fR | \fImetadata\fR\fR
>+.ad
>+.sp .6
>+.RS 4n
>+Controls what is cached in the primary cache (ARC). If this property is set to "all", then both user data and metadata is cached. If this property is set to "none", then neither user data nor metadata is cached. If this property is set to "metadata", then only metadata is cached. The default value is "all".
>+.RE
>+
>+.sp
>+.ne 2
>+.mk
>+.na
> \fBquota=\fIsize\fR | \fInone\fR\fR
> .ad
> .sp .6
> .RS 4n
>-Limits the amount of space a dataset and its descendents can consume. This property enforces a hard limit on the amount of space used. This includes all space consumed by descendents, including file systems and snapshots. Setting a quota on a descendent of a dataset that already
>-has a quota does not override the ancestor's quota, but rather imposes an additional limit.
>+Limits the amount of space a dataset and its descendents can consume. This property enforces a hard limit on the amount of space used. This includes all space consumed by descendents, including file systems and snapshots. Setting a quota on a descendent of a dataset that already has a quota does not override the ancestor's quota, but rather imposes an additional limit.
> .sp
> Quotas cannot be set on volumes, as the "volsize" property acts as an implicit quota.
> .RE
>@@ -650,11 +666,9 @@
> .ad
> .sp .6
> .RS 4n
>-Specifies a suggested block size for files in the file system. This property is designed solely for use with database workloads that access files in fixed-size records. \fBZFS\fR automatically tunes block sizes according to internal algorithms optimized for typical
>-access patterns. 
>+Specifies a suggested block size for files in the file system. This property is designed solely for use with database workloads that access files in fixed-size records. \fBZFS\fR automatically tunes block sizes according to internal algorithms optimized for typical access patterns. 
> .sp
>-For databases that create very large files but access them in small random chunks, these algorithms may be suboptimal. Specifying a "recordsize" greater than or equal to the record size of the database can result in significant performance gains. Use of this property for general
>-purpose file systems is strongly discouraged, and may adversely affect performance.
>+For databases that create very large files but access them in small random chunks, these algorithms may be suboptimal. Specifying a "recordsize" greater than or equal to the record size of the database can result in significant performance gains. Use of this property for general purpose file systems is strongly discouraged, and may adversely affect performance.
> .sp
> The size specified must be a power of two greater than or equal to 512 and less than or equal to 128 Kbytes.
> .sp
>@@ -682,8 +696,7 @@
> .ad
> .sp .6
> .RS 4n
>-The minimum amount of space guaranteed to a dataset, not including its descendents. When the amount of space used is below this value, the dataset is treated as if it were taking up the amount of space specified by \fBrefreservation\fR. The \fBrefreservation\fR reservation
>-is accounted for in the parent datasets' space used, and counts against the parent datasets' quotas and reservations.
>+The minimum amount of space guaranteed to a dataset, not including its descendents. When the amount of space used is below this value, the dataset is treated as if it were taking up the amount of space specified by \fBrefreservation\fR. The \fBrefreservation\fR reservation is accounted for in the parent datasets' space used, and counts against the parent datasets' quotas and reservations.
> .sp
> If \fBrefreservation\fR is set, a snapshot is only allowed if there is enough free pool space outside of this reservation to accommodate the current number of "referenced" bytes in the dataset.
> .sp
>@@ -698,8 +711,7 @@
> .ad
> .sp .6
> .RS 4n
>-The minimum amount of space guaranteed to a dataset and its descendents. When the amount of space used is below this value, the dataset is treated as if it were taking up the amount of space specified by its reservation. Reservations are accounted for in the parent datasets' space
>-used, and count against the parent datasets' quotas and reservations.
>+The minimum amount of space guaranteed to a dataset and its descendents. When the amount of space used is below this value, the dataset is treated as if it were taking up the amount of space specified by its reservation. Reservations are accounted for in the parent datasets' space used, and count against the parent datasets' quotas and reservations.
> .sp
> This property can also be referred to by its shortened column name, "reserv".
> .RE
>@@ -708,6 +720,17 @@
> .ne 2
> .mk
> .na
>+\fBsecondarycache=\fIall\fR | \fInone\fR | \fImetadata\fR\fR
>+.ad
>+.sp .6
>+.RS 4n
>+Controls what is cached in the secondary cache (L2ARC). If this property is set to "all", then both user data and metadata is cached. If this property is set to "none", then neither user data nor metadata is cached. If this property is set to "metadata", then only metadata is cached. The default value is "all".
>+.RE
>+
>+.sp
>+.ne 2
>+.mk
>+.na
> \fBsetuid=\fIon\fR | \fIoff\fR\fR
> .ad
> .sp .6
>@@ -723,8 +746,7 @@
> .ad
> .sp .6
> .RS 4n
>-Like the "sharenfs" property, "shareiscsi" indicates whether a \fBZFS\fR volume is exported as an \fBiSCSI\fR target. The acceptable values for this property are "on", "off", and "type=disk".
>-The default value is "off". In the future, other target types might be supported. For example, "tape".
>+Like the "sharenfs" property, "shareiscsi" indicates whether a \fBZFS\fR volume is exported as an \fBiSCSI\fR target. The acceptable values for this property are "on", "off", and "type=disk". The default value is "off". In the future, other target types might be supported. For example, "tape".
> .sp
> You might want to set "shareiscsi=on" for a file system so that all \fBZFS\fR volumes within the file system are shared by default. Setting this property on a file system has no direct effect, however.
> .RE
>@@ -737,15 +759,13 @@
> .ad
> .sp .6
> .RS 4n
>-Controls whether the file system is shared by using the Solaris \fBCIFS\fR service, and what options are to be used. A file system with the "\fBsharesmb\fR" property set to "off" is managed through traditional tools such as \fBsharemgr\fR(1M). Otherwise, the file system is automatically shared and unshared with the "zfs share" and "zfs unshare" commands. If the property is set to "on",
>-the \fBsharemgr\fR(1M) command is invoked with no options. Otherwise, the \fBsharemgr\fR(1M) command is invoked with options equivalent to the contents of this property.
>+Controls whether the file system is shared by using the Solaris \fBCIFS\fR service, and what options are to be used. A file system with the "\fBsharesmb\fR" property set to "off" is managed through traditional tools such as \fBsharemgr\fR(1M). Otherwise, the file system is automatically shared and unshared with the \fBzfs share\fR and \fBzfs unshare\fR commands. If the property is set to \fBon\fR, the \fBsharemgr\fR(1M) command is invoked with no options. Otherwise, the \fBsharemgr\fR(1M) command is invoked with options equivalent to the contents of this property.
> .sp
>-Because \fBSMB\fR shares requires a resource name, a unique resource name is constructed from the dataset name. The constructed name is a copy of the dataset name except that the characters in the dataset name, which would be illegal in the resource name, are replaced with underscore
>-(_) characters. A pseudo property "name" is also supported that allows you to replace the data set name with a specified name. The specified name is then used to replace the prefix dataset in the case of inheritance. For example, if the dataset "\fBdata/home/john\fR"
>-is set to "name=john", then "\fBdata/home/john\fR" has a resource name of "john". If a child dataset of "\fBdata/home/john/backups\fR", it has a resource name of "john_backups".
>+Because \fBSMB\fR shares requires a resource name, a unique resource name is constructed from the dataset name. The constructed name is a copy of the dataset name except that the characters in the dataset name, which would be illegal in the resource name, are replaced with underscore (\fB_\fR) characters. A pseudo property "name" is also supported that allows you to replace the data set name with a specified name. The specified name is then used to replace the prefix dataset in the case of inheritance. For example, if the dataset \fBdata/home/john\fR is set to \fBname=john\fR, then \fBdata/home/john\fR has a resource name of \fBjohn\fR. If a child dataset of \fBdata/home/john/backups\fR, it has a resource name of \fBjohn_backups\fR.
> .sp
>-When the "sharesmb" property is changed for a dataset, the dataset and any children inheriting the property are re-shared with the new options, only if the property was previously set to "off", or if they were shared before the property was changed. If the new property
>-is set to "off", the file systems are unshared.
>+When SMB shares are created, the SMB share name appears as an entry in the \fB\&.zfs/shares\fR directory. You can use the \fBls\fR or \fBchmod\fR command to display the share-level ACLs on the entries in this directory.
>+.sp
>+When the \fBsharesmb\fR property is changed for a dataset, the dataset and any children inheriting the property are re-shared with the new options, only if the property was previously set to \fBoff\fR, or if they were shared before the property was changed. If the new property is set to \fBoff\fR, the file systems are unshared.
> .RE
> 
> .sp
>@@ -756,11 +776,9 @@
> .ad
> .sp .6
> .RS 4n
>-Controls whether the file system is shared via \fBNFS\fR, and what options are used. A file system with a"\fBsharenfs\fR" property of "off" is managed through traditional tools such as \fBshare\fR(1M), \fBunshare\fR(1M), and \fBdfstab\fR(4). Otherwise, the file system is automatically shared and unshared with the "\fBzfs share\fR" and "\fBzfs unshare\fR" commands. If the property is set to "on",
>-the \fBshare\fR(1M) command is invoked with no options. Otherwise, the \fBshare\fR(1M) command is invoked with options equivalent to the contents of this property.
>+Controls whether the file system is shared via \fBNFS\fR, and what options are used. A file system with a"\fBsharenfs\fR" property of "off" is managed through traditional tools such as \fBshare\fR(1M), \fBunshare\fR(1M), and \fBdfstab\fR(4). Otherwise, the file system is automatically shared and unshared with the "\fBzfs share\fR" and "\fBzfs unshare\fR" commands. If the property is set to "on", the \fBshare\fR(1M) command is invoked with no options. Otherwise, the \fBshare\fR(1M) command is invoked with options equivalent to the contents of this property.
> .sp
>-When the "sharenfs" property is changed for a dataset, the dataset and any children inheriting the property are re-shared with the new options, only if the property was previously "off", or if they were shared before the property was changed. If the new property is "off",
>-the file systems are unshared.
>+When the "sharenfs" property is changed for a dataset, the dataset and any children inheriting the property are re-shared with the new options, only if the property was previously "off", or if they were shared before the property was changed. If the new property is "off", the file systems are unshared.
> .RE
> 
> .sp
>@@ -793,14 +811,11 @@
> .ad
> .sp .6
> .RS 4n
>-For volumes, specifies the logical size of the volume. By default, creating a volume establishes a reservation of equal size. For storage pools with a version number of 9 or higher, a \fBrefreservation\fR is set instead. Any changes to \fBvolsize\fR are
>-reflected in an equivalent change to the reservation (or \fBrefreservation\fR). The \fBvolsize\fR can only be set to a multiple of \fBvolblocksize\fR, and cannot be zero.
>+For volumes, specifies the logical size of the volume. By default, creating a volume establishes a reservation of equal size. For storage pools with a version number of 9 or higher, a \fBrefreservation\fR is set instead. Any changes to \fBvolsize\fR are reflected in an equivalent change to the reservation (or \fBrefreservation\fR). The \fBvolsize\fR can only be set to a multiple of \fBvolblocksize\fR, and cannot be zero.
> .sp
>-The reservation is kept equal to the volume's logical size to prevent unexpected behavior for consumers. Without the reservation, the volume could run out of space, resulting in undefined behavior or data corruption, depending on how the volume is used. These effects can also occur when
>-the volume size is changed while it is in use (particularly when shrinking the size). Extreme care should be used when adjusting the volume size.
>+The reservation is kept equal to the volume's logical size to prevent unexpected behavior for consumers. Without the reservation, the volume could run out of space, resulting in undefined behavior or data corruption, depending on how the volume is used. These effects can also occur when the volume size is changed while it is in use (particularly when shrinking the size). Extreme care should be used when adjusting the volume size.
> .sp
>-Though not recommended, a "sparse volume" (also known as "thin provisioning") can be created by specifying the \fB-s\fR option to the "\fBzfs create -V\fR" command, or by changing the reservation after the volume has been created.
>-A "sparse volume" is a volume where the reservation is less then the volume size. Consequently, writes to a sparse volume can fail with \fBENOSPC\fR when the pool is low on space. For a sparse volume, changes to \fBvolsize\fR are not reflected in the reservation.
>+Though not recommended, a "sparse volume" (also known as "thin provisioning") can be created by specifying the \fB-s\fR option to the "\fBzfs create -V\fR" command, or by changing the reservation after the volume has been created. A "sparse volume" is a volume where the reservation is less then the volume size. Consequently, writes to a sparse volume can fail with \fBENOSPC\fR when the pool is low on space. For a sparse volume, changes to \fBvolsize\fR are not reflected in the reservation.
> .RE
> 
> .sp
>@@ -838,8 +853,7 @@
> 
> .sp
> .LP
>-The following three properties cannot be changed after the file system is created, and therefore, should be set when the file system is created. If the properties are not set with the "\fBzfs create\fR" command, these properties are inherited from the parent dataset.
>-If the parent dataset lacks these properties due to having been created prior to these features being supported, the new file system will have the default values for these properties.
>+The following three properties cannot be changed after the file system is created, and therefore, should be set when the file system is created. If the properties are not set with the "\fBzfs create\fR" or "\fBzpool create\fR" commands, these properties are inherited from the parent dataset. If the parent dataset lacks these properties due to having been created prior to these features being supported, the new file system will have the default values for these properties.
> .sp
> .ne 2
> .mk
>@@ -848,11 +862,9 @@
> .ad
> .sp .6
> .RS 4n
>-Indicates whether the file name matching algorithm used by the file system should be case-sensitive, case-insensitive, or allow a combination of both styles of matching. The default value for the "\fBcasesensitivity\fR" property is "\fBsensitive\fR."
>-Traditionally, UNIX and POSIX file systems have case-sensitive file names.
>+Indicates whether the file name matching algorithm used by the file system should be case-sensitive, case-insensitive, or allow a combination of both styles of matching. The default value for the "\fBcasesensitivity\fR" property is "\fBsensitive\fR." Traditionally, UNIX and POSIX file systems have case-sensitive file names.
> .sp
>-The "\fBmixed\fR" value for the "\fBcasesensitivity\fR" property indicates that the file system can support requests for both case-sensitive and case-insensitive matching behavior. Currently, case-insensitive matching behavior on a file system
>-that supports mixed behavior is limited to the Solaris CIFS server product. For more information about the "mixed" value behavior, see the \fIZFS Administration Guide\fR.
>+The "\fBmixed\fR" value for the "\fBcasesensitivity\fR" property indicates that the file system can support requests for both case-sensitive and case-insensitive matching behavior. Currently, case-insensitive matching behavior on a file system that supports mixed behavior is limited to the Solaris CIFS server product. For more information about the "mixed" value behavior, see the \fIZFS Administration Guide\fR.
> .RE
> 
> .sp
>@@ -863,87 +875,63 @@
> .ad
> .sp .6
> .RS 4n
>-Indicates whether the file system should perform a \fBunicode\fR normalization of file names whenever two file names are compared, and which normalization algorithm should be used. File names are always stored unmodified, names are normalized as part of any comparison
>-process. If this property is set to a legal value other than "\fBnone\fR," and the "\fButf8only\fR" property was left unspecified, the "\fButf8only\fR" property is automatically set to "\fBon\fR."
>-The default value of the "\fBnormalization\fR" property is "\fBnone\fR." This property cannot be changed after the file system is created.
>+Indicates whether the file system should perform a \fBunicode\fR normalization of file names whenever two file names are compared, and which normalization algorithm should be used. File names are always stored unmodified, names are normalized as part of any comparison process. If this property is set to a legal value other than "\fBnone\fR," and the "\fButf8only\fR" property was left unspecified, the "\fButf8only\fR" property is automatically set to "\fBon\fR." The default value of the "\fBnormalization\fR" property is "\fBnone\fR." This property cannot be changed after the file system is created.
> .RE
> 
> .sp
> .ne 2
> .mk
> .na
>-\fBjailed =\fIon\fR | \fIoff\fR\fR
>-.ad
>-.sp .6
>-.RS 4n
>-Controls whether the dataset is managed from within a jail. The default value is "off".
>-.RE
>-
>-.sp
>-.ne 2
>-.mk
>-.na
> \fButf8only =\fBon\fR | \fBoff\fR\fR
> .ad
> .sp .6
> .RS 4n
>-Indicates whether the file system should reject file names that include characters that are not present in the \fBUTF-8\fR character code set. If this property is explicitly set to "\fBoff\fR," the normalization property must either not be
>-explicitly set or be set to "\fBnone\fR." The default value for the "\fButf8only\fR" property is "off." This property cannot be changed after the file system is created.
>+Indicates whether the file system should reject file names that include characters that are not present in the \fBUTF-8\fR character code set. If this property is explicitly set to "\fBoff\fR," the normalization property must either not be explicitly set or be set to "\fBnone\fR." The default value for the "\fButf8only\fR" property is "off." This property cannot be changed after the file system is created.
> .RE
> 
> .sp
> .LP
>-The "\fBcasesensitivity\fR," "\fBnormalization\fR," and "\fButf8only\fR" properties are also new permissions that can be assigned to non-privileged users by using the \fBZFS\fR delegated administration
>-feature.
>+The "\fBcasesensitivity\fR," "\fBnormalization\fR," and "\fButf8only\fR" properties are also new permissions that can be assigned to non-privileged users by using the \fBZFS\fR delegated administration feature.
> .SS "Temporary Mount Point Properties"
> .sp
> .LP
>-When a file system is mounted, either through \fBmount\fR(1M) for legacy mounts or the "\fBzfs mount\fR" command for normal file systems,
>-its mount options are set according to its properties. The correlation between properties and mount options is as follows:
>+When a file system is mounted, either through \fBmount\fR(1M) for legacy mounts or the "\fBzfs mount\fR" command for normal file systems, its mount options are set according to its properties. The correlation between properties and mount options is as follows:
> .sp
> .in +2
> .nf
>     PROPERTY                MOUNT OPTION
>-    devices                 devices/nodevices
>-    exec                    exec/noexec
>-    readonly                ro/rw
>-    setuid                  setuid/nosetuid
>-    xattr                   xattr/noxattr
>+     devices                 devices/nodevices
>+     exec                    exec/noexec
>+     readonly                ro/rw
>+     setuid                  setuid/nosetuid
>+     xattr                   xattr/noxattr
> .fi
> .in -2
> .sp
> 
> .sp
> .LP
>-In addition, these options can be set on a per-mount basis using the \fB-o\fR option, without affecting the property that is stored on disk. The values specified on the command line override the values stored in the dataset. The \fB-nosuid\fR option is an alias for "nodevices,nosetuid".
>-These properties are reported as "temporary" by the "\fBzfs get\fR" command. If the properties are changed while the dataset is mounted, the new setting overrides any temporary settings.
>+In addition, these options can be set on a per-mount basis using the \fB-o\fR option, without affecting the property that is stored on disk. The values specified on the command line override the values stored in the dataset. The \fB-nosuid\fR option is an alias for "nodevices,nosetuid". These properties are reported as "temporary" by the "\fBzfs get\fR" command. If the properties are changed while the dataset is mounted, the new setting overrides any temporary settings.
> .SS "User Properties"
> .sp
> .LP
>-In addition to the standard native properties, \fBZFS\fR supports arbitrary user properties. User properties have no effect on \fBZFS\fR behavior, but applications or administrators can use them to annotate datasets.
>+In addition to the standard native properties, \fBZFS\fR supports arbitrary user properties. User properties have no effect on \fBZFS\fR behavior, but applications or administrators can use them to annotate datasets (file systems, volumes, and snapshots).
> .sp
> .LP
>-User property names must contain a colon (":") character, to distinguish them from native properties. They might contain lowercase letters, numbers, and the following punctuation characters: colon (":"), dash ("-"), period ("."), and underscore
>-("_"). The expected convention is that the property name is divided into two portions such as "\fImodule\fR:\fIproperty\fR", but this namespace is not enforced by \fBZFS\fR. User property names can be at most 256 characters,
>-and cannot begin with a dash ("-").
>+User property names must contain a colon (":") character to distinguish them from native properties. They may contain lowercase letters, numbers, and the following punctuation characters: colon (":"), dash ("-"), period ("."), and underscore ("_"). The expected convention is that the property name is divided into two portions such as "\fImodule\fR:\fIproperty\fR", but this namespace is not enforced by \fBZFS\fR. User property names can be at most 256 characters, and cannot begin with a dash ("-").
> .sp
> .LP
>-When making programmatic use of user properties, it is strongly suggested to use a reversed \fBDNS\fR domain name for the \fImodule\fR component of property names to reduce the chance that two independently-developed packages use the same property name for
>-different purposes. Property names beginning with "com.sun." are reserved for use by Sun Microsystems.
>+When making programmatic use of user properties, it is strongly suggested to use a reversed \fBDNS\fR domain name for the \fImodule\fR component of property names to reduce the chance that two independently-developed packages use the same property name for different purposes. Property names beginning with "com.sun." are reserved for use by Sun Microsystems.
> .sp
> .LP
>-The values of user properties are arbitrary strings, are always inherited, and are never validated. All of the commands that operate on properties ("zfs list", "zfs get", "zfs set", etc.) can be used to manipulate both native properties and user properties.
>-Use the "\fBzfs inherit\fR" command to clear a user property . If the property is not defined in any parent dataset, it is removed entirely. Property values are limited to 1024 characters.
>-.SS "Volumes as Swap or Dump Devices"
>+The values of user properties are arbitrary strings, are always inherited, and are never validated. All of the commands that operate on properties ("zfs list", "zfs get", "zfs set", etc.) can be used to manipulate both native properties and user properties. Use the "\fBzfs inherit\fR" command to clear a user property . If the property is not defined in any parent dataset, it is removed entirely. Property values are limited to 1024 characters.
>+.SS "ZFS Volumes as Swap or Dump Devices"
> .sp
> .LP
>-To set up a swap area, create a \fBZFS\fR volume of a specific size and then enable swap on that device. For more information, see the EXAMPLES section.
>+During an initial installation or a live upgrade from a \fBUFS\fR file system, a swap device and dump device are created on \fBZFS\fR volumes in the \fBZFS\fR root pool. By default, the swap area size is based on 1/2 the size of physical memory up to 2 Gbytes. The size of the dump device depends on the kernel's requirements at installation time. Separate \fBZFS\fR volumes must be used for the swap area and dump devices. Do not swap to a file on a \fBZFS\fR file system. A \fBZFS\fR swap file configuration is not supported. 
> .sp
> .LP
>-Do not swap to a file on a \fBZFS\fR file system. A \fBZFS\fR swap file configuration is not supported.
>-.sp
>-.LP
>-Using a \fBZFS\fR volume as a dump device is not supported.
>+If you need to change your swap area or dump device after the system is installed or upgraded, use the \fBswap\fR(1M) and \fBdumpadm\fR(1M) commands. If you need to change the size of your swap area or dump device, see the \fISolaris ZFS Administration Guide\fR.
> .SH SUBCOMMANDS
> .sp
> .LP
>@@ -974,10 +962,9 @@
> .na
> \fB\fB-p\fR\fR
> .ad
>-.RS 21n
>-.rt  
>-Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. Any property specified on the command line using the \fB-o\fR option is ignored. If
>-the target filesystem already exists, the operation completes successfully.
>+.sp .6
>+.RS 4n
>+Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. Any property specified on the command line using the \fB-o\fR option is ignored. If the target filesystem already exists, the operation completes successfully.
> .RE
> 
> .sp
>@@ -986,10 +973,9 @@
> .na
> \fB\fB-o\fR \fIproperty\fR=\fIvalue\fR\fR
> .ad
>-.RS 21n
>-.rt  
>-Sets the specified property as if "\fBzfs set property=value\fR" was invoked at the same time the dataset was created. Any editable \fBZFS\fR property can also be set at creation time. Multiple \fB-o\fR options can be specified. An
>-error results if the same property is specified in multiple \fB-o\fR options.
>+.sp .6
>+.RS 4n
>+Sets the specified property as if "\fBzfs set property=value\fR" was invoked at the same time the dataset was created. Any editable \fBZFS\fR property can also be set at creation time. Multiple \fB-o\fR options can be specified. An error results if the same property is specified in multiple \fB-o\fR options.
> .RE
> 
> .RE
>@@ -1002,8 +988,7 @@
> .ad
> .sp .6
> .RS 4n
>-Creates a volume of the given size. The volume is exported as a block device in \fB/dev/zvol/{dsk,rdsk}/\fIpath\fR\fR, where \fIpath\fR is the name of the volume in the \fBZFS\fR namespace. The size represents
>-the logical size as exported by the device. By default, a reservation of equal size is created.
>+Creates a volume of the given size. The volume is exported as a block device in \fB/dev/zvol/{dsk,rdsk}/\fIpath\fR\fR, where \fIpath\fR is the name of the volume in the \fBZFS\fR namespace. The size represents the logical size as exported by the device. By default, a reservation of equal size is created.
> .sp
> \fIsize\fR is automatically rounded up to the nearest 128 Kbytes to ensure that the volume has an integral number of blocks regardless of \fIblocksize\fR.
> .sp
>@@ -1012,10 +997,9 @@
> .na
> \fB\fB-p\fR\fR
> .ad
>-.RS 21n
>-.rt  
>-Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. Any property specified on the command line using the \fB-o\fR option is ignored. If
>-the target filesystem already exists, the operation completes successfully.
>+.sp .6
>+.RS 4n
>+Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. Any property specified on the command line using the \fB-o\fR option is ignored. If the target filesystem already exists, the operation completes successfully.
> .RE
> 
> .sp
>@@ -1024,8 +1008,8 @@
> .na
> \fB\fB-s\fR\fR
> .ad
>-.RS 21n
>-.rt  
>+.sp .6
>+.RS 4n
> Creates a sparse volume with no reservation. See "volsize" in the Native Properties section for more information about sparse volumes.
> .RE
> 
>@@ -1035,10 +1019,9 @@
> .na
> \fB\fB-o\fR \fIproperty\fR=\fIvalue\fR\fR
> .ad
>-.RS 21n
>-.rt  
>-Sets the specified property as if "\fBzfs set property=value\fR" was invoked at the same time the dataset was created. Any editable \fBZFS\fR property can also be set at creation time. Multiple \fB-o\fR options can be specified. An
>-error results if the same property is specified in multiple \fB-o\fR options.
>+.sp .6
>+.RS 4n
>+Sets the specified property as if "\fBzfs set property=value\fR" was invoked at the same time the dataset was created. Any editable \fBZFS\fR property can also be set at creation time. Multiple \fB-o\fR options can be specified. An error results if the same property is specified in multiple \fB-o\fR options.
> .RE
> 
> .sp
>@@ -1047,10 +1030,9 @@
> .na
> \fB\fB-b\fR \fIblocksize\fR\fR
> .ad
>-.RS 21n
>-.rt  
>-Equivalent to "\fB\fR\fB-o\fR \fBvolblocksize=\fIblocksize\fR\fR". If this option is specified in conjunction with "\fB\fR\fB-o\fR \fBvolblocksize\fR", the resulting
>-behavior is undefined.
>+.sp .6
>+.RS 4n
>+Equivalent to "\fB\fR\fB-o\fR \fBvolblocksize=\fIblocksize\fR\fR". If this option is specified in conjunction with "\fB\fR\fB-o\fR \fBvolblocksize\fR", the resulting behavior is undefined.
> .RE
> 
> .RE
>@@ -1070,8 +1052,8 @@
> .na
> \fB\fB-r\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Recursively destroy all children. If a snapshot is specified, destroy all snapshots with this name in descendent file systems.
> .RE
> 
>@@ -1081,8 +1063,8 @@
> .na
> \fB\fB-R\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Recursively destroy all dependents, including cloned file systems outside the target hierarchy. If a snapshot is specified, destroy all snapshots with this name in descendent file systems.
> .RE
> 
>@@ -1092,8 +1074,8 @@
> .na
> \fB\fB-f\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Force an unmount of any file systems using the "\fBunmount -f\fR" command. This option has no effect on non-file systems or unmounted file systems.
> .RE
> 
>@@ -1104,7 +1086,7 @@
> .ne 2
> .mk
> .na
>-\fB\fBzfs snapshot\fR [\fB-r\fR] \fIfilesystem@snapname\fR|\fIvolume@snapname\fR\fR
>+\fB\fBzfs snapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIfilesystem@snapname\fR|\fIvolume@snapname\fR\fR
> .ad
> .sp .6
> .RS 4n
>@@ -1115,13 +1097,24 @@
> .na
> \fB\fB-r\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Recursively create snapshots of all descendent datasets. Snapshots are taken atomically, so that all recursive snapshots correspond to the same moment in time.
> .RE
> 
>+.sp
>+.ne 2
>+.mk
>+.na
>+\fB\fB-o\fR \fIproperty\fR=\fIvalue\fR\fR
>+.ad
>+.sp .6
>+.RS 4n
>+Sets the specified property; see "\fBzfs create\fR" for details.
> .RE
> 
>+.RE
>+
> .sp
> .ne 2
> .mk
>@@ -1130,16 +1123,15 @@
> .ad
> .sp .6
> .RS 4n
>-Roll back the given dataset to a previous snapshot. When a dataset is rolled back, all data that has changed since the snapshot is discarded, and the dataset reverts to the state at the time of the snapshot. By default, the command refuses to roll back to a snapshot other than
>-the most recent one. In order to do so, all intermediate snapshots must be destroyed by specifying the \fB-r\fR option.
>+Roll back the given dataset to a previous snapshot. When a dataset is rolled back, all data that has changed since the snapshot is discarded, and the dataset reverts to the state at the time of the snapshot. By default, the command refuses to roll back to a snapshot other than the most recent one. In order to do so, all intermediate snapshots must be destroyed by specifying the \fB-r\fR option.
> .sp
> .ne 2
> .mk
> .na
> \fB\fB-r\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Recursively destroy any snapshots more recent than the one specified.
> .RE
> 
>@@ -1149,8 +1141,8 @@
> .na
> \fB\fB-R\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Recursively destroy any more recent snapshots, as well as any clones of those snapshots.
> .RE
> 
>@@ -1160,8 +1152,8 @@
> .na
> \fB\fB-f\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Used with the \fB-R\fR option to force an unmount of any clone file systems that are to be destroyed.
> .RE
> 
>@@ -1171,7 +1163,7 @@
> .ne 2
> .mk
> .na
>-\fB\fBzfs clone\fR [\fB-p\fR] \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR\fR
>+\fB\fBzfs clone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR\fR
> .ad
> .sp .6
> .RS 4n
>@@ -1182,13 +1174,24 @@
> .na
> \fB\fB-p\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. If the target filesystem or volume already exists, the operation completes successfully.
> .RE
> 
>+.sp
>+.ne 2
>+.mk
>+.na
>+\fB\fB-o\fR \fIproperty\fR=\fIvalue\fR\fR
>+.ad
>+.sp .6
>+.RS 4n
>+Sets the specified property; see "\fBzfs create\fR" for details.
> .RE
> 
>+.RE
>+
> .sp
> .ne 2
> .mk
>@@ -1197,11 +1200,9 @@
> .ad
> .sp .6
> .RS 4n
>-Promotes a clone file system to no longer be dependent on its "origin" snapshot. This makes it possible to destroy the file system that the clone was created from. The clone parent-child dependency relationship is reversed, so that the "origin" file system
>-becomes a clone of the specified file system. 
>+Promotes a clone file system to no longer be dependent on its "origin" snapshot. This makes it possible to destroy the file system that the clone was created from. The clone parent-child dependency relationship is reversed, so that the "origin" file system becomes a clone of the specified file system. 
> .sp
>-The snapshot that was cloned, and any snapshots previous to this snapshot, are now owned by the promoted clone. The space they use moves from the "origin" file system to the promoted clone, so enough space must be available to accommodate these snapshots. No new space is consumed
>-by this operation, but the space accounting is adjusted. The promoted clone must not have any conflicting snapshot names of its own. The "\fBrename\fR" subcommand can be used to rename any conflicting snapshots.
>+The snapshot that was cloned, and any snapshots previous to this snapshot, are now owned by the promoted clone. The space they use moves from the "origin" file system to the promoted clone, so enough space must be available to accommodate these snapshots. No new space is consumed by this operation, but the space accounting is adjusted. The promoted clone must not have any conflicting snapshot names of its own. The "\fBrename\fR" subcommand can be used to rename any conflicting snapshots.
> .RE
> 
> .sp
>@@ -1216,21 +1217,19 @@
> .ad
> .br
> .na
>-\fB\fBzfs
>-rename\fR [\fB-p\fR] \fIfilesystem\fR|\fIvolume\fR \fIfilesystem\fR|\fIvolume\fR\fR
>+\fB\fBzfs rename\fR [\fB-p\fR] \fIfilesystem\fR|\fIvolume\fR \fIfilesystem\fR|\fIvolume\fR\fR
> .ad
> .sp .6
> .RS 4n
>-Renames the given dataset. The new target can be located anywhere in the \fBZFS\fR hierarchy, with the exception of snapshots. Snapshots can only be renamed within the parent file system or volume. When renaming a snapshot, the parent file system of the snapshot does
>-not need to be specified as part of the second argument. Renamed file systems can inherit new mount points, in which case they are unmounted and remounted at the new mount point.
>+Renames the given dataset. The new target can be located anywhere in the \fBZFS\fR hierarchy, with the exception of snapshots. Snapshots can only be renamed within the parent file system or volume. When renaming a snapshot, the parent file system of the snapshot does not need to be specified as part of the second argument. Renamed file systems can inherit new mount points, in which case they are unmounted and remounted at the new mount point.
> .sp
> .ne 2
> .mk
> .na
> \fB\fB-p\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent.
> .RE
> 
>@@ -1259,7 +1258,7 @@
> .ad
> .sp .6
> .RS 4n
>-Lists the property information for the given datasets in tabular form. If specified, you can list property information by the absolute pathname or the relative pathname. By default, all datasets are displayed and contain the following fields:
>+Lists the property information for the given datasets in tabular form. If specified, you can list property information by the absolute pathname or the relative pathname. By default, all file systems and volumes are displayed. Snapshots are displayed if the "listsnaps" property is "on" (the default is "off") . The following fields are displayed:
> .sp
> .in +2
> .nf
>@@ -1274,8 +1273,8 @@
> .na
> \fB\fB-H\fR\fR
> .ad
>-.RS 15n
>-.rt  
>+.sp .6
>+.RS 4n
> Used for scripting mode. Do not print headers and separate fields by a single tab instead of arbitrary whitespace.
> .RE
> 
>@@ -1285,8 +1284,8 @@
> .na
> \fB\fB-r\fR\fR
> .ad
>-.RS 15n
>-.rt  
>+.sp .6
>+.RS 4n
> Recursively display any children of the dataset on the command line. 
> .RE
> 
>@@ -1296,10 +1295,34 @@
> .na
> \fB\fB-o\fR \fIproperty\fR\fR
> .ad
>-.RS 15n
>-.rt  
>-A comma-separated list of properties to display. The property must be one of the properties described in the "Native Properties" section, or the special value "name" to display the dataset name.
>+.sp .6
>+.RS 4n
>+A comma-separated list of properties to display. The property must be:
>+.RS +4
>+.TP
>+.ie t \(bu
>+.el o
>+one of the properties described in the "Native Properties" section.
> .RE
>+.RS +4
>+.TP
>+.ie t \(bu
>+.el o
>+a user property.
>+.RE
>+.RS +4
>+.TP
>+.ie t \(bu
>+.el o
>+the value "name" to display the dataset name.
>+.RE
>+.RS +4
>+.TP
>+.ie t \(bu
>+.el o
>+the value "space" to display space usage properties on file systems and volumes. This is a shortcut for "\fB-o name,avail,used,usedsnap,usedds, usedrefreserv,usedchild -t filesystem,volume\fR".
>+.RE
>+.RE
> 
> .sp
> .ne 2
>@@ -1307,10 +1330,9 @@
> .na
> \fB\fB-s\fR \fIproperty\fR\fR
> .ad
>-.RS 15n
>-.rt  
>-A property to use for sorting the output by column in ascending order based on the value of the property. The property must be one of the properties described in the "Properties" section, or the special value "name" to sort by the dataset name. Multiple
>-properties can be specified at one time using multiple \fB-s\fR property options. Multiple \fB-s\fR options are evaluated from left to right in decreasing order of importance.
>+.sp .6
>+.RS 4n
>+A property to use for sorting the output by column in ascending order based on the value of the property. The property must be one of the properties described in the "Properties" section, or the special value "name" to sort by the dataset name. Multiple properties can be specified at one time using multiple \fB-s\fR property options. Multiple \fB-s\fR options are evaluated from left to right in decreasing order of importance.
> .sp
> The following is a list of sorting criteria:
> .RS +4
>@@ -1345,8 +1367,8 @@
> .na
> \fB\fB-S\fR \fIproperty\fR\fR
> .ad
>-.RS 15n
>-.rt  
>+.sp .6
>+.RS 4n
> Same as the \fB-s\fR option, but sorts by property in descending order. 
> .RE
> 
>@@ -1356,9 +1378,9 @@
> .na
> \fB\fB-t\fR \fItype\fR\fR
> .ad
>-.RS 15n
>-.rt  
>-A comma-separated list of types to display, where "type" is one of "filesystem", "snapshot" or "volume". For example, specifying "\fB-t snapshot\fR" displays only snapshots.
>+.sp .6
>+.RS 4n
>+A comma-separated list of types to display, where "type" is one of "filesystem", "snapshot" , "volume" or "all". For example, specifying "\fB-t snapshot\fR" displays only snapshots.
> .RE
> 
> .RE
>@@ -1367,12 +1389,11 @@
> .ne 2
> .mk
> .na
>-\fB\fBzfs set\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ...\fR
>+\fB\fBzfs set\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...\fR
> .ad
> .sp .6
> .RS 4n
>-Sets the property to the given value for each dataset. Only some properties can be edited. See the "Properties" section for more information on what properties can be set and acceptable values. Numeric values can be specified as exact values, or in a human-readable
>-form with a suffix of "B", "K", "M", "G", "T", "P", "E", "Z" (for bytes, Kbytes, Mbytes, gigabytes, terabytes, petabytes, exabytes, or zettabytes, respectively). Properties cannot be set on snapshots.
>+Sets the property to the given value for each dataset. Only some properties can be edited. See the "Properties" section for more information on what properties can be set and acceptable values. Numeric values can be specified as exact values, or in a human-readable form with a suffix of "B", "K", "M", "G", "T", "P", "E", "Z" (for bytes, kilobytes, megabytes, gigabytes, terabytes, petabytes, exabytes, or zettabytes, respectively). Properties cannot be set on snapshots.
> .RE
> 
> .sp
>@@ -1388,25 +1409,25 @@
> .in +2
> .nf
>     name      Dataset name
>-    property  Property name
>-    value     Property value
>-    source    Property source. Can either be local, default,
>-              temporary, inherited, or none (-).
>+     property  Property name
>+     value     Property value
>+     source    Property source. Can either be local, default,
>+               temporary, inherited, or none (-).
> .fi
> .in -2
> .sp
> 
> All columns are displayed by default, though this can be controlled by using the \fB-o\fR option. This command takes a comma-separated list of properties as described in the "Native Properties" and "User Properties" sections.
> .sp
>-The special value "all" can be used to display all properties for the given dataset.
>+The special value "all" can be used to display all properties that apply to the given dataset's type (filesystem, volume or snapshot).
> .sp
> .ne 2
> .mk
> .na
> \fB\fB-r\fR\fR
> .ad
>-.RS 13n
>-.rt  
>+.sp .6
>+.RS 4n
> Recursively display properties for any children.
> .RE
> 
>@@ -1416,8 +1437,8 @@
> .na
> \fB\fB-H\fR\fR
> .ad
>-.RS 13n
>-.rt  
>+.sp .6
>+.RS 4n
> Display output in a form more easily parsed by scripts. Any headers are omitted, and fields are explicitly separated by a single tab instead of an arbitrary amount of space.
> .RE
> 
>@@ -1427,8 +1448,8 @@
> .na
> \fB\fB-o\fR \fIfield\fR\fR
> .ad
>-.RS 13n
>-.rt  
>+.sp .6
>+.RS 4n
> A comma-separated list of columns to display. "name,property,value,source" is the default value. 
> .RE
> 
>@@ -1438,8 +1459,8 @@
> .na
> \fB\fB-s\fR \fIsource\fR\fR
> .ad
>-.RS 13n
>-.rt  
>+.sp .6
>+.RS 4n
> A comma-separated list of sources to display. Those properties coming from a source other than those in this list are ignored. Each source must be one of the following: "local,default,inherited,temporary,none". The default value is all sources.
> .RE
> 
>@@ -1449,8 +1470,8 @@
> .na
> \fB\fB-p\fR\fR
> .ad
>-.RS 13n
>-.rt  
>+.sp .6
>+.RS 4n
> Display numbers in parsable (exact) values.
> .RE
> 
>@@ -1460,7 +1481,7 @@
> .ne 2
> .mk
> .na
>-\fB\fBzfs inherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR ...\fR
>+\fB\fBzfs inherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...\fR
> .ad
> .sp .6
> .RS 4n
>@@ -1471,8 +1492,8 @@
> .na
> \fB\fB-r\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Recursively inherit the given property for all children.
> .RE
> 
>@@ -1497,8 +1518,7 @@
> .ad
> .sp .6
> .RS 4n
>-Upgrades file systems to a new on-disk version. Once this is done, the file systems will no longer be accessible on systems running older versions of the software. "\fBzfs send\fR" streams generated from new snapshots of these file systems can not be accessed
>-on systems running older versions of the software.
>+Upgrades file systems to a new on-disk version. Once this is done, the file systems will no longer be accessible on systems running older versions of the software. "\fBzfs send\fR" streams generated from new snapshots of these file systems can not be accessed on systems running older versions of the software.
> .sp
> The file system version is independent of the pool version (see \fBzpool\fR(1M) for information on the "\fBzpool upgrade\fR" command). 
> .sp
>@@ -1509,8 +1529,8 @@
> .na
> \fB\fB-a\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> Upgrade all file systems on all imported pools.
> .RE
> 
>@@ -1520,8 +1540,8 @@
> .na
> \fB\fIfilesystem\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> Upgrade the specified file system. 
> .RE
> 
>@@ -1531,8 +1551,8 @@
> .na
> \fB\fB-r\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> Upgrade the specified file system and all descendent file systems 
> .RE
> 
>@@ -1542,10 +1562,9 @@
> .na
> \fB\fB-V\fR \fIversion\fR\fR
> .ad
>-.RS 14n
>-.rt  
>-Upgrade to the specified \fIversion\fR. If the \fB-V\fR flag is not specified, this command upgrades to the most recent version. This option can only be used to increase the version number, and only up to the most recent version supported by this
>-software.
>+.sp .6
>+.RS 4n
>+Upgrade to the specified \fIversion\fR. If the \fB-V\fR flag is not specified, this command upgrades to the most recent version. This option can only be used to increase the version number, and only up to the most recent version supported by this software.
> .RE
> 
> .RE
>@@ -1576,8 +1595,8 @@
> .na
> \fB\fB-o\fR \fIoptions\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> An optional comma-separated list of mount options to use temporarily for the duration of the mount. See the "Temporary Mount Point Properties" section for details.
> .RE
> 
>@@ -1587,8 +1606,8 @@
> .na
> \fB\fB-O\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> Perform an overlay mount. See \fBmount\fR(1M) for more information.
> .RE
> 
>@@ -1598,8 +1617,8 @@
> .na
> \fB\fB-v\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> Report mount progress.
> .RE
> 
>@@ -1609,8 +1628,8 @@
> .na
> \fB\fB-a\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> Mount all available \fBZFS\fR file systems. Invoked automatically as part of the boot process. 
> .RE
> 
>@@ -1620,8 +1639,8 @@
> .na
> \fB\fIfilesystem\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> Mount the specified filesystem.
> .RE
> 
>@@ -1642,8 +1661,8 @@
> .na
> \fB\fB-f\fR\fR
> .ad
>-.RS 25n
>-.rt  
>+.sp .6
>+.RS 4n
> Forcefully unmount the file system, even if it is currently in use.
> .RE
> 
>@@ -1653,8 +1672,8 @@
> .na
> \fB\fB-a\fR\fR
> .ad
>-.RS 25n
>-.rt  
>+.sp .6
>+.RS 4n
> Unmount all available \fBZFS\fR file systems. Invoked automatically as part of the boot process. 
> .RE
> 
>@@ -1664,8 +1683,8 @@
> .na
> \fB\fIfilesystem\fR|\fImountpoint\fR\fR
> .ad
>-.RS 25n
>-.rt  
>+.sp .6
>+.RS 4n
> Unmount the specified filesystem. The command can also be given a path to a \fBZFS\fR file system mount point on the system.
> .RE
> 
>@@ -1686,8 +1705,8 @@
> .na
> \fB\fB-a\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> Share all available \fBZFS\fR file systems. Invoked automatically as part of the boot process. 
> .RE
> 
>@@ -1697,8 +1716,8 @@
> .na
> \fB\fIfilesystem\fR\fR
> .ad
>-.RS 14n
>-.rt  
>+.sp .6
>+.RS 4n
> Share the specified filesystem according to the "sharenfs" and "sharesmb" properties. File systems are shared when the "sharenfs" or "sharesmb" property is set.
> .RE
> 
>@@ -1719,8 +1738,8 @@
> .na
> \fB\fB-a\fR\fR
> .ad
>-.RS 25n
>-.rt  
>+.sp .6
>+.RS 4n
> Unshare all available \fBZFS\fR file systems. Invoked automatically as part of the boot process. 
> .RE
> 
>@@ -1730,8 +1749,8 @@
> .na
> \fB\fIfilesystem\fR|\fImountpoint\fR\fR
> .ad
>-.RS 25n
>-.rt  
>+.sp .6
>+.RS 4n
> Unshare the specified filesystem. The command can also be given a path to a \fBZFS\fR file system shared on the system.
> .RE
> 
>@@ -1741,7 +1760,7 @@
> .ne 2
> .mk
> .na
>-\fB\fBzfs send\fR [\fB-vR\fR] [\fB-\fR[\fB-iI\fR] \fIsnapshot\fR] \fIsnapshot\fR\fR
>+\fB\fBzfs send\fR [\fB-vR\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR\fR
> .ad
> .sp .6
> .RS 4n
>@@ -1752,10 +1771,9 @@
> .na
> \fB\fB-i\fR \fIsnapshot\fR\fR
> .ad
>-.RS 15n
>-.rt  
>-Generate an incremental stream from the first \fIsnapshot\fR to the second \fIsnapshot\fR. The incremental source (the first \fIsnapshot\fR) can be specified as the last component of the snapshot name (for example,
>-the part after the "@"), and it is assumed to be from the same file system as the second \fIsnapshot\fR.
>+.sp .6
>+.RS 4n
>+Generate an incremental stream from the first \fIsnapshot\fR to the second \fIsnapshot\fR. The incremental source (the first \fIsnapshot\fR) can be specified as the last component of the snapshot name (for example, the part after the "@"), and it is assumed to be from the same file system as the second \fIsnapshot\fR.
> .sp
> If the destination is a clone, the source may be the origin snapshot, which must be fully specified (for example, "pool/fs@origin", not just "@origin").
> .RE
>@@ -1766,10 +1784,9 @@
> .na
> \fB\fB-I\fR \fIsnapshot\fR\fR
> .ad
>-.RS 15n
>-.rt  
>-Generate a stream package that sends all intermediary snapshots from the first snapshot to the second snapshot. For example, "\fB-I @a fs@d\fR" is similar to "\fB-i @a fs@b; -i @b fs@c; -i @c fs@d\fR". The incremental source snapshot
>-may be specified as with the \fB-i\fR option.
>+.sp .6
>+.RS 4n
>+Generate a stream package that sends all intermediary snapshots from the first snapshot to the second snapshot. For example, "\fB-I @a fs@d\fR" is similar to "\fB-i @a fs@b; -i @b fs@c; -i @c fs@d\fR". The incremental source snapshot may be specified as with the \fB-i\fR option.
> .RE
> 
> .sp
>@@ -1778,8 +1795,8 @@
> .na
> \fB\fB-R\fR\fR
> .ad
>-.RS 15n
>-.rt  
>+.sp .6
>+.RS 4n
> Generate a replication stream package, which will replicate the specified filesystem, and all descendant file systems, up to the named snapshot. When received, all properties, snapshots, descendent file systems, and clones are preserved.
> .sp
> If the \fB-i\fR or \fB-I\fR flags are used in conjunction with the \fB-R\fR flag, an incremental replication stream is generated. The current values of properties, and current snapshot and file system names are set when the stream is received. If the \fB-F\fR flag is specified when this stream is recieved, snapshots and file systems that do not exist on the sending side are destroyed. 
>@@ -1791,8 +1808,8 @@
> .na
> \fB\fB-v\fR\fR
> .ad
>-.RS 15n
>-.rt  
>+.sp .6
>+.RS 4n
> Print verbose information about the stream package generated.
> .RE
> 
>@@ -1811,24 +1828,21 @@
> .ad
> .sp .6
> .RS 4n
>-Creates a snapshot whose contents are as specified in the stream provided on standard input. If a full stream is received, then a new file system is created as well. Streams are created using the "\fBzfs send\fR" subcommand, which by default creates a full
>-stream. "\fBzfs recv\fR" can be used as an alias for "\fBzfs receive\fR".
>+Creates a snapshot whose contents are as specified in the stream provided on standard input. If a full stream is received, then a new file system is created as well. Streams are created using the "\fBzfs send\fR" subcommand, which by default creates a full stream. "\fBzfs recv\fR" can be used as an alias for "\fBzfs receive\fR".
> .sp
>-If an incremental stream is received, then the destination file system must already exist, and its most recent snapshot must match the incremental stream's source. For \fBzvols\fR, the destination device link is destroyed and re-created, which means the \fBzvol\fR cannot
>-be accessed during the \fBreceive\fR operation.
>+If an incremental stream is received, then the destination file system must already exist, and its most recent snapshot must match the incremental stream's source. For \fBzvols\fR, the destination device link is destroyed and re-created, which means the \fBzvol\fR cannot be accessed during the \fBreceive\fR operation.
> .sp
> The name of the snapshot (and file system, if a full stream is received) that this subcommand creates depends on the argument type and the \fB-d\fR option.
> .sp
>-If the argument is a snapshot name, the specified \fIsnapshot\fR is created. If the argument is a file system or volume name, a snapshot with the same name as the sent snapshot is created within the specified \fIfilesystem\fR or \fIvolume\fR.
>-If the \fB-d\fR option is specified, the snapshot name is determined by appending the sent snapshot's name to the specified \fIfilesystem\fR. If the \fB-d\fR option is specified, any required file systems within the specified one are created.
>+If the argument is a snapshot name, the specified \fIsnapshot\fR is created. If the argument is a file system or volume name, a snapshot with the same name as the sent snapshot is created within the specified \fIfilesystem\fR or \fIvolume\fR. If the \fB-d\fR option is specified, the snapshot name is determined by appending the sent snapshot's name to the specified \fIfilesystem\fR. If the \fB-d\fR option is specified, any required file systems within the specified one are created.
> .sp
> .ne 2
> .mk
> .na
> \fB\fB-d\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Use the name of the sent snapshot to determine the name of the new snapshot as described in the paragraph above.
> .RE
> 
>@@ -1838,8 +1852,8 @@
> .na
> \fB\fB-v\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Print verbose information about the stream and the time required to perform the receive operation.
> .RE
> 
>@@ -1849,8 +1863,8 @@
> .na
> \fB\fB-n\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Do not actually receive the stream. This can be useful in conjunction with the \fB-v\fR option to verify the name the receive operation would use.
> .RE
> 
>@@ -1860,10 +1874,9 @@
> .na
> \fB\fB-F\fR\fR
> .ad
>-.RS 6n
>-.rt  
>-Force a rollback of the file system to the most recent snapshot before performing the receive operation. If receiving an incremental replication stream (for example, one generated by "z\fBfs send -R -[iI]\fR"), destroy snapshots and file systems that do
>-not exist on the sending side.
>+.sp .6
>+.RS 4n
>+Force a rollback of the file system to the most recent snapshot before performing the receive operation. If receiving an incremental replication stream (for example, one generated by "z\fBfs send -R -[iI]\fR"), destroy snapshots and file systems that do not exist on the sending side.
> .RE
> 
> .RE
>@@ -1889,8 +1902,7 @@
> .ad
> .sp .6
> .RS 4n
>-Specifies to whom the permissions are delegated. Multiple entities can be specified as a comma-separated list. If neither of the \fB-ug\fR options are specified, then the argument is interpreted preferentially as the keyword "everyone", then as a user name,
>-and lastly as a group name. To specify a user or group named "everyone", use the \fB-u\fR or \fB-g\fR options. To specify a group with the same name as a user, use the \fB-g\fR options.
>+Specifies to whom the permissions are delegated. Multiple entities can be specified as a comma-separated list. If neither of the \fB-ug\fR options are specified, then the argument is interpreted preferentially as the keyword "everyone", then as a user name, and lastly as a group name. To specify a user or group named "everyone", use the \fB-u\fR or \fB-g\fR options. To specify a group with the same name as a user, use the \fB-g\fR options.
> .RE
> 
> .sp
>@@ -1901,8 +1913,7 @@
> .ad
> .sp .6
> .RS 4n
>-Specifies that the permissions be delegated to "everyone." Multiple permissions may be specified as a comma-separated list. Permission names are the same as \fBZFS\fR subcommand and property names. See the property list below. Property set names, which
>-begin with an "at sign" ("@") , may be specified. See the \fB-s\fR form below for details.
>+Specifies that the permissions be delegated to "everyone." Multiple permissions may be specified as a comma-separated list. Permission names are the same as \fBZFS\fR subcommand and property names. See the property list below. Property set names, which begin with an "at sign" ("@") , may be specified. See the \fB-s\fR form below for details.
> .RE
> 
> .sp
>@@ -1913,8 +1924,7 @@
> .ad
> .sp .6
> .RS 4n
>-Specifies where the permissions are delegated. If neither of the \fB-ld\fR options are specified, or both are, then the permissions are allowed for the file system or volume, and all of its descendents. If only the \fB-l\fR option is used, then is allowed "locally"
>-only for the specified file system. If only the \fB-d\fR option is used, then is allowed only for the descendent file systems.
>+Specifies where the permissions are delegated. If neither of the \fB-ld\fR options are specified, or both are, then the permissions are allowed for the file system or volume, and all of its descendents. If only the \fB-l\fR option is used, then is allowed "locally" only for the specified file system. If only the \fB-d\fR option is used, then is allowed only for the descendent file systems.
> .RE
> 
> .RE
>@@ -1927,49 +1937,51 @@
> .nf
> NAME         TYPE         NOTES
> allow        subcommand   Must also have the permission
>-                          that is being allowed.
>+                           that is being allowed.
> clone        subcommand   Must also have the 'create' ability
>-                          and the 'mount' ability in the origin 
>-                          file system.
>+                           and the 'mount' ability in the origin 
>+                           file system.
> create       subcommand   Must also have the 'mount' ability.
> destroy      subcommand   Must also have the 'mount' ability.     
> mount        subcommand   Allows mount, unmount, and
>-                          create/remove zvol device links.
>+                           create/remove zvol device links.
> promote      subcommand   Must also have the 'mount' ability and
>-                          'promote' ability in the origin file system.    
>+                           'promote' ability in the origin file system.    
> receive      subcommand   Must also have the 'mount' ability and 
>-                          the 'create' ability.     
>+                           the 'create' ability.     
> rename       subcommand   Must also have the 'mount' ability and
>-                          the 'create' ability in the new parent.
>+                           the 'create' ability in the new parent.
> rollback     subcommand   Must also have the 'mount' ability.      
> snapshot     subcommand   Must also have the 'mount' ability.
> share        subcommand   Allows share and unshare.
> send         subcommand
>-      
>-      
>-aclinherit   property
>-aclmode      property
>-atime        property
>-canmount     property
>-checksum     property
>-compression  property
>-copies       property
>-devices      property
>-exec         property
>-mountpoint   property
>-quota        property
>-readonly     property
>-recordsize   property
>-reservation  property
>-setuid       property
>-shareiscsi   property
>-sharenfs     property
>-snapdir      property
>-version      property
>-volsize      property
>-xattr        property
>-zoned        property
>-userprop     other        Allows changing any user property.
>+       
>+       
>+aclinherit       property
>+aclmode          property
>+atime            property
>+canmount         property
>+checksum         property
>+compression      property
>+copies           property
>+devices          property
>+exec             property
>+mountpoint       property
>+primarycache     property
>+quota            property
>+readonly         property
>+recordsize       property
>+reservation      property
>+secondarycache   property
>+setuid           property
>+shareiscsi       property
>+sharenfs         property
>+snapdir          property
>+version          property
>+volsize          property
>+xattr            property
>+zoned            property
>+userprop         other        Allows changing any user property.
> .fi
> .in -2
> .sp
>@@ -1993,8 +2005,7 @@
> .ad
> .sp .6
> .RS 4n
>-Defines or adds permissions to a permission set. The set can be used by other \fBzfs allow\fR commands for the specified file system and its descendents. Sets are evaluated dynamically, so changes to a set are immediately reflected. Permission sets follow the same
>-naming restrictions as ZFS file systems, but the name must begin with an "at sign" ("@"), and can be no more than 64 characters long.
>+Defines or adds permissions to a permission set. The set can be used by other \fBzfs allow\fR commands for the specified file system and its descendents. Sets are evaluated dynamically, so changes to a set are immediately reflected. Permission sets follow the same naming restrictions as ZFS file systems, but the name must begin with an "at sign" ("@"), and can be no more than 64 characters long.
> .RE
> 
> .sp
>@@ -2017,17 +2028,15 @@
> .ad
> .sp .6
> .RS 4n
>-Removes permissions that were granted with the "\fBzfs allow\fR" command. No permissions are explicitly denied, so other permissions granted are still in effect. For example, if the permission is granted by an ancestor. If no permissions are specified,
>-then all permissions for the specified \fIuser\fR, \fIgroup\fR, or \fIeveryone\fR are removed. Specifying "everyone" (or using the \fB-e\fR option) only removes the permissions that were granted to "everyone",
>-not all permissions for every user and group. See the "\fBzfs allow\fR" command for a description of the \fB-ldugec\fR options.
>+Removes permissions that were granted with the "\fBzfs allow\fR" command. No permissions are explicitly denied, so other permissions granted are still in effect. For example, if the permission is granted by an ancestor. If no permissions are specified, then all permissions for the specified \fIuser\fR, \fIgroup\fR, or \fIeveryone\fR are removed. Specifying "everyone" (or using the \fB-e\fR option) only removes the permissions that were granted to "everyone", not all permissions for every user and group. See the "\fBzfs allow\fR" command for a description of the \fB-ldugec\fR options.
> .sp
> .ne 2
> .mk
> .na
> \fB\fB-r\fR\fR
> .ad
>-.RS 6n
>-.rt  
>+.sp .6
>+.RS 4n
> Recursively remove the permissions from this file system and all descendents.
> .RE
> 
>@@ -2048,36 +2057,12 @@
> Removes permissions from a permission set. If no permissions are specified, then all permissions are removed, thus removing the set entirely.
> .RE
> 
>-.sp
>-.ne 2
>-.mk
>-.na
>-\fB\fBzfs jail\fR \fIjailid\fR \fIfilesystem\fR\fR
>-.ad
>-.sp .6
>-.RS 4n
>-Attaches the given file system to the given jail. From now on this file system tree can be managed from within a jail if the "\fBjailed\fR" property has been set.
>-To use this functionality, sysctl \fBsecurity.jail.enforce_statfs\fR should be set to 0 and sysctl \fBsecurity.jail.mount_allowed\fR should be set to 1.
>-.RE
>-
>-.sp
>-.ne 2
>-.mk
>-.na
>-\fB\fBzfs unjail\fR \fIjailid\fR \fIfilesystem\fR\fR
>-.ad
>-.sp .6
>-.RS 4n
>-Detaches the given file system from the given jail.
>-.RE
>-
> .SH EXAMPLES
> .LP
> \fBExample 1 \fRCreating a ZFS File System Hierarchy
> .sp
> .LP
>-The following commands create a file system named "\fBpool/home\fR" and a file system named "\fBpool/home/bob\fR". The mount point "\fB/export/home\fR" is set for the parent file system, and automatically inherited
>-by the child file system.
>+The following commands create a file system named "\fBpool/home\fR" and a file system named "\fBpool/home/bob\fR". The mount point "\fB/export/home\fR" is set for the parent file system, and automatically inherited by the child file system.
> 
> .sp
> .in +2
>@@ -2107,8 +2092,7 @@
> \fBExample 3 \fRTaking and destroying multiple snapshots
> .sp
> .LP
>-The following command creates snapshots named "\fByesterday\fR" of "\fBpool/home\fR" and all of its descendent file systems. Each snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of its file system. The
>-second command destroys the newly created snapshots.
>+The following command creates snapshots named "\fByesterday\fR" of "\fBpool/home\fR" and all of its descendent file systems. Each snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of its file system. The second command destroys the newly created snapshots.
> 
> .sp
> .in +2
>@@ -2138,7 +2122,7 @@
> \fBExample 5 \fRListing ZFS Datasets
> .sp
> .LP
>-The following command lists all active file systems and volumes in the system.
>+The following command lists all active file systems and volumes in the system. Snapshots are displayed if the "listsnaps" property is "on" (the default is "off") . See \fBzpool\fR(1M) for more information on pool properties.
> 
> .sp
> .in +2
>@@ -2146,12 +2130,11 @@
> \fB# zfs list\fR
> 
> 
>-  NAME                      USED  AVAIL  REFER  MOUNTPOINT
>-  pool                      450K   457G    18K  /pool
>-  pool/home                 315K   457G    21K  /export/home
>-  pool/home/anne             18K   457G    18K  /export/home/anne
>-  pool/home/bob             276K   457G   276K  /export/home/bob
>-  pool/home/bob@yesterday      0      -   276K  -
>+   NAME                      USED  AVAIL  REFER  MOUNTPOINT
>+   pool                      450K   457G    18K  /pool
>+   pool/home                 315K   457G    21K  /export/home
>+   pool/home/anne             18K   457G    18K  /export/home/anne
>+   pool/home/bob             276K   457G   276K  /export/home/bob
> .fi
> .in -2
> .sp
>@@ -2182,42 +2165,52 @@
> \fB# zfs get all pool/home/bob\fR
> 
> 
>-  NAME           PROPERTY       VALUE                  SOURCE
>-  pool/home/bob  type           filesystem             -
>-  pool/home/bob  creation       Thu Jul 12 14:44 2007  -
>-  pool/home/bob  used           276K                   -
>-  pool/home/bob  available      50.0G                  -
>-  pool/home/bob  referenced     276K                   -
>-  pool/home/bob  compressratio  1.00x                  -
>-  pool/home/bob  mounted        yes                    -
>-  pool/home/bob  quota          50G                    local
>-  pool/home/bob  reservation    none                   default
>-  pool/home/bob  recordsize     128K                   default
>-  pool/home/bob  mountpoint     /export/home/bob       inherited from
>-                                                       pool/home
>-  pool/home/bob  checksum       on                     default
>-  pool/home/bob  compression    off                    default
>-  pool/home/bob  atime          on                     default
>-  pool/home/bob  devices        on                     default
>-  pool/home/bob  exec           on                     default
>-  pool/home/bob  setuid         on                     default
>-  pool/home/bob  readonly       off                    default
>-  pool/home/bob  zoned          off                    default
>-  pool/home/bob  snapdir        hidden                 default
>-  pool/home/bob  aclmode        groupmask              default
>-  pool/home/bob  aclinherit     restricted             default
>-  pool/home/bob  canmount       on                     default
>-  pool/home/bob  nbmand         off                    default
>-  pool/home/bob  shareiscsi     off                    default
>-  pool/home/bob  sharesmb       off                    default
>-  pool/home/bob  sharenfs       off                    default
>-  pool/home/bob  xattr          on                     default
>-  pool/home/bob  refquota       10M                    local
>-  pool/home/bob  refreservation none                   default
>-  pool/home/bob  copies         1                      default
>-  pool/home/bob  version        1                      -
>-
>-   
>+NAME           PROPERTY              VALUE                  SOURCE
>+pool/home/bob  type                  filesystem             -
>+pool/home/bob  creation              Thu Jul 12 14:44 2007  -
>+pool/home/bob  used                  276K                   -
>+pool/home/bob  available             50.0G                  -
>+pool/home/bob  referenced            276K                   -
>+pool/home/bob  compressratio         1.00x                  -
>+pool/home/bob  mounted               yes                    -
>+pool/home/bob  quota                 50G                    local
>+pool/home/bob  reservation           none                   default
>+pool/home/bob  recordsize            128K                   default
>+pool/home/bob  mountpoint            /export/home/bob       inherited 
>+                                                            from
>+                                                            pool/home
>+pool/home/bob  sharenfs              off                    default
>+pool/home/bob  checksum              on                     default
>+pool/home/bob  compression           off                    default
>+pool/home/bob  atime                 on                     default
>+pool/home/bob  devices               on                     default
>+pool/home/bob  exec                  on                     default
>+pool/home/bob  setuid                on                     default
>+pool/home/bob  readonly              off                    default
>+pool/home/bob  zoned                 off                    default
>+pool/home/bob  snapdir               hidden                 default
>+pool/home/bob  aclmode               groupmask              default
>+pool/home/bob  aclinherit            restricted             default
>+pool/home/bob  canmount              on                     default
>+pool/home/bob  shareiscsi            off                    default
>+pool/home/bob  xattr                 on                     default
>+pool/home/bob  copies                1                      default
>+pool/home/bob  version               1                      -
>+pool/home/bob  utf8only              off                    -
>+pool/home/bob  normalization         none                   -
>+pool/home/bob  casesensitivity       sensitive              -
>+pool/home/bob  vscan                 off                    default
>+pool/home/bob  nbmand                off                    default
>+pool/home/bob  sharesmb              off                    default
>+pool/home/bob  refquota              10M                    local
>+pool/home/bob  refreservation        none                   default
>+pool/home/bob  primarycache          all                    default
>+pool/home/bob  secondarycache        a                      default
>+pool/home/bob  usedbysnapshots       0                      -
>+pool/home/bob  usedbydataset         18K                    -
>+pool/home/bob  usedbychildren        0                      -
>+pool/home/bob  usedbyrefreservation  0                      -
>+    
> .fi
> .in -2
> .sp
>@@ -2244,9 +2237,9 @@
> .nf
> \fB# zfs get -r -s local -o name,property,value all pool/home/bob\fR
> 
>-  NAME             PROPERTY      VALUE
>-  pool             compression   on
>-  pool/home        checksum      off
>+   NAME             PROPERTY      VALUE
>+   pool             compression   on
>+   pool/home        checksum      off
> .fi
> .in -2
> .sp
>@@ -2289,15 +2282,15 @@
> .in +2
> .nf
> \fB# zfs create pool/project/production\fR
>- populate /pool/project/production with data
>+  populate /pool/project/production with data
> \fB# zfs snapshot pool/project/production@today
> # zfs clone pool/project/production@today pool/project/beta\fR
>- make changes to /pool/project/beta and test them
>+  make changes to /pool/project/beta and test them
> \fB# zfs promote pool/project/beta
> # zfs rename pool/project/production pool/project/legacy
> # zfs rename pool/project/beta pool/project/production\fR
>- once the legacy version is no longer needed, it can be
>- destroyed
>+  once the legacy version is no longer needed, it can be
>+  destroyed
> \fB# zfs destroy pool/project/legacy\fR
> .fi
> .in -2
>@@ -2321,16 +2314,15 @@
> \fBExample 12 \fRRemotely Replicating ZFS Data
> .sp
> .LP
>-The following commands send a full stream and then an incremental stream to a remote machine, restoring them into "\fBpoolB/received/fs\fR@a" and "\fBpoolB/received/fs@b\fR", respectively. "\fBpoolB\fR" must contain
>-the file system "\fBpoolB/received\fR", and must not initially contain "\fBpoolB/received/fs\fR".
>+The following commands send a full stream and then an incremental stream to a remote machine, restoring them into "\fBpoolB/received/fs\fR@a" and "\fBpoolB/received/fs@b\fR", respectively. "\fBpoolB\fR" must contain the file system "\fBpoolB/received\fR", and must not initially contain "\fBpoolB/received/fs\fR".
> 
> .sp
> .in +2
> .nf
> # zfs send pool/fs@a | \e
>-  ssh host zfs receive poolB/received/fs@a
>+   ssh host zfs receive poolB/received/fs@a
> # zfs send -i a pool/fs@b | ssh host \e
>-  zfs receive poolB/received/fs
>+   zfs receive poolB/received/fs
> .fi
> .in -2
> .sp
>@@ -2339,37 +2331,21 @@
> \fBExample 13 \fRUsing the zfs receive -d Option
> .sp
> .LP
>-The following command sends a full stream of "\fBpoolA/fsA/fsB@snap\fR" to a remote machine, receiving it into "\fBpoolB/received/fsA/fsB@snap\fR". The "\fBfsA/fsB@snap\fR" portion of the received snapshot's name
>-is determined from the name of the sent snapshot. "\fBpoolB\fR" must contain the file system "\fBpoolB/received\fR". If "\fBpoolB/received/fsA\fR" does not exist, it is be created as an empty file system.
>+The following command sends a full stream of "\fBpoolA/fsA/fsB@snap\fR" to a remote machine, receiving it into "\fBpoolB/received/fsA/fsB@snap\fR". The "\fBfsA/fsB@snap\fR" portion of the received snapshot's name is determined from the name of the sent snapshot. "\fBpoolB\fR" must contain the file system "\fBpoolB/received\fR". If "\fBpoolB/received/fsA\fR" does not exist, it is be created as an empty file system.
> 
> .sp
> .in +2
> .nf
> \fB# zfs send poolA/fsA/fsB@snap | \e
>-  ssh host zfs receive -d poolB/received\fR
>+   ssh host zfs receive -d poolB/received\fR
> .fi
> .in -2
> .sp
> 
> .LP
>-\fBExample 14 \fRCreating a ZFS volume as a Swap Device
>+\fBExample 14 \fRSetting User Properties
> .sp
> .LP
>-The following example shows how to create a 5-Gbyte ZFS volume and then add the volume as a swap device.
>-
>-.sp
>-.in +2
>-.nf
>-\fB# zfs create -V 5gb tank/vol
>-# swap -a /dev/zvol/dsk/tank/vol\fR
>-.fi
>-.in -2
>-.sp
>-
>-.LP
>-\fBExample 15 \fRSetting User Properties
>-.sp
>-.LP
> The following example sets the user defined "com.example:department" property for a dataset.
> 
> .sp
>@@ -2381,7 +2357,7 @@
> .sp
> 
> .LP
>-\fBExample 16 \fRCreating a ZFS Volume as a iSCSI Target Device
>+\fBExample 15 \fRCreating a ZFS Volume as a iSCSI Target Device
> .sp
> .LP
> The following example shows how to create a \fBZFS\fR volume as an \fBiSCSI\fR target. 
>@@ -2390,12 +2366,12 @@
> .in +2
> .nf
> \fB# zfs create -V 2g pool/volumes/vol1
>-# zfs set shareiscsi=on pool/volumes/vol1
>-# iscsitadm list target\fR
>-Target: pool/volumes/vol1
>-iSCSI Name: 
>-iqn.1986-03.com.sun:02:7b4b02a6-3277-eb1b-e686-a24762c52a8c
>-Connections: 0
>+ # zfs set shareiscsi=on pool/volumes/vol1
>+ # iscsitadm list target\fR
>+ Target: pool/volumes/vol1
>+ iSCSI Name: 
>+ iqn.1986-03.com.sun:02:7b4b02a6-3277-eb1b-e686-a24762c52a8c
>+ Connections: 0
> .fi
> .in -2
> .sp
>@@ -2404,7 +2380,7 @@
> .LP
> After the \fBiSCSI\fR target is created, set up the \fBiSCSI\fR initiator. For more information about the Solaris \fBiSCSI\fR initiator, see the Solaris Administration Guide: Devices and File Systems.
> .LP
>-\fBExample 17 \fRPerforming a Rolling Snapshot
>+\fBExample 16 \fRPerforming a Rolling Snapshot
> .sp
> .LP
> The following example shows how to maintain a history of snapshots with a consistent naming scheme. To keep a week's worth of snapshots, the user destroys the oldest snapshot, renames the remaining snapshots, and then creates a new snapshot, as follows:
>@@ -2424,7 +2400,7 @@
> .sp
> 
> .LP
>-\fBExample 18 \fRSetting sharenfs Property Options on a ZFS File System
>+\fBExample 17 \fRSetting sharenfs Property Options on a ZFS File System
> .sp
> .LP
> The following commands show how to set "sharenfs" property options to enable \fBrw\fR access for a set of \fBIP\fR addresses and to enable root access for system \fBneo\fR on the \fBtank/home\fR file system.
>@@ -2433,7 +2409,7 @@
> .in +2
> .nf
> \fB# zfs set sharenfs='rw=@123.123.0.0/16,root=neo' tank/home\fR
>-
>+ 
> .fi
> .in -2
> .sp
>@@ -2443,7 +2419,7 @@
> If you are using \fBDNS\fR for host name resolution, specify the fully qualified hostname.
> 
> .LP
>-\fBExample 19 \fRDelegating ZFS Administration Permissions on a ZFS Dataset
>+\fBExample 18 \fRDelegating ZFS Administration Permissions on a ZFS Dataset
> .sp
> .LP
> The following example shows how to set permissions so that user "\fBcindys\fR" can create, destroy, mount and take snapshots on \fBtank/cindys\fR. The permissions on \fBtank/cindys\fR are also displayed.
>@@ -2455,9 +2431,9 @@
> # zfs allow tank/cindys\fR
> -------------------------------------------------------------
> Local+Descendent permissions on (tank/cindys)
>-         user cindys create,destroy,mount,snapshot
>+          user cindys create,destroy,mount,snapshot
> -------------------------------------------------------------
>-
>+ 
> .fi
> .in -2
> .sp
>@@ -2474,7 +2450,7 @@
> .sp
> 
> .LP
>-\fBExample 20 \fRDelegating Create Time Permissions on a ZFS Dataset
>+\fBExample 19 \fRDelegating Create Time Permissions on a ZFS Dataset
> .sp
> .LP
> The following example shows how to grant anyone in the group \fBstaff\fR to create file systems in \fBtank/users\fR. This syntax also allows staff members to destroy their own file systems, but not destroy anyone else's file system. The permissions on \fBtank/users\fR are also displayed.
>@@ -2487,16 +2463,16 @@
> # zfs allow tank/users\fR
> -------------------------------------------------------------
> Create time permissions on (tank/users)
>-         create,destroy
>+          create,destroy
> Local+Descendent permissions on (tank/users)
>-         group staff create,mount
>+          group staff create,mount
> ------------------------------------------------------------- 
> .fi
> .in -2
> .sp
> 
> .LP
>-\fBExample 21 \fRDefining and Granting a Permission Set on a ZFS Dataset
>+\fBExample 20 \fRDefining and Granting a Permission Set on a ZFS Dataset
> .sp
> .LP
> The following example shows how to define and grant a permission set on the \fBtank/users\fR file system. The permissions on \fBtank/users\fR are also displayed.
>@@ -2509,18 +2485,18 @@
> # zfs allow tank/users
> -------------------------------------------------------------
> Permission sets on (tank/users)
>-       @pset create,destroy,mount,snapshot
>+        @pset create,destroy,mount,snapshot
> Create time permissions on (tank/users)
>-       create,destroy
>+        create,destroy
> Local+Descendent permissions on (tank/users)
>-       group staff @pset,create,mount
>+        group staff @pset,create,mount
> -------------------------------------------------------------\fR
> .fi
> .in -2
> .sp
> 
> .LP
>-\fBExample 22 \fRDelegating Property Permissions on a ZFS Dataset
>+\fBExample 21 \fRDelegating Property Permissions on a ZFS Dataset
> .sp
> .LP
> The following example shows to grant the ability to set quotas and reservations on the \fBusers/home\fR file system. The permissions on \fBusers/home\fR are also displayed.
>@@ -2532,7 +2508,7 @@
> # zfs allow users/home\fR
> -------------------------------------------------------------
> Local+Descendent permissions on (users/home)
>-       user cindys quota,reservation
>+        user cindys quota,reservation
> -------------------------------------------------------------
> cindys% zfs set quota=10G users/home/marks
> cindys% zfs get quota users/home/marks
>@@ -2543,7 +2519,7 @@
> .sp
> 
> .LP
>-\fBExample 23 \fRRemoving ZFS Delegated Permissions on a ZFS Dataset
>+\fBExample 22 \fRRemoving ZFS Delegated Permissions on a ZFS Dataset
> .sp
> .LP
> The following example shows how to remove the snapshot permission from the \fBstaff\fR group on the \fBtank/users\fR file system. The permissions on \fBtank/users\fR are also displayed.
>@@ -2555,11 +2531,11 @@
> # zfs allow tank/users\fR
> -------------------------------------------------------------
> Permission sets on (tank/users)
>-       @pset create,destroy,mount,snapshot
>+        @pset create,destroy,mount,snapshot
> Create time permissions on (tank/users)
>-       create,destroy
>+        create,destroy
> Local+Descendent permissions on (tank/users)
>-       group staff @pset,create,mount
>+        group staff @pset,create,mount
> ------------------------------------------------------------- 
> .fi
> .in -2
>@@ -2575,8 +2551,8 @@
> .na
> \fB\fB0\fR\fR
> .ad
>-.RS 5n
>-.rt  
>+.sp .6
>+.RS 4n
> Successful completion. 
> .RE
> 
>@@ -2586,8 +2562,8 @@
> .na
> \fB\fB1\fR\fR
> .ad
>-.RS 5n
>-.rt  
>+.sp .6
>+.RS 4n
> An error occurred.
> .RE
> 
>@@ -2597,8 +2573,8 @@
> .na
> \fB\fB2\fR\fR
> .ad
>-.RS 5n
>-.rt  
>+.sp .6
>+.RS 4n
> Invalid command line options were specified.
> .RE
> 
>@@ -2627,4 +2603,4 @@
> \fBgzip\fR(1), \fBssh\fR(1), \fBmount\fR(1M), \fBshare\fR(1M), \fBsharemgr\fR(1M), \fBunshare\fR(1M), \fBzonecfg\fR(1M), \fBzpool\fR(1M), \fBchmod\fR(2), \fBstat\fR(2), \fBfsync\fR(3c), \fBdfstab\fR(4), \fBattributes\fR(5)
> .sp
> .LP
>-For information about using the \fBZFS\fR web-based management tool and other \fBZFS\fR features, see the \fIZFS Administration Guide\fR.
>+For information about using the \fBZFS\fR web-based management tool and other \fBZFS\fR features, see the \fISolaris ZFS Administration Guide\fR.
>Index: cddl/contrib/opensolaris/cmd/zpool/zpool.8
>===================================================================
>--- cddl/contrib/opensolaris/cmd/zpool/zpool.8	(revision 205535)
>+++ cddl/contrib/opensolaris/cmd/zpool/zpool.8	(working copy)
>@@ -1,24 +1,9 @@
> '\" te
>-.\" CDDL HEADER START
>-.\"
>-.\" 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]
>-.\"
>-.\" CDDL HEADER END
> .\" Copyright (c) 2007, Sun Microsystems, Inc. All Rights Reserved.
>-.TH zpool 1M "13 Nov 2007" "SunOS 5.11" "System Administration Commands"
>+.\" 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 zpool 1M "5 Mar 2009" "SunOS 5.11" "System Administration Commands"
> .SH NAME
> zpool \- configures ZFS storage pools
> .SH SYNOPSIS
>@@ -29,8 +14,8 @@
> 
> .LP
> .nf
>-\fBzpool create\fR [\fB-fn\fR] [\fB-o\fR \fIproperty=value\fR] ... [\fB-m\fR \fImountpoint\fR] [\fB-R\fR \fIroot\fR]
>-    \fIpool\fR \fIvdev\fR ...
>+\fBzpool create\fR [\fB-fn\fR] [\fB-o\fR \fIproperty=value\fR] ... [\fB-O\fR \fIfile-system-property=value\fR] 
>+     ... [\fB-m\fR \fImountpoint\fR] [\fB-R\fR \fIroot\fR] \fIpool\fR \fIvdev\fR ...
> .fi
> 
> .LP
>@@ -106,13 +91,13 @@
> .LP
> .nf
> \fBzpool import\fR [\fB-o \fImntopts\fR\fR] [\fB-p\fR \fIproperty=value\fR] ... [\fB-d\fR \fIdir\fR | \fB-c\fR \fIcachefile\fR] 
>-    [\fB-D\fR] [\fB-f\fR] [\fB-R\fR \fIroot\fR] \fB-a\fR
>+     [\fB-D\fR] [\fB-f\fR] [\fB-R\fR \fIroot\fR] \fB-a\fR
> .fi
> 
> .LP
> .nf
> \fBzpool import\fR [\fB-o \fImntopts\fR\fR] [\fB-o\fR \fIproperty=value\fR] ... [\fB-d\fR \fIdir\fR | \fB-c\fR \fIcachefile\fR]
>-    [\fB-D\fR] [\fB-f\fR] [\fB-R\fR \fIroot\fR] \fIpool\fR |\fIid\fR [\fInewpool\fR]
>+     [\fB-D\fR] [\fB-f\fR] [\fB-R\fR \fIroot\fR] \fIpool\fR |\fIid\fR [\fInewpool\fR]
> .fi
> 
> .LP
>@@ -169,8 +154,7 @@
> .ad
> .RS 10n
> .rt  
>-A block device, typically located under "/dev/dsk". \fBZFS\fR can use individual slices or partitions, though the recommended mode of operation is to use whole disks. A disk can be specified by a full path, or it can be a shorthand name (the relative portion
>-of the path under "/dev/dsk"). A whole disk can be specified by omitting the slice or partition designation. For example, "c0t0d0" is equivalent to "/dev/dsk/c0t0d0s2". When given a whole disk, \fBZFS\fR automatically labels the disk, if necessary.
>+A block device, typically located under "/dev/dsk". \fBZFS\fR can use individual slices or partitions, though the recommended mode of operation is to use whole disks. A disk can be specified by a full path, or it can be a shorthand name (the relative portion of the path under "/dev/dsk"). A whole disk can be specified by omitting the slice or partition designation. For example, "c0t0d0" is equivalent to "/dev/dsk/c0t0d0s2". When given a whole disk, \fBZFS\fR automatically labels the disk, if necessary.
> .RE
> 
> .sp
>@@ -192,8 +176,7 @@
> .ad
> .RS 10n
> .rt  
>-A mirror of two or more devices. Data is replicated in an identical fashion across all components of a mirror. A mirror with \fIN\fR disks of size \fIX\fR can hold \fIX\fR bytes and can withstand (\fIN-1\fR)
>-devices failing before data integrity is compromised.
>+A mirror of two or more devices. Data is replicated in an identical fashion across all components of a mirror. A mirror with \fIN\fR disks of size \fIX\fR can hold \fIX\fR bytes and can withstand (\fIN-1\fR) devices failing before data integrity is compromised.
> .RE
> 
> .sp
>@@ -214,11 +197,9 @@
> .rt  
> A variation on \fBRAID-5\fR that allows for better distribution of parity and eliminates the "\fBRAID-5\fR write hole" (in which data and parity become inconsistent after a power loss). Data and parity is striped across all disks within a \fBraidz\fR group.
> .sp
>-A \fBraidz\fR group can have either single- or double-parity, meaning that the \fBraidz\fR group can sustain one or two failures respectively without losing any data. The \fBraidz1\fR \fBvdev\fR type specifies a single-parity \fBraidz\fR group
>-and the \fBraidz2\fR \fBvdev\fR type specifies a double-parity \fBraidz\fR group. The \fBraidz\fR \fBvdev\fR type is an alias for \fBraidz1\fR.
>+A \fBraidz\fR group can have either single- or double-parity, meaning that the \fBraidz\fR group can sustain one or two failures respectively without losing any data. The \fBraidz1\fR \fBvdev\fR type specifies a single-parity \fBraidz\fR group and the \fBraidz2\fR \fBvdev\fR type specifies a double-parity \fBraidz\fR group. The \fBraidz\fR \fBvdev\fR type is an alias for \fBraidz1\fR.
> .sp
>-A \fBraidz\fR group with \fIN\fR disks of size \fIX\fR with \fIP\fR parity disks can hold approximately (\fIN-P\fR)*\fIX\fR bytes and can withstand \fIP\fR device(s)
>-failing before data integrity is compromised. The minimum number of devices in a \fBraidz\fR group is one more than the number of parity disks. The recommended number is between 3 and 9 to help increase performance.
>+A \fBraidz\fR group with \fIN\fR disks of size \fIX\fR with \fIP\fR parity disks can hold approximately (\fIN-P\fR)*\fIX\fR bytes and can withstand \fIP\fR device(s) failing before data integrity is compromised. The minimum number of devices in a \fBraidz\fR group is one more than the number of parity disks. The recommended number is between 3 and 9 to help increase performance.
> .RE
> 
> .sp
>@@ -240,8 +221,7 @@
> .ad
> .RS 10n
> .rt  
>-A separate intent log device. If more than one log device is specified, then writes are load-balanced between devices. Log devices can be mirrored. However, \fBraidz\fR and \fBraidz2\fR are not supported for the intent log. For more information, see the "Intent
>-Log" section.
>+A separate intent log device. If more than one log device is specified, then writes are load-balanced between devices. Log devices can be mirrored. However, \fBraidz\fR and \fBraidz2\fR are not supported for the intent log. For more information, see the "Intent Log" section.
> .RE
> 
> .sp
>@@ -260,8 +240,7 @@
> Virtual devices cannot be nested, so a mirror or \fBraidz\fR virtual device can only contain files or disks. Mirrors of mirrors (or other combinations) are not allowed.
> .sp
> .LP
>-A pool can have any number of virtual devices at the top of the configuration (known as "root vdevs"). Data is dynamically distributed across all top-level devices to balance data among devices. As new virtual devices are added, \fBZFS\fR automatically places data
>-on the newly available devices.
>+A pool can have any number of virtual devices at the top of the configuration (known as "root vdevs"). Data is dynamically distributed across all top-level devices to balance data among devices. As new virtual devices are added, \fBZFS\fR automatically places data on the newly available devices.
> .sp
> .LP
> Virtual devices are specified one at a time on the command line, separated by whitespace. The keywords "mirror" and "raidz" are used to distinguish where a group ends and another begins. For example, the following creates two root vdevs, each a mirror of two disks:
>@@ -279,12 +258,10 @@
> \fBZFS\fR supports a rich set of mechanisms for handling device failure and data corruption. All metadata and data is checksummed, and \fBZFS\fR automatically repairs bad data from a good copy when corruption is detected.
> .sp
> .LP
>-In order to take advantage of these features, a pool must make use of some form of redundancy, using either mirrored or \fBraidz\fR groups. While \fBZFS\fR supports running in a non-redundant configuration, where each root vdev is simply a disk or file, this is
>-strongly discouraged. A single case of bit corruption can render some or all of your data unavailable.
>+In order to take advantage of these features, a pool must make use of some form of redundancy, using either mirrored or \fBraidz\fR groups. While \fBZFS\fR supports running in a non-redundant configuration, where each root vdev is simply a disk or file, this is strongly discouraged. A single case of bit corruption can render some or all of your data unavailable.
> .sp
> .LP
>-A pool's health status is described by one of three states: online, degraded, or faulted. An online pool has all devices operating normally. A degraded pool is one in which one or more devices have failed, but the data is still available due to a redundant configuration. A faulted pool has
>-corrupted metadata, or one or more faulted devices, and insufficient replicas to continue functioning. 
>+A pool's health status is described by one of three states: online, degraded, or faulted. An online pool has all devices operating normally. A degraded pool is one in which one or more devices have failed, but the data is still available due to a redundant configuration. A faulted pool has corrupted metadata, or one or more faulted devices, and insufficient replicas to continue functioning. 
> .sp
> .LP
> The health of the top-level vdev, such as mirror or \fBraidz\fR device, is potentially impacted by the state of its associated vdevs, or component devices. A top-level vdev or component device is in one of the following states:
>@@ -399,10 +376,12 @@
> 
> .sp
> .LP
>-Spares can be shared across multiple pools, and can be added with the "\fBzpool add\fR" command and removed with the "\fBzpool remove\fR" command. Once a spare replacement is initiated, a new "spare" \fBvdev\fR is
>-created within the configuration that will remain there until the original device is replaced. At this point, the hot spare becomes available again if another device fails.
>+Spares can be shared across multiple pools, and can be added with the "\fBzpool add\fR" command and removed with the "\fBzpool remove\fR" command. Once a spare replacement is initiated, a new "spare" \fBvdev\fR is created within the configuration that will remain there until the original device is replaced. At this point, the hot spare becomes available again if another device fails.
> .sp
> .LP
>+If a pool has a shared spare that is currently being used, the pool can not be exported since other pools may use this shared spare, which may lead to potential data corruption.
>+.sp
>+.LP
> An in-progress spare replacement can be cancelled by detaching the hot spare. If the original faulted device is detached, then the hot spare assumes its place in the configuration, and is removed from the spare list of all active pools.
> .sp
> .LP
>@@ -410,9 +389,7 @@
> .SS "Intent Log"
> .sp
> .LP
>-The \fBZFS\fR Intent Log (\fBZIL\fR) satisfies \fBPOSIX\fR requirements for synchronous transactions. For instance, databases often require their transactions to be on stable storage devices when returning from a system call. \fBNFS\fR and
>-other applications can also use \fBfsync\fR() to ensure data stability. By default, the intent log is allocated from blocks within the main pool. However, it might be possible to get better performance using separate intent log devices such as \fBNVRAM\fR or a dedicated
>-disk. For example:
>+The \fBZFS\fR Intent Log (\fBZIL\fR) satisfies \fBPOSIX\fR requirements for synchronous transactions. For instance, databases often require their transactions to be on stable storage devices when returning from a system call. \fBNFS\fR and other applications can also use \fBfsync\fR() to ensure data stability. By default, the intent log is allocated from blocks within the main pool. However, it might be possible to get better performance using separate intent log devices such as \fBNVRAM\fR or a dedicated disk. For example:
> .sp
> .in +2
> .nf
>@@ -430,8 +407,7 @@
> .SS "Cache Devices"
> .sp
> .LP
>-Devices can be added to a storage pool as "cache devices." These devices provide an additional layer of caching between main memory and disk. For read-heavy workloads, where the working set size is much larger than what can be cached in main memory, using cache devices allow
>-much more of this working set to be served from low latency media. Using cache devices provides the greatest performance improvement for random read-workloads of mostly static content.
>+Devices can be added to a storage pool as "cache devices." These devices provide an additional layer of caching between main memory and disk. For read-heavy workloads, where the working set size is much larger than what can be cached in main memory, using cache devices allow much more of this working set to be served from low latency media. Using cache devices provides the greatest performance improvement for random read-workloads of mostly static content.
> .sp
> .LP
> To create a pool with cache devices, specify a "cache" \fBvdev\fR with any number of devices. For example:
>@@ -521,8 +497,7 @@
> 
> .sp
> .LP
>-These space usage properties report actual physical space available to the storage pool. The physical space can be different from the total amount of space that any contained datasets can actually use. The amount of space used in a \fBraidz\fR configuration depends on the characteristics
>-of the data being written. In addition, \fBZFS\fR reserves some space for internal accounting that the \fBzfs\fR(1M) command takes into account, but the \fBzpool\fR command does not. For non-full pools of a reasonable size, these effects should be invisible. For small pools, or pools that are close to being completely full, these discrepancies may become more noticeable.
>+These space usage properties report actual physical space available to the storage pool. The physical space can be different from the total amount of space that any contained datasets can actually use. The amount of space used in a \fBraidz\fR configuration depends on the characteristics of the data being written. In addition, \fBZFS\fR reserves some space for internal accounting that the \fBzfs\fR(1M) command takes into account, but the \fBzpool\fR command does not. For non-full pools of a reasonable size, these effects should be invisible. For small pools, or pools that are close to being completely full, these discrepancies may become more noticeable.
> .sp
> .LP
> The following property can be set at creation time and import time:
>@@ -534,8 +509,7 @@
> .ad
> .sp .6
> .RS 4n
>-Alternate root directory. If set, this directory is prepended to any mount points within the pool. This can be used when examining an unknown pool where the mount points cannot be trusted, or in an alternate boot environment, where the typical paths are not valid. \fBaltroot\fR is
>-not a persistent property. It is valid only while the system is up. Setting \fBaltroot\fR defaults to using \fBcachefile\fR=none, though this may be overridden	 using an explicit setting.
>+Alternate root directory. If set, this directory is prepended to any mount points within the pool. This can be used when examining an unknown pool where the mount points cannot be trusted, or in an alternate boot environment, where the typical paths are not valid. \fBaltroot\fR is not a persistent property. It is valid only while the system is up. Setting \fBaltroot\fR defaults to using \fBcachefile\fR=none, though this may be overridden	 using an explicit setting.
> .RE
> 
> .sp
>@@ -549,8 +523,7 @@
> .ad
> .sp .6
> .RS 4n
>-Controls automatic device replacement. If set to "\fBoff\fR", device replacement must be initiated by the administrator by using the "\fBzpool replace\fR" command. If set to "\fBon\fR", any new device, found
>-in the same physical location as a device that previously belonged to the pool, is automatically formatted and replaced. The default behavior is "\fBoff\fR". This property can also be referred to by its shortened column name, "replace".
>+Controls automatic device replacement. If set to "\fBoff\fR", device replacement must be initiated by the administrator by using the "\fBzpool replace\fR" command. If set to "\fBon\fR", any new device, found in the same physical location as a device that previously belonged to the pool, is automatically formatted and replaced. The default behavior is "\fBoff\fR". This property can also be referred to by its shortened column name, "replace".
> .RE
> 
> .sp
>@@ -572,9 +545,7 @@
> .ad
> .sp .6
> .RS 4n
>-Controls the location of where the pool configuration is cached. Discovering all pools on system startup requires a cached copy of the configuration data that is stored on the root file system. All pools in this cache are automatically imported when the system boots. Some environments,
>-such as install and clustering, need to cache this information in a different location so that pools are not automatically imported. Setting this property caches the pool configuration in a different location that can later be imported with "\fBzpool import -c\fR". Setting
>-it to the special value "\fBnone\fR" creates a temporary pool that is never cached, and the special value \fB\&''\fR (empty string) uses the default location. 
>+Controls the location of where the pool configuration is cached. Discovering all pools on system startup requires a cached copy of the configuration data that is stored on the root file system. All pools in this cache are automatically imported when the system boots. Some environments, such as install and clustering, need to cache this information in a different location so that pools are not automatically imported. Setting this property caches the pool configuration in a different location that can later be imported with "\fBzpool import -c\fR". Setting it to the special value "\fBnone\fR" creates a temporary pool that is never cached, and the special value \fB\&''\fR (empty string) uses the default location. 
> .sp
> Multiple pools can share the same cache file. Because the kernel destroys and recreates this file when pools are added and removed, care should be taken when attempting to access this file. When the last pool using a \fBcachefile\fR is exported or destroyed, the file is removed.
> .RE
>@@ -587,8 +558,7 @@
> .ad
> .sp .6
> .RS 4n
>-Controls whether a non-privileged user is granted access based on the dataset permissions defined on the dataset. See \fBzfs\fR(1M) for more information
>-on \fBZFS\fR delegated administration.
>+Controls whether a non-privileged user is granted access based on the dataset permissions defined on the dataset. See \fBzfs\fR(1M) for more information on \fBZFS\fR delegated administration.
> .RE
> 
> .sp
>@@ -639,12 +609,22 @@
> .ne 2
> .mk
> .na
>+\fB\fBlistsnaps\fR=on | off\fR
>+.ad
>+.sp .6
>+.RS 4n
>+Controls whether information about snapshots associated with this pool is output when "\fBzfs list\fR" is run without the  \fB-t\fR option.  The default value is "off".
>+.RE
>+
>+.sp
>+.ne 2
>+.mk
>+.na
> \fB\fBversion\fR=\fIversion\fR\fR
> .ad
> .sp .6
> .RS 4n
>-The current on-disk version of the pool. This can be increased, but never decreased. The preferred method of updating pools is with the "\fBzpool upgrade\fR" command, though this property can be used when a specific version is needed for backwards compatibility.
>-This property can be any number between 1 and the current version reported by "\fBzpool upgrade -v\fR". The special value "\fBcurrent\fR" is an alias for the latest supported version.
>+The current on-disk version of the pool. This can be increased, but never decreased. The preferred method of updating pools is with the "\fBzpool upgrade\fR" command, though this property can be used when a specific version is needed for backwards compatibility. This property can be any number between 1 and the current version reported by "\fBzpool upgrade -v\fR".
> .RE
> 
> .SS "Subcommands"
>@@ -669,18 +649,15 @@
> .ne 2
> .mk
> .na
>-\fB\fBzpool create\fR [\fB-fn\fR] [\fB-o\fR \fIproperty=value\fR] ... [\fB-m\fR \fImountpoint\fR] [\fB-R\fR \fIroot\fR] \fIpool\fR \fIvdev\fR ...\fR
>+\fB\fBzpool create\fR [\fB-fn\fR] [\fB-o\fR \fIproperty=value\fR] ... [\fB-O\fR \fIfile-system-property=value\fR] ... [\fB-m\fR \fImountpoint\fR] [\fB-R\fR \fIroot\fR] \fIpool\fR \fIvdev\fR ...\fR
> .ad
> .sp .6
> .RS 4n
>-Creates a new storage pool containing the virtual devices specified on the command line. The pool name must begin with a letter, and can only contain alphanumeric characters as well as underscore ("_"), dash ("-"), and period ("."). The pool
>-names "mirror", "raidz", "spare" and "log" are reserved, as are names beginning with the pattern "c[0-9]". The \fBvdev\fR specification is described in the "Virtual Devices" section.
>+Creates a new storage pool containing the virtual devices specified on the command line. The pool name must begin with a letter, and can only contain alphanumeric characters as well as underscore ("_"), dash ("-"), and period ("."). The pool names "mirror", "raidz", "spare" and "log" are reserved, as are names beginning with the pattern "c[0-9]". The \fBvdev\fR specification is described in the "Virtual Devices" section.
> .sp
>-The command verifies that each device specified is accessible and not currently in use by another subsystem. There are some uses, such as being currently mounted, or specified as the dedicated dump device, that prevents a device from ever being used by \fBZFS\fR. Other uses,
>-such as having a preexisting \fBUFS\fR file system, can be overridden with the \fB-f\fR option.
>+The command verifies that each device specified is accessible and not currently in use by another subsystem. There are some uses, such as being currently mounted, or specified as the dedicated dump device, that prevents a device from ever being used by \fBZFS\fR. Other uses, such as having a preexisting \fBUFS\fR file system, can be overridden with the \fB-f\fR option.
> .sp
>-The command also checks that the replication strategy for the pool is consistent. An attempt to combine redundant and non-redundant storage in a single pool, or to mix disks and files, results in an error unless \fB-f\fR is specified. The use of differently sized devices within
>-a single \fBraidz\fR or mirror group is also flagged as an error unless \fB-f\fR is specified.
>+The command also checks that the replication strategy for the pool is consistent. An attempt to combine redundant and non-redundant storage in a single pool, or to mix disks and files, results in an error unless \fB-f\fR is specified. The use of differently sized devices within a single \fBraidz\fR or mirror group is also flagged as an error unless \fB-f\fR is specified.
> .sp
> Unless the \fB-R\fR option is specified, the default mount point is "/\fIpool\fR". The mount point must not exist or must be empty, or else the root dataset cannot be mounted. This can be overridden with the \fB-m\fR option.
> .sp
>@@ -720,6 +697,21 @@
> .ne 2
> .mk
> .na
>+\fB\fB-O\fR \fIfile-system-property=value\fR\fR
>+.ad
>+.br
>+.na
>+\fB[\fB-O\fR \fIfile-system-property=value\fR] ...\fR
>+.ad
>+.sp .6
>+.RS 4n
>+Sets the given file system properties in the root file system of the pool. See the "Properties" section of \fBzfs\fR(1M) for a list of valid properties that can be set.
>+.RE
>+
>+.sp
>+.ne 2
>+.mk
>+.na
> \fB\fB-R\fR \fIroot\fR\fR
> .ad
> .sp .6
>@@ -770,8 +762,7 @@
> .ad
> .sp .6
> .RS 4n
>-Adds the specified virtual devices to the given pool. The \fIvdev\fR specification is described in the "Virtual Devices" section. The behavior of the \fB-f\fR option, and the device checks performed are described in the "zpool create"
>-subcommand.
>+Adds the specified virtual devices to the given pool. The \fIvdev\fR specification is described in the "Virtual Devices" section. The behavior of the \fB-f\fR option, and the device checks performed are described in the "zpool create" subcommand.
> .sp
> .ne 2
> .mk
>@@ -805,8 +796,7 @@
> .ad
> .sp .6
> .RS 4n
>-Removes the specified device from the pool. This command currently only supports removing hot spares and cache devices. Devices that are part of a mirrored configuration can be removed using the "\fBzpool detach\fR" command. Non-redundant and \fBraidz\fR devices
>-cannot be removed from a pool.
>+Removes the specified device from the pool. This command currently only supports removing hot spares and cache devices. Devices that are part of a mirrored configuration can be removed using the "\fBzpool detach\fR" command. Non-redundant and \fBraidz\fR devices cannot be removed from a pool.
> .RE
> 
> .sp
>@@ -850,8 +840,7 @@
> .ad
> .sp .6
> .RS 4n
>-Displays \fBI/O\fR statistics for the given pools. When given an interval, the statistics are printed every \fIinterval\fR seconds until \fBCtrl-C\fR is pressed. If no \fIpools\fR are specified, statistics for
>-every pool in the system is shown. If \fIcount\fR is specified, the command exits after \fIcount\fR reports are printed.
>+Displays \fBI/O\fR statistics for the given pools. When given an interval, the statistics are printed every \fIinterval\fR seconds until \fBCtrl-C\fR is pressed. If no \fIpools\fR are specified, statistics for every pool in the system is shown. If \fIcount\fR is specified, the command exits after \fIcount\fR reports are printed.
> .sp
> .ne 2
> .mk
>@@ -956,8 +945,7 @@
> .ad
> .sp .6
> .RS 4n
>-Attaches \fInew_device\fR to an existing \fBzpool\fR device. The existing device cannot be part of a \fBraidz\fR configuration. If \fIdevice\fR is not currently part of a mirrored configuration, \fIdevice\fR automatically
>-transforms into a two-way mirror of \fIdevice\fR and \fInew_device\fR. If \fIdevice\fR is part of a two-way mirror, attaching \fInew_device\fR creates a three-way mirror, and so on. In either case, \fInew_device\fR begins to resilver immediately.
>+Attaches \fInew_device\fR to an existing \fBzpool\fR device. The existing device cannot be part of a \fBraidz\fR configuration. If \fIdevice\fR is not currently part of a mirrored configuration, \fIdevice\fR automatically transforms into a two-way mirror of \fIdevice\fR and \fInew_device\fR. If \fIdevice\fR is part of a two-way mirror, attaching \fInew_device\fR creates a three-way mirror, and so on. In either case, \fInew_device\fR begins to resilver immediately.
> .sp
> .ne 2
> .mk
>@@ -994,8 +982,7 @@
> .sp
> The size of \fInew_device\fR must be greater than or equal to the minimum size of all the devices in a mirror or \fBraidz\fR configuration.
> .sp
>-\fInew_device\fR is required if the pool is not redundant. If \fInew_device\fR is not specified, it defaults to \fIold_device\fR. This form of replacement is useful after an existing disk has failed and has been physically replaced.
>-In this case, the new disk may have the same \fB/dev/dsk\fR path as the old device, even though it is actually a different disk. \fBZFS\fR recognizes this.
>+\fInew_device\fR is required if the pool is not redundant. If \fInew_device\fR is not specified, it defaults to \fIold_device\fR. This form of replacement is useful after an existing disk has failed and has been physically replaced. In this case, the new disk may have the same \fB/dev/dsk\fR path as the old device, even though it is actually a different disk. \fBZFS\fR recognizes this.
> .sp
> .ne 2
> .mk
>@@ -1017,11 +1004,9 @@
> .ad
> .sp .6
> .RS 4n
>-Begins a scrub. The scrub examines all data in the specified pools to verify that it checksums correctly. For replicated (mirror or \fBraidz\fR) devices, \fBZFS\fR automatically repairs any damage discovered during the scrub. The "\fBzpool
>-status\fR" command reports the progress of the scrub and summarizes the results of the scrub upon completion.
>+Begins a scrub. The scrub examines all data in the specified pools to verify that it checksums correctly. For replicated (mirror or \fBraidz\fR) devices, \fBZFS\fR automatically repairs any damage discovered during the scrub. The "\fBzpool status\fR" command reports the progress of the scrub and summarizes the results of the scrub upon completion.
> .sp
>-Scrubbing and resilvering are very similar operations. The difference is that resilvering only examines data that \fBZFS\fR knows to be out of date (for example, when attaching a new device to a mirror or replacing an existing device), whereas scrubbing examines all data to
>-discover silent errors due to hardware faults or disk failure.
>+Scrubbing and resilvering are very similar operations. The difference is that resilvering only examines data that \fBZFS\fR knows to be out of date (for example, when attaching a new device to a mirror or replacing an existing device), whereas scrubbing examines all data to discover silent errors due to hardware faults or disk failure.
> .sp
> Because scrubbing and resilvering are \fBI/O\fR-intensive operations, \fBZFS\fR only allows one at a time. If a scrub is already in progress, the "\fBzpool scrub\fR" command terminates it and starts a new scrub. If a resilver is in progress, \fBZFS\fR does not allow a scrub to be started until the resilver completes.
> .sp
>@@ -1045,8 +1030,7 @@
> .ad
> .sp .6
> .RS 4n
>-Lists pools available to import. If the \fB-d\fR option is not specified, this command searches for devices in "/dev/dsk". The \fB-d\fR option can be specified multiple times, and all directories are searched. If the device appears to be part of
>-an exported pool, this command displays a summary of the pool with the name of the pool, a numeric identifier, as well as the \fIvdev\fR layout and current health of the device for each device or file. Destroyed pools, pools that were previously destroyed with the "\fBzpool destroy\fR" command, are not listed unless the \fB-D\fR option is specified. 
>+Lists pools available to import. If the \fB-d\fR option is not specified, this command searches for devices in "/dev/dsk". The \fB-d\fR option can be specified multiple times, and all directories are searched. If the device appears to be part of an exported pool, this command displays a summary of the pool with the name of the pool, a numeric identifier, as well as the \fIvdev\fR layout and current health of the device for each device or file. Destroyed pools, pools that were previously destroyed with the "\fBzpool destroy\fR" command, are not listed unless the \fB-D\fR option is specified. 
> .sp
> The numeric identifier is unique, and can be used instead of the pool name when multiple exported pools of the same name are available.
> .sp
>@@ -1088,13 +1072,11 @@
> .ne 2
> .mk
> .na
>-\fB\fBzpool import\fR [\fB-o\fR \fImntopts\fR] [ \fB-o\fR \fIproperty\fR=\fIvalue\fR] ... [\fB-d\fR \fIdir\fR | \fB-c\fR \fIcachefile\fR]
>-[\fB-D\fR] [\fB-f\fR] [\fB-R\fR \fIroot\fR] \fB-a\fR\fR
>+\fB\fBzpool import\fR [\fB-o\fR \fImntopts\fR] [ \fB-o\fR \fIproperty\fR=\fIvalue\fR] ... [\fB-d\fR \fIdir\fR | \fB-c\fR \fIcachefile\fR] [\fB-D\fR] [\fB-f\fR] [\fB-R\fR \fIroot\fR] \fB-a\fR\fR
> .ad
> .sp .6
> .RS 4n
>-Imports all pools found in the search directories. Identical to the previous command, except that all pools with a sufficient number of devices available are imported. Destroyed pools, pools that were previously destroyed with the "\fBzpool destroy\fR"
>-command, will not be imported unless the \fB-D\fR option is specified.
>+Imports all pools found in the search directories. Identical to the previous command, except that all pools with a sufficient number of devices available are imported. Destroyed pools, pools that were previously destroyed with the "\fBzpool destroy\fR" command, will not be imported unless the \fB-D\fR option is specified.
> .sp
> .ne 2
> .mk
>@@ -1103,8 +1085,7 @@
> .ad
> .RS 21n
> .rt  
>-Comma-separated list of mount options to use when mounting datasets within the pool. See \fBzfs\fR(1M) for a description of dataset properties and mount
>-options.
>+Comma-separated list of mount options to use when mounting datasets within the pool. See \fBzfs\fR(1M) for a description of dataset properties and mount options.
> .RE
> 
> .sp
>@@ -1190,15 +1171,13 @@
> .ne 2
> .mk
> .na
>-\fB\fBzpool import\fR [\fB-o\fR \fImntopts\fR] [ \fB-o\fR \fIproperty\fR=\fIvalue\fR] ... [\fB-d\fR \fIdir\fR | \fB-c\fR \fIcachefile\fR]
>-[\fB-D\fR] [\fB-f\fR] [\fB-R\fR \fIroot\fR] \fIpool\fR | \fIid\fR [\fInewpool\fR]\fR
>+\fB\fBzpool import\fR [\fB-o\fR \fImntopts\fR] [ \fB-o\fR \fIproperty\fR=\fIvalue\fR] ... [\fB-d\fR \fIdir\fR | \fB-c\fR \fIcachefile\fR] [\fB-D\fR] [\fB-f\fR] [\fB-R\fR \fIroot\fR] \fIpool\fR | \fIid\fR [\fInewpool\fR]\fR
> .ad
> .sp .6
> .RS 4n
> Imports a specific pool. A pool can be identified by its name or the numeric identifier. If \fInewpool\fR is specified, the pool is imported using the name \fInewpool\fR. Otherwise, it is imported with the same name as its exported name.
> .sp
>-If a device is removed from a system without running "\fBzpool export\fR" first, the device appears as potentially active. It cannot be determined if this was a failed export, or whether the device is really in use from another host. To import a pool in this state,
>-the \fB-f\fR option is required.
>+If a device is removed from a system without running "\fBzpool export\fR" first, the device appears as potentially active. It cannot be determined if this was a failed export, or whether the device is really in use from another host. To import a pool in this state, the \fB-f\fR option is required.
> .sp
> .ne 2
> .mk
>@@ -1207,8 +1186,7 @@
> .ad
> .sp .6
> .RS 4n
>-Comma-separated list of mount options to use when mounting datasets within the pool. See \fBzfs\fR(1M) for a description of dataset properties and mount
>-options.
>+Comma-separated list of mount options to use when mounting datasets within the pool. See \fBzfs\fR(1M) for a description of dataset properties and mount options.
> .RE
> 
> .sp
>@@ -1289,7 +1267,7 @@
> .RS 4n
> Exports the given pools from the system. All devices are marked as exported, but are still considered in use by other subsystems. The devices can be moved between systems (even those of different endianness) and imported as long as a sufficient number of devices are present.
> .sp
>-Before exporting the pool, all datasets within the pool are unmounted.
>+Before exporting the pool, all datasets within the pool are unmounted. A pool can not be exported if it has a shared spare that is currently being used.
> .sp
> For pools to be portable, you must give the \fBzpool\fR command whole disks, not just slices, so that \fBZFS\fR can label the disks with portable \fBEFI\fR labels. Otherwise, disk drivers on platforms of different endianness will not recognize the disks.
> .sp
>@@ -1301,6 +1279,8 @@
> .RS 6n
> .rt  
> Forcefully unmount all datasets, using the "\fBunmount -f\fR" command.
>+.sp
>+This command will forcefully export the pool even if it has a shared spare that is currently being used. This may lead to potential data corruption.
> .RE
> 
> .RE
>@@ -1313,8 +1293,7 @@
> .ad
> .sp .6
> .RS 4n
>-Displays all pools formatted using a different \fBZFS\fR on-disk version. Older versions can continue to be used, but some features may not be available. These pools can be upgraded using "\fBzpool upgrade -a\fR". Pools that are formatted with
>-a more recent version are also displayed, although these pools will be inaccessible on the system.
>+Displays all pools formatted using a different \fBZFS\fR on-disk version. Older versions can continue to be used, but some features may not be available. These pools can be upgraded using "\fBzpool upgrade -a\fR". Pools that are formatted with a more recent version are also displayed, although these pools will be inaccessible on the system.
> .RE
> 
> .sp
>@@ -1407,9 +1386,9 @@
> .in +2
> .nf
>        name          Name of storage pool
>-       property      Property name
>-       value         Property value
>-       source        Property source, either 'default' or 'local'.
>+        property      Property name
>+        value         Property value
>+        source        Property source, either 'default' or 'local'.
> .fi
> .in -2
> .sp
>@@ -1421,7 +1400,7 @@
> .ne 2
> .mk
> .na
>-\fB\fBzpool set\fR \fIproperty\fR=\fIvalue\fR \fIpool\fR \fR
>+\fB\fBzpool set\fR \fIproperty\fR=\fIvalue\fR \fIpool\fR\fR
> .ad
> .sp .6
> .RS 4n
>@@ -1513,10 +1492,10 @@
> .in +2
> .nf
> \fB# zpool list\fR
>-    NAME              SIZE    USED   AVAIL    CAP  HEALTH     ALTROOT
>-    pool             67.5G   2.92M   67.5G     0%  ONLINE     -
>-    tank             67.5G   2.92M   67.5G     0%  ONLINE     -
>-    zion                 -       -       -     0%  FAULTED    -
>+     NAME              SIZE    USED   AVAIL    CAP  HEALTH     ALTROOT
>+     pool             67.5G   2.92M   67.5G     0%  ONLINE     -
>+     tank             67.5G   2.92M   67.5G     0%  ONLINE     -
>+     zion                 -       -       -     0%  FAULTED    -
> .fi
> .in -2
> .sp
>@@ -1563,16 +1542,16 @@
> .in +2
> .nf
> \fB# zpool import\fR
>- pool: tank
>-   id: 15451357997522795478
>-state: ONLINE
>+  pool: tank
>+    id: 15451357997522795478
>+ state: ONLINE
> action: The pool can be imported using its name or numeric identifier.
> config:
> 
>-       tank        ONLINE
>-         mirror    ONLINE
>-           c1t2d0  ONLINE
>-           c1t3d0  ONLINE
>+        tank        ONLINE
>+          mirror    ONLINE
>+            c1t2d0  ONLINE
>+            c1t3d0  ONLINE
> 
> \fB# zpool import tank\fR
> .fi
>@@ -1642,7 +1621,7 @@
> .in +2
> .nf
> \fB# zpool create pool mirror c0d0 c1d0 mirror c2d0 c3d0 log mirror \e
>-  c4d0 c5d0\fR
>+   c4d0 c5d0\fR
> .fi
> .in -2
> .sp

Actions: View | Diff

Attachments on bug 144984: 104759