From 6a08fae22c7a5e343f268016122b664d7b3dd1b0 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Sat, 28 Oct 2023 23:05:28 +0200 Subject: [PATCH] conf/ups.conf.sample, docs/man/ups.conf.txt: further clarify behavior of maxstartdelay [#2134] Signed-off-by: Jim Klimov --- conf/ups.conf.sample | 10 +++++----- docs/man/ups.conf.txt | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/conf/ups.conf.sample b/conf/ups.conf.sample index 78caac8e4c..3a37f82ad4 100644 --- a/conf/ups.conf.sample +++ b/conf/ups.conf.sample @@ -91,11 +91,11 @@ maxretry = 3 # Note that after this time upsdrvctl would just move # along with its business (whether retrying the same # driver if `maxretry>1`, or trying another driver if -# starting them all, or just exit); however the most -# recently started "stuck" driver process may be further -# initializing in the background, and might even succeed -# eventually. -# It would not be actively killed by upsdrvctl after +# starting them all, or just eventually exit); however, +# each such most recently started "stuck" driver process +# may be further initializing in the background, and +# might even succeed eventually. +# They would not be actively killed by upsdrvctl after # this timeout expires. # # The default is 45 seconds. diff --git a/docs/man/ups.conf.txt b/docs/man/ups.conf.txt index edaac26e89..aa98feff1e 100644 --- a/docs/man/ups.conf.txt +++ b/docs/man/ups.conf.txt @@ -249,10 +249,11 @@ system from getting stuck due to a broken driver or UPS. + Note that after this time `upsdrvctl` would just move along with its business (whether retrying the same driver if `maxretry>1`, or trying -another driver if starting them all, or just exit); however the most -recently started "stuck" driver process may be further initializing -in the background, and might even succeed eventually. It would not be -actively killed by `upsdrvctl` after this timeout expires. +another driver if starting them all, or just eventually exit); however, +each such most recently started "stuck" driver process may be further +initializing in the background, and might even succeed eventually. ++ +They would not be actively killed by `upsdrvctl` after this timeout expires. + The default is 45 seconds.