diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | en/post-install/shutdown.xml | 25 |
2 files changed, 23 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index bd4926f78..ca902eb2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ installation-guide (20150528) UNRELEASED; urgency=medium * Add "MX53 LOCO Board" as alternative name for the MX53 Quick Start Board (see #788782). + [ Vincent McIntyre ] + * Document discrepancy between halt and poweroff. + -- Martin Michlmayr <tbm@cyrius.com> Sun, 14 Jun 2015 19:13:39 -0400 installation-guide (20150528) unstable; urgency=medium 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> |