Merging upstream version 4.23.0.

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

1 files changed, 10 insertions, 13 deletions

diff --git a/upstream/fedora-rawhide/man1/systemd-notify.1 b/upstream/fedora-rawhide/man1/systemd-notify.1
index a8f251e3..3d3a13a9 100644
--- a/upstream/fedora-rawhide/man1/systemd-notify.1
+++ b/upstream/fedora-rawhide/man1/systemd-notify.1
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\-NOTIFY" "1" "" "systemd 255" "systemd-notify"
+.TH "SYSTEMD\-NOTIFY" "1" "" "systemd 256~rc3" "systemd-notify"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -22,10 +22,10 @@
 .SH "NAME"
 systemd-notify \- Notify service manager about start\-up completion and other daemon status changes
 .SH "SYNOPSIS"
-.HP \w'\fBsystemd\-notify\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB[VARIABLE=VALUE...]\fR\ 'u
-\fBsystemd\-notify \fR\fB[OPTIONS...]\fR\fB \fR\fB[VARIABLE=VALUE...]\fR
-.HP \w'\fBsystemd\-notify\ \-\-exec\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB[VARIABLE=VALUE...]\fR\fB\ ;\ \fR\fB[CMDLINE...]\fR\ 'u
-\fBsystemd\-notify \-\-exec \fR\fB[OPTIONS...]\fR\fB \fR\fB[VARIABLE=VALUE...]\fR\fB ; \fR\fB[CMDLINE...]\fR
+.HP \w'\fBsystemd\-notify\fR\ 'u
+\fBsystemd\-notify\fR [OPTIONS...] [VARIABLE=VALUE...]
+.HP \w'\fBsystemd\-notify\fR\ 'u
+\fBsystemd\-notify\fR [\-\-exec] [OPTIONS...] [VARIABLE=VALUE...] [;] [CMDLINE...]
 .SH "DESCRIPTION"
 .PP
 \fBsystemd\-notify\fR
@@ -117,7 +117,9 @@ is used, except if that\*(Aqs the service manager\&. If the argument is specifie
 \fBsystemd\-notify\fR
 command itself is used, and if
 "parent"
-is specified the calling process\*(Aq PID is used \(em even if it is the service manager\&. The latter is equivalent to
+is specified the calling process\*(Aq PID is used \(em even if it is the service manager\&.
+\fB\-\-pid=auto\fR
+is equivalent to
 \fBsystemd\-notify MAINPID=$PID\fR\&. For details about the semantics of this option see
 \fBsd_notify\fR(3)\&.
 .sp
@@ -130,7 +132,7 @@ in the service unit file, or otherwise the notification will be ignored for secu
 for details\&.
 .RE
 .PP
-\fB\-\-uid=\fR\fIUSER\fR
+\fB\-\-uid=\fR\fB\fIUSER\fR\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
@@ -267,9 +269,4 @@ done
 .\}
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBsystemd.unit\fR(5),
-\fBsystemd.service\fR(5),
-\fBsd_notify\fR(3),
-\fBsd_booted\fR(3)
+\fBsystemd\fR(1), \fBsystemctl\fR(1), \fBsystemd.unit\fR(5), \fBsystemd.service\fR(5), \fBsd_notify\fR(3), \fBsd_booted\fR(3)