summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Laager <[email protected]>2016-05-11 11:38:51 -0500
committerBrian Behlendorf <[email protected]>2016-05-16 12:26:31 -0700
commit8c5edae99353bc24b83a3ec7da11607e149b3ae5 (patch)
tree7c6e10fbe9383ef9c384392c96543d5839873bb6
parent9bb3e153c4de16b3abc913719fbdd7c688466e28 (diff)
zfs.8 & zpool.8: Drop legal/illegal
There's a convention in documentation that these words not be used to mean "invalid". Signed-off-by: Richard Laager <[email protected]>
-rw-r--r--man/man8/zfs.84
-rw-r--r--man/man8/zpool.82
2 files changed, 3 insertions, 3 deletions
diff --git a/man/man8/zfs.8 b/man/man8/zfs.8
index 1f6f43e8f..57915440a 100644
--- a/man/man8/zfs.8
+++ b/man/man8/zfs.8
@@ -1254,7 +1254,7 @@ The values \fBon\fR and \fBoff\fR are equivalent to the \fBsuid\fR and \fBnosuid
.RS 4n
Controls whether the file system is shared by using \fBSamba USERSHARES\fR, and what options are to be used. 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 \fBnet\fR(8) command is invoked to create a \fBUSERSHARE\fR.
.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 (\fB_\fR) characters. Linux does not currently support additional options which might be available on Solaris.
+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 invalid in the resource name, are replaced with underscore (\fB_\fR) characters. Linux does not currently support additional options which might be available on Solaris.
.sp
If the \fBsharesmb\fR property is set to \fBoff\fR, the file systems are unshared.
.sp
@@ -1468,7 +1468,7 @@ The \fBmixed\fR value for the \fBcasesensitivity\fR property indicates that the
.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 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
diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
index e7bd19268..b2a5d6cc4 100644
--- a/man/man8/zpool.8
+++ b/man/man8/zpool.8
@@ -725,7 +725,7 @@ A text string consisting of printable ASCII characters that will be stored such
.ad
.sp .6
.RS 4n
-Threshold for the number of block ditto copies. If the reference count for a deduplicated block increases above this number, a new ditto copy of this block is automatically stored. The default setting is 0 which causes no ditto copies to be created for deduplicated blocks. The minimum legal nonzero setting is 100.
+Threshold for the number of block ditto copies. If the reference count for a deduplicated block increases above this number, a new ditto copy of this block is automatically stored. The default setting is 0 which causes no ditto copies to be created for deduplicated blocks. The minimum valid nonzero setting is 100.
.RE
.sp