svn commit: r271064 - stable/10/share/man/man9

[Gavin Atkinson]

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