Merging upstream version 4.23.0.

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

1 files changed, 20 insertions, 11 deletions

diff --git a/upstream/fedora-rawhide/man5/systemd.preset.5 b/upstream/fedora-rawhide/man5/systemd.preset.5
index 945e0d62..c75ee687 100644
--- a/upstream/fedora-rawhide/man5/systemd.preset.5
+++ b/upstream/fedora-rawhide/man5/systemd.preset.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\&.PRESET" "5" "" "systemd 255" "systemd.preset"
+.TH "SYSTEMD\&.PRESET" "5" "" "systemd 256~rc3" "systemd.preset"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -23,17 +23,24 @@
 systemd.preset \- Service enablement presets
 .SH "SYNOPSIS"
 .PP
+.RS 4
 /etc/systemd/system\-preset/*\&.preset
-.PP
+.RE
+.RS 4
 /run/systemd/system\-preset/*\&.preset
-.PP
+.RE
+.RS 4
 /usr/lib/systemd/system\-preset/*\&.preset
-.PP
+.RE
+.RS 4
 /etc/systemd/user\-preset/*\&.preset
-.PP
+.RE
+.RS 4
 /run/systemd/user\-preset/*\&.preset
-.PP
+.RE
+.RS 4
 /usr/lib/systemd/user\-preset/*\&.preset
+.RE
 .SH "DESCRIPTION"
 .PP
 Preset files may be used to encode policy which units shall be enabled by default and which ones shall be disabled\&. They are read by
@@ -45,7 +52,7 @@ is identical to
 or
 \fBsystemctl disable\fR\&.
 \fBsystemctl preset\fR
-is used by the post install scriptlets of rpm packages (or other OS package formats), to enable/disable specific units by default on package installation, enforcing distribution, spin or administrator preset policy\&. This allows choosing a certain set of units to be enabled/disabled even before installing the actual package\&. For more information, see
+is used by the post install scriptlets of rpm packages (or other OS package formats), to enable/disable specific units by default on package installation, enforcing distribution, spin, or administrator preset policy\&. This allows choosing a certain set of units to be enabled/disabled even before installing the actual package\&. For more information, see
 \fBsystemctl\fR(1)\&.
 .PP
 It is not recommended to ship preset files within the respective software packages implementing the units, but rather centralize them in a distribution or spin default policy, which can be amended by administrator policy, see below\&.
@@ -55,7 +62,11 @@ If no preset files exist, preset operations will enable all units that are insta
 When the machine is booted for the first time,
 \fBsystemd\fR(1)
 will enable/disable all units according to preset policy, similarly to
-\fBsystemctl preset\-all\fR\&. Also see "First Boot Semantics" in
+\fBsystemctl preset\-all\fR\&. Also see
+\fIConditionFirstBoot=\fR
+in
+\fBsystemd.unit\fR(5)
+and "First Boot Semantics" in
 \fBmachine-id\fR(5)\&.
 .SH "PRESET FILE FORMAT"
 .PP
@@ -203,9 +214,7 @@ The preset mechanism allows clean separation of the enablement mechanism (inside
 \fBsystemctl preset\fR) and enablement policy (centralized in the preset files), and lifts the configuration out of individual packages\&. Preset files may be written for specific distributions, for specific spins or for specific sites, in order to enforce different policies as needed\&. It is recommended to apply the policy encoded in preset files in package installation scriptlets\&.
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBsystemd-delta\fR(1)
+\fBsystemd\fR(1), \fBsystemctl\fR(1), \fBsystemd-delta\fR(1)
 .PP
 \fBdaemon\fR(7)
 has a discussion of packaging scriptlets\&.