From 665150acb43ef3325745e0209a837c3092e7e76f Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Sat, 16 Sep 2023 09:31:16 +0200
Subject: [PATCH] Make "nodump" what shouldn't be run by jhalfs

---
 kde/plasma5/plasma-all.xml    | 4 ++--
 lxqt/desktop/post-install.xml | 4 ++--
 x/dm/sddm.xml                 | 6 +++---
 x/installing/xinit.xml        | 2 +-
 xfce/core/xfce4-session.xml   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kde/plasma5/plasma-all.xml b/kde/plasma5/plasma-all.xml
index 1107555be2..ebbbd59d29 100644
--- a/kde/plasma5/plasma-all.xml
+++ b/kde/plasma5/plasma-all.xml
@@ -440,7 +440,7 @@ EOF</userinput></screen>
       run the following commands:
     </para>
 
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
 <literal>dbus-launch --exit-with-x11 $KF5_PREFIX/bin/startplasma-x11</literal>
 EOF
 
@@ -460,7 +460,7 @@ startx</userinput></screen>
       can be done starting X with:
     </para>
 
-    <screen><userinput>startx &amp;&gt; ~/x-session-errors</userinput></screen>
+    <screen role="nodump"><userinput>startx &amp;&gt; ~/x-session-errors</userinput></screen>
 
     <para>
       When shutting down or rebooting, the shutdown messages appear on the vt
diff --git a/lxqt/desktop/post-install.xml b/lxqt/desktop/post-install.xml
index 293d83faf9..1341b7c50b 100644
--- a/lxqt/desktop/post-install.xml
+++ b/lxqt/desktop/post-install.xml
@@ -87,7 +87,7 @@ update-desktop-database -q</userinput></screen>
       run the following commands:
     </para>
 
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
 <literal>exec startlxqt</literal>
 EOF
 
@@ -107,7 +107,7 @@ startx</userinput></screen>
       can be done starting X with:
     </para>
 
-    <screen><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
+    <screen role="nodump"><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
 
   </sect2>
 
diff --git a/x/dm/sddm.xml b/x/dm/sddm.xml
index a81d224dc8..0d1c16cd43 100644
--- a/x/dm/sddm.xml
+++ b/x/dm/sddm.xml
@@ -9,7 +9,7 @@
   <!ENTITY sddm-md5sum        "7af67d5fb767639861d35c80eb4e1191">
   <!ENTITY sddm-size          "3.4 MB">
   <!ENTITY sddm-buildsize     "22 MB">
-  <!ENTITY sddm-time          "0.3 SBU (Using parallelism=4">
+  <!ENTITY sddm-time          "0.3 SBU (Using parallelism=4)">
 ]>
 
 <sect1 id="sddm" xreflabel="sddm-&sddm-version;">
@@ -418,7 +418,7 @@ EOF</userinput></screen>
         &root; user:
       </para>
 
-<screen role="root"><userinput>/etc/rc.d/init.d/xdm start</userinput></screen>
+<screen role="nodump"><userinput>/etc/rc.d/init.d/xdm start</userinput></screen>
 
       <para>
         By convention, X should be executed at runlevel 5, consequently, the
@@ -428,7 +428,7 @@ EOF</userinput></screen>
         <command>sddm</command> bootscript, bringing up the greeter screen:
       </para>
 
-<screen role="root"><userinput>init 5</userinput></screen>
+<screen role="nodump"><userinput>init 5</userinput></screen>
 
       <para>
         In order to permanently set the default to 5, starting the
diff --git a/x/installing/xinit.xml b/x/installing/xinit.xml
index 8ebeaf5eab..31b4ec378c 100644
--- a/x/installing/xinit.xml
+++ b/x/installing/xinit.xml
@@ -137,7 +137,7 @@ ldconfig</userinput></screen>
 
       <para>
         After this change, the virtual terminal does not need to be
-        specified on the startx command line.
+        specified on the <command>startx</command> command line.
       </para>
 
     </note>
diff --git a/xfce/core/xfce4-session.xml b/xfce/core/xfce4-session.xml
index 22981b23b0..04e63c49a0 100644
--- a/xfce/core/xfce4-session.xml
+++ b/xfce/core/xfce4-session.xml
@@ -181,7 +181,7 @@ update-mime-database /usr/share/mime</userinput></screen>
     <!-- TODO: A plain "startxfce4" command works for me on Systemd.
          But maybe it does not work on SysV.  Need more investigate.  -->
 
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
 <literal>dbus-launch --exit-with-x11 startxfce4</literal>
 EOF
 
@@ -201,7 +201,7 @@ startx</userinput></screen>
       can be done starting X with:
     </para>
 
-    <screen><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
+    <screen role="nodump"><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
 
     <note revision="sysv">
       <para>