Minor follow-ups to inhibitor bug fixes

Addresses Zbigniew's comments left on the previous MR after merging:
https://github.com/systemd/systemd/pull/40400#pullrequestreview-3849602215

diff --git a/NEWS b/NEWS
index 0123d35e0fda2a6d32b61bf8b825c9eea3d7707f..f6b08b04c3dc1a9d5032d00c805e519414a9f72b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -65,11 +65,12 @@ CHANGES WITH 260 in spe:
           support for the old way using protofiles.
 
         * The org.systemd.login1.Manager D-Bus interface has a minor API break.
-          The `CanPowerOff()`, `CanReboot()`, `CanSuspend()`, etc. family of
+          The 'CanPowerOff()', 'CanReboot()', 'CanSuspend()', etc. family of
           methods have introduced new return values which may break downstream
           consumers, such as desktop environments. The new return values more
-          precisely communicate the status of inhibitors. This allows desktops
-          to differentiate between system administrator policy and
+          precisely communicate the status of inhibitors: 'inhibited',
+          'inhibitor-blocked', and 'challenge-inhibitor-blocked'. This allows
+          desktops to differentiate between system administrator policy and
           temporary restrictions imposed by inhibitors.
 
         New system interfaces and components:

diff --git a/man/org.freedesktop.login1.xml b/man/org.freedesktop.login1.xml
index dc80e96717724f7158bdc6ce18e2fb2644445999..bb1ee0b337d1d75073d168fffc2752465971c053 100644 (file)
--- a/man/org.freedesktop.login1.xml
+++ b/man/org.freedesktop.login1.xml
@@ -711,9 +711,10 @@ node /org/freedesktop/login1 {
       <function>CanRebootToBootLoaderMenu()</function>, and <function>CanRebootToBootLoaderEntry()</function>
       test whether the system supports the respective operation and whether the calling user is allowed to
       execute it. Returns one of <literal>na</literal>, <literal>yes</literal>, <literal>no</literal>,
-      <literal>challenge</literal>, and <literal>inhibited</literal>. If <literal>na</literal> is returned,
-      the operation is not available because hardware, kernel, or drivers do not support it. If <literal>yes</literal>
-      is returned, the operation is supported and the user may execute the operation without further authentication.
+      <literal>challenge</literal>, <literal>inhibited</literal>, <literal>inhibitor-blocked</literal>,
+      and <literal>challenge-inhibitor-blocked</literal>. If <literal>na</literal> is returned, the operation
+      is not available because hardware, kernel, or drivers do not support it. If <literal>yes</literal> is
+      returned, the operation is supported and the user may execute the operation without further authentication.
       If <literal>no</literal> is returned, the operation is available but the user is not allowed to execute
       the operation. If <literal>challenge</literal> is returned, the operation is available but only after
       authorization. If <literal>inhibited</literal> is returned, the operation is normally available without