From 6e0667dd238367111d3e4523e2679bb7f62e45c0 Mon Sep 17 00:00:00 2001 From: Aaron Campbell Date: Sat, 22 Jan 2000 13:59:31 +0000 Subject: canceled -> cancelled --- lib/libc_r/man/pthread_cancel.3 | 4 ++-- lib/libc_r/man/pthread_testcancel.3 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/libc_r') diff --git a/lib/libc_r/man/pthread_cancel.3 b/lib/libc_r/man/pthread_cancel.3 index c1d1d021238..f43dbe6bcd1 100644 --- a/lib/libc_r/man/pthread_cancel.3 +++ b/lib/libc_r/man/pthread_cancel.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pthread_cancel.3,v 1.4 1999/11/24 05:35:31 d Exp $ +.\" $OpenBSD: pthread_cancel.3,v 1.5 2000/01/22 13:59:29 aaron Exp $ .Dd January 17, 1999 .Dt PTHREAD_CANCEL 3 .Os @@ -14,7 +14,7 @@ The .Fn pthread_cancel function requests that .Fa thread -be canceled. The target thread's cancelability state and type determines +be cancelled. The target thread's cancelability state and type determines when the cancellation takes effect. When the cancellation is acted on, the cancellation cleanup handlers for .Fa thread diff --git a/lib/libc_r/man/pthread_testcancel.3 b/lib/libc_r/man/pthread_testcancel.3 index 4c0bce59135..b34ae7c7d8c 100644 --- a/lib/libc_r/man/pthread_testcancel.3 +++ b/lib/libc_r/man/pthread_testcancel.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pthread_testcancel.3,v 1.5 1999/11/24 05:35:33 d Exp $ +.\" $OpenBSD: pthread_testcancel.3,v 1.6 2000/01/22 13:59:29 aaron Exp $ .Dd January 17, 1999 .Dt PTHREAD_TESTCANCEL 3 .Os @@ -122,7 +122,7 @@ The and .Fn pthread_setcanceltype functions are used to control the points at which a thread may be -asynchronously canceled. For cancellation control to be usable in modular +asynchronously cancelled. For cancellation control to be usable in modular fashion, some rules must be followed. .Pp For purposes of this discussion, consider an object to be a generalization @@ -137,9 +137,9 @@ always be restored to its value on entry to the object. This follows from a modularity argument: if the client of an object (or the client of an object that uses that object) has disabled cancelability, it is because the client doesn't want to have to worry about how to clean up if the -thread is canceled while executing some sequence of actions. If an object +thread is cancelled while executing some sequence of actions. If an object is called in such a state and it enables cancelability and a cancellation -request is pending for that thread, then the thread will be canceled, +request is pending for that thread, then the thread will be cancelled, contrary to the wish of the client that disabled. .Pp Second, the cancelability type may be explicitly set to either -- cgit v1.2.3