Rename suspend-to-hibernate to suspend-then-hibernate

Per some discussion with Gnome folks, they would prefer this name
as it's more descriptive of what's happening.

2 files changed, 24 insertions, 19 deletions

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 9c5dfe1ea..a932cbb9f 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
@@ -156,12 +159,12 @@
         corresponding to the session and all processes inside that scope will be
         terminated. If false, the scope is "abandoned", see
         <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        and processes are not killed. Defaults to <literal>&KILL_USER_PROCESSES;</literal>,
         --><!-- else -->
         user should be killed when the user logs out. If true, the processes
         listed in their session cgroup will be terminated. If false, the session cgroup
         is ignored
         <!-- // 0 -->
-        and processes are not killed. Defaults to <literal>yes</literal>,
         but see the options <varname>KillOnlyUsers=</varname> and
         <varname>KillExcludeUsers=</varname> below.</para>
 
@@ -216,7 +219,8 @@
         <literal>kexec</literal>,
         <literal>suspend</literal>,
         <literal>hibernate</literal>,
-        <literal>hybrid-sleep</literal>, and
+        <literal>hybrid-sleep</literal>,
+        <literal>suspend-then-hibernate</literal>, and
         <literal>lock</literal>.
         Defaults to <literal>ignore</literal>.</para>
 
@@ -265,7 +269,8 @@
         <literal>kexec</literal>,
         <literal>suspend</literal>,
         <literal>hibernate</literal>,
-        <literal>hybrid-sleep</literal>, and
+        <literal>hybrid-sleep</literal>,
+        <literal>suspend-then-hibernate</literal>, and
         <literal>lock</literal>.
         If <literal>ignore</literal>, logind will never handle these
         keys. If <literal>lock</literal>, all running sessions will be
diff --git a/man/rules/meson.build b/man/rules/meson.build
index e33dc4393..fbd163e0e 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -1,6 +1,5 @@
 # Do not edit. Generated by make-man-rules.py.
 manpages = [
- ['pam_elogind', '8', [], 'HAVE_PAM'],
 ['binfmt.d', '5', [], 'ENABLE_BINFMT'],
  ['bootctl', '1', [], 'ENABLE_EFI'],
  ['bootup', '7', [], ''],
@@ -43,6 +42,7 @@ manpages = [
  ['nss-resolve', '8', ['libnss_resolve.so.2'], 'ENABLE_RESOLVE'],
  ['nss-elogind', '8', ['libnss_elogind.so.2'], 'ENABLE_NSS_SYSTEMD'],
  ['os-release', '5', [], ''],
+ ['pam_elogind', '8', [], 'HAVE_PAM'],
  ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'],
  ['runlevel', '8', [], 'ENABLE_UTMP'],
  ['sd-boot', '7', [], 'ENABLE_EFI'],
@@ -517,7 +517,6 @@ manpages = [
   ['elogind-ask-password-console.path',
    'elogind-ask-password-wall.path',
    'elogind-ask-password-wall.service'],
-  ''],
  ['elogind-ask-password', '1', [], ''],
  ['elogind-backlight@.service', '8', ['elogind-backlight'], 'ENABLE_BACKLIGHT'],
  ['elogind-binfmt.service', '8', ['elogind-binfmt'], 'ENABLE_BINFMT'],
@@ -525,6 +524,7 @@ manpages = [
  ['elogind-cgls', '1', [], ''],
  ['elogind-cgtop', '1', [], ''],
  ['elogind-coredump',
+  ''],
   '8',
   ['elogind-coredump.socket', 'elogind-coredump@.service'],
   'ENABLE_COREDUMP'],
@@ -543,18 +543,18 @@ manpages = [
  ['elogind-escape', '1', [], ''],
  ['elogind-firstboot', '1', ['elogind-firstboot.service'], 'ENABLE_FIRSTBOOT'],
  ['elogind-fsck@.service',
-  '8',
   ['elogind-fsck', 'elogind-fsck-root.service'],
-  ''],
  ['elogind-fstab-generator', '8', [], ''],
  ['elogind-getty-generator', '8', [], ''],
  ['elogind-gpt-auto-generator', '8', [], ''],
  ['elogind-halt.service',
-  '8',
   ['elogind-kexec.service',
    'elogind-poweroff.service',
    'elogind-reboot.service',
    'elogind-shutdown'],
+  '8',
+  ''],
+  '8',
   ''],
  ['elogind-hibernate-resume-generator', '8', [], 'ENABLE_HIBERNATE'],
  ['elogind-hibernate-resume@.service',
@@ -576,28 +576,28 @@ manpages = [
  ['elogind-journal-remote', '8', [], 'HAVE_MICROHTTPD'],
  ['elogind-journal-upload', '8', [], 'HAVE_MICROHTTPD'],
  ['elogind-journald.service',
-  '8',
   ['elogind-journald',
    'elogind-journald-audit.socket',
    'elogind-journald-dev-log.socket',
    'elogind-journald.socket'],
-  ''],
  ['elogind-localed.service', '8', ['elogind-localed'], 'ENABLE_LOCALED'],
  ['elogind.service', '8', ['elogind'], 'ENABLE_LOGIND'],
  ['elogind-machine-id-commit.service', '8', [], ''],
  ['elogind-machine-id-setup', '1', [], ''],
  ['elogind-machined.service', '8', ['elogind-machined'], 'ENABLE_MACHINED'],
  ['elogind-makefs@.service',
-  '8',
   ['elogind-growfs',
    'elogind-growfs@.service',
    'elogind-makefs',
    'elogind-makeswap@.service'],
-  ''],
  ['elogind-modules-load.service', '8', ['elogind-modules-load'], 'HAVE_KMOD'],
  ['elogind-mount', '1', ['elogind-umount'], ''],
  ['elogind-networkd-wait-online.service',
   '8',
+  ''],
+  '8',
+  ''],
+  '8',
   ['elogind-networkd-wait-online'],
   'ENABLE_NETWORKD'],
  ['elogind-networkd.service', '8', ['elogind-networkd'], 'ENABLE_NETWORKD'],
@@ -625,15 +625,15 @@ manpages = [
  ['elogind-socket-activate', '1', [], ''],
  ['elogind-socket-proxyd', '8', [], ''],
  ['elogind-suspend.service',
-  '8',
   ['elogind-hibernate.service',
    'elogind-hybrid-sleep.service',
-   'elogind-suspend-to-hibernate.service',
    'elogind-sleep'],
-  ''],
  ['elogind-sysctl.service', '8', ['elogind-sysctl'], ''],
  ['elogind-system-update-generator', '8', [], ''],
  ['elogind-system.conf',
+  '8',
+   'elogind-suspend-then-hibernate.service',
+  ''],
   '5',
   ['system.conf.d', 'elogind-user.conf', 'user.conf.d'],
   ''],
@@ -643,18 +643,18 @@ manpages = [
  ['elogind-timedated.service', '8', ['elogind-timedated'], 'ENABLE_TIMEDATED'],
  ['elogind-timesyncd.service', '8', ['elogind-timesyncd'], 'ENABLE_TIMESYNCD'],
  ['elogind-tmpfiles',
-  '8',
   ['elogind-tmpfiles-clean.service',
    'elogind-tmpfiles-clean.timer',
    'elogind-tmpfiles-setup-dev.service',
    'elogind-tmpfiles-setup.service'],
-  ''],
  ['elogind-tty-ask-password-agent', '1', [], ''],
  ['elogind-udevd.service',
-  '8',
   ['elogind-udevd',
    'elogind-udevd-control.socket',
    'elogind-udevd-kernel.socket'],
+  '8',
+  ''],
+  '8',
   ''],
  ['elogind-update-done.service', '8', ['elogind-update-done'], ''],
  ['elogind-update-utmp.service',