aboutsummaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-12-14 08:26:46 +0100
committerLennart Poettering <lennart@poettering.net>2018-12-14 11:17:52 +0100
commit3f9a0a522f2029e9295ea5e9984259022be88413 (patch)
treeb6b2a8ee8c96940952015f88c7721458dea503f8 /man
parentin-addr-util: fix undefined result for in4_addr_netmask_to_prefixlen(<0.0.0.0>) (diff)
downloadsystemd-3f9a0a522f2029e9295ea5e9984259022be88413.tar.gz
systemd-3f9a0a522f2029e9295ea5e9984259022be88413.tar.bz2
systemd-3f9a0a522f2029e9295ea5e9984259022be88413.zip
tree-wide: s/time-out/timeout/g
From WordNet (r) 3.0 (2006) [wn]: time-out n 1: a brief suspension of play; "each team has two time-outs left" From The Free On-line Dictionary of Computing (18 March 2015) [foldoc]: timeout A period of time after which an error condition is raised if some event has not occured. A common example is sending a message. If the receiver does not acknowledge the message within some preset timeout period, a transmission error is assumed to have occured.
Diffstat (limited to 'man')
-rw-r--r--man/systemd-boot.xml2
-rw-r--r--man/systemd-mount.xml2
-rw-r--r--man/systemd.service.xml2
-rw-r--r--man/systemd.unit.xml4
4 files changed, 5 insertions, 5 deletions
diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml
index e78420dd0..44b0f61f2 100644
--- a/man/systemd-boot.xml
+++ b/man/systemd-boot.xml
@@ -256,7 +256,7 @@
<varlistentry>
<term><varname>LoaderConfigTimeout</varname></term>
<term><varname>LoaderConfigTimeoutOneShot</varname></term>
- <listitem><para>The menu time-out in seconds. Read by the boot loader. <varname>LoaderConfigTimeout</varname>
+ <listitem><para>The menu timeout in seconds. Read by the boot loader. <varname>LoaderConfigTimeout</varname>
is maintained persistently, while <varname>LoaderConfigTimeoutOneShot</varname> is a one-time override which is
read once (in which case it takes precedence over <varname>LoaderConfigTimeout</varname>) and then
removed. <varname>LoaderConfigTimeout</varname> may be manipulated with the
diff --git a/man/systemd-mount.xml b/man/systemd-mount.xml
index 80d24ac8f..610c97f94 100644
--- a/man/systemd-mount.xml
+++ b/man/systemd-mount.xml
@@ -114,7 +114,7 @@
the command line. If passed, additional metadata is read from the device to enhance the unit to create. For
example, a descriptive string for the transient units is generated from the file system label and device
model. Moreover if a removable block device (e.g. USB stick) is detected an automount unit instead of a regular
- mount unit is created, with a short idle time-out, in order to ensure the file-system is placed in a clean
+ mount unit is created, with a short idle timeout, in order to ensure the file-system is placed in a clean
state quickly after each access.</para></listitem>
</varlistentry>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 4c33ed0b6..ad04efeb3 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -217,7 +217,7 @@
actual execution of the service program is delayed until all active jobs are dispatched. This may be used
to avoid interleaving of output of shell services with the status output on the console. Note that this
type is useful only to improve console output, it is not useful as a general unit ordering tool, and the
- effect of this service type is subject to a 5s time-out, after which the service program is invoked
+ effect of this service type is subject to a 5s timeout, after which the service program is invoked
anyway.</para></listitem>
</itemizedlist>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 26d215e3c..7e1b3cb7e 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -913,7 +913,7 @@
<term><varname>JobTimeoutSec=</varname></term>
<term><varname>JobRunningTimeoutSec=</varname></term>
- <listitem><para>When a job for this unit is queued, a time-out <varname>JobTimeoutSec=</varname> may be
+ <listitem><para>When a job for this unit is queued, a timeout <varname>JobTimeoutSec=</varname> may be
configured. Similarly, <varname>JobRunningTimeoutSec=</varname> starts counting when the queued job is actually
started. If either time limit is reached, the job will be cancelled, the unit however will not change state or
even enter the <literal>failed</literal> mode. This value defaults to <literal>infinity</literal> (job timeouts
@@ -931,7 +931,7 @@
<term><varname>JobTimeoutRebootArgument=</varname></term>
<listitem><para><varname>JobTimeoutAction=</varname> optionally configures an additional action to take when
- the time-out is hit, see description of <varname>JobTimeoutSec=</varname> and
+ the timeout is hit, see description of <varname>JobTimeoutSec=</varname> and
<varname>JobRunningTimeoutSec=</varname> above. It takes the same values as
<varname>StartLimitAction=</varname>. Defaults to <option>none</option>.
<varname>JobTimeoutRebootArgument=</varname> configures an optional reboot string to pass to the