summaryrefslogtreecommitdiff
path: root/man/systemd.service.xml
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@inai.de>2013-11-07 01:17:48 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-11-07 01:23:54 -0500
commit63ba209d8bc64137ff1585d5878328c93cb81b61 (patch)
tree3f2012a37e823e5a755e5b3137b25d4dd99f9c88 /man/systemd.service.xml
parentf576cd2092bc40f9998415cdc3caf10035d4743a (diff)
man: wording and grammar updates
This is a recurring submission and includes corrections to various issue spotted: comma setting, missing words/preposition choice.
Diffstat (limited to 'man/systemd.service.xml')
-rw-r--r--man/systemd.service.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 0cb3d9e351..d1f4a2d7d7 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -524,10 +524,10 @@
Takes a unit-less value in seconds, or a
time span value such as "5min
20s". Pass 0 to disable the timeout
- logic. Defaults to <varname>TimeoutStartSec=</varname> in
+ logic. Defaults to <varname>TimeoutStartSec=</varname> from the
manager configuration file, except when
<varname>Type=oneshot</varname> is
- used in which case the timeout
+ used, in which case the timeout
is disabled by default.
</para></listitem>
</varlistentry>
@@ -546,7 +546,7 @@
Takes a unit-less value in seconds, or a
time span value such as "5min
20s". Pass 0 to disable the timeout
- logic. Defaults to <varname>TimeoutStartSec=</varname> in
+ logic. Defaults to <varname>TimeoutStartSec=</varname> from the
manager configuration file.
</para></listitem>
</varlistentry>