From f2c8799ff5a07c8007ac52118bb7cf5c05fe4485 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <sthibault@debian.org>
Date: Sun, 5 Jul 2015 09:40:47 +0000
Subject: Document discrepancy between halt and poweroff.

---
 en/post-install/shutdown.xml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'en')

diff --git a/en/post-install/shutdown.xml b/en/post-install/shutdown.xml
index 9d54f681d..6ea11c942 100644
--- a/en/post-install/shutdown.xml
+++ b/en/post-install/shutdown.xml
@@ -21,11 +21,26 @@ Alternatively you can press the key combination <keycombo>
 <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>
 <phrase arch="powerpc"> or <keycombo> <keycap>Control</keycap>
 <keycap>Shift</keycap> <keycap>Power</keycap> </keycombo> on Macintosh
-systems</phrase>. A last option is to log in as root and type one of the
-commands <command>poweroff</command>, <command>halt</command> or
-<command>shutdown -h now</command> if either of the key combinations do not
-work or you prefer to type commands; use <command>reboot</command> to reboot
-the system.
+systems</phrase>.
+If the key combinations do not work, a last option is to log in as root
+and type the necessary commands.
+Use <command>reboot</command> to reboot the system.
+Use <command>halt</command> to halt the system without powering it off
+<footnote>
+
+ <para>
+  Under the SysV init system <command>halt</command> had the same
+  effect as <command>poweroff</command>, but with systemd as init
+  system (the default in jessie) their effects are different.
+ </para>
+
+</footnote>.
+To power off the machine, use <command>poweroff</command>
+or <command>shutdown -h now</command>.
+The systemd init system provides additional commands that perform
+the same functions; for example <command>systemctl reboot</command>
+or <command>systemctl poweroff</command>.
+
 
 </para>
  </sect1>
-- 
cgit v1.2.3