diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-20 20:26:34 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-20 20:26:34 +0200 |
| commit | f15ab461ec10cb0164b9e6110957012d052415ea (patch) | |
| tree | 51bac2b0baf064fc0ec93133e88656e46a3ca71a /man/systemd-tmpfiles.xml | |
| parent | 129baf1bbfe3174a667c1ae73de131c503c025ea (diff) | |
| parent | df8dee85da5fa41e95dd7f536e67fcc6940a6488 (diff) | |
Merge pull request #3074 from keszybz/tmpfiles
systemd-tmpfiles improvements, nspawn -E, honouring $TERM in pid1
Diffstat (limited to 'man/systemd-tmpfiles.xml')
| -rw-r--r-- | man/systemd-tmpfiles.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml index 447a7eaa17..c1aab51551 100644 --- a/man/systemd-tmpfiles.xml +++ b/man/systemd-tmpfiles.xml @@ -75,11 +75,11 @@ <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 absolute 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 + <para>If invoked with no arguments, it applies all directives from all configuration + files. If one or more absolute filenames are passed on the command line, only the + directives in these files are applied. If <literal>-</literal> is specified instead + of a filename, directives are read from standard input. 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> |