From 530ddcd5f1310963dd36252f705f80584cf2d4b1 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 12 Mar 2025 18:56:23 +0000 Subject: [PATCH] Harmonize on American spelling in several places Most of the documentation is written in American English, so it makes sense to be consistent. Signed-off-by: Simon Howard Reviewed-by: Tony Hutter Reviewed-by: Alexander Motin --- man/man1/ztest.1 | 2 +- man/man4/zfs.4 | 6 +++--- man/man7/zpoolconcepts.7 | 2 +- man/man8/zed.8.in | 2 +- man/man8/zpool-attach.8 | 2 +- man/man8/zpool-remove.8 | 2 +- man/man8/zpool-replace.8 | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/man/man1/ztest.1 b/man/man1/ztest.1 index 6dad1937e..0cbb58e40 100644 --- a/man/man1/ztest.1 +++ b/man/man1/ztest.1 @@ -176,7 +176,7 @@ Max loops in .It Fl B , -alt-ztest Ns = Path to alternate ("older") .Nm ztest -to drive, which will be used to initialise the pool, and, a stochastic half the +to drive, which will be used to initialize the pool, and, a stochastic half the time, to run the tests. The parallel .Pa lib diff --git a/man/man4/zfs.4 b/man/man4/zfs.4 index e166efe86..a493e3f7a 100644 --- a/man/man4/zfs.4 +++ b/man/man4/zfs.4 @@ -1131,7 +1131,7 @@ Max memory to use for dedup logs, as a percentage of total memory. .Pp If .Sy zfs_dedup_log_mem_max -is not set, it will be initialised as a percentage of the total memory in the +is not set, it will be initialized as a percentage of the total memory in the system. . .It Sy zfs_delay_min_dirty_percent Ns = Ns Sy 60 Ns % Pq uint @@ -2003,7 +2003,7 @@ as it typically results in leaked space, or worse. .It Sy zfs_removal_ignore_errors Ns = Ns Sy 0 Ns | Ns 1 Pq int Ignore hard I/O errors during device removal. When set, if a device encounters a hard I/O error during the removal process -the removal will not be cancelled. +the removal will not be canceled. This can result in a normally recoverable block becoming permanently damaged and is hence not recommended. This should only be used as a last resort when the @@ -2659,7 +2659,7 @@ and limits. . .It Sy zvol_volmode Ns = Ns Sy 1 Pq uint -Defines zvol block devices behaviour when +Defines zvol block devices behavior when .Sy volmode Ns = Ns Sy default : .Bl -tag -compact -offset 4n -width "a" .It Sy 1 diff --git a/man/man7/zpoolconcepts.7 b/man/man7/zpoolconcepts.7 index 16afb175d..87feb6d41 100644 --- a/man/man7/zpoolconcepts.7 +++ b/man/man7/zpoolconcepts.7 @@ -356,7 +356,7 @@ and both pools suffer a device failure at the same time, both could attempt to use the spare at the same time. This may not be detected, resulting in data corruption. .Pp -An in-progress spare replacement can be cancelled by detaching the hot spare. +An in-progress spare replacement can be canceled by detaching the hot spare. If the original faulted device is detached, then the hot spare assumes its place in the configuration, and is removed from the spare list of all active pools. diff --git a/man/man8/zed.8.in b/man/man8/zed.8.in index a00a93c50..c90a18344 100644 --- a/man/man8/zed.8.in +++ b/man/man8/zed.8.in @@ -55,7 +55,7 @@ Force the daemon to run if at all possible, disabling security checks and throwing caution to the wind. Not recommended for use in production. .It Fl F -Don't daemonise: remain attached to the controlling terminal, +Don't daemonize: remain attached to the controlling terminal, log to the standard I/O streams. .It Fl M Lock all current and future pages in the virtual memory address space. diff --git a/man/man8/zpool-attach.8 b/man/man8/zpool-attach.8 index fc7022f0a..51d876767 100644 --- a/man/man8/zpool-attach.8 +++ b/man/man8/zpool-attach.8 @@ -70,7 +70,7 @@ is part of a two-way mirror, attaching creates a three-way mirror, and so on. In either case, .Ar new_device -begins to resilver immediately and any running scrub is cancelled. +begins to resilver immediately and any running scrub is canceled. .Pp If the existing device is a RAID-Z device .Pq e.g. specified as Qq Ar raidz2-0 , diff --git a/man/man8/zpool-remove.8 b/man/man8/zpool-remove.8 index e8d6bdc69..d10a92e49 100644 --- a/man/man8/zpool-remove.8 +++ b/man/man8/zpool-remove.8 @@ -70,7 +70,7 @@ command initiates the removal and returns, while the evacuation continues in the background. The removal progress can be monitored with .Nm zpool Cm status . -If an I/O error is encountered during the removal process it will be cancelled. +If an I/O error is encountered during the removal process it will be canceled. The .Sy device_removal feature flag must be enabled to remove a top-level vdev, see diff --git a/man/man8/zpool-replace.8 b/man/man8/zpool-replace.8 index a2a42f5df..9f3156eeb 100644 --- a/man/man8/zpool-replace.8 +++ b/man/man8/zpool-replace.8 @@ -50,7 +50,7 @@ This is equivalent to attaching .Ar new-device , waiting for it to resilver, and then detaching .Ar device . -Any in progress scrub will be cancelled. +Any in progress scrub will be canceled. .Pp The size of .Ar new-device