X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-tmpfiles.xml;h=b90bd757ebf50afdae2ed2946a5b7c78bd0045ef;hp=22744c7c41174c930358ed52b003410fd9230710;hb=86198b2788e56fd05959c2dce670d1646bf99bcd;hpb=f274ece0f76b5709408821e317e87aef76123db6

diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index 22744c7c4..b90bd757e 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -45,6 +45,7 @@
         <refnamediv>
                 <refname>systemd-tmpfiles</refname>
                 <refname>systemd-tmpfiles-setup.service</refname>
+                <refname>systemd-tmpfiles-setup-dev.service</refname>
                 <refname>systemd-tmpfiles-clean.service</refname>
                 <refname>systemd-tmpfiles-clean.timer</refname>
                 <refpurpose>Creates, deletes and cleans up volatile
@@ -57,6 +58,7 @@
                 </cmdsynopsis>
 
                 <para><filename>systemd-tmpfiles-setup.service</filename></para>
+                <para><filename>systemd-tmpfiles-setup-dev.service</filename></para>
                 <para><filename>systemd-tmpfiles-clean.service</filename></para>
                 <para><filename>systemd-tmpfiles-clean.timer</filename></para>
         </refsynopsisdiv>
@@ -74,7 +76,7 @@
 
                 <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
+                more filenames 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>
@@ -89,10 +91,24 @@
                 <para>The following options are understood:</para>
 
                 <variablelist>
+                        <varlistentry>
+                                <term><option>-h</option></term>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Prints a short help
+                                text and exits.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--version</option></term>
+
+                                <listitem><para>Prints a short version
+                                string and exits.</para></listitem>
+                        </varlistentry>
 
                         <varlistentry>
                                 <term><option>--create</option></term>
-                                <listitem><para>If this option is passed all
+                                <listitem><para>If this option is passed, all
                                 files and directories marked with f,
                                 F, d, D in the configuration files are
                                 created. Files and directories marked with z,
@@ -103,7 +119,7 @@
                         <varlistentry>
                                 <term><option>--clean</option></term>
                                 <listitem><para>If this option is
-                                passed all files and directories with
+                                passed, all files and directories with
                                 an age parameter configured will be
                                 cleaned up.</para></listitem>
                         </varlistentry>
@@ -111,7 +127,7 @@
                         <varlistentry>
                                 <term><option>--remove</option></term>
                                 <listitem><para>If this option is
-                                passed all files and directories marked
+                                passed, all files and directories marked
                                 with r, R in the configuration files
                                 are removed.</para></listitem>
                         </varlistentry>
@@ -119,17 +135,16 @@
                                 <term><option>--prefix=PATH</option></term>
                                 <listitem><para>Only apply rules that
                                 apply to paths with the specified
-                                prefix.</para></listitem>
+                                prefix. This option can be specified
+                                multiple times.</para></listitem>
                         </varlistentry>
-
-
                         <varlistentry>
-                                <term><option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
+                                <term><option>--exclude-prefix=PATH</option></term>
+                                <listitem><para>Ignore rules that
+                                apply to paths with the specified
+                                prefix. This option can be specified
+                                multiple times.</para></listitem>
                         </varlistentry>
-
                 </variablelist>
 
                 <para>It is possible to combine
@@ -155,7 +170,7 @@
                 <title>See Also</title>
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 </para>
         </refsect1>