Bug#789652: v2 patch
On Thu, Jun 25, 2015 at 05:51:02PM +0100, Justin B Rye wrote:
> Vincent McIntyre wrote:
> > Justin B Rye wrote:
> >> It's good, but I've got a couple of English usage nitpicks:
> >
> > And I'm happy to have you pick the nits off my contribution :)
> > Would you care to peruse #789652, which is related?
>
> Hmm, well, I've never proofread the installation-guide as a whole. I
> ought to get round to doing that some time.
>
> Okay, your patch introduces another example of un-American behaviour,
> but I would actually suggest rephrasing that bit: it's not obvious
> what newly introduced behavio(u)r it's talking about.
>
> Also, it's not strictly true that it was introduced by systemd in
> Jessie. Distinguishing halt from poweroff was already a feature of
> systemd on Wheezy - and Upstart too, unless I'm misreading
> "https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/532366";.
>
> So:
>
> [...]
> 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>.
>
> (and drop the final sentence about systemctl).
>
> I use "SysV init" and "systemd" above because we don't mean
> <package>sysvinit</package> or (especially)
> <package>systemd</package>, we mean those software frameworks as a
> whole, referred to by "brand name". And it's "jessie" because we
> don't mean whatever &releasename; currently resolves to, we mean
> Debian 8 (and using lowercase because apparently &releasename; follows
> that standard).
Thanks for the review Justin. I agree with most of your comments.
I do think it is important to mention systemctrl because things like
/sbin/reboot are implemented as symlinks to /bin/systemctrl.
version 2:
Index: post-install/shutdown.xml
===================================================================
--- post-install/shutdown.xml (revision 69984)
+++ post-install/shutdown.xml (working copy)
@@ -21,11 +21,26 @@
<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>
Reply to: