From owner-svn-src-all@FreeBSD.ORG  Wed Jul 14 18:55:46 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 52E9C1065678;
	Wed, 14 Jul 2010 18:55:46 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 422678FC1F;
	Wed, 14 Jul 2010 18:55:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6EItkh9051106;
	Wed, 14 Jul 2010 18:55:46 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6EItkSe051104;
	Wed, 14 Jul 2010 18:55:46 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201007141855.o6EItkSe051104@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 14 Jul 2010 18:55:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210071 - stable/7/share/man/man3
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 14 Jul 2010 18:55:46 -0000

Author: jhb
Date: Wed Jul 14 18:55:45 2010
New Revision: 210071
URL: http://svn.freebsd.org/changeset/base/210071

Log:
  MFC 209588:
  - The ETIMEDOUT error applies to pthread_timedjoin_np(), not pthread_join().
  - Tweak wording in history section for pthread_timedjoin_np().

Modified:
  stable/7/share/man/man3/pthread_join.3
Directory Properties:
  stable/7/share/man/man3/   (props changed)

Modified: stable/7/share/man/man3/pthread_join.3
==============================================================================
--- stable/7/share/man/man3/pthread_join.3	Wed Jul 14 18:55:34 2010	(r210070)
+++ stable/7/share/man/man3/pthread_join.3	Wed Jul 14 18:55:45 2010	(r210071)
@@ -116,7 +116,7 @@ The implementation detected that another
 .El
 .Pp
 Additionally, the
-.Fn pthread_join
+.Fn pthread_timedjoin_np
 function will fail if:
 .Bl -tag -width Er
 .It Bq Er ETIMEDOUT
@@ -134,7 +134,7 @@ function conforms to
 .St -p1003.1-96 .
 The
 .Fn pthread_timedjoin_np
-is
+is a
 .Fx
-extension, first appeared in
+extension which first appeared in
 .Fx 6.1 .