X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=59ecf810fb82bebeb1497848df55ba27fe6a52b1;hp=339dea9aa503d8ab3787a3ea68edb8f38b7f4dc5;hb=f89a3b6f5bf695186e7b9e6cc63993b1272e7569;hpb=c53158818d8cdaf46b3f1b5299b9bda118a1043f

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 339dea9aa..59ecf810f 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -365,6 +365,13 @@
                                 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>
 
@@ -372,9 +379,9 @@
                                 <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
-                                <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
@@ -407,12 +414,12 @@
                                 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>