diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8 index f072ce3de50b..95264069446f 100644 --- a/sbin/shutdown/shutdown.8 +++ b/sbin/shutdown/shutdown.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: shutdown.8,v 1.19 2000/07/20 17:46:57 jdolecek Exp $ +.\" $NetBSD: shutdown.8,v 1.20 2000/07/25 19:02:15 jdolecek Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" .\" @(#)shutdown.8 8.2 (Berkeley) 4/27/95 .\" -.Dd July 20, 2000 +.Dd January 20, 1998 .Dt SHUTDOWN 8 .Os .Sh NAME @@ -42,7 +42,6 @@ .Sh SYNOPSIS .Nm .Op Fl Ddfhknpr -.Op Fl T Ar timeout .Ar time .Op Ar message ... | Ar - .Sh DESCRIPTION @@ -70,13 +69,6 @@ flags are specified, then .Fl d also implies .Fl r . -.It Fl D -Prevents -.Nm -from detaching from the tty with -.Xr fork 2 -and -.Xr exit 3 . .It Fl f .Nm arranges, in the manner of @@ -118,12 +110,12 @@ when .Nm execs .Xr reboot 8 . -.It Fl T -Timeout in seconds to wait for -.Pa /etc/rc.shutdown -to finish. After -this period, the script is killed and system shutdown proceeds. -Default is 300 seconds (5 minutes). +.It Fl D +Prevents +.Nm +from detaching from the tty with +.Xr fork 2 / +.Xr exit 3 . .It Ar time .Ar Time is the time at which @@ -177,12 +169,8 @@ time of shutdown, who initiated the shutdown and the reason. Next a message is printed announcing the start of the system shutdown hooks. Then the shutdown hooks in .Pa /etc/rc.shutdown -are run. If they don't complete within timeout (see -.Fl T , -default 5 minutes), the script is killed and -.Nm -proceeds with system shutdown. -In either case, a message is printed indicating that they have completed. +are run. +And a message is printed indicating that they have completed. After a short delay a terminate signal is then sent to .Xr init 8 @@ -216,9 +204,3 @@ The .Nm command appeared in .Bx 4.0 . -Running of shutdown hooks in -.Pa /etc/rc.shutdown -and -.Fl T -option have been added in -.Nx 1.5 .