Merge pull request #10753 from keszybz/pager-no-interrupt

Add mode in journalctl where ^C is handled by the pager

4 files changed, 23 insertions, 16 deletions

diff --git a/man/busctl.xml b/man/busctl.xml
index 539ef6c645..a5e3d92cf0 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -291,8 +291,9 @@
         <listitem><para>Dump messages being exchanged. If
         <replaceable>SERVICE</replaceable> is specified, show messages
         to or from this peer, identified by its well-known or unique
-        name. Otherwise, show all messages on the bus. Use Ctrl-C to
-        terminate the dump.</para></listitem>
+        name. Otherwise, show all messages on the bus. Use
+        <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>
+        to terminate the dump.</para></listitem>
       </varlistentry>
 
       <varlistentry>
diff --git a/man/less-variables.xml b/man/less-variables.xml
index a3faa38997..eb332b56b0 100644
--- a/man/less-variables.xml
+++ b/man/less-variables.xml
@@ -26,7 +26,13 @@
       <term><varname>$SYSTEMD_LESS</varname></term>
 
       <listitem><para>Override the options passed to <command>less</command> (by default
-      <literal>FRSXMK</literal>).</para></listitem>
+      <literal>FRSXMK</literal>).</para>
+
+      <para>If the value of <varname>$SYSTEMD_LESS</varname> does not include <literal>K</literal>,
+      and the pager that is invoked is <command>less</command>,
+      <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> will be ignored by the
+      executable.  This allows <command>less</command> to handle
+      <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> itself.</para></listitem>
     </varlistentry>
 
     <varlistentry id='lesscharset'>
diff --git a/man/systemd.xml b/man/systemd.xml
index b166e534a5..49a29f9651 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -580,16 +580,15 @@
       <varlistentry>
         <term><constant>SIGINT</constant></term>
 
-        <listitem><para>Upon receiving this signal the systemd system
-        manager will start the
-        <filename>ctrl-alt-del.target</filename> unit. This is mostly
-        equivalent to <command>systemctl start ctrl-alt-del.target
-        --job-mode=replace-irreversible</command>. If this signal is
-        received more than 7 times per 2s, an immediate reboot is
-        triggered.  Note that pressing Ctrl-Alt-Del on the console
-        will trigger this signal. Hence, if a reboot is hanging,
-        pressing Ctrl-Alt-Del more than 7 times in 2s is a relatively
-        safe way to trigger an immediate reboot.</para>
+        <listitem><para>Upon receiving this signal the systemd system manager will start the
+        <filename>ctrl-alt-del.target</filename> unit. This is mostly equivalent to
+        <command>systemctl start ctrl-alt-del.target --job-mode=replace-irreversible</command>. If
+        this signal is received more than 7 times per 2s, an immediate reboot is triggered. Note
+        that pressing
+        <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></keycombo> on the
+        console will trigger this signal. Hence, if a reboot is hanging, pressing
+        <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></keycombo> more than
+        7 times in 2 seconds is a relatively safe way to trigger an immediate reboot.</para>
 
         <para>systemd user managers treat this signal the same way as
         <constant>SIGTERM</constant>.</para></listitem>
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index 39cd78666e..a62902423a 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -73,10 +73,11 @@
       <varlistentry>
         <term><option>--monitor</option></term>
 
-        <listitem><para>If <command>timesync-status</command> is invoked and this option is passed,
-        then <command>timedatectl</command> monitors the status of
+        <listitem><para>If <command>timesync-status</command> is invoked and this option is passed, then
+        <command>timedatectl</command> monitors the status of
         <citerefentry><refentrytitle>systemd-timesyncd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        and updates the outputs. Use Ctrl-C to terminate the monitoring.</para></listitem>
+        and updates the outputs. Use <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> to terminate the
+        monitoring.</para></listitem>
       </varlistentry>
 
       <varlistentry>