[PATCH] man3, man5, man7: Fix spelling (British -> American)
From: Simon Essien <hidden>
Date: 2026-01-06 10:33:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
Change 'cancelled' to 'canceled' to follow the project's American English standard. Reported-by: Helge Kreutzmann <redacted> Signed-off-by: Simon Essien <redacted> --- man/man3/pthread_cond_init.3 | 2 +- man/man5/proc_pid_io.5 | 6 +++--- man/man7/bpf-helpers.7 | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/man/man3/pthread_cond_init.3 b/man/man3/pthread_cond_init.3
index 88600b3a5..f562ce47a 100644
--- a/man/man3/pthread_cond_init.3
+++ b/man/man3/pthread_cond_init.3@@ -169,7 +169,7 @@ except checking that the condition has no waiting threads. and .BR pthread_cond_timedwait () are cancelation points. -If a thread is cancelled while suspended in one of these functions, +If a thread is canceled while suspended in one of these functions, the thread immediately resumes execution, then locks again the .I mutex
diff --git a/man/man5/proc_pid_io.5 b/man/man5/proc_pid_io.5
index 19b5bde9e..fe810b60d 100644
--- a/man/man5/proc_pid_io.5
+++ b/man/man5/proc_pid_io.5@@ -22,7 +22,7 @@ syscr: 632687 syscw: 632675 read_bytes: 0 write_bytes: 323932160 -cancelled_write_bytes: 0 +canceled_write_bytes: 0 .EE .in .IP
@@ -70,7 +70,7 @@ This is accurate for block-backed filesystems. .IR write_bytes ": bytes written" The number of bytes really sent to the storage layer. .TP -.IR cancelled_write_bytes : +.IR canceled_write_bytes : The above statistics fail to account for truncation: if a process writes 1 MB to a regular file and then removes it, said 1 MB will not be written, but
@@ -79,7 +79,7 @@ have nevertheless been accounted as a 1 MB write. This field represents the number of bytes "saved" from I/O writeback. This can yield to having done negative I/O if caches dirtied by another process are truncated. -.I cancelled_write_bytes +.I canceled_write_bytes applies to I/O already accounted-for in .IR write_bytes . .RE
diff --git a/man/man7/bpf-helpers.7 b/man/man7/bpf-helpers.7
index 01c2d87d9..fdabfbf2d 100644
--- a/man/man7/bpf-helpers.7
+++ b/man/man7/bpf-helpers.7@@ -4317,7 +4317,7 @@ the same \fImap\fP\&. \fB\-EPERM\fP if \fItimer\fP is in a map that doesn\(aqt have any user references. The user space should either hold a file descriptor to a map with timers or pin such map in bpffs. When map is unpinned or file descriptor is -closed all timers in the map will be cancelled and freed. +closed all timers in the map will be canceled and freed. .UNINDENT .TP .B \fBlong bpf_timer_set_callback(struct bpf_timer *\fP\fItimer\fP\fB, void *\fP\fIcallback_fn\fP\fB)\fP
@@ -4332,7 +4332,7 @@ Configure the timer to call \fIcallback_fn\fP static function. \fB\-EPERM\fP if \fItimer\fP is in a map that doesn\(aqt have any user references. The user space should either hold a file descriptor to a map with timers or pin such map in bpffs. When map is unpinned or file descriptor is -closed all timers in the map will be cancelled and freed. +closed all timers in the map will be canceled and freed. .UNINDENT .TP .B \fBlong bpf_timer_start(struct bpf_timer *\fP\fItimer\fP\fB, u64\fP \fInsecs\fP\fB, u64\fP \fIflags\fP\fB)\fP
@@ -4347,7 +4347,7 @@ Since struct bpf_timer is a field inside map element the map owns the timer. The bpf_timer_set_callback() will increment refcnt of BPF program to make sure that callback_fn code stays valid. When user space reference to a map reaches zero all timers -in a map are cancelled and corresponding program\(aqs refcnts are +in a map are canceled and corresponding program\(aqs refcnts are decremented. This is done to make sure that Ctrl\-C of a user process doesn\(aqt leave any timers running. If map is pinned in bpffs the callback_fn can re\-arm itself indefinitely.
--
2.51.0