Merge from head@274682

4 files changed, 23 insertions, 7 deletions

diff --git a/share/man/man3/offsetof.3 b/share/man/man3/offsetof.3
index 9b3f568..ee5958f 100644
--- a/share/man/man3/offsetof.3
+++ b/share/man/man3/offsetof.3
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 18 2010
+.Dd February 18, 2010
 .Dt OFFSETOF 3
 .Os
 .Sh NAME
diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3
index 9c80f70..78a9153 100644
--- a/share/man/man3/pthread.3
+++ b/share/man/man3/pthread.3
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 8, 2010
+.Dd August 12, 2014
 .Dt PTHREAD 3
 .Os
 .Sh NAME
@@ -344,13 +344,13 @@ Unblock at least one of the threads blocked on the specified condition variable.
 .Fa "const struct timespec *abstime"
 .Fc
 .Xc
-Wait no longer than the specified time for a condition
-and lock the specified mutex.
+Unlock the specified mutex, wait no longer than the specified time for
+a condition, and then relock the mutex.
 .It Xo
 .Ft int
 .Fn pthread_cond_wait "pthread_cond_t *" "pthread_mutex_t *mutex"
 .Xc
-Wait for a condition and lock the specified mutex.
+Unlock the specified mutex, wait for a condition, and relock the mutex.
 .El
 .Ss Read/Write Lock Routines
 .Bl -tag -width indent
diff --git a/share/man/man3/pthread_cleanup_pop.3 b/share/man/man3/pthread_cleanup_pop.3
index 519e53f..2b7756a 100644
--- a/share/man/man3/pthread_cleanup_pop.3
+++ b/share/man/man3/pthread_cleanup_pop.3
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 30, 1998
+.Dd October 25, 2014
 .Dt PTHREAD_CLEANUP_POP 3
 .Os
 .Sh NAME
@@ -50,6 +50,14 @@ If there is no cleanup routine
 then
 .Fn pthread_cleanup_pop
 does nothing.
+.Pp
+The
+.Fn pthread_cleanup_pop
+function is implemented as a macro that closes a block.
+Invocations of this function must appear as standalone statements that are
+paired with an earlier call of
+.Xr pthread_cleanup_push 3
+in the same lexical scope.
 .Sh RETURN VALUES
 The
 .Fn pthread_cleanup_pop
diff --git a/share/man/man3/pthread_cleanup_push.3 b/share/man/man3/pthread_cleanup_push.3
index 2790987..47f35db 100644
--- a/share/man/man3/pthread_cleanup_push.3
+++ b/share/man/man3/pthread_cleanup_push.3
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 30, 1998
+.Dd October 25, 2014
 .Dt PTHREAD_CLEANUP_PUSH 3
 .Os
 .Sh NAME
@@ -52,6 +52,14 @@ When
 is called, it is passed
 .Fa arg
 as its only argument.
+.Pp
+The
+.Fn pthread_cleanup_push
+function is implemented as a macro that opens a new block.
+Invocations of this function must appear as standalone statements that are
+paired with a later call of
+.Xr pthread_cleanup_pop 3
+in the same lexical scope.
 .Sh RETURN VALUES
 The
 .Fn pthread_cleanup_push