Merging upstream version 4.23.0.

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

1 files changed, 11 insertions, 1 deletions

diff --git a/upstream/opensuse-tumbleweed/man5/journal-upload.conf.5 b/upstream/opensuse-tumbleweed/man5/journal-upload.conf.5
index 46d33e65..09f47e5f 100644
--- a/upstream/opensuse-tumbleweed/man5/journal-upload.conf.5
+++ b/upstream/opensuse-tumbleweed/man5/journal-upload.conf.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "JOURNAL\-UPLOAD\&.CONF" "5" "" "systemd 254" "journal-upload.conf"
+.TH "JOURNAL\-UPLOAD\&.CONF" "5" "" "systemd 255" "journal-upload.conf"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -79,21 +79,29 @@ The URL to upload the journal entries to\&. See the description of
 option in
 \fBsystemd-journal-upload\fR(8)
 for the description of possible values\&. There is no default value, so either this option or the command\-line option must be always present to make an upload\&.
+.sp
+Added in version 232\&.
 .RE
 .PP
 \fIServerKeyFile=\fR
 .RS 4
 SSL key in PEM format\&.
+.sp
+Added in version 232\&.
 .RE
 .PP
 \fIServerCertificateFile=\fR
 .RS 4
 SSL CA certificate in PEM format\&.
+.sp
+Added in version 232\&.
 .RE
 .PP
 \fITrustedCertificateFile=\fR
 .RS 4
 SSL CA certificate\&.
+.sp
+Added in version 232\&.
 .RE
 .PP
 \fINetworkTimeoutSec=\fR
@@ -102,6 +110,8 @@ When network connectivity to the server is lost, this option configures the time
 \fBsystemd\-journal\-upload\fR
 exits\&. Takes a value in seconds (or in other time units if suffixed with "ms", "min", "h", etc)\&. For details, see
 \fBsystemd.time\fR(5)\&.
+.sp
+Added in version 249\&.
 .RE
 .SH "SEE ALSO"
 .PP