X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.time.xml;h=02431a5a1ebcb484d5adea5a69228b2a73bb8fc2;hp=1ff302f5cda29d71f9d19cdab4523773516a0f56;hb=8c275eef38bf7e3e592e4cb35a497522d1f15bb6;hpb=00b3f12fcda78c8902b785eb014e4f78851139ad diff --git a/man/systemd.time.xml b/man/systemd.time.xml index 1ff302f5c..02431a5a1 100644 --- a/man/systemd.time.xml +++ b/man/systemd.time.xml @@ -50,16 +50,16 @@ Description - In systemd timestamps, timespans, and calendar + In systemd, timestamps, time spans, and calendar events are displayed and may be specified in closely related syntaxes. - Displaying Timespans + Displaying Time Spans - Timespans refer to time durations. On display - systemd will present timespans as a space separated + Time spans refer to time durations. On display, + systemd will present time spans as a space-separated series of time values each suffixed by a time unit. @@ -70,10 +70,10 @@ - Parsing Timespans + Parsing Time Spans - When parsing systemd will accept the same - timespan syntax. Separating spaces may be omitted. The + When parsing, systemd will accept the same + time span syntax. Separating spaces may be omitted. The following time units are understood: @@ -92,9 +92,9 @@ are assumed, but some exceptions exist and are marked as such. In a few cases ns, nsec is accepted too, where the - granularity of the timespan allows for this. + granularity of the time span allows for this. - Examples for valid timespan specifications: + Examples for valid time span specifications: 2 h 2hours @@ -108,12 +108,12 @@ Displaying Timestamps Timestamps refer to specific, unique points in - time. On display systemd will format these in the + time. On display, systemd will format these in the local timezone as follows: Fri 2012-11-23 23:02:15 CET - The week day is printed according to the locale + The weekday is printed according to the locale choice of the user. @@ -123,11 +123,11 @@ When parsing systemd will accept a similar timestamp syntax, but excluding any timezone specification (this limitation might be removed - eventually). The week day specification is optional, - but when the week day is specified it must either be + eventually). The weekday specification is optional, + but when the weekday is specified it must either be in the abbreviated (Wed) or - non-abbreviated (Wednesday) english - language form (case doesn't matter), and is not + non-abbreviated (Wednesday) English + language form (case does not matter), and is not subject to the locale choice of the user. Either the date, or the time part may be omitted, in which case the current date or 00:00:00, resp., is assumed. The @@ -136,11 +136,11 @@ specified in full or may be abbreviated (omitting the century). - A timestamp is considered invalid if a week day + A timestamp is considered invalid if a weekday is specified and the date does not actually match the specified day of the week. - When parsing systemd will also accept a few + When parsing, systemd will also accept a few special placeholders instead of timestamps: now may be used to refer to the current time (or of the invocation of the command @@ -150,17 +150,22 @@ current day, the day before or the next day, respectively. - When parsing systemd will also accept relative - time specifications. A timespan (see above) that is + 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 - timespan. Correspondingly a timespan that is prefix + current time plus the specified time + span. Correspondingly, a time span that is prefixed with - is evaluated to the current - time minus the specified timespan. Instead of - prefixing the timespan with - it - may also be suffixed with a space and the word + time minus the specified time span. Instead of + 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,15 +182,16 @@ 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 specification is not accepted, and printing timestamps - is subject to locale settings for the week day while - parsing only accepts english week day names. + is subject to locale settings for the weekday while + parsing only accepts English weekday names. - In some cases systemd will display a relative + In some cases, systemd will display a relative timestamp (relative to the current time, or the time of invocation of the command) instead or in addition to an absolute timestamp as described above. A @@ -208,40 +214,45 @@ 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. + is a Thursday or Friday. The weekday specification is optional. If - specified it should consist of one or more english - language week day names, either in the abbreviated + specified, it should consist of one or more English + language weekday names, either in the abbreviated (Wed) or non-abbreviated (Wednesday) form (case does - not matter), separated by colons. Specifying two week - days separated by "-" refers to a range of continuous - week days. "," and "-" may be combined freely. - - 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 by - colons. Values may also be suffixed with "/" and a - repetition value, which indicates that the value and - all values plus multiples of the repetition value are - matched. + not matter), separated by commas. Specifying two + weekdays separated by - refers to a + range of continuous weekdays. , and + - may be combined freely. + + 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 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 + of the repetition value are matched. 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 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, + and yearly or + annually may be used as calendar + events which refer to + *-*-* *:00:00, + *-*-* 00:00:00, + *-*-01 00:00:00, + Mon *-*-* 00:00:00, and + *-01-01 00:00:00 respectively. + Examples for valid timestamps and their normalized form: @@ -270,10 +281,12 @@ 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 - systemdr.time5 + systemd.timer5 for details. @@ -284,7 +297,8 @@ Wed-Sat,Tue 12-10-15 1:2:3 → Tue-Sat 2012-10-15 01:02:03 systemd1, journalctl1, systemd.timer5, - systemd.unit5 + systemd.unit5, + systemd.directives7