From ce3eccd85fb12ae2208417e47603b65357cf60ea Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Fri, 3 Nov 2023 21:32:36 +0000
Subject: [PATCH 1/2] NEWS: update for deprecated sleep configs

---
 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index 7dd063be0e..65ea49599f 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,12 @@ CHANGES WITH 255 in spe:
         * The NAMING_BRIDGE_MULTIFUNCTION_SLOT naming scheme has been deprecated
           and is now disabled.
 
+        * SuspendMode=, HibernateState= and HybridSleepState= in the [Sleep]
+          section of systemd-sleep.conf are now deprecated and have no effect.
+          They did not (and could not) take any value other than the respective
+          default. HybridSleepMode= is also deprecated, and will now always use
+          the 'suspend' disk mode.
+
         Service Manager:
 
         * The way services are spawned has been overhauled. Previously, a

From 2c9fa8d3f03fc60138a6f790373f56a73946e51e Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Fri, 3 Nov 2023 21:33:52 +0000
Subject: [PATCH 2/2] man: drop obsolete reference to SuspendMode=

Follow-up for 1f82c21dce
---
 man/systemd-sleep.conf.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 91ea909afe..4a04263c1a 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -159,8 +159,7 @@
 
         <para>
         <citerefentry><refentrytitle>systemd-suspend-then-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        uses the value of <varname>SuspendMode=</varname> when suspending and the value of
-        <varname>HibernateMode=</varname> when hibernating.</para>
+        uses the value of <varname>HibernateMode=</varname> when hibernating.</para>
 
         <xi:include href="version-info.xml" xpointer="v203"/></listitem>
       </varlistentry>