diff --git a/man/zfs-tpm-list.8.pp b/man/zfs-tpm-list.8.pp index 734b38d..d9034f8 100644 --- a/man/zfs-tpm-list.8.pp +++ b/man/zfs-tpm-list.8.pp @@ -49,18 +49,15 @@ program or and .Nm zfs Cm inherit \(em if the key becomes unloaded, they will require restoration from back-up. -However, they should never occur, unless something went terribly wrong with the dataset properties. +However, this should never occur, unless something went horribly wrong with the dataset properties. .Pp -If no datasets are specified, lists all matching encryption roots. -The default filter is to list all roots managed by +If no datasets are specified, all matching encryption roots are listed \(em by default, those managed by .Nm tzpfms . -.Fl ab -can be used to either list all roots or only ones backed by a particular end, respectively. . .Sh OPTIONS .Bl -tag -compact -width "-b back-end" .It Fl H -Scripting mode \(em do not print headers and separate fields by a single tab instead of columnating with spaces. +Scripting mode \(em remove headers and separate fields by a single tab instead of columnating them with spaces. .Pp .It Fl r Recurse into all descendants of specified datasets. @@ -75,9 +72,8 @@ Default: List all encryption roots, even ones not managed by .Nm tzpfms . .It Fl b Ar back-end -List only encryption roots with -.Ar tzpfms -back-end +List only encryption roots with the specified +.Nm tzpfms .Ar back-end . .Pp .It Fl l diff --git a/man/zfs-tpm1x-change-key.8.pp b/man/zfs-tpm1x-change-key.8.pp index 44476ed..63f3c2b 100644 --- a/man/zfs-tpm1x-change-key.8.pp +++ b/man/zfs-tpm1x-change-key.8.pp @@ -37,11 +37,11 @@ and the back-end was used, the metadata will be silently cleared. Otherwise, or in case of an error, data required for manual intervention will be printed to the standard error stream. .Pp -Next, a new wrapping key is be generated on the TPM, optionally backed up +Next, a new wrapping key is generated on the TPM, optionally backed up .Pq see Sx OPTIONS , and sealed on the TPM; the user is prompted for an optional passphrase to protect the key with, -and for the SRK passphrase, set when taking ownership, if it is not "well-known" (all zeroes). +and for the SRK passphrase, set when taking ownership, if not "well-known" (all zeroes). .Pp The following properties are set on .Ar dataset : diff --git a/man/zfs-tpm1x-load-key.8.pp b/man/zfs-tpm1x-load-key.8.pp index 42bfece..1278c76 100644 --- a/man/zfs-tpm1x-load-key.8.pp +++ b/man/zfs-tpm1x-load-key.8.pp @@ -6,7 +6,7 @@ . .Sh NAME .Nm zfs-tpm1x-load-key -.Nd load tzpfms TPM1.X-encrypted ZFS dataset key +.Nd load TPM1.X-encrypted ZFS dataset key .Sh SYNOPSIS .Nm .Op Fl n @@ -22,8 +22,8 @@ backend will unseal the key and load it into .Ar dataset . .Pp -The user is prompted for, first, the SRK passphrase, set when taking ownership, if it's not "well-known" (all zeroes), -then the additional passphrase set when creating the key, if it was provided. +The user is first prompted for the SRK passphrase, set when taking ownership, if not "well-known" (all zeroes); +then for the additional passphrase, set when creating the key, if one was set. .Pp See .Xr zfs-tpm1x-change-key 8 diff --git a/man/zfs-tpm2-change-key.8.pp b/man/zfs-tpm2-change-key.8.pp index cb8be15..e740dd4 100644 --- a/man/zfs-tpm2-change-key.8.pp +++ b/man/zfs-tpm2-change-key.8.pp @@ -37,7 +37,7 @@ and the back-end was used, the previous key will be freed from the TPM. Otherwise, or in case of an error, data required for manual intervention will be printed to the standard error stream. .Pp -Next, a new wrapping key is be generated on the TPM, optionally backed up +Next, a new wrapping key is generated on the TPM, optionally backed up .Pq see Sx OPTIONS , and sealed to a persistent object on the TPM under the owner hierarchy; if there is a passphrase set on the owner hierarchy, the user is prompted for it; diff --git a/man/zfs-tpm2-load-key.8.pp b/man/zfs-tpm2-load-key.8.pp index 88f2357..2a2a59b 100644 --- a/man/zfs-tpm2-load-key.8.pp +++ b/man/zfs-tpm2-load-key.8.pp @@ -6,7 +6,7 @@ . .Sh NAME .Nm zfs-tpm2-load-key -.Nd load tzpfms TPM2-encrypted ZFS dataset key +.Nd load TPM2-encrypted ZFS dataset key .Sh SYNOPSIS .Nm .Op Fl n @@ -22,6 +22,8 @@ backend unseals the key and loads it into .Ar dataset . .Pp +The user is prompted for the additional passphrase, set when creating the key, if one was set. +.Pp See .Xr zfs-tpm2-change-key 8 for a detailed description.