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 reboot to reboot the system.
> Use halt to halt the system without powering it off
>
>
>
> Under the SysV init system halt had the same
> effect as poweroff, but with systemd as init
> system (the default in jessie) their effects are different.
>
>
> .
> To power off the machine, use poweroff or
> shutdown -h now.
>
> (and drop the final sentence about systemctl).
>
> I use "SysV init" and "systemd" above because we don't mean
> sysvinit or (especially)
> systemd, 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 @@
Ctrl Alt Del
or Control
Shift Power on Macintosh
-systems. A last option is to log in as root and type one of the
-commands poweroff, halt or
-shutdown -h now if either of the key combinations do not
-work or you prefer to type commands; use reboot to reboot
-the system.
+systems.
+If the key combinations do not work, a last option is to log in as root
+and type the necessary commands.
+Use reboot to reboot the system.
+Use halt to halt the system without powering it off
+
+
+ Under the SysV init system halt had the same
+ effect as poweroff, but with systemd as init
+ system (the default in jessie) their effects are different.
+
+
+.
+To power off the machine, use poweroff
+or shutdown -h now.
+The systemd init system provides additional commands that perform
+the same functions; for example systemctl reboot
+or systemctl poweroff.
+
+
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
