Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 69 insertions, 24 deletions

diff --git a/upstream/fedora-rawhide/man8/systemd-tmpfiles.8 b/upstream/fedora-rawhide/man8/systemd-tmpfiles.8
index cc6228af..c4302e94 100644
--- a/upstream/fedora-rawhide/man8/systemd-tmpfiles.8
+++ b/upstream/fedora-rawhide/man8/systemd-tmpfiles.8
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\-TMPFILES" "8" "" "systemd 255" "systemd-tmpfiles"
+.TH "SYSTEMD\-TMPFILES" "8" "" "systemd 256~rc3" "systemd-tmpfiles"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -20,44 +20,54 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-systemd-tmpfiles, systemd-tmpfiles-setup.service, systemd-tmpfiles-setup-dev-early.service, systemd-tmpfiles-setup-dev.service, systemd-tmpfiles-clean.service, systemd-tmpfiles-clean.timer \- Creates, deletes and cleans up volatile and temporary files and directories
+systemd-tmpfiles, systemd-tmpfiles-setup.service, systemd-tmpfiles-setup-dev-early.service, systemd-tmpfiles-setup-dev.service, systemd-tmpfiles-clean.service, systemd-tmpfiles-clean.timer \- Create, delete, and clean up files and directories
 .SH "SYNOPSIS"
 .HP \w'\fBsystemd\-tmpfiles\fR\ 'u
 \fBsystemd\-tmpfiles\fR [OPTIONS...] [\fICONFIGFILE\fR...]
 .PP
 System units:
-.sp
-.nf
+.RS 4
 systemd\-tmpfiles\-setup\&.service
+.RE
+.RS 4
 systemd\-tmpfiles\-setup\-dev\-early\&.service
+.RE
+.RS 4
 systemd\-tmpfiles\-setup\-dev\&.service
+.RE
+.RS 4
 systemd\-tmpfiles\-clean\&.service
+.RE
+.RS 4
 systemd\-tmpfiles\-clean\&.timer
-.fi
+.RE
 .PP
 User units:
-.sp
-.nf
+.RS 4
 systemd\-tmpfiles\-setup\&.service
+.RE
+.RS 4
 systemd\-tmpfiles\-clean\&.service
+.RE
+.RS 4
 systemd\-tmpfiles\-clean\&.timer
-.fi
+.RE
 .SH "DESCRIPTION"
 .PP
 \fBsystemd\-tmpfiles\fR
 creates, deletes, and cleans up volatile and temporary files and directories, using the configuration file format and location specified in
-\fBtmpfiles.d\fR(5)\&. It must be invoked with one or more options
+\fBtmpfiles.d\fR(5)\&. It must be invoked with one or more commands
 \fB\-\-create\fR,
 \fB\-\-remove\fR, and
 \fB\-\-clean\fR, to select the respective subset of operations\&.
 .PP
-By default, directives from all configuration files are applied\&. When invoked with
-\fB\-\-replace=\fR\fB\fIPATH\fR\fR, arguments specified on the command line are used instead of the configuration file
-\fIPATH\fR\&. Otherwise, if one or more absolute filenames are passed on the command line, only the directives in these files are applied\&. If
+If invoked with no arguments, directives from the configuration files found in the directories specified by
+\fBtmpfiles.d\fR(5)\&. When invoked with positional arguments, if option
+\fB\-\-replace=\fR\fB\fIPATH\fR\fR
+is specified, arguments specified on the command line are used instead of the configuration file
+\fIPATH\fR\&. Otherwise, just the configuration specified by the command line arguments is executed\&. If the string
 "\-"
-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
-\fBtmpfiles.d\fR(5)
-are searched for a matching file and the file found that has the highest priority is executed\&.
+is specified instead of a filename, the configuration is read from standard input\&. If the argument is a file name (without any slashes), all configuration directories are searched for a matching file and the file found that has the highest priority is executed\&. If the argument is a path, that file is used directly without searching the configuration directories for any other matching file\&.
 .PP
 System services (systemd\-tmpfiles\-setup\&.service,
 systemd\-tmpfiles\-setup\-dev\-early\&.service,
@@ -81,13 +91,13 @@ systemd\-tmpfiles\-clean\&.service, which will apply any settings which can be s
 \fBsystemd\-tmpfiles\fR, it may be useful to invoke it directly from the command line with increased log level (see
 \fI$SYSTEMD_LOG_LEVEL\fR
 below)\&.
-.SH "OPTIONS"
+.SH "COMMANDS AND OPTIONS"
 .PP
-The following options are understood:
+The following commands are understood:
 .PP
 \fB\-\-create\fR
 .RS 4
-If this option is passed, all files and directories marked with
+If this command is passed, all files and directories marked with
 \fIf\fR,
 \fIF\fR,
 \fIw\fR,
@@ -111,12 +121,12 @@ have their ownership, access mode and security labels set\&.
 .PP
 \fB\-\-clean\fR
 .RS 4
-If this option is passed, all files and directories with an age parameter configured will be cleaned up\&.
+If this command is passed, all files and directories with an age parameter configured will be cleaned up\&.
 .RE
 .PP
 \fB\-\-remove\fR
 .RS 4
-If this option is passed, the contents of directories marked with
+If this command is passed, the contents of directories marked with
 \fID\fR
 or
 \fIR\fR, and files or directories themselves marked with
@@ -127,6 +137,15 @@ are removed unless an exclusive or shared BSD lock is taken on them (see
 \fBflock\fR(2))\&.
 .RE
 .PP
+\fB\-\-purge\fR
+.RS 4
+If this option is passed, all files and directories created by a
+tmpfiles\&.d/
+entry will be deleted\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
 \fB\-\-user\fR
 .RS 4
 Execute "user" configuration, i\&.e\&.
@@ -155,6 +174,13 @@ Ignore configuration lines pertaining to unknown users or groups\&. This option
 Added in version 254\&.
 .RE
 .PP
+\fB\-\-dry\-run\fR
+.RS 4
+Process the configuration and print what operations would be performed, but don\*(Aqt actually change anything in the file system\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
 \fB\-\-prefix=\fR\fB\fIpath\fR\fR
 .RS 4
 Only apply rules with paths that start with the specified prefix\&. This option can be specified multiple times\&.
@@ -299,7 +325,7 @@ credential from the service manager\&.
 .PP
 \fI$SYSTEMD_LOG_LEVEL\fR
 .RS 4
-The maximum log level of emitted messages (messages with a higher log level, i\&.e\&. less important ones, will be suppressed)\&. Either one of (in order of decreasing importance)
+The maximum log level of emitted messages (messages with a higher log level, i\&.e\&. less important ones, will be suppressed)\&. Takes a comma\-separated list of values\&. A value may be either one of (in order of decreasing importance)
 \fBemerg\fR,
 \fBalert\fR,
 \fBcrit\fR,
@@ -309,7 +335,15 @@ The maximum log level of emitted messages (messages with a higher log level, i\&
 \fBinfo\fR,
 \fBdebug\fR, or an integer in the range 0\&...7\&. See
 \fBsyslog\fR(3)
-for more information\&.
+for more information\&. Each value may optionally be prefixed with one of
+\fBconsole\fR,
+\fBsyslog\fR,
+\fBkmsg\fR
+or
+\fBjournal\fR
+followed by a colon to set the maximum log level for that specific log target (e\&.g\&.
+\fBSYSTEMD_LOG_LEVEL=debug,console:info\fR
+specifies to log at debug level except when logging to the console which should be at info level)\&. Note that the global maximum log level takes priority over any per target maximum log levels\&.
 .RE
 .PP
 \fI$SYSTEMD_LOG_COLOR\fR
@@ -415,6 +449,12 @@ will be ignored by the executable, and needs to be handled by the pager\&.
 This option instructs the pager to not send termcap initialization and deinitialization strings to the terminal\&. It is set by default to allow command output to remain visible in the terminal even after the pager exits\&. Nevertheless, this prevents some pager functionality from working, in particular paged output cannot be scrolled with the mouse\&.
 .RE
 .sp
+Note that setting the regular
+\fI$LESS\fR
+environment variable has no effect for
+\fBless\fR
+invocations by systemd tools\&.
+.sp
 See
 \fBless\fR(1)
 for more discussion\&.
@@ -426,6 +466,12 @@ Override the charset passed to
 \fBless\fR
 (by default
 "utf\-8", if the invoking terminal is determined to be UTF\-8 compatible)\&.
+.sp
+Note that setting the regular
+\fI$LESSCHARSET\fR
+environment variable has no effect for
+\fBless\fR
+invocations by systemd tools\&.
 .RE
 .PP
 \fI$SYSTEMD_PAGERSECURE\fR
@@ -507,8 +553,7 @@ Note: when creating items, if the target already exists, but is of the wrong typ
 "+", a message is emitted, but the failure is otherwise ignored\&.
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBtmpfiles.d\fR(5)
+\fBsystemd\fR(1), \fBtmpfiles.d\fR(5)
 .SH "NOTES"
 .IP " 1." 4
 Discoverable Partitions Specification