Merging upstream version 4.23.0.

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

1 files changed, 27 insertions, 1 deletions

diff --git a/upstream/opensuse-tumbleweed/man8/systemd-journal-upload.service.8 b/upstream/opensuse-tumbleweed/man8/systemd-journal-upload.service.8
index 728d0314..0ea61197 100644
--- a/upstream/opensuse-tumbleweed/man8/systemd-journal-upload.service.8
+++ b/upstream/opensuse-tumbleweed/man8/systemd-journal-upload.service.8
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\-JOURNAL\-UPLOAD\&.SERVICE" "8" "" "systemd 254" "systemd-journal-upload.service"
+.TH "SYSTEMD\-JOURNAL\-UPLOAD\&.SERVICE" "8" "" "systemd 255" "systemd-journal-upload.service"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -54,6 +54,8 @@ may specify either just the hostname or both the protocol and hostname\&.
 is the default\&. The port number may be specified after a colon (":"), otherwise
 \fB19532\fR
 will be used by default\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-system\fR, \fB\-\-user\fR
@@ -64,6 +66,8 @@ and
 \fB\-\-user\fR
 options for
 \fBjournalctl\fR(1)\&. If neither is specified, all accessible entries are uploaded\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-m\fR, \fB\-\-merge\fR
@@ -72,6 +76,8 @@ Upload entries interleaved from all available journals, including other machines
 \fB\-\-merge\fR
 option for
 \fBjournalctl\fR(1)\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-namespace=\fR\fB\fINAMESPACE\fR\fR
@@ -82,6 +88,8 @@ instead of the default namespace\&. This has the same meaning as
 \fB\-\-namespace=\fR
 option for
 \fBjournalctl\fR(1)\&.
+.sp
+Added in version 254\&.
 .RE
 .PP
 \fB\-D\fR, \fB\-\-directory=\fR\fB\fIDIR\fR\fR
@@ -92,6 +100,8 @@ instead of the default runtime and system journal paths\&. This has the same mea
 \fB\-\-directory=\fR
 option for
 \fBjournalctl\fR(1)\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-file=\fR\fB\fIGLOB\fR\fR
@@ -102,6 +112,8 @@ instead of the default runtime and system journal paths\&. May be specified mult
 \fB\-\-file=\fR
 option for
 \fBjournalctl\fR(1)\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-cursor=\fR
@@ -110,6 +122,8 @@ Upload entries from the location in the journal specified by the passed cursor\&
 \fB\-\-cursor=\fR
 option for
 \fBjournalctl\fR(1)\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-after\-cursor=\fR
@@ -120,6 +134,8 @@ the location specified by the this cursor\&. This has the same meaning as
 \fB\-\-after\-cursor=\fR
 option for
 \fBjournalctl\fR(1)\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-save\-state\fR[=\fIPATH\fR]
@@ -130,6 +146,8 @@ the location specified by the cursor saved in file at
 \fIPATH\fR
 (/var/lib/systemd/journal\-upload/state
 by default)\&. After an entry is successfully uploaded, update this file with the cursor of that entry\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-follow\fR[=\fIBOOL\fR]
@@ -137,6 +155,8 @@ by default)\&. After an entry is successfully uploaded, update this file with th
 If set to yes, then
 \fBsystemd\-journal\-upload\fR
 waits for input\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-key=\fR
@@ -146,6 +166,8 @@ Takes a path to a SSL key file in PEM format, or
 \fB\-\fR
 is set, then client certificate authentication checking will be disabled\&. Defaults to
 /etc/pki/systemd/private/journal\-upload\&.pem\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-cert=\fR
@@ -155,6 +177,8 @@ Takes a path to a SSL certificate file in PEM format, or
 \fB\-\fR
 is set, then client certificate authentication checking will be disabled\&. Defaults to
 /etc/pki/systemd/certs/journal\-upload\&.pem\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-\-trust=\fR
@@ -164,6 +188,8 @@ Takes a path to a SSL CA certificate file in PEM format, or
 \fB\-\fR/\fBall\fR
 is set, then certificate checking will be disabled\&. Defaults to
 /etc/pki/systemd/ca/trusted\&.pem\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fB\-h\fR, \fB\-\-help\fR