summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-07 21:22:56 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-07 21:22:56 +0200
commitb3eaa6288107210a84d6d121036fb4b2f7283ee2 (patch)
tree852384049ac5037a10d9abcc7fbba5e362200f9c
parent61e5d8ed877b6389ea94c05e0e2f646f8b66d8bd (diff)
man: update man pages for recent syntax changes
-rw-r--r--man/systemd.service.xml49
-rw-r--r--man/systemd.socket.xml25
-rw-r--r--man/systemd.unit.xml5
3 files changed, 51 insertions, 28 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index bceb5aa110..7eaf9cbce3 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -270,10 +270,21 @@
<listitem><para>Additional commands
that are executed before (resp. after)
the command in
- <varname>ExecStart=</varname>. If
- specified more than once, all commands
- are executed one after the other,
- serially. Use of these settings is
+ <varname>ExecStart=</varname>. Multiple
+ command lines may be concatenated in a
+ single directive, by seperating them
+ by semicolons (these semicolons must
+ be passed as seperate words). In that
+ case, the commands are executed one
+ after the other,
+ serially. Alternatively, these
+ directives may be specified more than
+ once whith the same effect. However,
+ the latter syntax is not recommended
+ for compatibility with parsers
+ suitable for XDG
+ <filename>.desktop</filename> files.
+ Use of these settings is
optional.</para></listitem>
</varlistentry>
@@ -281,20 +292,24 @@
<term><varname>ExecReload=</varname></term>
<listitem><para>Commands to execute to
trigger a configuration reload in the
- service. If used more than once, all
- commands are executed one after the
- other, serially. Use of this setting is optional.
- </para></listitem>
+ service. This argument takes multiple
+ command lines, following the same
+ scheme as pointed out for
+ <varname>ExecStartPre=</varname>
+ above. Use of this setting is
+ optional. </para></listitem>
</varlistentry>
<varlistentry>
<term><varname>ExecStop=</varname></term>
<listitem><para>Commands to execute to
stop the service started via
- <varname>ExecStart=</varname>. If used
- more than once, all commands are
- executed one after the other,
- serially. Use of this setting is
+ <varname>ExecStart=</varname>. This
+ argument takes multiple command lines,
+ following the same scheme as pointed
+ out for
+ <varname>ExecStartPre=</varname>
+ above. Use of this setting is
optional. All processes remaining for
a service after the commands
configured in this option are run are
@@ -312,10 +327,12 @@
that are executed after the service
was stopped using the commands
configured in
- <varname>ExecStop=</varname>. If
- specified more than once, all commands
- are executed one after the other,
- serially. Use of these settings is
+ <varname>ExecStop=</varname>. This
+ argument takes multiple command lines,
+ following the same scheme as pointed
+ out for
+ <varname>ExecStartPre</varname>. Use
+ of these settings is
optional.</para></listitem>
</varlistentry>
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 32102fab88..20dc00ed01 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -440,16 +440,18 @@
<varlistentry>
<term><varname>ExecStartPre=</varname></term>
<term><varname>ExecStartPost=</varname></term>
- <listitem><para>Takes a command line,
- which is executed before (resp. after)
- the listening sockets/FIFOs are created and
+ <listitem><para>Takes one or more
+ command lines, which are executed
+ before (resp. after) the listening
+ sockets/FIFOs are created and
bound. The first token of the command
line must be an absolute file name,
then followed by arguments for the
- process. If specified more than once,
- all commands are executed one after
- the other, fully serialized. The use of
- these settings is optional.</para></listitem>
+ process. Multiple command lines may be
+ specified following the same scheme as
+ used for
+ <varname>ExecStartPre=</varname> of
+ service unit files.</para></listitem>
</varlistentry>
<varlistentry>
@@ -458,10 +460,11 @@
<listitem><para>Additional commands
that are executed before (resp. after)
the listening sockets/FIFOs are closed
- and removed. If specified more than
- once, all commands are executed one
- after the other, fully serialized. The use of
- these settings is optional.</para></listitem>
+ and removed. Multiple command lines
+ may be specified following the same
+ scheme as used for
+ <varname>ExecStartPre=</varname> of
+ service unit files.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 26272c4410..a06eed5861 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -114,7 +114,10 @@
are understood: s, min, h, d, w, ms, us.</para>
<para>Empty lines and lines starting with # or ; are
- ignored. This may be used for commenting.</para>
+ ignored. This may be used for commenting. Lines ending
+ in a backslash are concatenated with the following
+ line while reading and the backslash is replaced by a
+ space character. This may be used to wrap long lines.</para>
<para>If a line starts with <option>.include</option>
followed by a file name the specified file will be