From 005f716389f03889cea164612b6ec14843ae7fdf Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 3 Mar 2017 21:41:17 +0000
Subject: [PATCH] MFC r313867,r313869,r313870,r314001:

  r313867:
    Add history and Authors section in the manpage
  r313869:
    Also add vsevolod@ in the authors
  r313870:
    Use full name for the month
  r314001:
    Make it more clear that -k sends SIGKILL, not the -s signal.
---
 usr.bin/timeout/timeout.1 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/usr.bin/timeout/timeout.1 b/usr.bin/timeout/timeout.1
index 70a91066a6d1..f4532b102c62 100644
--- a/usr.bin/timeout/timeout.1
+++ b/usr.bin/timeout/timeout.1
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Oct 28, 2014
+.Dd February 20, 2017
 .Dt TIMEOUT 1
 .Os
 .Sh NAME
@@ -68,7 +68,9 @@ By default,
 .Ar SIGTERM .
 is sent.
 .It Fl k Ar time , Fl -kill-after Ar time
-Send a second kill signal if
+Send a
+.Ar SIGKILL
+signal if
 .Ar command
 is still running after
 .Ar time
@@ -127,3 +129,12 @@ the exit status return is 125.
 .Sh SEE ALSO
 .Xr kill 1 ,
 .Xr signal 3
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Fx 10.3 .
+.Sh AUTHORS
+.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org
+and
+.An Vsevolod Stakhov Aq Mt vsevolod@FreeBSD.org