From b3eaa6288107210a84d6d121036fb4b2f7283ee2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 7 Jul 2010 21:22:56 +0200 Subject: [PATCH] man: update man pages for recent syntax changes --- man/systemd.service.xml | 49 +++++++++++++++++++++++++++-------------- man/systemd.socket.xml | 25 ++++++++++++--------- man/systemd.unit.xml | 5 ++++- 3 files changed, 51 insertions(+), 28 deletions(-) diff --git a/man/systemd.service.xml b/man/systemd.service.xml index bceb5aa11..7eaf9cbce 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -270,10 +270,21 @@ Additional commands that are executed before (resp. after) the command in - ExecStart=. If - specified more than once, all commands - are executed one after the other, - serially. Use of these settings is + ExecStart=. 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 + .desktop files. + Use of these settings is optional. @@ -281,20 +292,24 @@ ExecReload= 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. - + service. This argument takes multiple + command lines, following the same + scheme as pointed out for + ExecStartPre= + above. Use of this setting is + optional. ExecStop= Commands to execute to stop the service started via - ExecStart=. If used - more than once, all commands are - executed one after the other, - serially. Use of this setting is + ExecStart=. This + argument takes multiple command lines, + following the same scheme as pointed + out for + ExecStartPre= + 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 - ExecStop=. If - specified more than once, all commands - are executed one after the other, - serially. Use of these settings is + ExecStop=. This + argument takes multiple command lines, + following the same scheme as pointed + out for + ExecStartPre. Use + of these settings is optional. diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 32102fab8..20dc00ed0 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -440,16 +440,18 @@ ExecStartPre= ExecStartPost= - Takes a command line, - which is executed before (resp. after) - the listening sockets/FIFOs are created and + 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. + process. Multiple command lines may be + specified following the same scheme as + used for + ExecStartPre= of + service unit files. @@ -458,10 +460,11 @@ 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. + and removed. Multiple command lines + may be specified following the same + scheme as used for + ExecStartPre= of + service unit files. diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 26272c441..a06eed586 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -114,7 +114,10 @@ are understood: s, min, h, d, w, ms, us. Empty lines and lines starting with # or ; are - ignored. This may be used for commenting. + 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. If a line starts with followed by a file name the specified file will be -- 2.30.2