diff options
| author | Matthew Miller <mattdm@mattdm.org> | 2010-08-31 00:17:56 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-31 00:17:56 +0200 |
| commit | 74ac3cbd509de2f5995542aa5db39328e8cbd22a (patch) | |
| tree | 9836d146be88e690d0680c1629b1674736b6258b /man/systemd.unit.xml | |
| parent | c88e7f4e57fcef7998dcd570e8a8866c5116f0de (diff) | |
manager: rename 'maintenance' state to 'failed' to avoid user confusion
https://bugzilla.redhat.com/show_bug.cgi?id=614619
Diffstat (limited to 'man/systemd.unit.xml')
| -rw-r--r-- | man/systemd.unit.xml | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 250989fe0f..3bc5d3c66f 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -418,8 +418,9 @@ <listitem><para>Lists one or more units that are activated when this - unit fails (i.e. enters maintenance - state).</para></listitem> + unit enters the + '<literal>failed</literal>' + state.</para></listitem> </varlistentry> <varlistentry> @@ -552,22 +553,23 @@ time. If this time limit is reached the job will be cancelled, the unit however will not change state or even - enter maintenance mode. This value - defaults to 0 (job timeouts disabled), - except for device units. NB: this - timeout is independent from any - unit-specific timeout (for example, - the timeout set with + enter the '<literal>failed</literal>' + mode. This value defaults to 0 (job + timeouts disabled), except for device + units. NB: this timeout is independent + from any unit-specific timeout (for + example, the timeout set with <varname>Timeout=</varname> in service - units) as the job timeout has no effect - on the unit itself, only on the job - that might be pending for it. Or in - other words: unit-specific timeouts + units) as the job timeout has no + effect on the unit itself, only on the + job that might be pending for it. Or + in other words: unit-specific timeouts are useful to abort unit state changes, and revert them. The job timeout set with this option however - is useful to abort only the job waiting - for the unit state to change.</para></listitem> + is useful to abort only the job + waiting for the unit state to + change.</para></listitem> </varlistentry> </variablelist> |