diff options
| author | Hamish Moffatt <hamish@moffatt.id.au> | 2021-07-05 19:06:15 +1000 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-07-07 11:08:21 +0200 |
| commit | 33f899bd479534b0a920ce427cdf06739028f5ab (patch) | |
| tree | 8e86ecc76ecd9a435271ebbc33f2c344f6e67a4c | |
| parent | 8ca29d97f22cc8cb8673a4351ba10d621dfd51fc (diff) | |
| download | systemd-33f899bd479534b0a920ce427cdf06739028f5ab.tar.gz | |
Clarify the behaviour of suspend-then-sleep mode in the manual pages.
Fixes #20125.
| -rw-r--r-- | man/systemd-sleep.conf.xml | 17 | ||||
| -rw-r--r-- | man/systemd-suspend.service.xml | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml index d117a212ac..8a51d729ff 100644 --- a/man/systemd-sleep.conf.xml +++ b/man/systemd-sleep.conf.xml @@ -137,14 +137,17 @@ <filename>/sys/power/disk</filename> by, respectively, <citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or - <citerefentry><refentrytitle>systemd-suspend-then-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. + <citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or + <citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. 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 neither succeeds, the operation will be aborted. + </para> + <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></listitem> + </varlistentry> <varlistentry> @@ -156,13 +159,15 @@ <filename>/sys/power/state</filename> by, respectively, <citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or - <citerefentry><refentrytitle>systemd-suspend-then-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. + <citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or + <citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. 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 neither succeeds, the operation will be aborted. + </para> + <para><citerefentry><refentrytitle>systemd-suspend-then-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> + uses the value of <varname>SuspendState=</varname> when suspending and the value of <varname>HibernateState=</varname> when hibernating. </para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index c525a3bda2..29249365a0 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -103,8 +103,8 @@ <varlistentry> <term><option>suspend</option></term> <term><option>hibernate</option></term> - <term><option>hybrid-sleep</option></term> <term><option>suspend-then-hibernate</option></term> + <term><option>hybrid-sleep</option></term> <listitem><para>Suspend, hibernate, suspend then hibernate, or put the system to hybrid sleep.</para> |