From owner-svn-src-all@FreeBSD.ORG  Wed Sep  3 23:14:27 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 8AC60BD2;
 Wed,  3 Sep 2014 23:14:27 +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 763C7158C;
 Wed,  3 Sep 2014 23:14:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s83NERxo027197;
 Wed, 3 Sep 2014 23:14:27 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s83NER2R027196;
 Wed, 3 Sep 2014 23:14:27 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201409032314.s83NER2R027196@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:14:27 +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: r271064 - stable/10/share/man/man9
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:14:27 -0000

Author: gavin
Date: Wed Sep  3 23:14:26 2014
New Revision: 271064
URL: http://svnweb.freebsd.org/changeset/base/271064

Log:
  Merge r270251 from head:
  
    Fix return type of callout_init_rm() and add return type to
    callout_deactivate().
  
  PR:		192520
  Submitted by:	ngie

Modified:
  stable/10/share/man/man9/timeout.9
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man9/timeout.9
==============================================================================
--- stable/10/share/man/man9/timeout.9	Wed Sep  3 23:11:41 2014	(r271063)
+++ stable/10/share/man/man9/timeout.9	Wed Sep  3 23:14:26 2014	(r271064)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 23, 2013
+.Dd August 21, 2014
 .Dt TIMEOUT 9
 .Os
 .Sh NAME
@@ -74,7 +74,7 @@ struct callout_handle handle = CALLOUT_H
 .Fn callout_init "struct callout *c" "int mpsafe"
 .Ft void
 .Fn callout_init_mtx "struct callout *c" "struct mtx *mtx" "int flags"
-.Fn void
+.Ft void
 .Fn callout_init_rm "struct callout *c" "struct rmlock *rm" "int flags"
 .Ft void
 .Fn callout_init_rw "struct callout *c" "struct rwlock *rw" "int flags"
@@ -103,6 +103,7 @@ struct callout_handle handle = CALLOUT_H
 .Fn callout_pending "struct callout *c"
 .Ft int
 .Fn callout_active "struct callout *c"
+.Ft void
 .Fn callout_deactivate "struct callout *c"
 .Sh DESCRIPTION
 The function