]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Fix typesetting of Errata #4
authorJMoVS <git@justinscholz.de>
Wed, 8 May 2019 23:04:45 +0000 (01:04 +0200)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 8 May 2019 23:04:45 +0000 (16:04 -0700)
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Justin Scholz <git@justinscholz.de>
Closes #8712
Closes #8721

cmd/zpool/zpool_main.c

index 34b9272a3997895dacc56ef18868bfbb14579fa4..1dac4b167f7ce2e4575dfdc2ffc42cec63e493bd 100644 (file)
@@ -2570,16 +2570,16 @@ show_import(nvlist_t *config)
                                (void) printf(gettext(" action: Existing "
                                    "encrypted snapshots and bookmarks contain "
                                    "an on-disk\n\tincompatibility. This may "
-                                   "cause on-disk corruption if they are used "
-                                   "with\n\t'zfs recv'. To correct the issue, "
-                                   "enable the bookmark_v2 feature. No "
-                                   "additional\n\taction is needed if there "
-                                   "are no encrypted snapshots or bookmarks. "
-                                   "If preserving\n\tthe encrypted snapshots "
-                                   "and bookmarks is required, use a non-raw "
-                                   "send to backup\n\tand restore them. "
-                                   "Alternately, they may be removed to "
-                                   "resolve the\n\tincompatibility.\n"));
+                                   "cause on-disk corruption if they are used"
+                                   "\n\twith 'zfs recv'. To correct the "
+                                   "issue, enable the bookmark_v2 feature.\n\t"
+                                   "No additional action is needed if there "
+                                   "are no encrypted snapshots or\n\t"
+                                   "bookmarks. If preserving the encrypted "
+                                   "snapshots and bookmarks is\n\trequired, "
+                                   "use a non-raw send to backup and restore "
+                                   "them. Alternately,\n\tthey may be removed"
+                                   " to resolve the incompatibility.\n"));
                                break;
                        default:
                                /*
@@ -7636,19 +7636,18 @@ status_callback(zpool_handle_t *zhp, void *data)
                        break;
 
                case ZPOOL_ERRATA_ZOL_8308_ENCRYPTION:
-                       (void) printf(gettext("Existing encrypted snapshots "
-                           "and bookmarks contain an on-disk "
-                           "incompatibility.\n\tThis may cause on-disk "
-                           "corruption if they are used with 'zfs recv'."));
-                       (void) printf(gettext(" action:  To correct the issue, "
-                           "enable the bookmark_v2 feature. No "
-                           "additional\n\taction is needed if there "
-                           "are no encrypted snapshots or bookmarks. "
-                           "If preserving\n\tthe encrypted snapshots "
-                           "and bookmarks is required, use a non-raw "
-                           "send to backup\n\tand restore them. "
-                           "Alternately, they may be removed to "
-                           "resolve the\n\tincompatibility.\n"));
+                       (void) printf(gettext("\tExisting encrypted snapshots "
+                           "and bookmarks contain an on-disk\n\tincompat"
+                           "ibility. This may cause on-disk corruption if "
+                           "they are used\n\twith 'zfs recv'.\n"));
+                       (void) printf(gettext("action: To correct the issue, "
+                           "enable the bookmark_v2 feature. No additional\n\t"
+                           "action is needed if there are no encrypted "
+                           "snapshots or bookmarks.\n\tIf preserving the "
+                           "encrypted snapshots and bookmarks is required, "
+                           "use\n\ta non-raw send to backup and restore them. "
+                           "Alternately, they may be\n\tremoved to resolve "
+                           "the incompatibility.\n"));
                        break;
 
                default: