X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.time.xml;h=f35ccd7f171b4bd6148d5b8294785896776a38ab;hb=baade8cc237c37bd8905d86ec6e9c7872d4abe03;hp=3d13b573fa46ee8c1bb81e085375308205917712;hpb=6b4991cfde6c0a0b62e836ca75ae362779c474d4;p=elogind.git
diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index 3d13b573f..f35ccd7f1 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -153,14 +153,19 @@
When parsing, systemd will also accept relative
time specifications. A time span (see above) that is
prefixed with + is evaluated to the
- current time plus the specified
- time span. Correspondingly, a time span that is prefixed
+ current time plus the specified time
+ span. Correspondingly, a time span that is prefixed
with - is evaluated to the current
time minus the specified time span. Instead of
- prefixing the time span with - it
- may also be suffixed with a space and the word
+ prefixing the time span with + or
+ -, it may also be suffixed with a
+ space and the word left or
ago.
+ Finally, a timespan prefixed with
+ @ is evaluated relative to the UNIX
+ time epoch 1st Jan, 1970, 00:00.
+
Examples for valid timestamps and their
normalized form (assuming the current time was
2012-11-23 18:15:22):
@@ -177,7 +182,8 @@
tomorrow â Fri 2012-11-24 00:00:00
+3h30min â Fri 2012-11-23 21:45:22
-5s â Fri 2012-11-23 18:15:17
- 11min ago â Fri 2012-11-23 18:04:22
+ 11min ago â Fri 2012-11-23 18:04:22
+ @1395716396 â Tue 2014-03-25 03:59:56
Note that timestamps printed by systemd will not
be parsed correctly by systemd, as the timezone
@@ -222,7 +228,7 @@
In the date and time specifications, any
component may be specified as * in
which case any value will match. Alternatively, each
- component can be specified as list of values separated
+ component can be specified as a list of values separated
by commas. Values may also be suffixed with
/ and a repetition value, which
indicates that the value and all values plus multiples
@@ -231,18 +237,27 @@
Either time or date specification may be
omitted, in which case the current day and 00:00:00 is
implied, respectively. If the second component is not
- specified :00 is assumed.
+ specified, :00 is assumed.
Timezone names may not be specified.
The special expressions
+ minutely,
hourly, daily,
- monthly and weekly
- may be used as calendar events which refer to
- *-*-* *:00:00, *-*-*
- 00:00:00, *-*-01 00:00:00 and
- Mon *-*-* 00:00:00,
- respectively.
+ monthly, weekly,
+ yearly,
+ quarterly,
+ semiannually may be used as
+ calendar events which refer to
+ *-*-*Â *:*:00,
+ *-*-*Â *:00:00,
+ *-*-*Â 00:00:00,
+ *-*-01Â 00:00:00,
+ Mon *-*-* 00:00:00,
+ *-01-01Â 00:00:00,
+ *-01,04,07,10-01 00:00:0 and
+ *-01,07-01 00:00:00 respectively.
+
Examples for valid timestamps and their
normalized form:
@@ -271,6 +286,8 @@ Wed-Sat,Tue 12-10-15 1:2:3 â Tue-Sat 2012-10-15 01:02:03
daily â *-*-* 00:00:00
monthly â *-*-01 00:00:00
weekly â Mon *-*-* 00:00:00
+ yearly â *-01-01 00:00:00
+ annually â *-01-01 00:00:00
*:2/3 â *-*-* *:02/3:00
Calendar events are used by timer units, see