From owner-svn-src-all@FreeBSD.ORG  Wed Sep  3 23:11:39 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DF36394A;
 Wed,  3 Sep 2014 23:11:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CA8BB1560;
 Wed,  3 Sep 2014 23:11:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s83NBd3J026738;
 Wed, 3 Sep 2014 23:11:39 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s83NBdX4026737;
 Wed, 3 Sep 2014 23:11:39 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201409032311.s83NBdX4026737@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gavin set sender to
 gavin@FreeBSD.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Wed, 3 Sep 2014 23:11:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r271062 - stable/10/share/man/man3
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Sep 2014 23:11:40 -0000

Author: gavin
Date: Wed Sep  3 23:11:39 2014
New Revision: 271062
URL: http://svnweb.freebsd.org/changeset/base/271062

Log:
  Merge r269871 from head:
  
    Clarify descriptions of pthread_cond_wait() and pthread_cond_timedwait()
  
  Submitted by:	Malcolm Douglas via freebsd-doc
  Reviewed by:	jhb

Modified:
  stable/10/share/man/man3/pthread.3
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man3/pthread.3
==============================================================================
--- stable/10/share/man/man3/pthread.3	Wed Sep  3 23:08:48 2014	(r271061)
+++ stable/10/share/man/man3/pthread.3	Wed Sep  3 23:11:39 2014	(r271062)
@@ -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 bloc
 .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