Minor documentation updates.

FransUrbo · Dec 19, 2013 · d461f23 · d461f23
1 parent be362c3
commit d461f23
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/README.crypto b/README.crypto
@@ -24,7 +24,8 @@ The crypto/api implementation is brand new, and supports "bare
 minimum" features as needed by ZFS only.
 
 
-Current support is at "proof of concept" level only. It is NOT usable.
+Current support is at "works for some" level only. It is NOT
+recomended in a commersial environment.
 
 
 Required work before Alpha:
@@ -44,7 +45,7 @@ Required work before Alpha:
 * All "// FIXME" should be inspected. In particular, known areas
   which differ are PROP_ALIAS, PROP_INHERIT, crypto vs userquota,
 
-* Removed KEY methods "https URI" (requires curl) and pkcs11 types.
+* Removed KEY method pkcs11.
 
 * Undo the POOL VERSION=30, put it back to 28, and make CRYPTO be a
   "Named Extension" instead.

diff --git a/README.markdown b/README.markdown
@@ -58,7 +58,7 @@ Importing a Solaris pool can be done using:
 * All "// FIXME" should be inspected. In particular, known areas
   which differ are PROP_ALIAS, PROP_INHERIT, crypto vs userquota,
 
-* Removed KEY methods "https URI" (requires curl) and pkcs11 types.
+* Removed KEY method pkcs11.
 
 
 Example 1: Ask for password.

diff --git a/man/man1/zfs_encrypt.1 b/man/man1/zfs_encrypt.1
@@ -125,6 +125,8 @@ The following properties cannot be changed after the file system is created and,
 .sp .6
 .RS 4n
 Defines the encryption algorithm and key length that is used for the encrypted dataset. The \fBon\fR value is equal to \fBaes-128-ccm\fR. The default value is \fBoff\fR. When encryption is set to a value other than \fBoff\fR, the \fBchecksum\fR property is set to \fBsha256+mac\fR and becomes \fBreadonly\fR.
+.sp
+Only \fBon\fR or \fBoff\fR is allowed for a ZVOL.
 .RE
 .LP
 For a ZVOL, the only encryption algorithms allowed is
-Original file line number
+Diff line change
@@ Expand Up @@
     .sp .6
     .RS 4n
     Defines the encryption algorithm and key length that is used for the encrypted dataset. The \fBon\fR value is equal to \fBaes-128-ccm\fR. The default value is \fBoff\fR. When encryption is set to a value other than \fBoff\fR, the \fBchecksum\fR property is set to \fBsha256+mac\fR and becomes \fBreadonly\fR.
+    .sp
+    Only \fBon\fR or \fBoff\fR is allowed for a ZVOL.
     .RE
     .LP
     For a ZVOL, the only encryption algorithms allowed is
@@ Expand Down @@