48 lines
2.2 KiB
Diff
48 lines
2.2 KiB
Diff
|
From 6941ea3fb076b8abc3e4e1759f448e2532ed14a5 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|||
|
|
Date: Wed, 16 Jul 2014 22:17:29 -0400
|
|||
|
|
Subject: [PATCH] man: document yearly and annually in systemd.time(7)
|
|||
|
|
|
|||
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=81158
|
|||
|
|
(cherry picked from commit 8c275eef38bf7e3e592e4cb35a497522d1f15bb6)
|
|||
|
|
---
|
|||
|
|
man/systemd.time.xml | 18 ++++++++++++------
|
|||
|
|
1 file changed, 12 insertions(+), 6 deletions(-)
|
|||
|
|
|
|||
|
|
diff --git a/man/systemd.time.xml b/man/systemd.time.xml
|
|||
|
|
index 0706cdf54a..02431a5a1e 100644
|
|||
|
|
--- a/man/systemd.time.xml
|
|||
|
|
+++ b/man/systemd.time.xml
|
|||
|
|
@@ -243,12 +243,16 @@
|
|||
|
|
|
|||
|
|
<para>The special expressions
|
|||
|
|
<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>,
|
|||
|
|
+ and <literal>yearly</literal> or
|
|||
|
|
+ <literal>annually</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>,
|
|||
|
|
+ <literal>Mon *-*-* 00:00:00</literal>, and
|
|||
|
|
+ <literal>*-01-01 00:00:00</literal> respectively.
|
|||
|
|
+ </para>
|
|||
|
|
|
|||
|
|
<para>Examples for valid timestamps and their
|
|||
|
|
normalized form:</para>
|
|||
|
|
@@ -277,6 +281,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
|