build-sys: add check for --help width

[elogind.git] / man / systemd.xml

diff --git a/man/systemd.xml b/man/systemd.xml
index 331e6c2ff6c4e770c905336ec04fd39e614a381c..d020582b539cb1ea38f2d4a2e493b208fa3d142b 100644 (file)
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -75,10 +75,12 @@
                 <citerefentry><refentrytitle>telinit</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 for more information.</para>
 
                 <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>
                 <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 for more information.</para>
         </refsect1>


@@ -180,10 +182,8 @@
                                 target. Argument must be one of
                                 <option>console</option>,
                                 <option>journal</option>,
                                 target. Argument must be one of
                                 <option>console</option>,
                                 <option>journal</option>,

-                                <option>syslog</option>,

                                 <option>kmsg</option>,
                                 <option>journal-or-kmsg</option>,
                                 <option>kmsg</option>,
                                 <option>journal-or-kmsg</option>,

-                                <option>syslog-or-kmsg</option>,

                                 <option>null</option>.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <option>null</option>.</para></listitem>
                         </varlistentry>
                         <varlistentry>


@@ -191,7 +191,7 @@
 
                                 <listitem><para>Set log level. As
                                 argument this accepts a numerical log
 
                                 <listitem><para>Set log level. As
                                 argument this accepts a numerical log

-                                level or the well-known <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+                                level or the well-known <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>

                                 symbolic names (lowercase):
                                 <option>emerg</option>,
                                 <option>alert</option>,
                                 symbolic names (lowercase):
                                 <option>emerg</option>,
                                 <option>alert</option>,


@@ -424,7 +424,7 @@
                 file system hierarchy (beneath
                 <filename>/sys/fs/cgroup/systemd/</filename>), or in tools
                 such as
                 file system hierarchy (beneath
                 <filename>/sys/fs/cgroup/systemd/</filename>), or in tools
                 such as

-                <citerefentry><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <citerefentry project='man-pages'><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>

                 (<command>ps xawf -eo pid,user,cgroup,args</command>
                 is particularly useful to list all processes and the
                 systemd units they belong to.).</para>
                 (<command>ps xawf -eo pid,user,cgroup,args</command>
                 is particularly useful to list all processes and the
                 systemd units they belong to.).</para>


@@ -627,10 +627,19 @@
                                 <listitem><para>Upon receiving this
                                 signal the systemd system manager will
                                 start the
                                 <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
                                 <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
 
                                 <para>systemd user managers
                                 treat this signal the same way as


@@ -681,7 +690,7 @@
                                 received the systemd manager will log
                                 its complete state in human readable
                                 form. The data logged is the same as
                                 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>
 
                                 dump</command>.</para></listitem>
                         </varlistentry>
 


@@ -844,26 +853,21 @@
                                 <term><constant>SIGRTMIN+26</constant></term>
                                 <term><constant>SIGRTMIN+27</constant></term>
                                 <term><constant>SIGRTMIN+28</constant></term>
                                 <term><constant>SIGRTMIN+26</constant></term>
                                 <term><constant>SIGRTMIN+27</constant></term>
                                 <term><constant>SIGRTMIN+28</constant></term>

-                                <term><constant>SIGRTMIN+29</constant></term>

 
                                 <listitem><para>Sets the log level to
 
                                 <listitem><para>Sets the log level to

-                                <literal>journal-or-kmsg</literal>
-                                (or <literal>console</literal> on
+                                <literal>journal-or-kmsg</literal> (or
+                                <literal>console</literal> on

                                 <constant>SIGRTMIN+27</constant>,
                                 <literal>kmsg</literal> on
                                 <constant>SIGRTMIN+27</constant>,
                                 <literal>kmsg</literal> on

-                                <constant>SIGRTMIN+28</constant>,
-                                or <literal>syslog-or-kmsg</literal>
-                                on <constant>SIGRTMIN+29</constant>), as
+                                <constant>SIGRTMIN+28</constant>), as

                                 controlled via
                                 <varname>systemd.log_target=journal-or-kmsg</varname>
                                 controlled via
                                 <varname>systemd.log_target=journal-or-kmsg</varname>

-                                (or <varname>systemd.log_target=console</varname>
-                                on <constant>SIGRTMIN+27</constant>,
+                                (or
+                                <varname>systemd.log_target=console</varname>
+                                on <constant>SIGRTMIN+27</constant> or

                                 <varname>systemd.log_target=kmsg</varname>
                                 <varname>systemd.log_target=kmsg</varname>

-                                on <constant>SIGRTMIN+28</constant>,
-                                or
-                                <varname>systemd.log_target=syslog-or-kmsg</varname>
-                                on <constant>SIGRTMIN+29</constant>) on
-                                the kernel command
+                                on <constant>SIGRTMIN+28</constant>)
+                                on the kernel command

                                 line.</para></listitem>
                         </varlistentry>
                 </variablelist>
                                 line.</para></listitem>
                         </varlistentry>
                 </variablelist>


@@ -1132,17 +1136,19 @@
                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

-                                <term><varname>-b</varname></term>

                                 <term><varname>emergency</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>
 
                                 <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>
                         </varlistentry>
 
                         <varlistentry>

+                                <term><varname>rescue</varname></term>

                                 <term><varname>single</varname></term>
                                 <term><varname>s</varname></term>
                                 <term><varname>S</varname></term>
                                 <term><varname>single</varname></term>
                                 <term><varname>s</varname></term>
                                 <term><varname>S</varname></term>


@@ -1274,9 +1280,9 @@
                         <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>5</manvolnum></citerefentry>,

-                        <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>,

                         <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry>,

-                        <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+                        <citerefentry project='man-pages'><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>,

                         <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                 </para>
         </refsect1>
                         <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                 </para>
         </refsect1>