From owner-p4-projects@FreeBSD.ORG  Thu Oct  2 20:59:34 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 532C1309; Thu,  2 Oct 2014 20:59:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 13F9A307
 for <perforce@freebsd.org>; Thu,  2 Oct 2014 20:59:34 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682: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 00B93FD4
 for <perforce@freebsd.org>; Thu,  2 Oct 2014 20:59:34 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s92KxXOS070148
 for <perforce@freebsd.org>; Thu, 2 Oct 2014 20:59:33 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s92KxX7a070145
 for perforce@freebsd.org; Thu, 2 Oct 2014 20:59:33 GMT
 (envelope-from jhb@freebsd.org)
Date: Thu, 2 Oct 2014 20:59:33 GMT
Message-Id: <201410022059.s92KxX7a070145@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1201064 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Oct 2014 20:59:34 -0000

http://p4web.freebsd.org/@@1201064?ac=10

Change 1201064 by jhb@jhb_jhbbsd on 2014/10/02 20:58:49

	More fixes.
	
	Submitted by:	wblock

Affected files ...

.. //depot/projects/smpng/share/man/man9/timeout.9#17 edit

Differences ...

==== //depot/projects/smpng/share/man/man9/timeout.9#17 (text+ko) ====

@@ -463,10 +463,10 @@
 the callout by another thread.
 In particular, since callout functions typically acquire a lock as
 their first action, the callout function may have already been invoked,
-but be blocked waiting for that lock at the time that another thread
+but is blocked waiting for that lock at the time that another thread
 tries to reset or stop the callout.
 .Pp
-One of the following approaches can be used to address these
+There are three main techniques for addressing these
 synchronization concerns.
 The first approach is preferred as it is the simplest:
 .Bl -enum -offset indent