a233116
From 9b09a6df372e9eec7296c42239c8eef8f6edbdc8 Mon Sep 17 00:00:00 2001
a233116
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
a233116
Date: Mon, 23 Feb 2015 18:59:17 -0500
a233116
Subject: [PATCH] man: explain time units in tmpfiles
a233116
a233116
https://bugzilla.redhat.com/show_bug.cgi?id=1195294
a233116
(cherry picked from commit 00c53f4283ca41878a84b370840a84760b00d46e)
a233116
---
a233116
 man/tmpfiles.d.xml | 29 ++++++++++++++---------------
a233116
 1 file changed, 14 insertions(+), 15 deletions(-)
a233116
a233116
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
a233116
index 8815bf9970..4bd0fcf751 100644
a233116
--- a/man/tmpfiles.d.xml
a233116
+++ b/man/tmpfiles.d.xml
a233116
@@ -443,23 +443,22 @@
a233116
       delete when cleaning. If a file or directory is older than the
a233116
       current time minus the age field, it is deleted. The field
a233116
       format is a series of integers each followed by one of the
a233116
-      following postfixes for the respective time units:</para>
a233116
-
a233116
-      <variablelist>
a233116
-        <varlistentry>
a233116
-          <term><varname>s</varname></term>
a233116
-          <term><varname>min</varname></term>
a233116
-          <term><varname>h</varname></term>
a233116
-          <term><varname>d</varname></term>
a233116
-          <term><varname>w</varname></term>
a233116
-          <term><varname>ms</varname></term>
a233116
-          <term><varname>m</varname></term>
a233116
-        <term><varname>us</varname></term></varlistentry>
a233116
-      </variablelist>
a233116
+      following postfixes for the respective time units:
a233116
+      <constant>s</constant>,
a233116
+      <constant>m</constant> or <constant>min</constant>,
a233116
+      <constant>h</constant>,
a233116
+      <constant>d</constant>,
a233116
+      <constant>w</constant>,
a233116
+      <constant>ms</constant>,
a233116
+      <constant>us</constant>,
a233116
+      respectively meaning seconds, minutes, hours, days, weeks,
a233116
+      milliseconds, and microseconds. Full names of the time units can
a233116
+      be used too.
a233116
+      </para>
a233116
 
a233116
       <para>If multiple integers and units are specified, the time
a233116
-      values are summed up. If an integer is given without a unit,
a233116
-      <varname>s</varname> is assumed.
a233116
+      values are summed. If an integer is given without a unit,
a233116
+      <constant>s</constant> is assumed.
a233116
       </para>
a233116
 
a233116
       <para>When the age is set to zero, the files are cleaned