Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 13 insertions, 10 deletions

diff --git a/upstream/archlinux/man3/pthread_mutex_init.3 b/upstream/archlinux/man3/pthread_mutex_init.3
index 1574489c..6f1c2150 100644
--- a/upstream/archlinux/man3/pthread_mutex_init.3
+++ b/upstream/archlinux/man3/pthread_mutex_init.3
@@ -3,7 +3,7 @@
 .\"
 .\" SPDX-License-Identifier: Linux-man-pages-copyleft
 .\"
-.TH pthread_mutex_init 3 2023-10-31 "Linux man-pages 6.06"
+.TH pthread_mutex_init 3 2024-05-19 "Linux man-pages 6.8"
 .
 .
 .SH NAME
@@ -17,17 +17,20 @@ operations on mutexes
 .
 .
 .SH SYNOPSIS
+.nf
 .B #include <pthread.h>
 .P
 .BI "pthread_mutex_t " fastmutex " = PTHREAD_MUTEX_INITIALIZER;"
 .BI "pthread_mutex_t " recmutex " = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;"
 .BI "pthread_mutex_t " errchkmutex " = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;"
 .P
-.BI "int pthread_mutex_init(pthread_mutex_t *" mutex ", const pthread_mutexattr_t *" mutexattr ");"
-.BI "int pthread_mutex_lock(pthread_mutex_t *" mutex ");"
-.BI "int pthread_mutex_trylock(pthread_mutex_t *" mutex ");"
-.BI "int pthread_mutex_unlock(pthread_mutex_t *" mutex ");"
-.BI "int pthread_mutex_destroy(pthread_mutex_t *" mutex ");"
+.BI "int pthread_mutex_init(pthread_mutex_t *" mutex ,
+.BI "                       const pthread_mutexattr_t *" mutexattr );
+.BI "int pthread_mutex_lock(pthread_mutex_t *" mutex );
+.BI "int pthread_mutex_trylock(pthread_mutex_t *" mutex );
+.BI "int pthread_mutex_unlock(pthread_mutex_t *" mutex );
+.BI "int pthread_mutex_destroy(pthread_mutex_t *" mutex );
+.fi
 .
 .
 .SH DESCRIPTION
@@ -130,16 +133,16 @@ except checking that the mutex is unlocked.
 .
 .
 .SH CANCELLATION
-None of the mutex functions is a cancellation point,
+None of the mutex functions is a cancelation point,
 not even \fBpthread_mutex_lock\fP,
 in spite of the fact that it can suspend a thread for arbitrary durations.
 This way,
-the status of mutexes at cancellation points is predictable,
-allowing cancellation handlers
+the status of mutexes at cancelation points is predictable,
+allowing cancelation handlers
 to unlock precisely those mutexes that need to be unlocked
 before the thread stops executing.
 Consequently,
-threads using deferred cancellation
+threads using deferred cancelation
 should never hold a mutex for extended periods of time.
 .
 .