diff --git a/Manual.md b/Manual.md index 6c66f62..09aa97f 100644 --- a/Manual.md +++ b/Manual.md @@ -140,7 +140,7 @@ Now the snapshots are actually transferred, unless `--no-send` is used. If `--other-snapshots` is specified, we will also transfer snapshots that do not match our `--snapshot-format`. These other snapshots will never be destroyed. For each snapshot we: -* Check if we need to resume and aborted transfer. +* Check if we need to resume an aborted transfer. * Handle [Encryption](Encryption) options. (`--encrypt` and `--decrypt`) * Transfer the data, using various [Transfer options](Piping) (`--zfs-compressed`, `--compress`, `--send-pipe`, `--recv-pipe`, `--buffer`, `--rate`) * Filter/set properties according to `--set-properties` and `--filter-properties` @@ -148,18 +148,18 @@ For each snapshot we: Just before the first snapshot is transferred, we do a rollback, if `--rollback` is specified. -If its an initial transfer that created a new target dataset, we try to [automount](Mounting) the target after the first snapshot is transferred. +If it's an initial transfer that created a new target dataset, we try to [automount](Mounting) the target after the first snapshot is transferred. We destroy obsolete snapshots from the planning phase as soon as possible. (`--no-thinning` effectively disables this ) #### Extra transfer options -* `--ignore-transfer-errors`: ignore zfs transfer errors. It still checks if received filesystem exists. This is usefull to ignore some acltype errors. -* `--clear-refreservation`: Filter "refreservation" property. Recommended, saves space. Same as --filter-properties refreservation. -* `--clear-mountpoint`: Set property canmount=noauto for new datasets. Recommended, prevents mount conflicts. Same as --set-properties canmount=noauto. Also see [Mounting](Mounting) -* `--strip-path N`: Number of directories to strip from target path. An example is giving in the Getting started guide. -* `--force`: Use zfs -F option to force overwrite/rollback. Useful with --strip-path=1, but use with care. +* `--ignore-transfer-errors`: Ignore ZFS transfer errors. It still checks if received filesystem exists. This is useful to ignore some acltype errors. +* `--clear-refreservation`: Filter "refreservation" property. Recommended to save space. Same as `--filter-properties` refreservation. +* `--clear-mountpoint`: Set property `canmount=noauto` for new datasets. Recommended, prevents mount conflicts. Same as `--set-properties canmount=noauto`. Also see [Mounting](Mounting) +* `--strip-path N`: Number of directories to strip from target path. An example is given in the Getting started guide. +* `--force`: Use `zfs -F` option to force overwrite/rollback. Useful with `--strip-path=1`. Use with care! ## Step 4: Handle missing datasets