X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.xml;h=d020582b539cb1ea38f2d4a2e493b208fa3d142b;hb=7d328b544621d4b1bec936dec612947ad8bfb65a;hp=0d017575b61793cf1f7ad66fef9968d7ef212348;hpb=ee0e998e1ccb07cc90748e5edcb312f13e8a06f4;p=elogind.git

diff --git a/man/systemd.xml b/man/systemd.xml
index 0d017575b..d020582b5 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -75,10 +75,12 @@
                 <citerefentry><refentrytitle>telinit</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 for more information.</para>
 
-                <para>When run as system instance, systemd interprets
-                the configuration file
-                <filename>system.conf</filename>, otherwise
-                <filename>user.conf</filename>. See
+                <para>When run as a system instance, systemd interprets the
+                configuration file <filename>system.conf</filename> and the
+                files in <filename>system.conf.d</filename> directories; when
+                run as a user instance, systemd interprets the configuration
+                file <filename>user.conf</filename> and the files in
+                <filename>user.conf.d</filename> directories. See
                 <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 for more information.</para>
         </refsect1>
@@ -625,10 +627,19 @@
                                 <listitem><para>Upon receiving this
                                 signal the systemd system manager will
                                 start the
-                                <filename>ctrl-alt-del.target</filename> unit. This
-                                is mostly equivalent to
+                                <filename>ctrl-alt-del.target</filename>
+                                unit. This is mostly equivalent to
                                 <command>systemctl start
-                                ctl-alt-del.target</command>.</para>
+                                ctl-alt-del.target</command>. If this
+                                signal is received more often than 7
+                                times per 2s an immediate reboot is
+                                triggered. Note that pressing
+                                Ctrl-Alt-Del on the console will
+                                trigger this signal. Hence, if a
+                                reboot is hanging pressing
+                                Ctrl-Alt-Del more than 7 times in 2s
+                                is a relatively safe way to trigger an
+                                immediate reboot.</para>
 
                                 <para>systemd user managers
                                 treat this signal the same way as
@@ -679,7 +690,7 @@
                                 received the systemd manager will log
                                 its complete state in human readable
                                 form. The data logged is the same as
-                                printed by <command>systemctl
+                                printed by <command>systemd-analyze
                                 dump</command>.</para></listitem>
                         </varlistentry>
 
@@ -1125,17 +1136,19 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>-b</varname></term>
                                 <term><varname>emergency</varname></term>
+                                <term><varname>-b</varname></term>
 
                                 <listitem><para>Boot into emergency
                                 mode. This is equivalent to
                                 <varname>systemd.unit=emergency.target</varname>
-                                and provided for compatibility
-                                reasons and to be easier to type.</para></listitem>
+                                and provided for compatibility reasons
+                                and to be easier to
+                                type.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
+                                <term><varname>rescue</varname></term>
                                 <term><varname>single</varname></term>
                                 <term><varname>s</varname></term>
                                 <term><varname>S</varname></term>