journalctl: unify ellipsation handling between journalctl and systemctl

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

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 72b67c698801c2a00b44f8849ea82ee28a43471e..59ecf810fb82bebeb1497848df55ba27fe6a52b1 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -160,7 +160,7 @@
                                 complete and all communication
                                 channels set up. The child continues
                                 to run as the main daemon
                                 complete and all communication
                                 channels set up. The child continues
                                 to run as the main daemon

-                                process. This is the behaviour of
+                                process. This is the behavior of

                                 traditional UNIX daemons. If this
                                 setting is used, it is recommended to
                                 also use the
                                 traditional UNIX daemons. If this
                                 setting is used, it is recommended to
                                 also use the


@@ -171,7 +171,7 @@
                                 soon as the parent process
                                 exits.</para>
 
                                 soon as the parent process
                                 exits.</para>
 

-                                <para>Behaviour of
+                                <para>Behavior of

                                 <option>oneshot</option> is similar
                                 to <option>simple</option>, however
                                 it is expected that the process has to
                                 <option>oneshot</option> is similar
                                 to <option>simple</option>, however
                                 it is expected that the process has to


@@ -180,7 +180,7 @@
                                 is particularly useful for this type
                                 of service.</para>
 
                                 is particularly useful for this type
                                 of service.</para>
 

-                                <para>Behaviour of
+                                <para>Behavior of

                                 <option>dbus</option> is similar to
                                 <option>simple</option>, however it is
                                 expected that the daemon acquires a
                                 <option>dbus</option> is similar to
                                 <option>simple</option>, however it is
                                 expected that the daemon acquires a


@@ -197,7 +197,7 @@
                                 <varname>BusName=</varname> is
                                 specified.</para>
 
                                 <varname>BusName=</varname> is
                                 specified.</para>
 

-                                <para>Behaviour of
+                                <para>Behavior of

                                 <option>notify</option> is similar to
                                 <option>simple</option>, however it is
                                 expected that the daemon sends a
                                 <option>notify</option> is similar to
                                 <option>simple</option>, however it is
                                 expected that the daemon sends a


@@ -216,7 +216,7 @@
                                 not set, it will be implicitly set to
                                 <option>main</option>.</para>
 
                                 not set, it will be implicitly set to
                                 <option>main</option>.</para>
 

-                                <para>Behaviour of
+                                <para>Behavior of

                                 <option>idle</option> is very similar
                                 to <option>simple</option>, however
                                 actual execution of a the service
                                 <option>idle</option> is very similar
                                 to <option>simple</option>, however
                                 actual execution of a the service


@@ -356,16 +356,32 @@
                                 argument (i.e. the program to execute)
                                 may not be a variable, and must be a
                                 literal and absolute path
                                 argument (i.e. the program to execute)
                                 may not be a variable, and must be a
                                 literal and absolute path

-                                name.</para></listitem>
+                                name.</para>
+
+                                <para>Note that this setting does not
+                                directly support shell command
+                                lines. If shell command lines are to
+                                be used they need to be passed
+                                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>
 
                         <varlistentry>
                                 <term><varname>ExecStartPre=</varname></term>
                                 <term><varname>ExecStartPost=</varname></term>
                                 <listitem><para>Additional commands
                         </varlistentry>
 
                         <varlistentry>
                                 <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


@@ -398,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>
 


@@ -590,7 +606,7 @@
                                 SIGTERM and SIGPIPE. Exit status
                                 definitions can either be numeric exit
                                 codes or termination signal names, and
                                 SIGTERM and SIGPIPE. Exit status
                                 definitions can either be numeric exit
                                 codes or termination signal names, and

-                                are are separated by spaces. Example:
+                                are separated by spaces. Example:

                                 "<literal>SuccessExitStatus=1 2 8
                                 SIGKILL</literal>", ensures that exit
                                 codes 1, 2, 8 and the termination
                                 "<literal>SuccessExitStatus=1 2 8
                                 SIGKILL</literal>", ensures that exit
                                 codes 1, 2, 8 and the termination