Merging upstream version 4.23.0.

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

1 files changed, 16 insertions, 2 deletions

diff --git a/upstream/opensuse-tumbleweed/man1/systemd-notify.1 b/upstream/opensuse-tumbleweed/man1/systemd-notify.1
index 5a3a243b..a8f251e3 100644
--- a/upstream/opensuse-tumbleweed/man1/systemd-notify.1
+++ b/upstream/opensuse-tumbleweed/man1/systemd-notify.1
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\-NOTIFY" "1" "" "systemd 254" "systemd-notify"
+.TH "SYSTEMD\-NOTIFY" "1" "" "systemd 255" "systemd-notify"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -93,6 +93,8 @@ services, see
 \fBsystemd.service\fR(5)
 for details)\&. For details about the semantics of this option see
 \fBsd_notify\fR(3)\&.
+.sp
+Added in version 253\&.
 .RE
 .PP
 \fB\-\-stopping\fR
@@ -100,6 +102,8 @@ for details)\&. For details about the semantics of this option see
 Inform the invoking service manager about the beginning of the shutdown phase of the service\&. This is equivalent to
 \fBsystemd\-notify STOPPING=1\fR\&. For details about the semantics of this option see
 \fBsd_notify\fR(3)\&.
+.sp
+Added in version 253\&.
 .RE
 .PP
 \fB\-\-pid=\fR
@@ -129,6 +133,8 @@ for details\&.
 \fB\-\-uid=\fR\fIUSER\fR
 .RS 4
 Set the user ID to send the notification from\&. Takes a UNIX user name or numeric UID\&. When specified the notification message will be sent with the specified UID as sender, in place of the user the command was invoked as\&. This option requires sufficient privileges in order to be able manipulate the user identity of the process\&.
+.sp
+Added in version 237\&.
 .RE
 .PP
 \fB\-\-status=\fR
@@ -160,6 +166,8 @@ Do not synchronously wait for the requested operation to finish\&. Use of this o
 is spawned by the service manager, or when the invoking process is directly spawned by the service manager and has enough privileges to allow
 \fBsystemd\-notify\fR
 to send the notification on its behalf\&. Sending notifications with this option set is prone to race conditions in all other cases\&.
+.sp
+Added in version 246\&.
 .RE
 .PP
 \fB\-\-exec\fR
@@ -176,6 +184,8 @@ as their own separator for command lines, hence when
 \fBsystemd\-notify\fR
 is invoked from a shell the semicolon must usually be escaped as
 "\e;"\&.
+.sp
+Added in version 254\&.
 .RE
 .PP
 \fB\-\-fd=\fR
@@ -189,7 +199,7 @@ for details\&. The specified file descriptor must be passed to
 when invoked\&. This option may be used multiple times to pass multiple file descriptors in a single notification message\&.
 .sp
 To use this functionality from a
-\fBbash\fR
+\fBbash\fR(1)
 shell, use an expression like the following:
 .sp
 .if n \{\
@@ -201,6 +211,8 @@ systemd\-notify \-\-fd=4 \-\-fd=5 4</some/file 5</some/other/file
 .if n \{\
 .RE
 .\}
+.sp
+Added in version 254\&.
 .RE
 .PP
 \fB\-\-fdname=\fR
@@ -210,6 +222,8 @@ Set a name to assign to the file descriptors passed via
 (see above)\&. This controls the
 "FDNAME="
 field\&. This setting may only be specified once, and applies to all file descriptors passed\&. Invoke this tool multiple times in case multiple file descriptors with different file descriptor names shall be submitted\&.
+.sp
+Added in version 254\&.
 .RE
 .PP
 \fB\-h\fR, \fB\-\-help\fR