Merging upstream version 4.23.0.

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

1 files changed, 62 insertions, 31 deletions

diff --git a/upstream/fedora-rawhide/man5/systemd-sleep.conf.5 b/upstream/fedora-rawhide/man5/systemd-sleep.conf.5
index 20d3e071..0c81de64 100644
--- a/upstream/fedora-rawhide/man5/systemd-sleep.conf.5
+++ b/upstream/fedora-rawhide/man5/systemd-sleep.conf.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\-SLEEP\&.CONF" "5" "" "systemd 255" "systemd-sleep.conf"
+.TH "SYSTEMD\-SLEEP\&.CONF" "5" "" "systemd 256~rc3" "systemd-sleep.conf"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -23,13 +23,24 @@
 systemd-sleep.conf, sleep.conf.d \- Suspend and hibernation configuration file
 .SH "SYNOPSIS"
 .PP
+.RS 4
 /etc/systemd/sleep\&.conf
-.PP
+.RE
+.RS 4
+/run/systemd/sleep\&.conf
+.RE
+.RS 4
+/usr/lib/systemd/sleep\&.conf
+.RE
+.RS 4
 /etc/systemd/sleep\&.conf\&.d/*\&.conf
-.PP
+.RE
+.RS 4
 /run/systemd/sleep\&.conf\&.d/*\&.conf
-.PP
+.RE
+.RS 4
 /usr/lib/systemd/sleep\&.conf\&.d/*\&.conf
+.RE
 .SH "DESCRIPTION"
 .PP
 \fBsystemd\fR
@@ -89,16 +100,16 @@ attempts to suspend or hibernate the machine\&. See
 for a general description of the syntax\&.
 .SH "CONFIGURATION DIRECTORIES AND PRECEDENCE"
 .PP
-The default configuration is set during compilation, so configuration is only needed when it is necessary to deviate from those defaults\&. The main configuration file is either in
-/usr/lib/systemd/
-or
-/etc/systemd/
-and contains commented out entries showing the defaults as a guide to the administrator\&. Local overrides can be created by creating drop\-ins, as described below\&. The main configuration file can also be edited for this purpose (or a copy in
+The default configuration is set during compilation, so configuration is only needed when it is necessary to deviate from those defaults\&. The main configuration file is loaded from one of the listed directories in order of priority, only the first file found is used:
+/etc/systemd/,
+/run/systemd/,
+/usr/local/lib/systemd/,
+/usr/lib/systemd/\&. The vendor version of the file contains commented out entries showing the defaults as a guide to the administrator\&. Local overrides can also be created by creating drop\-ins, as described below\&. The main configuration file can also be edited for this purpose (or a copy in
 /etc/
-if it\*(Aqs shipped in
-/usr/) however using drop\-ins for local configuration is recommended over modifications to the main configuration file\&.
+if it\*(Aqs shipped under
+/usr/), however using drop\-ins for local configuration is recommended over modifications to the main configuration file\&.
 .PP
-In addition to the "main" configuration file, drop\-in configuration snippets are read from
+In addition to the main configuration file, drop\-in configuration snippets are read from
 /usr/lib/systemd/*\&.conf\&.d/,
 /usr/local/lib/systemd/*\&.conf\&.d/, and
 /etc/systemd/*\&.conf\&.d/\&. Those drop\-ins have higher precedence and override the main configuration file\&. Files in the
@@ -108,7 +119,12 @@ configuration subdirectories are sorted by their filename in lexicographic order
 When packages need to customize the configuration, they can install drop\-ins under
 /usr/\&. Files in
 /etc/
-are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages\&. Drop\-ins have to be used to override package drop\-ins, since the main configuration file has lower precedence\&. It is recommended to prefix all filenames in those subdirectories with a two\-digit number and a dash, to simplify the ordering of the files\&. This also defined a concept of drop\-in priority to allow distributions to ship drop\-ins within a specific range lower than the range used by users\&. This should lower the risk of package drop\-ins overriding accidentally drop\-ins defined by users\&.
+are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages\&. Drop\-ins have to be used to override package drop\-ins, since the main configuration file has lower precedence\&. It is recommended to prefix all filenames in those subdirectories with a two\-digit number and a dash, to simplify the ordering of the files\&. This also defines a concept of drop\-in priorities to allow OS vendors to ship drop\-ins within a specific range lower than the range used by users\&. This should lower the risk of package drop\-ins overriding accidentally drop\-ins defined by users\&. It is recommended to use the range 10\-40 for drop\-ins in
+/usr/
+and the range 60\-90 for drop\-ins in
+/etc/
+and
+/run/, to make sure that local and transient drop\-ins take priority over drop\-ins shipped by the OS vendor\&.
 .PP
 To disable a configuration file supplied by the vendor, the recommended way is to place a symlink to
 /dev/null
@@ -142,6 +158,25 @@ can be used to override and enable those specific modes\&.
 Added in version 240\&.
 .RE
 .PP
+\fISuspendState=\fR
+.RS 4
+The string to be written to
+/sys/power/state
+by
+\fBsystemd-suspend.service\fR(8)\&. More than one value can be specified by separating multiple values with whitespace\&. They will be tried in turn, until one is written without error\&. If none of the writes succeed, the operation will be aborted\&.
+.sp
+The allowed set of values is determined by the kernel and is shown in the file itself (use
+\fBcat /sys/power/state\fR
+to display)\&. See
+\m[blue]\fBBasic sysfs Interfaces for System Suspend and Hibernation\fR\m[]\&\s-2\u[1]\d\s+2
+for more details\&.
+.sp
+\fBsystemd-suspend-then-hibernate.service\fR(8)
+uses this value when suspending\&.
+.sp
+Added in version 203\&.
+.RE
+.PP
 \fIHibernateMode=\fR
 .RS 4
 The string to be written to
@@ -163,23 +198,25 @@ when hibernating\&.
 Added in version 203\&.
 .RE
 .PP
-\fISuspendState=\fR
+\fIMemorySleepMode=\fR
 .RS 4
 The string to be written to
-/sys/power/state
-by
-\fBsystemd-suspend.service\fR(8)\&. More than one value can be specified by separating multiple values with whitespace\&. They will be tried in turn, until one is written without error\&. If none of the writes succeed, the operation will be aborted\&.
+/sys/power/mem_sleep
+when
+\fBSuspendState=mem\fR
+or
+\fBhybrid\-sleep\fR
+is used\&. More than one value can be specified by separating multiple values with whitespace\&. They will be tried in turn, until one is written without error\&. If none of the writes succeed, the operation will be aborted\&. Defaults to empty, i\&.e\&. the kernel default or kernel command line option
+\fImem_sleep_default=\fR
+is respected\&.
 .sp
 The allowed set of values is determined by the kernel and is shown in the file itself (use
-\fBcat /sys/power/state\fR
-to display)\&. See
+\fBcat /sys/power/mem_sleep\fR
+to display)\&. See the kernel documentation page
 \m[blue]\fBBasic sysfs Interfaces for System Suspend and Hibernation\fR\m[]\&\s-2\u[1]\d\s+2
 for more details\&.
 .sp
-\fBsystemd-suspend-then-hibernate.service\fR(8)
-uses this value when suspending\&.
-.sp
-Added in version 203\&.
+Added in version 256\&.
 .RE
 .PP
 \fIHibernateDelaySec=\fR
@@ -221,16 +258,10 @@ SuspendState=freeze
 .\}
 .SH "SEE ALSO"
 .PP
-\fBsystemd-sleep\fR(8),
-\fBsystemd-suspend.service\fR(8),
-\fBsystemd-hibernate.service\fR(8),
-\fBsystemd-hybrid-sleep.service\fR(8),
-\fBsystemd-suspend-then-hibernate.service\fR(8),
-\fBsystemd\fR(1),
-\fBsystemd.directives\fR(7)
+\fBsystemd-sleep\fR(8), \fBsystemd-suspend.service\fR(8), \fBsystemd-hibernate.service\fR(8), \fBsystemd-hybrid-sleep.service\fR(8), \fBsystemd-suspend-then-hibernate.service\fR(8), \fBsystemd\fR(1), \fBsystemd.directives\fR(7)
 .SH "NOTES"
 .IP " 1." 4
 Basic sysfs Interfaces for System Suspend and Hibernation
 .RS 4
-\%https://www.kernel.org/doc/html/latest/admin-guide/pm/sleep-states.html#basic-sysfs-interfaces-for-system-suspend-and-hibernation
+\%https://docs.kernel.org/admin-guide/pm/sleep-states.html#basic-sysfs-interfaces-for-system-suspend-and-hibernation
 .RE