X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fshutdown.xml;h=c8c4b546205fabddfc7f2c872810f2d01a0212ab;hb=224f2ee221e77c326d1d7761abb6e812432b2163;hp=bff68213e6854ee6ca050feb938e03e973d66e75;hpb=160cd5c9aa2301892e13950015de7968c764340d;p=elogind.git
diff --git a/man/shutdown.xml b/man/shutdown.xml
index bff68213e..c8c4b5462 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -49,7 +49,7 @@
- shutdown OPTIONSnowWALL
+ shutdown OPTIONSTIMEWALL
@@ -59,11 +59,30 @@
shutdown may be used to halt,
power-off or reboot the machine.
- The first argument should be the string
- now which however is ignored by
- this implementation. Optionally, this may be followed
- by a wall message to be sent to all logged-in users
- before going down.
+ The first argument may be a time string (which
+ is usually now). Optionally, this
+ may be followed by a wall message to be sent to all
+ logged-in users before going down.
+
+ The time string may either be in the format
+ hh:mm for hour/minutes specifying
+ the time to execute the shutdown at, specified in 24h
+ clock format. Alternatively it may be in the syntax
+ +m referring to the specified
+ number of minutes m from now. now
+ is an alias for +0, i.e. for
+ triggering an immediate shutdown. If no time argument
+ is specified, +1 is
+ implied.
+
+ Note that to specify a wall message you must
+ specify a time argument, too.
+
+ If the time argument is used, 5 minutes
+ before the system goes down the
+ /etc/nologin file is created to
+ ensure that further logins shall not be
+ allowed.
@@ -112,7 +131,7 @@
-
+ Don't halt, power-off,
reboot, just write wall
@@ -126,6 +145,19 @@
message before
halt, power-off, reboot.
+
+
+
+
+ Cancel a pending
+ shutdown. This may be used cancel the
+ effect of an invocation of
+ shutdown with a
+ time argument that is not
+ +0 or
+ now.
+
+
@@ -148,7 +180,8 @@
systemd1,
systemctl1,
- halt8
+ halt8,
+ wall1