Index: general/sysutils/hdparm.xml
===================================================================
--- general/sysutils/hdparm.xml	(revision cfcb2530a628ef9feb47781ce391bf07aa643b47)
+++ general/sysutils/hdparm.xml	(revision fbbc908491102482c503b39fea766916b0e7d69a)
@@ -117,5 +117,5 @@
     </para>
 
-<screen role="root"><userinput>make binprefix=/usr install</userinput></screen></note>
+<screen role="nodump"><userinput>make binprefix=/usr install</userinput></screen></note>
 
   </sect2>
Index: kde/kf5/kf5-frameworks.xml
===================================================================
--- kde/kf5/kf5-frameworks.xml	(revision cfcb2530a628ef9feb47781ce391bf07aa643b47)
+++ kde/kf5/kf5-frameworks.xml	(revision fbbc908491102482c503b39fea766916b0e7d69a)
@@ -89,4 +89,9 @@
     <xref linkend="NetworkManager"/> (needed to build NetworkManager-Qt), and
     <xref linkend="polkit-qt"/> (Authentication backend for KAuth)
+  </para>
+
+  <para role="recommended">
+    Furthermore, the instructions below assume that the environment has been
+    set up as described in <xref linkend="kf5-intro"/>.
   </para>
 
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision cfcb2530a628ef9feb47781ce391bf07aa643b47)
+++ networking/netprogs/nfs-utils.xml	(revision fbbc908491102482c503b39fea766916b0e7d69a)
@@ -234,5 +234,7 @@
       over the local network, the following line may be added:</para>
 
-<screen role="root"><userinput>/home <replaceable>192.168.0.0/24</replaceable>(rw,subtree_check,anonuid=99,anongid=99)</userinput></screen>
+<screen role="nodump"><userinput>cat &gt;&gt; /etc/exports &lt;&lt; EOF
+<replaceable>/home 192.168.0.0/24</replaceable>(rw,subtree_check,anonuid=99,anongid=99)
+EOF</userinput></screen>
 
       <note><para>Be sure to replace the directory, network address. and prefix above
Index: x/dm/lightdm.xml
===================================================================
--- x/dm/lightdm.xml	(revision cfcb2530a628ef9feb47781ce391bf07aa643b47)
+++ x/dm/lightdm.xml	(revision fbbc908491102482c503b39fea766916b0e7d69a)
@@ -80,4 +80,6 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional download</bridgehead>
+
     <note>
       <para>
@@ -89,5 +91,4 @@
     </note>
 
-    <bridgehead renderas="sect3">Lightdm-gtk-greeter Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision cfcb2530a628ef9feb47781ce391bf07aa643b47)
+++ x/wm/openbox.xml	(revision fbbc908491102482c503b39fea766916b0e7d69a)
@@ -103,5 +103,5 @@
     scripts to Python 3:</para>
 
-<screen><userinput>2to3 -w data/autostart/openbox-xdg-autostart &amp;&amp;
+<screen><userinput>2to3-&python3-majorver; -w data/autostart/openbox-xdg-autostart &amp;&amp;
 sed 's/python/python3/' -i data/autostart/openbox-xdg-autostart</userinput></screen>
 
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision cfcb2530a628ef9feb47781ce391bf07aa643b47)
+++ xsoft/graphweb/seamonkey.xml	(revision fbbc908491102482c503b39fea766916b0e7d69a)
@@ -315,5 +315,5 @@
     </para>
 
-<screen role="root"><userinput>make -C obj* install</userinput></screen>
+<screen role="nodump"><userinput>make -C obj* install</userinput></screen>
 
     <note>
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision cfcb2530a628ef9feb47781ce391bf07aa643b47)
+++ xsoft/office/libreoffice.xml	(revision fbbc908491102482c503b39fea766916b0e7d69a)
@@ -298,5 +298,5 @@
     </important>
 
-<screen><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
+<screen role="nodump"><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
 cd libreoffice-&libreoffice-dlversion;</userinput></screen>
 
@@ -389,4 +389,5 @@
              --with-system-lcms2         \
              --with-system-libatomic_ops \
+             --with-system-libgpgmepp    \
              --with-system-libpng        \
              --with-system-libxml        \
Index: xsoft/other/rxvt-unicode.xml
===================================================================
--- xsoft/other/rxvt-unicode.xml	(revision cfcb2530a628ef9feb47781ce391bf07aa643b47)
+++ xsoft/other/rxvt-unicode.xml	(revision fbbc908491102482c503b39fea766916b0e7d69a)
@@ -152,5 +152,5 @@
     <para>In order to view the defined X resources, issue:</para>
 
-<screen><userinput>xrdb -query</userinput></screen>
+<screen role="nodump"><userinput>xrdb -query</userinput></screen>
 
     <para>In order to add the modifications of the new user configuration file,
@@ -158,5 +158,5 @@
     on previously define), issue:</para>
 
-<screen><userinput>xrdb -merge ~/.Xresources</userinput></screen>
+<screen role="nodump"><userinput>xrdb -merge ~/.Xresources</userinput></screen>
 
     <para>The <application>rxvt-unicode</application> application can also run
@@ -172,5 +172,5 @@
     of the script:</para>
 
-<screen><userinput><literal># Start the urxvtd daemon
+<screen role="nodump"><userinput><literal># Start the urxvtd daemon
 urxvtd -q -f -o &amp;</literal></userinput></screen>
 
Index: xsoft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision cfcb2530a628ef9feb47781ce391bf07aa643b47)
+++ xsoft/other/tigervnc.xml	(revision fbbc908491102482c503b39fea766916b0e7d69a)
@@ -164,5 +164,5 @@
 EOF
 
-install -vm644 ../media/icons/tigervnc_24.png /usr/share/pixmaps &amp;&amp;
+install -vm644 media/icons/tigervnc_24.png /usr/share/pixmaps &amp;&amp;
 ln -sfv tigervnc_24.png /usr/share/pixmaps/tigervnc.png</userinput></screen>
 
@@ -173,8 +173,8 @@
 
     <para><command>tar -xf .. xorg-server...</command>: This command extracts the
-    standard Xorg packages into the tree in a location needed for modification.</para>
+    standard Xorg package into the tree in a location needed for modification.</para>
 
     <para><option>--disable ...</option>: Most options that are usually needed for
-    the standard Xorg server are not needed fror the Xvnc instance being built.</para>
+    the standard Xorg server are not needed for the Xvnc instance being built.</para>
 
     <para><command>[ -e /usr/bin/Xvnc ] || ln ... Xvnc</command>: If the Xvnc server
