summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorChristian Rebischke <Chris.Rebischke@posteo.de>2016-06-06 17:06:20 +0200
committerLennart Poettering <lennart@poettering.net>2016-06-06 17:06:20 +0200
commitb2bb19bbda8f5ab3ab497165bc52a0ef952348c4 (patch)
tree3e9ec474a8e9513243b4a40c6562976de39c7b99 /man
parent45819e7cbfe5bd9044faca0f1e6e1145d7c0cfaa (diff)
machinectl: Added stop as alias for poweroff (#3406)
Diffstat (limited to 'man')
-rw-r--r--man/machinectl.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 4b7f9a0391..d3891332e4 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -373,8 +373,7 @@
<para>To interactively start a container on the command line
with full access to the container's console, please invoke
<command>systemd-nspawn</command> directly. To stop a running
- container use <command>machinectl poweroff</command>, see
- below.</para></listitem>
+ container use <command>machinectl poweroff</command>.</para></listitem>
</varlistentry>
<varlistentry>
@@ -461,8 +460,8 @@
<listitem><para>Power off one or more containers. This will
trigger a reboot by sending SIGRTMIN+4 to the container's init
process, which causes systemd-compatible init systems to shut
- down cleanly. This operation does not work on containers that
- do not run a
+ down cleanly. Use <command>stop</command> as alias for <command>poweroff</command>.
+ This operation does not work on containers that do not run a
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>-compatible
init system, such as sysvinit. Use
<command>terminate</command> (see below) to immediately