X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-tmpfiles.xml;h=63c84910f0ad60f4571d0b8814d01902cd7fcaef;hp=f58913d0c2e146392b4e168de650bb46c5f835d0;hb=5b6a2c5aab9893ba82acf90696f83e4d48db2b19;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8

diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index f58913d0c..63c84910f 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -44,6 +44,9 @@
 
         <refnamediv>
                 <refname>systemd-tmpfiles</refname>
+                <refname>systemd-tmpfiles-setup.service</refname>
+                <refname>systemd-tmpfiles-clean.service</refname>
+                <refname>systemd-tmpfiles-clean.timer</refname>
                 <refpurpose>Creates, deletes and cleans up volatile
                 and temporary files and directories.</refpurpose>
         </refnamediv>
@@ -52,6 +55,10 @@
                 <cmdsynopsis>
                         <command>systemd-tmpfiles <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt" rep="repeat">CONFIGURATION FILE</arg></command>
                 </cmdsynopsis>
+
+                <para><filename>systemd-tmpfiles-setup.service</filename></para>
+                <para><filename>systemd-tmpfiles-clean.service</filename></para>
+                <para><filename>systemd-tmpfiles-clean.timer</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
@@ -59,17 +66,21 @@
 
                 <para><command>systemd-tmpfiles</command> creates,
                 deletes and cleans up volatile and temporary files and
-                directories, based on the configuration from
-                <filename>/etc/tmpfiles.d/</filename>. See
-                <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                for more details on these files.</para>
-
-                <para>If invoked with no arguments applies all
-                directives from all configuration files in
-                <filename>/etc/tmpfiles.d/*.conf</filename>. If one or
-                more absolute file names are passed on the command
-                line only the directives in these files are
-                applied.</para>
+                directories, based on the configuration file format and
+                location specified in <citerefentry>
+                        <refentrytitle>tmpfiles.d</refentrytitle>
+                        <manvolnum>5</manvolnum>
+                </citerefentry>.</para>
+
+                <para>If invoked with no arguments, it applies all
+                directives from all configuration files. If one or
+                more file names are passed on the command line, only
+                the directives in these files are applied. If only
+                the basename of a configuration file is specified,
+                all configuration directories as specified in <citerefentry>
+                        <refentrytitle>tmpfiles.d</refentrytitle>
+                        <manvolnum>5</manvolnum>
+                </citerefentry> are searched for a matching file.</para>
         </refsect1>
 
         <refsect1>
@@ -145,7 +156,6 @@
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>tmpwatch</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 </para>
         </refsect1>