From 3f9a0a522f2029e9295ea5e9984259022be88413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 14 Dec 2018 08:26:46 +0100 Subject: [PATCH] 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. --- NEWS | 4 ++-- docs/BOOT_LOADER_INTERFACE.md | 6 +++--- man/systemd-boot.xml | 2 +- man/systemd-mount.xml | 2 +- man/systemd.service.xml | 2 +- man/systemd.unit.xml | 4 ++-- src/libsystemd/sd-bus/bus-internal.h | 2 +- src/libsystemd/sd-resolve/test-resolve.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index 4c32d86139..2430fa115c 100644 --- a/NEWS +++ b/NEWS @@ -541,7 +541,7 @@ CHANGES WITH 239: Debian and FreeBSD resolvconf tool. * Support for suspend-then-hibernate has been added, i.e. a sleep mode - where the system initially suspends, and after a time-out resumes and + where the system initially suspends, and after a timeout resumes and hibernates again. * networkd's ClientIdentifier= now accepts a new option "duid-only". If @@ -4845,7 +4845,7 @@ CHANGES WITH 217: /run/systemd/user directory that was already previously supported, but is under the control of the user. - * Job timeouts (i.e. time-outs on the time a job that is + * Job timeouts (i.e. timeouts on the time a job that is queued stays in the run queue) can now optionally result in immediate reboot or power-off actions (JobTimeoutAction= and JobTimeoutRebootArgument=). This is useful on ".target" diff --git a/docs/BOOT_LOADER_INTERFACE.md b/docs/BOOT_LOADER_INTERFACE.md index e1b99be960..a0c7f39970 100644 --- a/docs/BOOT_LOADER_INTERFACE.md +++ b/docs/BOOT_LOADER_INTERFACE.md @@ -21,18 +21,18 @@ variables. All EFI variables use the vendor UUID ESP the boot loader was run from formatted as NUL-terminated UTF16 string, in normal GUID syntax. -* The EFI variable `LoaderConfigTimeout` contains the boot menu time-out +* The EFI variable `LoaderConfigTimeout` contains the boot menu timeout currently in use. It may be modified both by the boot loader and by the host. The value should be formatted as numeric, NUL-terminated, decimal string, in UTF-16. The time is specified in µs. * Similarly, the EFI variable `LoaderConfigTimeoutOneShot` contains a boot menu - time-out for a single following boot. It is set by the OS in order to request + timeout for a single following boot. It is set by the OS in order to request display of the boot menu on the following boot. When set overrides `LoaderConfigTimeout`. It is removed automatically after being read by the boot loader, to ensure it only takes effect a single time. This value is formatted the same way as `LoaderConfigTimeout`. If set to `0` the boot menu - time-out is turned off, and the menu is shown indefinitely. + timeout is turned off, and the menu is shown indefinitely. * The EFI variable `LoaderEntries` may contain a series of boot loader entry identifiers, one after the other, each individually NUL terminated. This may diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml index e78420dd0d..44b0f61f22 100644 --- a/man/systemd-boot.xml +++ b/man/systemd-boot.xml @@ -256,7 +256,7 @@ LoaderConfigTimeout LoaderConfigTimeoutOneShot - The menu time-out in seconds. Read by the boot loader. LoaderConfigTimeout + The menu timeout in seconds. Read by the boot loader. LoaderConfigTimeout is maintained persistently, while LoaderConfigTimeoutOneShot is a one-time override which is read once (in which case it takes precedence over LoaderConfigTimeout) and then removed. LoaderConfigTimeout may be manipulated with the diff --git a/man/systemd-mount.xml b/man/systemd-mount.xml index 80d24ac8f5..610c97f948 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. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 4c33ed0b68..ad04efeb34 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. diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 26d215e3cc..7e1b3cb7eb 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -913,7 +913,7 @@ JobTimeoutSec= JobRunningTimeoutSec= - When a job for this unit is queued, a time-out JobTimeoutSec= may be + When a job for this unit is queued, a timeout JobTimeoutSec= may be configured. Similarly, JobRunningTimeoutSec= 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 failed mode. This value defaults to infinity (job timeouts @@ -931,7 +931,7 @@ JobTimeoutRebootArgument= JobTimeoutAction= optionally configures an additional action to take when - the time-out is hit, see description of JobTimeoutSec= and + the timeout is hit, see description of JobTimeoutSec= and JobRunningTimeoutSec= above. It takes the same values as StartLimitAction=. Defaults to . JobTimeoutRebootArgument= configures an optional reboot string to pass to the diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h index b352f0bfe5..f208b294d8 100644 --- a/src/libsystemd/sd-bus/bus-internal.h +++ b/src/libsystemd/sd-bus/bus-internal.h @@ -320,7 +320,7 @@ struct sd_bus { usec_t method_call_timeout; }; -/* For method calls we time-out at 25s, like in the D-Bus reference implementation */ +/* For method calls we timeout at 25s, like in the D-Bus reference implementation */ #define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC)) /* For the authentication phase we grant 90s, to provide extra room during boot, when RNGs and such are not filled up diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c index bff2c4976b..8de7adcd16 100644 --- a/src/libsystemd/sd-resolve/test-resolve.c +++ b/src/libsystemd/sd-resolve/test-resolve.c @@ -92,7 +92,7 @@ int main(int argc, char *argv[]) { if (r == 0) break; if (r == -ETIMEDOUT) { - /* Let's catch time-outs here, so that we can run safely in a CI that has no reliable DNS. Note + /* Let's catch timeouts here, so that we can run safely in a CI that has no reliable DNS. Note * that we invoke exit() directly here, as the stuck NSS call will not allow us to exit * cleanly. */