Merging upstream version 4.23.0.

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

1 files changed, 46 insertions, 19 deletions

diff --git a/upstream/debian-unstable/man1/journalctl.1 b/upstream/debian-unstable/man1/journalctl.1
index 16dd0e82..89b3a8bc 100644
--- a/upstream/debian-unstable/man1/journalctl.1
+++ b/upstream/debian-unstable/man1/journalctl.1
@@ -1,5 +1,5 @@
 '\" t
-.TH "JOURNALCTL" "1" "" "systemd 255" "journalctl"
+.TH "JOURNALCTL" "1" "" "systemd 256~rc3" "journalctl"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -63,8 +63,8 @@ being shown\&.
 The set of journal files which will be used can be modified using the
 \fB\-\-user\fR,
 \fB\-\-system\fR,
-\fB\-\-directory\fR, and
-\fB\-\-file\fR
+\fB\-\-directory=\fR, and
+\fB\-\-file=\fR
 options, see below\&.
 .PP
 All users are granted access to their private per\-user journals\&. However, by default, only root and users who are members of a few special groups are granted access to the system journal and the journals of other users\&. Members of the groups
@@ -139,7 +139,7 @@ instead of the default runtime and system journal paths\&.
 Added in version 187\&.
 .RE
 .PP
-\fB\-\-file=\fR\fB\fIGLOB\fR\fR
+\fB\-i \fR\fB\fIGLOB\fR\fR, \fB\-\-file=\fR\fB\fIGLOB\fR\fR
 .RS 4
 Takes a file glob as an argument\&. If specified, journalctl will operate on the specified journal files matching
 \fIGLOB\fR
@@ -278,7 +278,7 @@ the boot before last, and so on\&. An empty
 \fIoffset\fR
 is equivalent to specifying
 \fB\-0\fR, except when the current boot is not the last boot (e\&.g\&. because
-\fB\-\-directory\fR
+\fB\-\-directory=\fR
 was specified to look at logs from a different machine)\&.
 .sp
 If the 32\-character
@@ -349,6 +349,16 @@ This parameter can be specified multiple times\&.
 Added in version 217\&.
 .RE
 .PP
+\fB\-T\fR, \fB\-\-exclude\-identifier=\fR\fB\fISYSLOG_IDENTIFIER\fR\fR
+.RS 4
+Exclude messages for the specified syslog identifier
+\fISYSLOG_IDENTIFIER\fR\&.
+.sp
+This parameter can be specified multiple times\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
 \fB\-p\fR, \fB\-\-priority=\fR
 .RS 4
 Filter output by message priorities or priority ranges\&. Takes either a single numeric or textual log level (i\&.e\&. between 0/"emerg"
@@ -789,7 +799,7 @@ Added in version 206\&.
 .RE
 .SH "COMMANDS"
 .PP
-The following commands are understood\&. If none is specified the default is to display journal records\&.
+The following commands are understood\&. If none is specified the default is to display journal records:
 .PP
 \fB\-N\fR, \fB\-\-fields\fR
 .RS 4
@@ -807,7 +817,13 @@ Added in version 195\&.
 .PP
 \fB\-\-list\-boots\fR
 .RS 4
-Show a tabular list of boot numbers (relative to the current boot), their IDs, and the timestamps of the first and last message pertaining to the boot\&.
+Show a tabular list of boot numbers (relative to the current boot), their IDs, and the timestamps of the first and last message pertaining to the boot\&. When specified with
+\fB\-n/\-\-lines=\fR\fB[+]\fR\fB\fIN\fR\fR
+option, only the first (when the number prefixed with
+"+") or the last (without prefix)
+\fIN\fR
+entries will be shown\&. When specified with
+\fB\-r/\-\-reverse\fR, the list will be shown in the reverse order\&.
 .sp
 Added in version 209\&.
 .RE
@@ -1003,7 +1019,7 @@ On success, 0 is returned; otherwise, a non\-zero failure code is returned\&.
 .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,
@@ -1013,7 +1029,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
@@ -1132,6 +1156,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\&.
@@ -1143,6 +1173,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
@@ -1326,16 +1362,7 @@ journalctl \-f \-u apache
 .\}
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBsystemd-cat\fR(1),
-\fBsystemd-journald.service\fR(8),
-\fBsystemctl\fR(1),
-\fBcoredumpctl\fR(1),
-\fBsystemd.journal-fields\fR(7),
-\fBjournald.conf\fR(5),
-\fBsystemd.time\fR(7),
-\fBsystemd-journal-remote.service\fR(8),
-\fBsystemd-journal-upload.service\fR(8)
+\fBsystemd\fR(1), \fBsystemd-cat\fR(1), \fBsystemd-journald.service\fR(8), \fBsystemctl\fR(1), \fBcoredumpctl\fR(1), \fBsystemd.journal-fields\fR(7), \fBjournald.conf\fR(5), \fBsystemd.time\fR(7), \fBsystemd-journal-remote.service\fR(8), \fBsystemd-journal-upload.service\fR(8)
 .SH "NOTES"
 .IP " 1." 4
 Discoverable Partitions Specification