Sync both the content and style of `shutdown -h` and `man shutdown`. http://bugs.gentoo.org/91724 --- man/shutdown.8 +++ man/shutdown.8 @@ -11,7 +11,7 @@ .B /sbin/shutdown +.RB [ \-akrhPHfFnc ] .RB [ \-t .IR sec ] -.RB [ \-arkhncfFHP ] .I time -.RI [ warning-message ] +.RI [ "warning message" ] .\"}}} @@ -41,7 +41,2 @@ .\"}}} -.\"{{{ -t sec -.IP "\fB\-t\fP \fIsec\fP" -Tell \fBinit\fP(8) to wait \fIsec\fP seconds between sending processes the -warning and the kill signal, before changing to another runlevel. -.\"}}} .\"{{{ -k @@ -58,7 +53,2 @@ .\"}}} -.\"{{{ -H -.IP \fB\-H\fP -Halt action is to halt or drop into boot monitor on systems that -support it. -.\"}}} .\"{{{ -P @@ -67,7 +57,6 @@ .\"}}} -.\"{{{ -n -.IP \fB\-n\fP -[DEPRECATED] Don't call \fBinit\fP(8) to do the shutdown but do it ourself. -The use of this option is discouraged, and its results are not always what -you'd expect. +.\"{{{ -H +.IP \fB\-H\fP +Halt action is to halt or drop into boot monitor on systems that +support it. .\"}}} @@ -81,2 +70,8 @@ .\"}}} +.\"{{{ -n +.IP \fB\-n\fP +[DEPRECATED] Don't call \fBinit\fP(8) to do the shutdown but do it ourself. +The use of this option is discouraged, and its results are not always what +you'd expect. +.\"}}} .\"{{{ -c @@ -87,2 +82,7 @@ .\"}}} +.\"{{{ -t sec +.IP "\fB\-t\fP \fIsec\fP" +Tell \fBinit\fP(8) to wait \fIsec\fP seconds between sending processes the +warning and the kill signal, before changing to another runlevel. +.\"}}} .\"{{{ time @@ -92,3 +92,3 @@ .\"{{{ warning-message -.IP \fIwarning-message\fP +.IP "\fIwarning message\fP" Message to send to all users. --- src/shutdown.c +++ src/shutdown.c @@ -104,3 +104,3 @@ fprintf(stderr, - "Usage:\t shutdown [-akrhHPfnc] [-t secs] time [warning message]\n" + "Usage:\t shutdown [-akrhPHfFnc] [-t sec] time [warning message]\n" "\t\t -a: use /etc/shutdown.allow\n"