X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.timer.xml;h=2b9d91a60fe01cb26f0feb8611ce7d926bc44804;hb=1e158d273bb63883566358cbb886cd4167421df6;hp=557a45e0fe186f99bfc149e55cc0c1fc50f790f7;hpb=03fae01822b5275a2940458f65644796283a8a23;p=elogind.git
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 557a45e0f..2b9d91a60 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -9,16 +9,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -44,11 +44,11 @@
systemd.timer
- systemd timer configuration files
+ Timer unit configuration
- systemd.timer
+ timer.timer
@@ -97,7 +97,7 @@
defines. The options specific to the [Timer] section
of timer units are the following:
-
+
OnActiveSec=
OnBootSec=
@@ -105,7 +105,7 @@
OnUnitActiveSec=
OnUnitInactiveSec=
- Defines timers
+ Defines monotonic timers
relative to different starting points:
OnActiveSec= defines a
timer relative to the moment the timer
@@ -115,7 +115,7 @@
machine was booted
up. OnStartupSec=
defines a timer relative to when
- systemd was
+ systemd was first
started. OnUnitActiveSec=
defines a timer relative to when the
unit the timer is activating was last
@@ -139,8 +139,8 @@
seconds. Example: "OnBootSec=50" means
50s after boot-up. The argument may
also include time units. Example:
- "OnBootSec=5h 30min" means 5 hours and 30
- minutes after boot-up. For details
+ "OnBootSec=5h 30min" means 5 hours and
+ 30 minutes after boot-up. For details
about the syntax of time spans see
systemd.unit5.
@@ -152,14 +152,35 @@
elapse and the configured unit is
started. This is not the case for
timers defined in the other
- directives.
+ directives.
These are monotonic timers,
independent of wall-clock time and timezones. If the
computer is temporarily suspended, the
monotonic clock stops too.
+ If the empty string is assigned
+ to any of these options the list of
+ timers is reset, and all prior
+ assignments will have no
+ effect.
+
+
+
+ OnCalendar=
+
+ Defines realtime
+ (i.e. wallclock) timers via calendar
+ event expressions. See
+ systemd.time7
+ for more information on the syntax of
+ calendar event expressions. Otherwise
+ the semantics are similar to
+ OnActiveSec= and
+ related settings.
+
+
Unit=
@@ -170,10 +191,10 @@
specified, this value defaults to a
service that has the same name as the
timer unit, except for the
- suffix. (See above.) It is recommended,
+ suffix. (See above.) It is recommended
that the unit name that is activated
and the unit name of the timer unit
- are named identical, except for the
+ are named identically, except for the
suffix.
@@ -182,10 +203,12 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
- systemd.service5
+ systemd.service5,
+ systemd.time7,
+ systemd.directives7