From 7a29896d5f7749ddcd34ef8188286ab300ee69d7 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 3 Nov 2017 10:37:49 -0400 Subject: [PATCH] 2017-11-03 Fred Gleason * Moved the contents of 'docs/datetime_wildcards.txt' to an appendix in the Operations Guide. --- ChangeLog | 3 + docs/Makefile.am | 1 - docs/datetime_wildcards.txt | 122 -------- docs/opsguide/opsguide.xml | 587 ++++++++++++++++++++++++++++++++++++ rivendell.spec.in | 1 - 5 files changed, 590 insertions(+), 124 deletions(-) delete mode 100644 docs/datetime_wildcards.txt diff --git a/ChangeLog b/ChangeLog index 66aa9c70..569cf6c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16241,3 +16241,6 @@ * Renamed 'docs/docbook/' to 'docs/apis/'. * Qualified all 'id=' tag attributes as 'xml:id=' in the Operations Guide. +2017-11-03 Fred Gleason + * Moved the contents of 'docs/datetime_wildcards.txt' to an + appendix in the Operations Guide. diff --git a/docs/Makefile.am b/docs/Makefile.am index e75e1230..1e6754f1 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -32,7 +32,6 @@ EXTRA_DIST = ALSA.txt\ catchd.txt\ colors\ copy_split_format.odt\ - datetime_wildcards.txt\ MESSAGE_BOX.txt\ metadata_wildcards.txt\ NEXGEN_FILTER.txt\ diff --git a/docs/datetime_wildcards.txt b/docs/datetime_wildcards.txt deleted file mode 100644 index d145a84c..00000000 --- a/docs/datetime_wildcards.txt +++ /dev/null @@ -1,122 +0,0 @@ - Rivendell Date/Time Wildcards - -A date/time wildcard in Rivendell has the following form: - - % - -where: - - % -- A literal '%' - - -- Optional. One of the following meta-characters: - ^ -- Convert value indicated by to all uppercase. - $ -- Convert the initial character of the value indicated by - to uppercase. - - -- One of the following letters: - - a -- Abbreviated weekday name --e.g. 'mon', 'tue' - - A -- Full weekday name --e.g. 'monday', 'tuesday' - - b -- Abbreviated month name --e.g. 'jan', 'feb' - - B -- Full month name --e.g. 'january', 'february' - - c -- [unassigned] - - C -- Century - - d -- Day of the month, zero padded (01 - 31) - - D -- Date (mm/dd/yy) - - e -- Day of the month, space padded ( 1 - 12) - - E -- Day of the month, unpadded (1 - 12) - - f -- [unassigned] - - F -- Date (yyyy-mm-dd) - - g -- Two digit year, as per ISO 8601 - - G -- Four digit year, as per ISO 8601 - - h -- Abbreviated month name --e.g. 'jan', 'feb' - - H -- Hour, 24 hour, zero padded (00 - 23) - - i -- Hour, 12 hour, space padded ( 0 - 12) - - I -- Hour, 12 hour, zero padded (00 - 12) - - j -- Day of year, zero padded (000 - 355) - - J -- Hour, 12 hour, unpadded (1 - 12) - - k -- Hour, 24 hour, space padded ( 0 - 23) - - K -- [unassigned] - - l -- [unassigned] - - L -- [unassigned] - - m -- Month, zero padded (01 - 12) - - M -- Minute, zero padded (00 - 59) - - n -- [unassigned] - - N -- [unassigned] - - o -- [unassigned] - - O -- [unassigned] - - p -- AM/PM string - - P -- [unassigned] - - q -- [unassigned] - - Q -- [unassigned] - - r -- Rivendell Host Name [not FQDN] - - R -- Rivendell Host Short Name - - s -- Service Name - - S -- Seconds, zero padded (00 - 60) - - t -- [unassigned] - - T -- [unassigned] - - u -- Day of the week, numeric, 1=Monday, 7=Sunday - - U -- [unassigned] - - v -- [unassigned] - - V -- Week number, as per ISO 8601 - - w -- Day of the week, numeric, 0=Sunday,6=Saturday - - W -- Week number, as per ISO 8601 - - x -- [unassigned] - - X -- [unassigned] - - y -- Two digit year - - Y -- Four digit year - - z -- [unassigned] - - Z -- [unassigned] - - % -- A literal '%'. diff --git a/docs/opsguide/opsguide.xml b/docs/opsguide/opsguide.xml index b584f969..99379c3a 100644 --- a/docs/opsguide/opsguide.xml +++ b/docs/opsguide/opsguide.xml @@ -8988,6 +8988,593 @@ under certain conditions; type `show c' for details. + + Filepath Wildcards + + Filepath wildcards can be used in most places in RDAdmin where a filename + is required. + + + Definition + + A date/time wildcard in Rivendell has the following form: + + + %<meta-char><fmt-char> + + + where: + + + + % + + + A literal percent. + + + + + <meta-char> + + + Optional. One of the following meta-characters: + + + + ^ + + + Convert value indicated by <fmt-char> + to all uppercase. + + + + + $ + + + Convert the initial character of the value indicated by + <fmt-char> to uppercase. + + + + + + + + <fmt-char> + + + One of the following letters: + + + + a + + + Abbreviated weekday name --e.g. 'mon', 'tue' + + + + + A + + + Full weekday name --e.g. 'monday', 'tuesday' + + + + + b + + + Abbreviated month name --e.g. 'jan', 'feb' + + + + + B + + + Full month name --e.g. 'january', 'february' + + + + + c + + + [unassigned] + + + + + C + + + Century + + + + + d + + + Day of the month, zero padded (01 - 31) + + + + + D + + + Date (mm/dd/yy) + + + + + e + + + Day of the month, space padded ( 1 - 12) + + + + + E + + + Day of the month, unpadded (1 - 12) + + + + + f + + + [unassigned] + + + + + F + + + Date (yyyy-mm-dd) + + + + + g + + + Two digit year, as per ISO 8601 + + + + + G + + + Four digit year, as per ISO 8601 + + + + + h + + + Abbreviated month name --e.g. 'jan', 'feb' + + + + + H + + + Hour, 24 hour, zero padded (00 - 23) + + + + + i + + + Hour, 12 hour, space padded ( 0 - 12) + + + + + I + + + Hour, 12 hour, zero padded (00 - 12) + + + + + j + + + Day of year, zero padded (000 - 355) + + + + + J + + + Hour, 12 hour, unpadded (1 - 12) + + + + + k + + + Hour, 24 hour, space padded ( 0 - 23) + + + + + K + + + [unassigned] + + + + + l + + + [unassigned] + + + + + L + + + [unassigned] + + + + + m + + + Month, zero padded (01 - 12) + + + + + M + + + Minute, zero padded (00 - 59) + + + + + n + + + [unassigned] + + + + + N + + + [unassigned] + + + + + o + + + [unassigned] + + + + + O + + + [unassigned] + + + + + p + + + AM/PM string + + + + + P + + + [unassigned] + + + + + q + + + [unassigned] + + + + + Q + + + [unassigned] + + + + + r + + + Rivendell Host Name [not FQDN] + + + + + R + + + Rivendell Host Short Name + + + + + s + + + Service Name + + + + + S + + + Seconds, zero padded (00 - 60) + + + + + t + + + [unassigned] + + + + + T + + + [unassigned] + + + + + u + + + Day of the week, numeric, 1=Monday, 7=Sunday + + + + + U + + + [unassigned] + + + + + v + + + [unassigned] + + + + + V + + + Week number, as per ISO 8601 + + + + + w + + + Day of the week, numeric, 0=Sunday,6=Saturday + + + + + W + + + Week number, as per ISO 8601 + + + + + x + + + [unassigned] + + + + + X + + + [unassigned] + + + + + y + + + Two digit year + + + + + Y + + + Four digit year + + + + + z + + + [unassigned] + + + + + Z + + + [unassigned] + + + + + % + + + A literal '%' + + + + + + + + + + Examples + + For the date time of February 3rd, 2017 at 2:34:26 PM: + + + + %b + + + feb + + + + + %B + + + february + + + + + %^B + + + FEBRUARY + + + + + %$B + + + February + + + + + %A + + + friday + + + + + %a + + + fri + + + + + %u + + + 5 + + + + + %D + + + 02/03/17 + + + + + %j + + + 034 + + + + + %m/%d/%Y - %H:%M:%S + + + 02/03/2017 - 14:34:26 + + + + + %m/%d/%Y - %I:%M:%S %p + + + 02/03/2017 - 02:34:26 PM + + + + + +