Merging upstream version 4.23.0.

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

1 files changed, 28 insertions, 9 deletions

diff --git a/upstream/fedora-rawhide/man1/systemd-inhibit.1 b/upstream/fedora-rawhide/man1/systemd-inhibit.1
index 19950530..c099bce0 100644
--- a/upstream/fedora-rawhide/man1/systemd-inhibit.1
+++ b/upstream/fedora-rawhide/man1/systemd-inhibit.1
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\-INHIBIT" "1" "" "systemd 255" "systemd-inhibit"
+.TH "SYSTEMD\-INHIBIT" "1" "" "systemd 256~rc3" "systemd-inhibit"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -22,10 +22,10 @@
 .SH "NAME"
 systemd-inhibit \- Execute a program with an inhibition lock taken
 .SH "SYNOPSIS"
-.HP \w'\fBsystemd\-inhibit\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB[COMMAND]\fR\fB\ \fR\fB[ARGUMENTS...]\fR\ 'u
-\fBsystemd\-inhibit \fR\fB[OPTIONS...]\fR\fB \fR\fB[COMMAND]\fR\fB \fR\fB[ARGUMENTS...]\fR
-.HP \w'\fBsystemd\-inhibit\ \fR\fB[OPTIONS...]\fR\fB\ \-\-list\fR\ 'u
-\fBsystemd\-inhibit \fR\fB[OPTIONS...]\fR\fB \-\-list\fR
+.HP \w'\fBsystemd\-inhibit\fR\ 'u
+\fBsystemd\-inhibit\fR [OPTIONS...] [COMMAND] [ARGUMENTS...]
+.HP \w'\fBsystemd\-inhibit\fR\ 'u
+\fBsystemd\-inhibit\fR [OPTIONS...] [\-\-list]
 .SH "DESCRIPTION"
 .PP
 \fBsystemd\-inhibit\fR
@@ -128,7 +128,7 @@ on a CD using
 .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,
@@ -138,7 +138,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
@@ -257,6 +265,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\&.
@@ -268,6 +282,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
@@ -323,8 +343,7 @@ and other conditions\&.
 .RE
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBlogind.conf\fR(5)
+\fBsystemd\fR(1), \fBlogind.conf\fR(5)
 .SH "NOTES"
 .IP " 1." 4
 Inhibitor Lock Developer Documentation