From owner-p4-projects@FreeBSD.ORG  Fri Oct  3 19:34:23 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 05120E39; Fri,  3 Oct 2014 19:34:23 +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 B9CC9E37
 for <perforce@freebsd.org>; Fri,  3 Oct 2014 19:34:22 +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 A6AACBF1
 for <perforce@freebsd.org>; Fri,  3 Oct 2014 19:34:22 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s93JYMIc030965
 for <perforce@freebsd.org>; Fri, 3 Oct 2014 19:34:22 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s93JYM3a030962
 for perforce@freebsd.org; Fri, 3 Oct 2014 19:34:22 GMT
 (envelope-from jhb@freebsd.org)
Date: Fri, 3 Oct 2014 19:34:22 GMT
Message-Id: <201410031934.s93JYM3a030962@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 1201096 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: Fri, 03 Oct 2014 19:34:23 -0000

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

Change 1201096 by jhb@jhb_ralph on 2014/10/03 19:33:34

	More fixes.
	
	Submitted by:	wblock

Affected files ...

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

Differences ...

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

@@ -178,7 +178,8 @@
 callout function and releases it after the function returns.
 If the callout was cancelled while the callout subsystem waited for the
 associated lock,
-the callout function is not called and the associated lock is released.
+the callout function is not called,
+and the associated lock is released.
 This guarantees that stopping or rescheduling the callout will not race with
 the callout function itself because the associated lock must be held to
 stop or reschedule the callout.
@@ -401,13 +402,13 @@
 and
 .Fn callout_schedule
 functions schedule the callout to execute in the softclock thread of the CPU
-it is currently assigned to.
+to which it is currently assigned.
 .Pp
-The softclock threads are not pinned to their respective CPUs by default.
+Softclock threads are not pinned to their respective CPUs by default.
 The softclock thread for CPU 0 can be pinned to CPU 0 by setting the
 .Va kern.pin_default_swi
 loader tunable to a non-zero value.
-The softclock threads for CPUs other than zero can be pinned to their
+Softclock threads for CPUs other than zero can be pinned to their
 respective CPUs by setting the
 .Va kern.pin_pcpu_swi
 loader tunable to a non-zero value.