X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.xml;h=cd38c1637572b856dd755faaf9c3822ae1517002;hp=a184b1a401ede3c202e2e4b5879d49dde43bf270;hb=df34f169b8961c6ef1429cdb940206b42c3f9041;hpb=cb07866b1b7c11e687a322d70dd9f9d73bbbe488

diff --git a/man/systemd.xml b/man/systemd.xml
index a184b1a40..cd38c1637 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -45,7 +45,7 @@
         <refnamediv>
                 <refname>systemd</refname>
                 <refname>init</refname>
-                <refpurpose>systemd System and Service Manager</refpurpose>
+                <refpurpose>systemd system and service manager</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
@@ -78,7 +78,7 @@
                 the configuration file
                 <filename>system.conf</filename>, otherwise
                 <filename>user.conf</filename>. See
-                <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 for more information.</para>
         </refsect1>
 
@@ -95,6 +95,12 @@
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><option>--version</option></term>
+
+                                <listitem><para>Prints a systemd version
+                                identifier and exits.</para></listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><option>--test</option></term>
 
@@ -138,11 +144,13 @@
                                 <term><option>--system</option></term>
                                 <term><option>--user</option></term>
 
-                                <listitem><para>Tell systemd to run a
-                                system instance (resp. user
-                                instance), even if the process ID is
-                                not 1 (resp. is 1), i.e. systemd is
-                                not (resp. is) run as init process.
+                                <listitem><para>For <option>--system</option>,
+                                tell systemd to run a
+                                system instance, even if the process ID is
+                                not 1, i.e. systemd is not run as init process.
+                                <option>--user</option> does the opposite,
+                                running a user instance even if the process
+                                ID is 1.
                                 Normally it should not be necessary to
                                 pass these options, as systemd
                                 automatically detects the mode it is
@@ -245,11 +253,11 @@
                                 <term><option>--default-standard-error=</option></term>
 
                                 <listitem><para>Sets the default
-                                output resp. error output for all
-                                services and sockets, i.e. controls
+                                output or error output for all
+                                services and sockets, respectively. That is, controls
                                 the default for
                                 <option>StandardOutput=</option>
-                                resp. <option>StandardError=</option>
+                                and <option>StandardError=</option>
                                 (see
                                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details). Takes one of
@@ -489,18 +497,18 @@
                 Specification</ulink>.</para>
 
                 <para>Systems which invoke systemd in a container
-                resp. initrd environment should implement the
+                or initrd environment should implement the
                 <ulink
                 url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
-                Interface</ulink> resp. <ulink
+                Interface</ulink> or <ulink
                 url="http://www.freedesktop.org/wiki/Software/systemd/InitrdInterface">initrd
-                Interface</ulink> specifications.</para>
+                Interface</ulink> specifications, respectively.</para>
         </refsect1>
 
         <refsect1>
                 <title>Directories</title>
 
-                <variablelist>
+                <variablelist class='unit-directives'>
                         <varlistentry>
                                 <term>System unit directories</term>
 
@@ -527,7 +535,9 @@
                                 <command>disable</command> commands of
                                 the
                                 <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                                tool.</para></listitem>
+                                tool. Full list of directories is provided in
+                                <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+                                </para></listitem>
                         </varlistentry>
                 </variablelist>
 
@@ -556,7 +566,9 @@
                                 tool can handle both global (i.e. for
                                 all users) and private (for one user)
                                 enabling/disabling of
-                                units.</para></listitem>
+                                units. Full list of directories is provided in
+                                <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+                                </para></listitem>
                         </varlistentry>
                 </variablelist>
 
@@ -819,16 +831,24 @@
 
                                 <listitem><para>Sets the log level to
                                 <literal>debug</literal>
-                                (resp. <literal>info</literal> on
+                                (or <literal>info</literal> on
                                 <literal>SIGRTMIN+23</literal>), as
                                 controlled via
                                 <varname>systemd.log_level=debug</varname>
-                                (resp. <varname>systemd.log_level=info</varname>
+                                (or <varname>systemd.log_level=info</varname>
                                 on <literal>SIGRTMIN+23</literal>) on
                                 the kernel command
                                 line.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term>SIGRTMIN+24</term>
+
+                                <listitem><para>Immediately exits the
+                                manager (only available for --user
+                                instances).</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term>SIGRTMIN+26</term>
                                 <term>SIGRTMIN+27</term>
@@ -837,19 +857,19 @@
 
                                 <listitem><para>Sets the log level to
                                 <literal>journal-or-kmsg</literal>
-                                (resp. <literal>console</literal> on
-                                <literal>SIGRTMIN+27</literal>;
-                                resp. <literal>kmsg</literal> on
-                                <literal>SIGRTMIN+28</literal>;
-                                resp. <literal>syslog-or-kmsg</literal>
+                                (or <literal>console</literal> on
+                                <literal>SIGRTMIN+27</literal>,
+                                <literal>kmsg</literal> on
+                                <literal>SIGRTMIN+28</literal>,
+                                or <literal>syslog-or-kmsg</literal>
                                 on <literal>SIGRTMIN+29</literal>), as
                                 controlled via
                                 <varname>systemd.log_target=journal-or-kmsg</varname>
-                                (resp. <varname>systemd.log_target=console</varname>
-                                on <literal>SIGRTMIN+27</literal>;
-                                resp. <varname>systemd.log_target=kmsg</varname>
-                                on <literal>SIGRTMIN+28</literal>;
-                                resp
+                                (or <varname>systemd.log_target=console</varname>
+                                on <literal>SIGRTMIN+27</literal>,
+                                <varname>systemd.log_target=kmsg</varname>
+                                on <literal>SIGRTMIN+28</literal>,
+                                or
                                 <varname>systemd.log_target=syslog-or-kmsg</varname>
                                 on <literal>SIGRTMIN+29</literal>) on
                                 the kernel command
@@ -861,7 +881,7 @@
         <refsect1>
                 <title>Environment</title>
 
-                <variablelist>
+                <variablelist class='environment-variables'>
                         <varlistentry>
                                 <term><varname>$SYSTEMD_LOG_LEVEL</varname></term>
                                 <listitem><para>systemd reads the
@@ -971,7 +991,7 @@
                 <filename>/proc/cmdline</filename>
                 instead.</para></footnote>:</para>
 
-                <variablelist>
+                <variablelist class='kernel-commandline-options'>
                         <varlistentry>
                                 <term><varname>systemd.unit=</varname></term>
                                 <term><varname>rd.systemd.unit=</varname></term>
@@ -986,7 +1006,7 @@
                                 <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                                 for details about these units. The
                                 option prefixed with
-                                <literal>rd.</literal> is honoured
+                                <literal>rd.</literal> is honored
                                 only in the initial RAM disk (initrd),
                                 while the one that isn't prefixed only
                                 in the main system.</para></listitem>
@@ -1067,12 +1087,12 @@
                                 <term><varname>systemd.default_standard_output=</varname></term>
                                 <term><varname>systemd.default_standard_error=</varname></term>
                                 <listitem><para>Controls default
-                                standard output/error output for
+                                standard output and error output for
                                 services, with the same effect as the
                                 <option>--default-standard-output=</option>
-                                resp. <option>--default-standard-error=</option>
+                                and <option>--default-standard-error=</option>
                                 command line arguments described
-                                above.</para></listitem>
+                                above, respectively.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -1085,7 +1105,7 @@
                                 process and all its children at boot
                                 time. May be used more than once to
                                 set multiple variables. If the equal
-                                sign and variable are missing unsets
+                                sign and variable are missing it unsets
                                 an environment variable which might be
                                 passed in from the initial ram
                                 disk.</para></listitem>
@@ -1137,12 +1157,12 @@
                                 <term><varname>5</varname></term>
 
                                 <listitem><para>Boot into the
-                                specified legacy SysV runlevel. This
-                                is equivalent to
+                                specified legacy SysV runlevel. These
+                                are equivalent to
                                 <varname>systemd.unit=runlevel2.target</varname>,
                                 <varname>systemd.unit=runlevel3.target</varname>,
                                 <varname>systemd.unit=runlevel4.target</varname>,
-                                resp. <varname>systemd.unit=runlevel5.target</varname>
+                                and <varname>systemd.unit=runlevel5.target</varname>, respectively,
                                 and provided for compatibility reasons
                                 and to be easier to
                                 type.</para></listitem>
@@ -1238,10 +1258,10 @@
         <refsect1>
                 <title>See Also</title>
                 <para>
-                        <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemadm</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-notify</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
@@ -1249,7 +1269,8 @@
                         <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                 </para>
         </refsect1>