X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.timer.xml;h=55b458557f357634ae7f27591cbd8cddf7001e30;hb=18ead1b00dff180a97507d014325cb46198e6657;hp=b60199c2f7fb696ca4607fdec8e40b35d3125096;hpb=06642d1795382a4849aa750ee54238f91e2f3126;p=elogind.git
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index b60199c2f..55b458557 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -78,15 +78,20 @@
Unit= (see below).
Unless DefaultDependencies=
- is set to , timer units will
+ is set to , all timer units will
implicitly have dependencies of type
Conflicts= and
Before= on
- shutdown.target. These ensure
- that timer units are stopped cleanly prior to system
- shutdown. Only timer units involved with early boot or
- late system shutdown should disable this
- option.
+ shutdown.target to ensure that
+ they are stopped cleanly prior to system shutdown.
+ Timer units with at least one
+ OnCalendar= directive will have an
+ additional After= dependency on
+ timer-sync.target to avoid
+ being started before the system clock has been
+ correctly set. Only timer units involved with early
+ boot or late system shutdown should disable the
+ DefaultDependencies= option.
@@ -255,22 +260,37 @@
Persistent=Takes a boolean
- argument. If true the service unit is
- immediately triggered when the timer
- unit is activated and the timer
- elapsed at least once since the last
- time the service unit has been
- triggered by the timer unit. The time
- when the service unit was last
- triggered is stored on disk. This is
- useful to catch up for missed timers
- when a machine is shutdown temporarily
- and then is powered up again. Note
- that this setting only has an effect
- on timers configured with
- OnCalendar=.
+ argument. If true, the time when the
+ service unit was last triggered is
+ stored on disk. When the timer is
+ activated, the service unit is
+ triggered immediately if it would have
+ been triggered at least once during
+ the time when the timer was inactive.
+ This is useful to catch up on missed
+ runs of the service when the machine
+ was off. Note that this setting only
+ has an effect on timers configured
+ with OnCalendar=.
+
+
+ WakeSystem=
+
+ Takes a boolean
+ argument. If true, an elapsing timer
+ will cause the system to resume from
+ suspend, should it be suspended and if
+ the system supports this. Note that
+ this option will only make sure the
+ system resumes on the appropriate
+ times, it will not take care of
+ suspending it again after any work
+ that is to be done is
+ finished. Defaults to
+ false.
+
@@ -278,7 +298,7 @@
See Alsosystemd1,
- systemctl8,
+ systemctl1,
systemd.unit5,
systemd.service5,
systemd.time7,