summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libc_r/man/pthread_cancel.34
-rw-r--r--lib/libc_r/man/pthread_testcancel.38
-rw-r--r--lib/libpthread/man/pthread_cancel.34
-rw-r--r--lib/libpthread/man/pthread_testcancel.38
-rw-r--r--share/termtypes/termcap.54
5 files changed, 14 insertions, 14 deletions
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
diff --git a/lib/libpthread/man/pthread_cancel.3 b/lib/libpthread/man/pthread_cancel.3
index c1d1d021238..f43dbe6bcd1 100644
--- a/lib/libpthread/man/pthread_cancel.3
+++ b/lib/libpthread/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/libpthread/man/pthread_testcancel.3 b/lib/libpthread/man/pthread_testcancel.3
index 4c0bce59135..b34ae7c7d8c 100644
--- a/lib/libpthread/man/pthread_testcancel.3
+++ b/lib/libpthread/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
diff --git a/share/termtypes/termcap.5 b/share/termtypes/termcap.5
index 66ca5fcdb59..ab4a02d61ee 100644
--- a/share/termtypes/termcap.5
+++ b/share/termtypes/termcap.5
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)termcap.5 6.11 (Berkeley) 3/6/93
-.\" $Id: termcap.5,v 1.7 1999/09/23 04:12:07 alex Exp $
+.\" $Id: termcap.5,v 1.8 2000/01/22 13:59:30 aaron Exp $
.\"
.Dd March 6, 1993
.Dt TERMCAP 5
@@ -1781,7 +1781,7 @@ The capabilities given before
.Sy \&tc
override those in the terminal type invoked by
.Sy \&tc .
-A capability can be canceled by placing
+A capability can be cancelled by placing
.Sy \&xx@
to the left of the
.Sy \&tc