X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.time.xml;h=2e64089c2957e48cd0fcf7d0204a1c2adf89781b;hp=a837f232c37cd6f1e797ce671dd01018754b02b5;hb=1af2536acf8aecc3eb940d04268a419c956ee10a;hpb=3563b896da77bb2e6abc2ca0f03d8e2f570f1cc7

diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index a837f232c..2e64089c2 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -153,14 +153,19 @@
                 <para>When parsing, systemd will also accept relative
                 time specifications. A time span (see above) that is
                 prefixed with <literal>+</literal> 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 <literal>-</literal> is evaluated to the current
                 time minus the specified time span. Instead of
-                prefixing the time span with <literal>-</literal>, it
-                may also be suffixed with a space and the word
+                prefixing the time span with <literal>+</literal> or
+                <literal>-</literal>, it may also be suffixed with a
+                space and the word <literal>left</literal> or
                 <literal>ago</literal>.</para>
 
+                <para>Finally, a timespan prefixed with
+                <literal>@</literal> is evaluated relative to the UNIX
+                time epoch 1st Jan, 1970, 00:00.</para>
+
                 <para>Examples for valid timestamps and their
                 normalized form (assuming the current time was
                 2012-11-23 18:15:22):</para>
@@ -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</programlisting>
+              11min ago → Fri 2012-11-23 18:04:22
+            @1395716396 → Tue 2014-03-25 03:59:56</programlisting>
 
                 <para>Note that timestamps printed by systemd will not
                 be parsed correctly by systemd, as the timezone
@@ -207,8 +213,8 @@
                 <programlisting>Thu,Fri 2012-*-1,5 11:12:13</programlisting>
 
                 <para>The above refers to 11:12:13 of the first or
-                fifth day of any month of the year 2012, given that it
-                is a Thursday or Friday.</para>
+                fifth day of any month of the year 2012, but only if that
+                day is a Thursday or Friday.</para>
 
                 <para>The weekday specification is optional. If
                 specified, it should consist of one or more English
@@ -236,13 +242,22 @@
                 <para>Timezone names may not be specified.</para>
 
                 <para>The special expressions
+                <literal>minutely</literal>,
                 <literal>hourly</literal>, <literal>daily</literal>,
-                <literal>monthly</literal> and <literal>weekly</literal>
-                may be used as calendar events which refer to
-                <literal>*-*-* *:00:00</literal>, <literal>*-*-*
-                00:00:00</literal>, <literal>*-*-01 00:00:00</literal> and
-                <literal>Mon *-*-* 00:00:00</literal>,
-                respectively.</para>
+                <literal>monthly</literal>, <literal>weekly</literal>,
+                <literal>yearly</literal>,
+                <literal>quarterly</literal>,
+                <literal>semiannually</literal> may be used as
+                calendar events which refer to
+                <literal>*-*-* *:*:00</literal>,
+                <literal>*-*-* *:00:00</literal>,
+                <literal>*-*-* 00:00:00</literal>,
+                <literal>*-*-01 00:00:00</literal>,
+                <literal>Mon *-*-* 00:00:00</literal>,
+                <literal>*-01-01 00:00:00</literal>,
+                <literal>*-01,04,07,10-01 00:00:0</literal> and
+                <literal>*-01,07-01 00:00:00</literal> respectively.
+                </para>
 
                 <para>Examples for valid timestamps and their
                 normalized form:</para>
@@ -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</programlisting>
 
                   <para>Calendar events are used by timer units, see