man: explain a bit more detailed what happens on suspend

[elogind.git] / man / systemd.service.xml

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 339dea9aa503d8ab3787a3ea68edb8f38b7f4dc5..00a6398a1e1ac2adff0dddc36d2e433df5aad60d 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -100,7 +100,7 @@
                 script. This is useful for compatibility with
                 SysV. Note that this compatibility is quite
                 comprehensive but not 100%. For details about the
                 script. This is useful for compatibility with
                 SysV. Note that this compatibility is quite
                 comprehensive but not 100%. For details about the

-                incomptibilities see the <ulink
+                incompatibilities see the <ulink

                 url="http://www.freedesktop.org/wiki/Software/systemd/Incompatibilities">Incompatibilities
                 with SysV</ulink> document.
                 </para>
                 url="http://www.freedesktop.org/wiki/Software/systemd/Incompatibilities">Incompatibilities
                 with SysV</ulink> document.
                 </para>


@@ -219,7 +219,7 @@
                                 <para>Behavior of
                                 <option>idle</option> is very similar
                                 to <option>simple</option>, however
                                 <para>Behavior of
                                 <option>idle</option> is very similar
                                 to <option>simple</option>, however

-                                actual execution of a the service
+                                actual execution of the service

                                 binary is delayed until all jobs are
                                 dispatched. This may be used to avoid
                                 interleaving of output of shell
                                 binary is delayed until all jobs are
                                 dispatched. This may be used to avoid
                                 interleaving of output of shell


@@ -245,7 +245,7 @@
                                 <listitem><para>Takes a boolean value
                                 that specifies whether systemd should
                                 try to guess the main PID of a service
                                 <listitem><para>Takes a boolean value
                                 that specifies whether systemd should
                                 try to guess the main PID of a service

-                                should if it cannot be determined
+                                if it cannot be determined

                                 reliably. This option is ignored
                                 unless <option>Type=forking</option>
                                 is set and <option>PIDFile=</option>
                                 reliably. This option is ignored
                                 unless <option>Type=forking</option>
                                 is set and <option>PIDFile=</option>


@@ -283,7 +283,7 @@
                                 <term><varname>BusName=</varname></term>
 
                                 <listitem><para>Takes a D-Bus bus
                                 <term><varname>BusName=</varname></term>
 
                                 <listitem><para>Takes a D-Bus bus

-                                name, where this service is reachable
+                                name, that this service is reachable

                                 as. This option is mandatory for
                                 services where
                                 <varname>Type=</varname> is set to
                                 as. This option is mandatory for
                                 services where
                                 <varname>Type=</varname> is set to


@@ -341,7 +341,7 @@
                                 variable substitution is
                                 supported. Use
                                 <literal>${FOO}</literal> as part of a
                                 variable substitution is
                                 supported. Use
                                 <literal>${FOO}</literal> as part of a

-                                word, or as word of its own on the
+                                word, or as a word of its own on the

                                 command line, in which case it will be
                                 replaced by the value of the
                                 environment variable including all
                                 command line, in which case it will be
                                 replaced by the value of the
                                 environment variable including all


@@ -365,6 +365,13 @@
                                 explicitly to a shell implementation
                                 of some kind. Example:
                                 <literal>ExecStart=/bin/sh -c 'dmesg | tac'</literal></para>
                                 explicitly to a shell implementation
                                 of some kind. Example:
                                 <literal>ExecStart=/bin/sh -c 'dmesg | tac'</literal></para>

+
+                                <para>For services run by a user
+                                instance of systemd the special
+                                environment variable
+                                <literal>MANAGERPID</literal> is set
+                                to the PID of the systemd
+                                instance.</para>

                                 </listitem>
                         </varlistentry>
 
                                 </listitem>
                         </varlistentry>
 


@@ -372,9 +379,9 @@
                                 <term><varname>ExecStartPre=</varname></term>
                                 <term><varname>ExecStartPost=</varname></term>
                                 <listitem><para>Additional commands
                                 <term><varname>ExecStartPre=</varname></term>
                                 <term><varname>ExecStartPost=</varname></term>
                                 <listitem><para>Additional commands

-                                that are executed before (resp. after)
+                                that are executed before or after

                                 the command in
                                 the command in

-                                <varname>ExecStart=</varname>. Multiple
+                                <varname>ExecStart=</varname>, respectively. Multiple

                                 command lines may be concatenated in a
                                 single directive, by separating them
                                 by semicolons (these semicolons must
                                 command lines may be concatenated in a
                                 single directive, by separating them
                                 by semicolons (these semicolons must


@@ -407,12 +414,12 @@
                                 variable substitution is supported
                                 here following the same scheme as for
                                 <varname>ExecStart=</varname>. One
                                 variable substitution is supported
                                 here following the same scheme as for
                                 <varname>ExecStart=</varname>. One

-                                special environment variable is set:
-                                if known <literal>$MAINPID</literal> is
-                                set to the main process of the
-                                daemon, and may be used for command
-                                lines like the following:
-                                <command>/bin/kill -HUP
+                                additional special environment
+                                variables is set: if known
+                                <literal>$MAINPID</literal> is set to
+                                the main process of the daemon, and
+                                may be used for command lines like the
+                                following: <command>/bin/kill -HUP

                                 $MAINPID</command>.</para></listitem>
                         </varlistentry>
 
                                 $MAINPID</command>.</para></listitem>
                         </varlistentry>
 


@@ -571,7 +578,7 @@
                                 0. If set to
                                 <option>on-failure</option> it will be
                                 restarted only when it exited with an
                                 0. If set to
                                 <option>on-failure</option> it will be
                                 restarted only when it exited with an

-                                exit code not equalling 0, when
+                                exit code not equaling 0, when

                                 terminated by a signal (including on
                                 core dump), when an operation (such as
                                 service reload) times out or when the
                                 terminated by a signal (including on
                                 core dump), when an operation (such as
                                 service reload) times out or when the