X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.timer.xml;h=5cc543e453ea42bfcf14af138beb2d09b31ff3c9;hb=735e0712710a1dc26da0febafb91b242b2687f3f;hp=9b6b486bf43f353dac6f52af7a0ec111a55f7c57;hpb=19c5f19d69bb5f520fa7213239490c55de06d99d;p=elogind.git
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 9b6b486bf..5cc543e45 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,7 +44,7 @@
systemd.timer
- systemd timer configuration files
+ Timer unit configuration
@@ -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
@@ -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,27 @@
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.
+ monotonic clock stops too.
+
+
+ OnCalendar=
+
+ Defines realtime
+ (i.e. wallclock) timers via calendar
+ event expressions. See
+ systemd.time7
+ for more information on the syntax of
+ calendar event
+ expressions.
+
+
Unit=
@@ -185,7 +198,8 @@
systemd1,
systemctl8,
systemd.unit5,
- systemd.service5
+ systemd.service5,
+ systemd.time7