summaryrefslogtreecommitdiff
path: root/man/systemd.service.xml
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-06-25 00:04:29 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-25 00:04:29 +0200
commitaf62c704053b5d34672497eb5bdc4764ebbb5f4f (patch)
treee599d76739031d9c37e12d9deb651b306df8e757 /man/systemd.service.xml
parent11e299550e832659095d7bf833e4e8fc1971ef1e (diff)
man: various fixes
Diffstat (limited to 'man/systemd.service.xml')
-rw-r--r--man/systemd.service.xml26
1 files changed, 13 insertions, 13 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 5285ce3d52..5230a78337 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -94,14 +94,14 @@
daemon process. This is the
behaviour of traditional UNIX
daemons. If this setting is
- used it is recommended to also
+ used, it is recommended to also
use the
<varname>PIDFile=</varname>
option, so that systemd can
identify the main process of
- the daemon. systemd will start
- follow-up units as soon as the
- parent process exited.</para>
+ the daemon. systemd will proceed
+ starting follow-up units as soon
+ as the parent process exits.</para>
<para>If set to
<literal>simple</literal> (the
@@ -110,12 +110,12 @@
configured with
<varname>ExecStart=</varname>
is the main process of the
- daemon. In this mode
+ daemon. In this mode,
communication channels must be
available before the daemon is
- started up, as systemd will
- immediately start follow-up
- units.</para>
+ started up (sockets set up by systemd),
+ as systemd will immediately proceed
+ starting follow-up units.</para>
<para>Behaviour of
<literal>finish</literal> is
@@ -136,9 +136,9 @@
the daemon acquires a name on
the D-Bus bus, as configured
by
- <varname>BusName=</varname>. Follow-up
- units will be started after
- the name has been
+ <varname>BusName=</varname>. Systemd will
+ proceed starting follow-up
+ units after the D-Bus bus name has been
acquired.</para>
</listitem>
</varlistentry>
@@ -170,8 +170,8 @@
<varlistentry>
<term><varname>BusName=</varname></term>
<listitem>
- <para>Takes a D-Bus bus name
- that this service is reachable
+ <para>Takes a D-Bus bus name,
+ where this service is reachable
as. This option is mandatory
for services where
<varname>Type=</varname> is