diff --git a/Makefile.am b/Makefile.am
index 56fdfceda30..dd872f88516 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -485,6 +485,7 @@ MANPAGES = \
man/systemctl.1 \
man/systemadm.1 \
man/systemd-cgls.1 \
+ man/systemd-tmpfiles.8 \
man/systemd-notify.1 \
man/sd_notify.3 \
man/sd_readahead.3 \
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
new file mode 100644
index 00000000000..986a442ebbf
--- /dev/null
+++ b/man/systemd-tmpfiles.xml
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+ systemd-tmpfiles
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ systemd-tmpfiles
+ 8
+
+
+
+ systemd-tmpfiles
+ Creates, deletes and cleans up volatile
+ and temporary files and directories.
+
+
+
+
+ systemd-tmpfiles OPTIONSCONFIGURATION FILE
+
+
+
+
+ Description
+
+ systemd-tmpfiles creates,
+ deletes and cleans up volatile ad temporary files and
+ directories, based on the configuration from
+ /etc/tmpfiles.d/. See
+ tmpfiles.d5
+ for more details on these files.
+
+ If invoked with no arguments applies all
+ directives from all configuration files in
+ /etc/tmpfiles.d/*.conf. If one or
+ more absolute file names are passed on the command
+ line only the directives in these files are
+ applied.
+
+
+
+ Options
+
+ The following options are understood:
+
+
+
+
+
+ If this option is passed all
+ files and directories marked with f,
+ F, d, D in the configuration files are
+ created.
+
+
+
+
+ If this option is
+ passed all files and directories with
+ an age parameter configured will be
+ cleaned up.
+
+
+
+
+ If this option is
+ passed all files and directories marked
+ with r, R in the configuration files
+ are removed.
+
+
+
+ Only apply rules that
+ apply to paths with the specified
+ prefix.
+
+
+
+
+
+
+ Prints a short help
+ text and exits.
+
+
+
+
+ It is possible to combine
+ , ,
+ and in one invocation. For
+ example, during boot the following command line is
+ executed to ensure that all temporary and volatile
+ directores are removed and created according to the
+ configuration file:
+
+ systemctl-tmpfiles --remove --create
+
+
+
+
+ Exit status
+
+ On success 0 is returned, a non-zero failure
+ code otherwise.
+
+
+
+ See Also
+
+ systemd1,
+ tmpfiles.d5,
+ tmpwatch8
+
+
+
+
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index e211d6ded5c..868b57e9351 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -42,7 +42,8 @@
tmpfiles.d
- Configuration for creation, deletion and cleaning of temporary and volatile files
+ Configuration for creation, deletion and
+ cleaning of volatile and temporary files
@@ -52,13 +53,14 @@
Description
- systemd uses
+ systemd-tmpfiles uses the
+ configuration files in
/etc/tmpfiles.d/ to describe the
- creation, cleaning and removal of volatile files and
- directories which usually reside in directories such
- as /var/run or
- /tmp. Each configuration file is
- named in the style of
+ creation, cleaning and removal of volatile and
+ temporary files and directories which usually reside
+ in directories such as /var/run
+ or /tmp. Each configuration file
+ is named in the style of
/etc/tmpfiles.d/<program>.conf.
@@ -201,7 +203,8 @@ d /var/run/uscreens 0755 root root 10d12h
See Also
- systemd1
+ systemd1,
+ systemd-tmpfiles8
diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 36fc9165f81..9b697e47e8c 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -700,13 +700,13 @@ static int scandir_filter(const struct dirent *d) {
static int help(void) {
- printf("%s [OPTIONS...] [CONFIGURATION FILE]\n\n"
- "Create and clean up temporary files and directories.\n\n"
+ printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n"
+ "Creates, deletes and cleans up volatile and temporary files and directories.\n\n"
" -h --help Show this help\n"
" --create Create marked files/directories\n"
" --clean Clean up marked directories\n"
" --remove Remove marked files/directories\n"
- " --prefix=PATH Only apply rules that apply to paths\n",
+ " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n",
program_invocation_short_name);
return 0;