[Glibc-bsd-commits] r3760 - in trunk/zfsutils/debian: . patches
Arno Töll
atoell-guest at alioth.debian.org
Sat Oct 22 18:35:48 UTC 2011
Author: atoell-guest
Date: 2011-10-22 18:35:48 +0000 (Sat, 22 Oct 2011)
New Revision: 3760
Added:
trunk/zfsutils/debian/patches/manpage_debian_specifics.diff
Removed:
trunk/zfsutils/debian/patches/07_manpages.diff
Modified:
trunk/zfsutils/debian/
trunk/zfsutils/debian/patches/manpage_hyphens.diff
trunk/zfsutils/debian/patches/series
Log:
Manual process manpage_hyphens.diff to make sure hyphens are kept where they are supposed to be; refresh and extend 07_manpages.diff, move it to manpage_debian_specifics.diff
Property changes on: trunk/zfsutils/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Deleted: trunk/zfsutils/debian/patches/07_manpages.diff
===================================================================
--- trunk/zfsutils/debian/patches/07_manpages.diff 2011-10-22 17:12:27 UTC (rev 3759)
+++ trunk/zfsutils/debian/patches/07_manpages.diff 2011-10-22 18:35:48 UTC (rev 3760)
@@ -1,38 +0,0 @@
----
- cddl/contrib/opensolaris/cmd/zfs/zfs.8 | 2 +-
- cddl/contrib/opensolaris/cmd/zpool/zpool.8 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
-+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
-@@ -8,7 +8,7 @@
- .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
- .\" Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- .\" Copyright 2011 by Delphix. All rights reserved.
--.TH zfs 1M "24 Sep 2009" "SunOS 5.11" "System Administration Commands"
-+.TH zfs 8 "24 Sep 2009" "SunOS 5.11" "System Administration Commands"
- .SH NAME
- zfs \- configures ZFS file systems
- .SH SYNOPSIS
---- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8
-+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8
-@@ -3,7 +3,7 @@
- .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
- .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
- .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
--.TH zpool 1M "21 Sep 2009" "SunOS 5.11" "System Administration Commands"
-+.TH zpool 8 "21 Sep 2009" "SunOS 5.11" "System Administration Commands"
- .SH NAME
- zpool \- configures ZFS storage pools
- .SH SYNOPSIS
---- a/cddl/contrib/opensolaris/cmd/zdb/zdb.8
-+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.8
-@@ -3,7 +3,7 @@
- .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
- .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
- .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
--.TH zdb 1M "31 Oct 2005" "SunOS 5.11" "System Administration Commands"
-+.TH zdb 8 "31 Oct 2005" "SunOS 5.11" "System Administration Commands"
- .SH NAME
- zdb \- ZFS debugger
- .SH SYNOPSIS
Added: trunk/zfsutils/debian/patches/manpage_debian_specifics.diff
===================================================================
--- trunk/zfsutils/debian/patches/manpage_debian_specifics.diff (rev 0)
+++ trunk/zfsutils/debian/patches/manpage_debian_specifics.diff 2011-10-22 18:35:48 UTC (rev 3760)
@@ -0,0 +1,193 @@
+This patch adds Debian specific additions to the manpage, whereas other manpage
+related patches can also be submitted upstream.
+
+In particular this patch replaces references to section 1M by 8, e.g. zfs(1M) ->
+zfs(8) and similar.
+--- a/cddl/contrib/opensolaris/cmd/zdb/zdb.8
++++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.8
+@@ -3,7 +3,7 @@
+ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
+ .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
+ .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+-.TH zdb 1M "31 Oct 2005" "SunOS 5.11" "System Administration Commands"
++.TH zdb 8 "31 Oct 2005" "SunOS 5.11" "System Administration Commands"
+ .SH NAME
+ zdb \- ZFS debugger
+ .SH SYNOPSIS
+@@ -81,4 +81,4 @@
+ .SH SEE ALSO
+ .sp
+ .LP
+-\fBzfs\fR(1M), \fBzpool\fR(1M), \fBattributes\fR(5)
++\fBzfs\fR(8), \fBzpool\fR(8), \fBattributes\fR(5)
+--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
++++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+@@ -8,7 +8,7 @@
+ .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+ .\" Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+ .\" Copyright 2011 by Delphix. All rights reserved.
+-.TH zfs 1M "24 Sep 2009" "SunOS 5.11" "System Administration Commands"
++.TH zfs 8 "24 Sep 2009" "SunOS 5.11" "System Administration Commands"
+ .SH NAME
+ zfs \- configures ZFS file systems
+ .SH SYNOPSIS
+@@ -230,7 +230,7 @@
+ .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(8). A dataset is identified by a unique path within the \fBZFS\fR namespace. For example:
+ .sp
+ .in +2
+ .nf
+@@ -284,10 +284,11 @@
+ A \fBZFS\fR storage pool is a logical collection of devices that provide space for datasets. A storage pool is also the root of the \fBZFS\fR file system hierarchy.
+ .sp
+ .LP
+-The root of the pool can be accessed as a file system, such as mounting and unmounting, taking snapshots, and setting properties. The physical storage characteristics, however, are managed by the \fBzpool\fR(1M) command.
++The root of the pool can be accessed as a file system, such as mounting and
++unmounting, taking snapshots, and setting properties. The physical storage characteristics, however, are managed by the \fBzpool\fR(8) command.
+ .sp
+ .LP
+-See \fBzpool\fR(1M) for more information on creating and administering pools.
++See \fBzpool\fR(8) for more information on creating and administering pools.
+ .SS "Snapshots"
+ .sp
+ .LP
+@@ -754,7 +755,7 @@
+ .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(8) for more information on \fBnbmand\fR mounts.
+ .RE
+
+ .sp
+@@ -1107,7 +1108,7 @@
+ .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(8) 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
+@@ -1143,7 +1144,7 @@
+ 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
+-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.
++If you need to change your swap area or dump device after the system is installed or upgraded, use the \fBswapctl\fR(8) 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
+@@ -1790,7 +1791,7 @@
+ .RS 4n
+ Upgrades file systems to a new on\(hydisk 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 cannot be accessed on systems running older versions of the software.
+ .sp
+-In general, the file system version is independent of the pool version. See \fBzpool\fR(1M) for information on the \fBzpool upgrade\fR command.
++In general, the file system version is independent of the pool version. See \fBzpool\fR(8) for information on the \fBzpool upgrade\fR command.
+ .sp
+ In some cases, the file system version and the pool version are interrelated and the pool version must be upgraded before the file system version can be upgraded.
+ .sp
+@@ -2000,7 +2001,7 @@
+ .ad
+ .sp .6
+ .RS 4n
+-Perform an overlay mount. See \fBmount\fR(1M) for more information.
++Perform an overlay mount. See \fBmount\fR(8) for more information.
+ .RE
+
+ .sp
+@@ -2637,7 +2638,7 @@
+ \fBExample 5 \fRListing ZFS Datasets
+ .sp
+ .LP
+-The following command lists all active file systems and volumes in the system. Snapshots are displayed if the \fBlistsnaps\fR property is \fBon\fR. The default is \fBoff\fR. See \fBzpool\fR(1M) for more information on pool properties.
++The following command lists all active file systems and volumes in the system. Snapshots are displayed if the \fBlistsnaps\fR property is \fBon\fR. The default is \fBoff\fR. See \fBzpool\fR(8) for more information on pool properties.
+
+ .sp
+ .in +2
+@@ -3106,10 +3107,7 @@
+ .SH SEE ALSO
+ .sp
+ .LP
+-\fBssh\fR(1), \fBiscsitadm\fR(1M), \fBmount\fR(1M), \fBshare\fR(1M), \fBsharemgr\fR(1M), \fBunshare\fR(1M), \fBzonecfg\fR(1M), \fBzpool\fR(1M), \fBchmod\fR(2), \fBstat\fR(2), \fBwrite\fR(2), \fBfsync\fR(3C), \fBdfstab\fR(4), \fBattributes\fR(5)
+-.sp
+-.LP
+-See the \fBgzip\fR(1) man page, which is not part of the SunOS man page collection.
++\fBssh\fR(1), \fBiscsitadm\fR(1M), \fBmount\fR(8), \fBshare\fR(1M), \fBsharemgr\fR(1M), \fBunshare\fR(1M), \fBzonecfg\fR(1M), \fBzpool\fR(8), \fBchmod\fR(2), \fBstat\fR(2), \fBwrite\fR(2), \fBfsync\fR(3), \fBdfstab\fR(4), \fBattributes\fR(5), \fBgzip\fR(1).
+ .sp
+ .LP
+ For information about using the \fBZFS\fR web\(hybased management tool and other \fBZFS\fR features, see the \fISolaris ZFS Administration Guide\fR.
+--- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8
++++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8
+@@ -3,7 +3,7 @@
+ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
+ .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
+ .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+-.TH zpool 1M "21 Sep 2009" "SunOS 5.11" "System Administration Commands"
++.TH zpool 8 "21 Sep 2009" "SunOS 5.11" "System Administration Commands"
+ .SH NAME
+ zpool \- configures ZFS storage pools
+ .SH SYNOPSIS
+@@ -141,7 +141,7 @@
+ The \fBzpool\fR command configures \fBZFS\fR storage pools. A storage pool is a collection of devices that provides physical storage and data replication for \fBZFS\fR datasets.
+ .sp
+ .LP
+-All datasets within a storage pool share the same space. See \fBzfs\fR(1M) for information on managing datasets.
++All datasets within a storage pool share the same space. See \fBzfs\fR(8) for information on managing datasets.
+ .SS "Virtual Devices (\fBvdev\fRs)"
+ .sp
+ .LP
+@@ -573,7 +573,7 @@
+ .ad
+ .sp .6
+ .RS 4n
+-Controls whether a non\(hyprivileged 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\(hyprivileged user is granted access based on the dataset permissions defined on the dataset. See \fBzfs\fR(8) for more information on \fBZFS\fR delegated administration.
+ .RE
+
+ .sp
+@@ -787,7 +787,7 @@
+ .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.
++Sets the given file system properties in the root file system of the pool. See the "Properties" section of \fBzfs\fR(8) for a list of valid properties that can be set.
+ .RE
+
+ .sp
+@@ -809,7 +809,7 @@
+ .ad
+ .sp .6
+ .RS 4n
+-Sets the mount point for the root dataset. The default mount point is "/\fIpool\fR" or "\fBaltroot\fR/\fIpool\fR" if \fBaltroot\fR is specified. The mount point must be an absolute path, "\fBlegacy\fR", or "\fBnone\fR". For more information on dataset mount points, see \fBzfs\fR(1M).
++Sets the mount point for the root dataset. The default mount point is "/\fIpool\fR" or "\fBaltroot\fR/\fIpool\fR" if \fBaltroot\fR is specified. The mount point must be an absolute path, "\fBlegacy\fR", or "\fBnone\fR". For more information on dataset mount points, see \fBzfs\fR(8).
+ .RE
+
+ .RE
+@@ -994,7 +994,7 @@
+ .ad
+ .RS 21n
+ .rt
+-Comma\(hyseparated 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\(hyseparated list of mount options to use when mounting datasets within the pool. See \fBzfs\fR(8) for a description of dataset properties and mount options.
+ .RE
+
+ .sp
+@@ -1095,7 +1095,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(8) for a description of dataset properties and mount options.
+ .RE
+
+ .sp
+@@ -1796,4 +1796,4 @@
+ .SH SEE ALSO
+ .sp
+ .LP
+-\fBzfs\fR(1M), \fBattributes\fR(5)
++\fBzfs\fR(8), \fBattributes\fR(5)
Modified: trunk/zfsutils/debian/patches/manpage_hyphens.diff
===================================================================
--- trunk/zfsutils/debian/patches/manpage_hyphens.diff 2011-10-22 17:12:27 UTC (rev 3759)
+++ trunk/zfsutils/debian/patches/manpage_hyphens.diff 2011-10-22 18:35:48 UTC (rev 3760)
@@ -7,6 +7,11 @@
perl -pi -e 's/(?<!\\)(?<!\.in |\.ll |\.po |\.ti |\.ce )-/\\-/g' < $i | sponge $i
done
+Afterwards the delta has been manually processed to exclude some false positives
+where really a hyphen was meant, e.g. in grammatical constructs like
+"comma-separated". Those have been replaced by "\(hy" for clarification.
+
+
--- a/cddl/contrib/opensolaris/cmd/zdb/zdb.8
+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.8
@@ -15,7 +15,7 @@
@@ -14,7 +19,7 @@
.sp
.LP
-The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self-repairing, \fBzdb\fR should only be run under the direction by a support engineer.
-+The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self\-repairing, \fBzdb\fR should only be run under the direction by a support engineer.
++The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self\(hyrepairing, \fBzdb\fR should only be run under the direction by a support engineer.
.sp
.LP
If no arguments are specified, \fBzdb\fR, performs basic consistency checks on the pool and associated datasets, and report any problems detected.
@@ -266,7 +271,7 @@
.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 at name\fR or \fIvolume at name\fR.
-+A read\-only version of a file system or volume at a given point in time. It is specified as \fIfilesystem at name\fR or \fIvolume at name\fR.
++A read\(hyonly version of a file system or volume at a given point in time. It is specified as \fIfilesystem at name\fR or \fIvolume at name\fR.
.RE
.SS "ZFS File System Hierarchy"
@@ -275,7 +280,7 @@
.sp
.LP
-A snapshot is a read-only copy of a file system or volume. Snapshots can be created extremely quickly, and initially consume no additional space within the pool. As data within the active dataset changes, the snapshot consumes more data than would otherwise be shared with the active dataset.
-+A snapshot is a read\-only copy of a file system or volume. Snapshots can be created extremely quickly, and initially consume no additional space within the pool. As data within the active dataset changes, the snapshot consumes more data than would otherwise be shared with the active dataset.
++A snapshot is a read\(hyonly copy of a file system or volume. Snapshots can be created extremely quickly, and initially consume no additional space within the pool. As data within the active dataset changes, the snapshot consumes more data than would otherwise be shared with the active dataset.
.sp
.LP
Snapshots can have arbitrary names. Snapshots of volumes can be cloned or rolled back, but cannot be accessed independently.
@@ -284,7 +289,7 @@
.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.
++The clone parent\(hychild 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
@@ -302,14 +307,14 @@
.sp
.LP
-A \fBZFS\fR file system can be added to a non-global zone by using the \fBzonecfg\fR \fBadd fs\fR subcommand. A \fBZFS\fR file system that is added to a non-global zone must have its \fBmountpoint\fR property set to \fBlegacy\fR.
-+A \fBZFS\fR file system can be added to a non\-global zone by using the \fBzonecfg\fR \fBadd fs\fR subcommand. A \fBZFS\fR file system that is added to a non\-global zone must have its \fBmountpoint\fR property set to \fBlegacy\fR.
++A \fBZFS\fR file system can be added to a non\-global zone by using the \fBzonecfg\fR \fBadd fs\fR subcommand. A \fBZFS\fR file system that is added to a non\(hyglobal zone must have its \fBmountpoint\fR property set to \fBlegacy\fR.
.sp
.LP
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 the \fBzonecfg\fR \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 \fBquota\fR property is controlled by the global administrator.
-+A dataset can also be delegated to a non\-global zone by using the \fBzonecfg\fR \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 \fBquota\fR property is controlled by the global administrator.
++A dataset can also be delegated to a non\(hyglobal zone by using the \fBzonecfg\fR \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 \fBquota\fR 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 the \fBzonecfg\fR \fBadd device\fR subcommand. However, its physical properties can be modified only by the global administrator.
@@ -320,7 +325,7 @@
.sp
.LP
-After a dataset is delegated to a non-global zone, the \fBzoned\fR property is automatically set. A zoned file system cannot be mounted in the global zone, since the zone administrator might have to set the mount point to an unacceptable value.
-+After a dataset is delegated to a non\-global zone, the \fBzoned\fR property is automatically set. A zoned file system cannot be mounted in the global zone, since the zone administrator might have to set the mount point to an unacceptable value.
++After a dataset is delegated to a non\(hyglobal zone, the \fBzoned\fR property is automatically set. A zoned file system cannot be mounted in the global zone, since the zone administrator might have to set the mount point to an unacceptable value.
.sp
.LP
The global administrator can forcibly clear the \fBzoned\fR property, though this should be done with extreme care. The global administrator should verify that all the mount points are acceptable before clearing the property.
@@ -328,14 +333,14 @@
.sp
.LP
-Properties are divided into two types, native properties and user-defined (or "user") 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, below.
-+Properties are divided into two types, native properties and user\-defined (or "user") 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, below.
++Properties are divided into two types, native properties and user\(hydefined (or "user") properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read\(hyonly. 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, below.
.sp
.LP
Every dataset has a set of properties that export statistics about the dataset as well as control various behaviors. Properties are inherited from the parent unless overridden by the child. Some properties apply only to certain types of datasets (file systems, volumes, or snapshots).
.sp
.LP
-The values of numeric properties can be specified using human-readable suffixes (for example, \fBk\fR, \fBKB\fR, \fBM\fR, \fBGb\fR, and so forth, up to \fBZ\fR for zettabyte). The following are all valid (and equal) specifications:
-+The values of numeric properties can be specified using human\-readable suffixes (for example, \fBk\fR, \fBKB\fR, \fBM\fR, \fBGb\fR, and so forth, up to \fBZ\fR for zettabyte). The following are all valid (and equal) specifications:
++The values of numeric properties can be specified using human\(hyreadable suffixes (for example, \fBk\fR, \fBKB\fR, \fBM\fR, \fBGb\fR, and so forth, up to \fBZ\fR for zettabyte). The following are all valid (and equal) specifications:
.sp
.in +2
.nf
@@ -344,11 +349,11 @@
.sp
.LP
-The values of non-numeric properties are case sensitive and must be lowercase, except for \fBmountpoint\fR, \fBsharenfs\fR, and \fBsharesmb\fR.
-+The values of non\-numeric properties are case sensitive and must be lowercase, except for \fBmountpoint\fR, \fBsharenfs\fR, and \fBsharesmb\fR.
++The values of non\(hynumeric properties are case sensitive and must be lowercase, except for \fBmountpoint\fR, \fBsharenfs\fR, and \fBsharesmb\fR.
.sp
.LP
-The following native properties consist of read-only statistics about the dataset. These properties can be neither set, nor inherited. Native properties apply to all dataset types unless otherwise noted.
-+The following native properties consist of read\-only statistics about the dataset. These properties can be neither set, nor inherited. Native properties apply to all dataset types unless otherwise noted.
++The following native properties consist of read\(hyonly statistics about the dataset. These properties can be neither set, nor inherited. Native properties apply to all dataset types unless otherwise noted.
.sp
.ne 2
.mk
@@ -357,7 +362,7 @@
.sp .6
.RS 4n
-For non-snapshots, the compression ratio achieved for the \fBused\fR space of this dataset, expressed as a multiplier. The \fBused\fR property includes descendant datasets, and, for clones, does not include the space shared with the origin snapshot. For snapshots, the \fBcompressratio\fR is the same as the \fBrefcompressratio\fR property. Compression can be turned on by running: \fBzfs set compression=on \fIdataset\fR\fR. The default value is \fBoff\fR.
-+For non\-snapshots, the compression ratio achieved for the \fBused\fR space of this dataset, expressed as a multiplier. The \fBused\fR property includes descendant datasets, and, for clones, does not include the space shared with the origin snapshot. For snapshots, the \fBcompressratio\fR is the same as the \fBrefcompressratio\fR property. Compression can be turned on by running: \fBzfs set compression=on \fIdataset\fR\fR. The default value is \fBoff\fR.
++For non\(hysnapshots, the compression ratio achieved for the \fBused\fR space of this dataset, expressed as a multiplier. The \fBused\fR property includes descendant datasets, and, for clones, does not include the space shared with the origin snapshot. For snapshots, the \fBcompressratio\fR is the same as the \fBrefcompressratio\fR property. Compression can be turned on by running: \fBzfs set compression=on \fIdataset\fR\fR. The default value is \fBoff\fR.
.RE
.sp
@@ -437,7 +442,7 @@
Controls the checksum used to verify data integrity. The default value is \fBon\fR, which automatically selects an appropriate algorithm (currently, \fBfletcher4\fR, but this may change in future releases). The value \fBoff\fR disables integrity checking on user data. Disabling checksums is \fBNOT\fR a recommended practice.
.sp
-Changing this property affects only newly-written data.
-+Changing this property affects only newly\-written data.
++Changing this property affects only newly\(hywritten data.
.RE
.sp
@@ -453,7 +458,7 @@
+Controls the compression algorithm used for this dataset. The \fBlzjb\fR compression algorithm is optimized for performance while providing decent data compression. Setting compression to \fBon\fR uses the \fBlzjb\fR compression algorithm. The \fBgzip\fR compression algorithm uses the same compression as the \fBgzip\fR(1) command. You can specify the \fBgzip\fR level by using the value \fBgzip\-\fR\fIN\fR where \fIN\fR is an integer from 1 (fastest) to 9 (best compression ratio). Currently, \fBgzip\fR is equivalent to \fBgzip\-6\fR (which is also the default for \fBgzip\fR(1)).
.sp
-This property can also be referred to by its shortened column name \fBcompress\fR. Changing this property affects only newly-written data.
-+This property can also be referred to by its shortened column name \fBcompress\fR. Changing this property affects only newly\-written data.
++This property can also be referred to by its shortened column name \fBcompress\fR. Changing this property affects only newly\(hywritten data.
.RE
.sp
@@ -465,7 +470,7 @@
+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 \fBused\fR 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 \fBcopies=\fR\fIN\fR option.
-+Changing this property only affects newly\-written data. Therefore, set this property at file system creation time by using the \fB\-o\fR \fBcopies=\fR\fIN\fR option.
++Changing this property only affects newly\(hywritten data. Therefore, set this property at file system creation time by using the \fB\-o\fR \fBcopies=\fR\fIN\fR option.
.RE
.sp
@@ -483,7 +488,7 @@
.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.
++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\(hysize 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 \fBrecordsize\fR 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
@@ -501,10 +506,10 @@
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 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.
-+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.
++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\(hylevel 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.
-+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.
++When the \fBsharesmb\fR property is changed for a dataset, the dataset and any children inheriting the property are re\(hyshared 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
@@ -513,7 +518,7 @@
Controls whether the file system is shared via \fBNFS\fR, and what options are used. A file system with a \fBsharenfs\fR property of \fBoff\fR 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 \fBon\fR, 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 \fBsharenfs\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 \fBoff\fR, or if they were shared before the property was changed. If the new property is \fBoff\fR, the file systems are unshared.
-+When the \fBsharenfs\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 \fBoff\fR, or if they were shared before the property was changed. If the new property is \fBoff\fR, the file systems are unshared.
++When the \fBsharenfs\fR property is changed for a dataset, the dataset and any children inheriting the property are re\(hyshared with the new options, only if the property was previously \fBoff\fR, or if they were shared before the property was changed. If the new property is \fBoff\fR, the file systems are unshared.
.RE
.sp
@@ -522,7 +527,7 @@
.sp .6
.RS 4n
-The on-disk version of this file system, which is independent of the pool version. This property can only be set to later supported versions. See the \fBzfs upgrade\fR command.
-+The on\-disk version of this file system, which is independent of the pool version. This property can only be set to later supported versions. See the \fBzfs upgrade\fR command.
++The on\(hydisk version of this file system, which is independent of the pool version. This property can only be set to later supported versions. See the \fBzfs upgrade\fR command.
.RE
.sp
@@ -540,7 +545,7 @@
.sp .6
.RS 4n
-Controls whether the dataset is managed from a non-global zone. See the "Zones" section for more information. The default value is \fBoff\fR.
-+Controls whether the dataset is managed from a non\-global zone. See the "Zones" section for more information. The default value is \fBoff\fR.
++Controls whether the dataset is managed from a non\(hyglobal zone. See the "Zones" section for more information. The default value is \fBoff\fR.
.RE
.sp
@@ -549,10 +554,10 @@
.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.
++Indicates whether the file name matching algorithm used by the file system should be case\(hysensitive, case\(hyinsensitive, 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 \fBmixed\fR value behavior, see the \fISolaris ZFS 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 \fBmixed\fR value behavior, see the \fISolaris ZFS Administration Guide\fR.
++The \fBmixed\fR value for the \fBcasesensitivity\fR property indicates that the file system can support requests for both case\(hysensitive and case\(hyinsensitive matching behavior. Currently, case\(hyinsensitive matching behavior on a file system that supports mixed behavior is limited to the Solaris CIFS server product. For more information about the \fBmixed\fR value behavior, see the \fISolaris ZFS Administration Guide\fR.
.RE
.sp
@@ -576,7 +581,7 @@
.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 \fBnodevices,nosetuid\fR. 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 \fBnodevices,nosetuid\fR. 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\(hymount 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 \fBnodevices,nosetuid\fR. 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
@@ -588,7 +593,7 @@
.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 \fBcom.sun\fR. 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 \fBcom.sun\fR. 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\(hydeveloped packages use the same property name for different purposes. Property names beginning with \fBcom.sun\fR. 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 (\fBzfs list\fR, \fBzfs get\fR, \fBzfs set\fR, and so forth) 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.
@@ -611,7 +616,7 @@
.sp .6
.RS 4n
-Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the \fBmountpoint\fR 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.
-+Creates all the non\-existing parent datasets. Datasets created in this manner are automatically mounted according to the \fBmountpoint\fR 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.
++Creates all the non\(hyexisting parent datasets. Datasets created in this manner are automatically mounted according to the \fBmountpoint\fR 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
@@ -723,7 +728,7 @@
.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.
-+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.
++Force an unmount of any file systems using the \fBunmount \-f\fR command. This option has no effect on non\(hyfile systems or unmounted file systems.
.RE
-Extreme care should be taken when applying either the \fB-r\fR or the \fB-R\fR options, as they can destroy large portions of a pool and cause unexpected behavior for mounted file systems in use.
@@ -740,7 +745,7 @@
.sp .6
.RS 4n
-The given snapshot is destroyed immediately if and only if the \fBzfs destroy\fR command without the \fB-d\fR option would have destroyed it. Such immediate destruction would occur, for example, if the snapshot had no clones and the user-initiated reference count were zero.
-+The given snapshot is destroyed immediately if and only if the \fBzfs destroy\fR command without the \fB\-d\fR option would have destroyed it. Such immediate destruction would occur, for example, if the snapshot had no clones and the user\-initiated reference count were zero.
++The given snapshot is destroyed immediately if and only if the \fBzfs destroy\fR command without the \fB\-d\fR option would have destroyed it. Such immediate destruction would occur, for example, if the snapshot had no clones and the user\(hyinitiated reference count were zero.
.sp
If the snapshot does not qualify for immediate destruction, it is marked for deferred deletion. In this state, it exists as a usable, visible snapshot until both of the preconditions listed above are met, at which point it is destroyed.
.sp
@@ -810,7 +815,7 @@
+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
-The \fB-rR\fR options do not recursively destroy the child snapshots of a recursive snapshot. Only the top-level recursive snapshot is destroyed by either of these options. To completely roll back a recursive snapshot, you must rollback the individual child snapshots.
-+The \fB\-rR\fR options do not recursively destroy the child snapshots of a recursive snapshot. Only the top\-level recursive snapshot is destroyed by either of these options. To completely roll back a recursive snapshot, you must rollback the individual child snapshots.
++The \fB\-rR\fR options do not recursively destroy the child snapshots of a recursive snapshot. Only the top\(hylevel recursive snapshot is destroyed by either of these options. To completely roll back a recursive snapshot, you must rollback the individual child snapshots.
.sp
.ne 2
.mk
@@ -884,7 +889,7 @@
.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.
++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\(hychild 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.
.RE
@@ -961,7 +966,7 @@
.sp .6
.RS 4n
-A comma-separated list of properties to display. The property must be:
-+A comma\-separated list of properties to display. The property must be:
++A comma\(hyseparated list of properties to display. The property must be:
.RS +4
.TP
.ie t \(bu
@@ -1020,7 +1025,7 @@
.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 \fBB\fR, \fBK\fR, \fBM\fR, \fBG\fR, \fBT\fR, \fBP\fR, \fBE\fR, \fBZ\fR (for bytes, kilobytes, megabytes, gigabytes, terabytes, petabytes, exabytes, or zettabytes, respectively). User properties can be set on snapshots. For more information, see the "User Properties" section.
-+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 \fBB\fR, \fBK\fR, \fBM\fR, \fBG\fR, \fBT\fR, \fBP\fR, \fBE\fR, \fBZ\fR (for bytes, kilobytes, megabytes, gigabytes, terabytes, petabytes, exabytes, or zettabytes, respectively). User properties can be set on snapshots. For more information, see the "User Properties" section.
++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\(hyreadable form with a suffix of \fBB\fR, \fBK\fR, \fBM\fR, \fBG\fR, \fBT\fR, \fBP\fR, \fBE\fR, \fBZ\fR (for bytes, kilobytes, megabytes, gigabytes, terabytes, petabytes, exabytes, or zettabytes, respectively). User properties can be set on snapshots. For more information, see the "User Properties" section.
.RE
.sp
@@ -1083,7 +1088,7 @@
.sp .6
.RS 4n
-A comma-separated list of columns to display. \fBname,property,value,source\fR is the default value.
-+A comma\-separated list of columns to display. \fBname,property,value,source\fR is the default value.
++A comma\(hyseparated list of columns to display. \fBname,property,value,source\fR is the default value.
.RE
.sp
@@ -1096,7 +1101,7 @@
.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: \fBlocal,default,inherited,temporary,none\fR. The default value is all sources.
-+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: \fBlocal,default,inherited,temporary,none\fR. The default value is all sources.
++A comma\(hyseparated 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: \fBlocal,default,inherited,temporary,none\fR. The default value is all sources.
.RE
.sp
@@ -1145,7 +1150,7 @@
.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 cannot 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 cannot be accessed on systems running older versions of the software.
++Upgrades file systems to a new on\(hydisk 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 cannot be accessed on systems running older versions of the software.
.sp
In general, the file system version is independent of the pool version. See \fBzpool\fR(1M) for information on the \fBzpool upgrade\fR command.
.sp
@@ -1209,7 +1214,7 @@
.sp .6
.RS 4n
-Do not print headers, use tab-delimited output.
-+Do not print headers, use tab\-delimited output.
++Do not print headers, use tab\(hydelimited output.
.RE
.sp
@@ -1282,7 +1287,7 @@
.sp .6
.RS 4n
-Translate SID to POSIX ID. The POSIX ID may be ephemeral if no mapping exists. Normal POSIX interfaces (for example, \fBstat\fR(2), \fBls\fR \fB-l\fR) perform this translation, so the \fB-i\fR option allows the output from \fBzfs userspace\fR to be compared directly with those utilities. However, \fB-i\fR may lead to confusion if some files were created by an SMB user before a SMB-to-POSIX name mapping was established. In such a case, some files are owned by the SMB entity and some by the POSIX entity. However, the \fB-i\fR option will report that the POSIX entity has the total usage and quota for both.
-+Translate SID to POSIX ID. The POSIX ID may be ephemeral if no mapping exists. Normal POSIX interfaces (for example, \fBstat\fR(2), \fBls\fR \fB\-l\fR) perform this translation, so the \fB\-i\fR option allows the output from \fBzfs userspace\fR to be compared directly with those utilities. However, \fB\-i\fR may lead to confusion if some files were created by an SMB user before a SMB\-to\-POSIX name mapping was established. In such a case, some files are owned by the SMB entity and some by the POSIX entity. However, the \fB\-i\fR option will report that the POSIX entity has the total usage and quota for both.
++Translate SID to POSIX ID. The POSIX ID may be ephemeral if no mapping exists. Normal POSIX interfaces (for example, \fBstat\fR(2), \fBls\fR \fB\-l\fR) perform this translation, so the \fB\-i\fR option allows the output from \fBzfs userspace\fR to be compared directly with those utilities. However, \fB\-i\fR may lead to confusion if some files were created by an SMB user before a SMB\(hyto\(hyPOSIX name mapping was established. In such a case, some files are owned by the SMB entity and some by the POSIX entity. However, the \fB\-i\fR option will report that the POSIX entity has the total usage and quota for both.
.RE
.RE
@@ -1324,7 +1329,7 @@
.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.
-+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.
++An optional, comma\(hyseparated list of mount options to use temporarily for the duration of the mount. See the "Temporary Mount Point Properties" section for details.
.RE
.sp
@@ -1591,7 +1596,7 @@
.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 (\fB@\fR) , 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 (\fB@\fR) , 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\(hyseparated 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 (\fB@\fR) , may be specified. See the \fB\-s\fR form below for details.
.RE
.sp
@@ -1978,7 +1983,7 @@
.sp
.LP
-For information about using the \fBZFS\fR web-based management tool and other \fBZFS\fR features, see the \fISolaris ZFS 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.
++For information about using the \fBZFS\fR web\(hybased management tool and other \fBZFS\fR features, see the \fISolaris ZFS Administration Guide\fR.
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8
@@ -9,17 +9,17 @@
@@ -2133,7 +2138,7 @@
+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 single-, double- , or triple parity, meaning that the \fBraidz\fR group can sustain one, two, or three failures, respectively, without losing any data. The \fBraidz1\fR \fBvdev\fR type specifies a single-parity \fBraidz\fR group; the \fBraidz2\fR \fBvdev\fR type specifies a double-parity \fBraidz\fR group; and the \fBraidz3\fR \fBvdev\fR type specifies a triple-parity \fBraidz\fR group. The \fBraidz\fR \fBvdev\fR type is an alias for \fBraidz1\fR.
-+A \fBraidz\fR group can have single\-, double\- , or triple parity, meaning that the \fBraidz\fR group can sustain one, two, or three failures, respectively, without losing any data. The \fBraidz1\fR \fBvdev\fR type specifies a single\-parity \fBraidz\fR group; the \fBraidz2\fR \fBvdev\fR type specifies a double\-parity \fBraidz\fR group; and the \fBraidz3\fR \fBvdev\fR type specifies a triple\-parity \fBraidz\fR group. The \fBraidz\fR \fBvdev\fR type is an alias for \fBraidz1\fR.
++A \fBraidz\fR group can have single\(hy, double\(hy, or triple parity, meaning that the \fBraidz\fR group can sustain one, two, or three failures, respectively, without losing any data. The \fBraidz1\fR \fBvdev\fR type specifies a single\(hyparity \fBraidz\fR group; the \fBraidz2\fR \fBvdev\fR type specifies a double\(hyparity \fBraidz\fR group; and the \fBraidz3\fR \fBvdev\fR type specifies a triple\(hyparity \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.
@@ -2145,7 +2150,7 @@
.RS 10n
.rt
-A special pseudo-\fBvdev\fR which keeps track of available hot spares for a pool. For more information, see the "Hot Spares" section.
-+A special pseudo\-\fBvdev\fR which keeps track of available hot spares for a pool. For more information, see the "Hot Spares" section.
++A special pseudo\(hy\fBvdev\fR which keeps track of available hot spares for a pool. For more information, see the "Hot Spares" section.
.RE
.sp
@@ -2154,7 +2159,7 @@
.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 \fBvdev\fR types 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 \fBvdev\fR types are not supported for the intent log. For more information, see the "Intent Log" section.
++A separate\(hyintent log device. If more than one log device is specified, then writes are load\(hybalanced between devices. Log devices can be mirrored. However, \fBraidz\fR \fBvdev\fR types are not supported for the intent log. For more information, see the "Intent Log" section.
.RE
.sp
@@ -2163,7 +2168,7 @@
.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.
++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\(hylevel 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:
@@ -2172,14 +2177,14 @@
.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.
++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\(hyredundant 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.
.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:
-+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:
++The health of the top\(hylevel vdev, such as mirror or \fBraidz\fR device, is potentially impacted by the state of its associated vdevs, or component devices. A top\(hylevel vdev or component device is in one of the following states:
.sp
.ne 2
.mk
@@ -2188,7 +2193,7 @@
.RS 12n
.rt
-One or more top-level vdevs is in the degraded state because one or more component devices are offline. Sufficient replicas exist to continue functioning.
-+One or more top\-level vdevs is in the degraded state because one or more component devices are offline. Sufficient replicas exist to continue functioning.
++One or more top\(hylevel vdevs is in the degraded state because one or more component devices are offline. Sufficient replicas exist to continue functioning.
.sp
One or more component devices is in the degraded or faulted state, but sufficient replicas exist to continue functioning. The underlying conditions are as follows:
.RS +4
@@ -2197,7 +2202,7 @@
.RS 12n
.rt
-One or more top-level vdevs is in the faulted state because one or more component devices are offline. Insufficient replicas exist to continue functioning.
-+One or more top\-level vdevs is in the faulted state because one or more component devices are offline. Insufficient replicas exist to continue functioning.
++One or more top\(hylevel vdevs is in the faulted state because one or more component devices are offline. Insufficient replicas exist to continue functioning.
.sp
One or more component devices is in the faulted state, and insufficient replicas exist to continue functioning. The underlying conditions are as follows:
.RS +4
@@ -2206,7 +2211,7 @@
.RS 12n
.rt
-The device was physically removed while the system was running. Device removal detection is hardware-dependent and may not be supported on all platforms.
-+The device was physically removed while the system was running. Device removal detection is hardware\-dependent and may not be supported on all platforms.
++The device was physically removed while the system was running. Device removal detection is hardware\(hydependent and may not be supported on all platforms.
.RE
.sp
@@ -2215,7 +2220,7 @@
.sp
.LP
-If a device is removed and later re-attached to the system, \fBZFS\fR attempts to put the device online automatically. Device attach detection is hardware-dependent and might not be supported on all platforms.
-+If a device is removed and later re\-attached to the system, \fBZFS\fR attempts to put the device online automatically. Device attach detection is hardware\-dependent and might not be supported on all platforms.
++If a device is removed and later re\(hyattached to the system, \fBZFS\fR attempts to put the device online automatically. Device attach detection is hardware\(hydependent and might not be supported on all platforms.
.SS "Hot Spares"
.sp
.LP
@@ -2224,7 +2229,7 @@
.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.
-+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.
++An in\(hyprogress 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
Spares cannot replace log devices.
@@ -2233,12 +2238,12 @@
.sp
.LP
-Log devices can be added, replaced, attached, detached, and imported and exported as part of the larger pool. Mirrored log devices can be removed by specifying the top-level mirror for the log.
-+Log devices can be added, replaced, attached, detached, and imported and exported as part of the larger pool. Mirrored log devices can be removed by specifying the top\-level mirror for the log.
++Log devices can be added, replaced, attached, detached, and imported and exported as part of the larger pool. Mirrored log devices can be removed by specifying the top\(hylevel mirror for the log.
.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.
++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\(hyheavy 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\(hyworkloads 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:
@@ -2247,7 +2252,7 @@
.sp
.LP
-Each pool has several properties associated with it. Some properties are read-only statistics while others are configurable and change the behavior of the pool. The following are read-only properties:
-+Each pool has several properties associated with it. Some properties are read\-only statistics while others are configurable and change the behavior of the pool. The following are read\-only properties:
++Each pool has several properties associated with it. Some properties are read\(hyonly statistics while others are configurable and change the behavior of the pool. The following are read\-only properties:
.sp
.ne 2
.mk
@@ -2256,7 +2261,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.
++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\(hyfull 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:
@@ -2274,7 +2279,7 @@
.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.
++Controls whether a non\(hyprivileged 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
@@ -2292,7 +2297,7 @@
.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 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 current on\(hydisk 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"
@@ -2344,7 +2349,7 @@
.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.
++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\(hyway mirror of \fIdevice\fR and \fInew_device\fR. If \fIdevice\fR is part of a two\(hyway mirror, attaching \fInew_device\fR creates a three\(hyway mirror, and so on. In either case, \fInew_device\fR begins to resilver immediately.
.sp
.ne 2
.mk
@@ -2370,7 +2375,7 @@
+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.
++The command also checks that the replication strategy for the pool is consistent. An attempt to combine redundant and non\(hyredundant 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.
+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.
@@ -2570,7 +2575,7 @@
.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.
++Comma\(hyseparated 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
@@ -2794,7 +2799,7 @@
.RS 12n
.rt
-Comma-separated list of properties to display. See the "Properties" section for a list of valid properties. The default list is "name, size, used, available, capacity, health, altroot"
-+Comma\-separated list of properties to display. See the "Properties" section for a list of valid properties. The default list is "name, size, used, available, capacity, health, altroot"
++Comma\(hyseparated list of properties to display. See the "Properties" section for a list of valid properties. The default list is "name, size, used, available, capacity, health, altroot"
.RE
.RE
@@ -2839,7 +2844,7 @@
.sp .6
.RS 4n
-Removes the specified device from the pool. This command currently only supports removing hot spares, cache, and log devices. A mirrored log device can be removed by specifying the top-level mirror for the log. Non-log 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, cache, and log devices. A mirrored log device can be removed by specifying the top\-level mirror for the log. Non\-log 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, cache, and log devices. A mirrored log device can be removed by specifying the top\(hylevel mirror for the log. Non\-log devices that are part of a mirrored configuration can be removed using the \fBzpool detach\fR command. Non\(hyredundant and \fBraidz\fR devices cannot be removed from a pool.
.RE
.sp
@@ -2874,7 +2879,7 @@
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.
-+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.
++Because scrubbing and resilvering are \fBI/O\fR\(hyintensive 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
.ne 2
.mk
@@ -2916,7 +2921,7 @@
.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.
++Displays all pools formatted using a different \fBZFS\fR on\(hydisk 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
@@ -2938,7 +2943,7 @@
.sp .6
.RS 4n
-Upgrades the given pool to the latest on-disk version. Once this is done, the pool will no longer be accessible on systems running older versions of the software.
-+Upgrades the given pool to the latest on\-disk version. Once this is done, the pool will no longer be accessible on systems running older versions of the software.
++Upgrades the given pool to the latest on\(hydisk version. Once this is done, the pool will no longer be accessible on systems running older versions of the software.
.sp
.ne 2
.mk
@@ -2975,7 +2980,7 @@
.sp
.LP
-The following command adds two mirrored disks to the pool "\fItank\fR", assuming the pool is already made up of two-way mirrors. The additional space is immediately available to any datasets within the pool.
-+The following command adds two mirrored disks to the pool "\fItank\fR", assuming the pool is already made up of two\-way mirrors. The additional space is immediately available to any datasets within the pool.
++The following command adds two mirrored disks to the pool "\fItank\fR", assuming the pool is already made up of two\(hyway mirrors. The additional space is immediately available to any datasets within the pool.
.sp
.in +2
@@ -3015,7 +3020,7 @@
.sp
.LP
-The following command creates a ZFS storage pool consisting of two, two-way mirrors and mirrored log devices:
-+The following command creates a ZFS storage pool consisting of two, two\-way mirrors and mirrored log devices:
++The following command creates a ZFS storage pool consisting of two, two\(hyway mirrors and mirrored log devices:
.sp
.in +2
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2011-10-22 17:12:27 UTC (rev 3759)
+++ trunk/zfsutils/debian/patches/series 2011-10-22 18:35:48 UTC (rev 3760)
@@ -8,7 +8,6 @@
03_glibc_namespace.diff
04_stdint.diff
06_mountd.diff
-07_manpages.diff
08_libbsd.diff
09_xdr_control.diff
11_endian.diff
@@ -20,3 +19,4 @@
# Debian-specific
makefile.diff
+manpage_debian_specifics.diff
More information about the Glibc-bsd-commits
mailing list