Index: general.ent
===================================================================
--- general.ent	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general.ent	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "20">                   <!-- Always 2 digits -->
+<!ENTITY day          "21">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 20th, &year;">
+<!ENTITY releasedate  "May 21st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/gsl.xml
===================================================================
--- general/genlib/gsl.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/genlib/gsl.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -99,5 +99,5 @@
     installed, buid the documentation with:</para>
 
-<screen><userinput>make html</userinput></screen>
+<screen remap="doc"><userinput>make html</userinput></screen>
 
     <para>
@@ -113,5 +113,6 @@
     <para>If you built the documentation, install it (as root) with:</para>
 
-<screen role="root"><userinput>mkdir                   /usr/share/doc/gsl-&gsl-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>mkdir                   /usr/share/doc/gsl-&gsl-version; &amp;&amp;
 cp -R doc/_build/html/* /usr/share/doc/gsl-&gsl-version;</userinput></screen>
 
Index: general/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/genlib/libassuan.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -115,13 +115,19 @@
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to build documentation, you must have
-      <xref linkend="texlive"/> installed and issue the following commands:
+make                      &amp;&amp;
+
+make -C doc html                                                       &amp;&amp;
+makeinfo --html --no-split -o doc/assuan_nochunks.html doc/assuan.texi &amp;&amp;
+makeinfo --plaintext       -o doc/assuan.txt           doc/assuan.texi
+</userinput></screen>
+
+    <para>
+      The above commands build the documentation in html and plaintext formats.
+      If you wish to build alternate formats of the documentation, you must
+      have <xref linkend="texlive"/> installed and issue the following commands:
     </para>
 
 <!--<screen><userinput>patch -Np1 -i ../libassuan-&libassuan-version;-fix_doc_build-1.patch &amp;&amp;-->
-<screen><userinput>make -C doc pdf ps</userinput></screen>
+<screen remap="doc"><userinput>make -C doc pdf ps</userinput></screen>
 
     <para>
@@ -133,14 +139,22 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the documentation, install it by running the
-      following commands as the
+<screen role="root"><userinput>make install &amp;&amp;
+
+install -v -dm755   /usr/share/doc/libassuan-1.8.4/html &amp;&amp;
+install -v -m644 doc/assuan.html/* \
+                    /usr/share/doc/libassuan-1.8.4/html &amp;&amp;
+install -v -m644 doc/assuan_nochunks.html \
+                    /usr/share/doc/libassuan-1.8.4      &amp;&amp;
+install -v -m644 doc/assuan.{txt,texi} \
+                    /usr/share/doc/libassuan-1.8.4</userinput></screen>
+
+    <para>
+      If you built alternate formats of the documentation, install them by
+      running the following commands as the
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/libassuan-&libassuan-version; &amp;&amp;
-install -v -m644  doc/assuan.{pdf,ps,dvi} \
+<screen role="root"
+        remap="doc"><userinput>install -v -m644  doc/assuan.{pdf,ps,dvi} \
                   /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
   </sect2>
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/genlib/libgcrypt.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -103,16 +103,18 @@
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Only <command>info</command> documentation is shipped in the package
-      tarball. If you wish to build alternate formats of the documentation,
-      (you must have <xref linkend="texlive"/> installed to build the PDF
-      and PostScript documentation), then issue the following commands:
-    </para>
-
-<screen><userinput>make -C doc pdf ps html &amp;&amp;
+make                      &amp;&amp;
+
+make -C doc html                                                       &amp;&amp;
 makeinfo --html --no-split -o doc/gcrypt_nochunks.html doc/gcrypt.texi &amp;&amp;
 makeinfo --plaintext       -o doc/gcrypt.txt           doc/gcrypt.texi</userinput></screen>
+
+    <para>
+      The above commands build the documentation in html and plaintext
+      formats. If you wish to build alternate formats of the documentation, you
+      need <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>). Issue
+      the following command:
+    </para>
+
+<screen remap="doc"><userinput>make -C doc pdf ps</userinput></screen>
 
     <para>
@@ -127,18 +129,22 @@
 install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
 install -v -m644    README doc/{README.apichanges,fips*,libgcrypt*} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
-
-    <para>
-      If you built the additional documentation, install it by issuing the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
+                    /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
+
+install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
 install -v -m644 doc/gcrypt.html/* \
                     /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
 install -v -m644 doc/gcrypt_nochunks.html \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
-install -v -m644 doc/gcrypt.{pdf,ps,dvi,txt,texi} \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version;      &amp;&amp;
+install -v -m644 doc/gcrypt.{txt,texi} \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
+
+    <para>
+      If you built alternate formats of the documentation, install them by
+      issuing the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"
+        remap="doc"><userinput>install -v -m644 doc/gcrypt.{pdf,ps,dvi} \
                     /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
 
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/genlib/libical.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -117,5 +117,5 @@
     </para>
 
-<screen><userinput>make docs</userinput></screen>
+<screen remap="doc"><userinput>make docs</userinput></screen>
 -->
     <para>
@@ -137,5 +137,6 @@
     </para>
 
-<screen role="root"><userinput>install -vdm755 /usr/share/doc/libical-&libical-version;/html &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -vdm755 /usr/share/doc/libical-&libical-version;/html &amp;&amp;
 cp -vr apidocs/html/* /usr/share/doc/libical-&libical-version;/html</userinput></screen>
 -->
Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/genlib/libusb.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -107,5 +107,5 @@
     </para>
 
-<screen><userinput>make -C doc docs</userinput></screen>
+<screen remap="doc"><userinput>make -C doc docs</userinput></screen>
 
     <para>
@@ -124,5 +124,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -d -m755 /usr/share/doc/libusb-&libusb-version;/apidocs &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/libusb-&libusb-version;/apidocs &amp;&amp;
 install -v -m644    doc/html/* \
                     /usr/share/doc/libusb-&libusb-version;/apidocs</userinput></screen>
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/genlib/popt.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -73,5 +73,7 @@
 
     <para>If you have <xref linkend="doxygen"/> installed and wish to build
-    the API documentation, issue <command>doxygen</command>.</para>
+    the API documentation, issue:</para>
+
+<screen remap="doc"><userinput>doxygen</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -85,5 +87,6 @@
     user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/popt-&popt-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/popt-&popt-version; &amp;&amp;
 install -v -m644 doxygen/html/* /usr/share/doc/popt-&popt-version;</userinput></screen>
 
Index: general/graphlib/graphite2.xml
===================================================================
--- general/graphlib/graphite2.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/graphlib/graphite2.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -151,5 +151,5 @@
     </para>
 
-<screen><userinput>make docs</userinput></screen>
+<screen remap="doc"><userinput>make docs</userinput></screen>
 
     <para>
@@ -168,5 +168,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -d -m755 /usr/share/doc/graphite2-&graphite2-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/graphite2-&graphite2-version; &amp;&amp;
 <!-- doc/doxygen seems to have gone, so I removed the api dir, but now both html
 and pdf for the GTF and the manual
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/prog/doxygen.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -150,5 +150,5 @@
     </para>
 
-<screen><userinput>cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
+<screen remap="doc"><userinput>cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
 
 make docs</userinput></screen>
Index: general/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/prog/gdb.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -120,5 +120,5 @@
     </para>
 
-<screen><userinput>make -C gdb/doc doxy</userinput></screen>
+<screen remap="doc"><userinput>make -C gdb/doc doxy</userinput></screen>
 
     <para>
@@ -126,5 +126,5 @@
     </para>
 
-<screen><userinput>pushd gdb/testsuite &amp;&amp;
+<screen remap="test"><userinput>pushd gdb/testsuite &amp;&amp;
 make  site.exp      &amp;&amp;
 echo  "set gdb_test_timeout 120" &gt;&gt; site.exp &amp;&amp;
@@ -205,5 +205,6 @@
     </para>
 
-<screen role="root"><userinput>install -d /usr/share/doc/gdb-&gdb-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -d /usr/share/doc/gdb-&gdb-version; &amp;&amp;
 rm -rf gdb/doc/doxy/xml &amp;&amp;
 cp -Rv gdb/doc/doxy /usr/share/doc/gdb-&gdb-version;</userinput></screen>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/prog/git.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -165,5 +165,5 @@
     </para>
 
-<screen><userinput>make html</userinput></screen>
+<screen remap="doc"><userinput>make html</userinput></screen>
 
     <para>
@@ -172,5 +172,5 @@
     </para>
 
-<screen><userinput>make man</userinput></screen>
+<screen remap="doc"><userinput>make man</userinput></screen>
 
     <para>
@@ -195,5 +195,5 @@
     </para>
 
-<screen role="root"><userinput>make install-man</userinput></screen>
+<screen role="root" remap="doc"><userinput>make install-man</userinput></screen>
 
     <para>
@@ -202,5 +202,5 @@
     </para>
 
-<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
+<screen role="root" remap="doc"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
 
 <!-- ==== Method 2 for docs ====== -->
Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/prog/llvm.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -211,4 +211,23 @@
 
     <para>
+      If you have installed <application>Sphinx</application> and
+      <application>recommonmark</application> and wish
+      to generate the html documentation and manual pages, issue the following
+      commands:
+    </para>
+
+<screen remap="doc"><userinput>cmake -DLLVM_ENABLE_SPHINX=ON         \
+      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
+      -Wno-dev -G Ninja ..            &amp;&amp;
+ninja docs-llvm-html  docs-llvm-man</userinput></screen>
+
+    <para>
+      If you have downloaded the optional packages, the clang documentation
+      can be built too:
+    </para>
+
+<screen remap="doc"><userinput>ninja docs-clang-html docs-clang-man</userinput></screen>
+
+    <para>
       <!-- EDITORS - if you have more than 4 cores, take some offline to measure
       the elapsed time for the tests.  Also, libstdc++.a and perhaps libstdc++fs.a
@@ -234,34 +253,22 @@
 
     <para>
-      If you have installed <application>Sphinx</application> and
-      <application>recommonmark</application> and wish
-      to generate the html documentation and manual pages, issue the following
-      commands:
-    </para>
-<screen><userinput>cmake -DLLVM_ENABLE_SPHINX=ON         \
-      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
-      -Wno-dev -G Ninja ..            &amp;&amp;
-ninja docs-llvm-html  docs-llvm-man</userinput></screen>
-    <para>
-      If you have downloaded the optional packages, the clang documentation
-      can be built too:
-    </para>
-<screen><userinput>ninja docs-clang-html docs-clang-man</userinput></screen>
-
-    <para>
-      Install the llvm documentation by running the following command as the 
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 docs/man/* /usr/share/man/man1             &amp;&amp;
+      If you have built the the llvm documentation, install it by running the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"
+        remap="doc"><userinput>install -v -m644 docs/man/* /usr/share/man/man1             &amp;&amp;
 install -v -d -m755 /usr/share/doc/llvm-&llvm-version;/llvm-html     &amp;&amp;
 cp -Rv docs/html/* /usr/share/doc/llvm-&llvm-version;/llvm-html</userinput></screen>
 
     <para>
-      The clang documentation can be installed in the same way (again as the
+      If you have built the clang documentation, it can be installed in the
+      same way (again as the
       <systemitem class="username">root</systemitem> user):
     </para>
 
-<screen role="root"><userinput>install -v -m644 tools/clang/docs/man/* /usr/share/man/man1 &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m644 tools/clang/docs/man/* /usr/share/man/man1 &amp;&amp;
 install -v -d -m755 /usr/share/doc/llvm-&llvm-version;/clang-html    &amp;&amp;
 cp -Rv tools/clang/docs/html/* /usr/share/doc/llvm-&llvm-version;/clang-html</userinput></screen>
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/prog/mercurial.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -100,5 +100,5 @@
     issue:</para>
 
-<screen><userinput>sed -i '/runrst/s/N)/N)3/' doc/Makefile &amp;&amp;
+<screen remap="doc"><userinput>sed -i '/runrst/s/N)/N)3/' doc/Makefile &amp;&amp;
 2to3-3.7 -w doc/hgmanpage.py            &amp;&amp;
 make doc</userinput></screen>
@@ -111,5 +111,5 @@
     issue:</para>
 
-<screen><userinput>cat &gt; tests/blacklists/failed-tests &lt;&lt; "EOF"
+<screen remap="test"><userinput>cat &gt; tests/blacklists/failed-tests &lt;&lt; "EOF"
 <literal># Test Failures
   test-gpg.t</literal>
@@ -119,5 +119,5 @@
       To run the test suite, issue:
     </para>
-<screen><userinput>rm -rf tests/tmp &amp;&amp;
+<screen remap="test"><userinput>rm -rf tests/tmp &amp;&amp;
 TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/failed-tests" make check</userinput></screen>
 
@@ -130,5 +130,5 @@
     the tests that failed before:</para>
 
-<screen><userinput>pushd tests  &amp;&amp;
+<screen remap="test"><userinput>pushd tests  &amp;&amp;
   rm -rf tmp &amp;&amp;
   ./run-tests.py --tmpdir tmp test-gpg.t
@@ -142,5 +142,5 @@
     or not. One test, test-https.t, is known to fail.</para>
 
-    <para>An interesting switch is "- -time", which will generate at the end of
+    <para>An interesting switch is "--time", which will generate at the end of
     the test suite execution, a table with all executed tests and respective
     start, end, user, system and real times. Notice that the switches may be
@@ -156,5 +156,6 @@
     command (as <systemitem class="username">root</systemitem>):</para>
 
-<screen role="root"><userinput>make PREFIX=/usr install-doc</userinput></screen>
+<screen role="root"
+        remap="doc"><userinput>make PREFIX=/usr install-doc</userinput></screen>
 
     <para>After installed, two very quick and simple tests should run correctly.
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ general/sysutils/cpio.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -88,5 +88,5 @@
     both of the following commands:</para>
 
-<screen><userinput>make -C doc pdf &amp;&amp;
+<screen remap="doc"><userinput>make -C doc pdf &amp;&amp;
 make -C doc ps</userinput></screen>
 
@@ -106,5 +106,6 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m644 doc/cpio.{pdf,ps,dvi} \
+<screen role="root"
+        remap="doc"><userinput>install -v -m644 doc/cpio.{pdf,ps,dvi} \
                  /usr/share/doc/cpio-&cpio-version;</userinput></screen>
 
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ multimedia/videoutils/ffmpeg.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -194,5 +194,5 @@
 <!-- sed -i '$s/$/\n\n@bye/' doc/{git-howto,nut,fate}.texi             &amp;&amp;
 sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &amp;&amp; -->
-<screen><userinput>pushd doc &amp;&amp;
+<screen remap="doc"><userinput>pushd doc &amp;&amp;
 for DOCNAME in `basename -s .html *.html`
 do
@@ -209,7 +209,8 @@
       If you have <xref linkend="doxygen"/> installed 
       and you wish to build (if --disable-doc was
-      used) or rebuild the html documentation, issue the command
-      <command>doxygen doc/Doxyfile</command>.
-    </para>
+      used) or rebuild the html documentation, issue:
+    </para>
+
+<screen remap="doc"><userinput>doxygen doc/Doxyfile</userinput></screen>
 
     <para>
@@ -235,5 +236,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -m644 doc/*.pdf /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m644 doc/*.pdf /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
 install -v -m644 doc/*.ps  /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
 
@@ -244,5 +246,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg-&ffmpeg-version;/api                     &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg-&ffmpeg-version;/api                     &amp;&amp;
 cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api                  &amp;&amp;
 find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type f -exec chmod -c 0644 \{} \; &amp;&amp;
@@ -257,5 +260,5 @@
     </para>
 
-<screen><userinput>make fate-rsync SAMPLES=fate-suite/</userinput></screen>
+<screen remap="test"><userinput>make fate-rsync SAMPLES=fate-suite/</userinput></screen>
 
     <para>
@@ -274,5 +277,5 @@
     </para>
 
-<screen><userinput><command>rsync -vrltLW  --delete --timeout=60 --contimeout=60 \
+<screen role="nodump"><userinput><command>rsync -vrltLW  --delete --timeout=60 --contimeout=60 \
       rsync://fate-suite.ffmpeg.org/fate-suite/ fate-suite/</command></userinput></screen>
 
@@ -282,5 +285,5 @@
     </para>
 
-<screen><userinput>make fate THREADS=<replaceable>N</replaceable> SAMPLES=fate-suite/ | tee ../fate.log &amp;&amp;
+<screen remap="test"><userinput>make fate THREADS=<replaceable>N</replaceable> SAMPLES=fate-suite/ | tee ../fate.log &amp;&amp;
 grep ^TEST ../fate.log | wc -l</userinput></screen>
 
Index: networking/netlibs/libevent.xml
===================================================================
--- networking/netlibs/libevent.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ networking/netlibs/libevent.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -107,6 +107,8 @@
     <para>
       If you have <xref linkend="doxygen"/> installed and wish to build API
-      documentation, issue <command>doxygen Doxyfile</command>.
-    </para>
+      documentation, issue :
+    </para>
+
+<screen remap="doc"><userinput>doxygen Doxyfile</userinput></screen>
 
     <para>
@@ -125,5 +127,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/libevent-&libevent-version;/api &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libevent-&libevent-version;/api &amp;&amp;
 cp      -v -R       doxygen/html/* \
                     /usr/share/doc/libevent-&libevent-version;/api</userinput></screen>
Index: networking/netprogs/rsync.xml
===================================================================
--- networking/netprogs/rsync.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ networking/netprogs/rsync.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -91,5 +91,7 @@
 
     <para>If you have <xref linkend="doxygen"/> installed and wish to
-    build HTML API documentation, issue <command>doxygen</command>.</para>
+    build HTML API documentation, issue:</para>
+
+<screen remap="doc"><userinput>doxygen</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -102,5 +104,6 @@
     commands as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role='root'><userinput>install -v -m755 -d          /usr/share/doc/rsync-&rsync-version;/api &amp;&amp;
+<screen role='root'
+        remap="doc"><userinput>install -v -m755 -d          /usr/share/doc/rsync-&rsync-version;/api &amp;&amp;
 install -v -m644 dox/html/*  /usr/share/doc/rsync-&rsync-version;/api</userinput></screen>
 
@@ -202,5 +205,5 @@
         <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>systemctl stop rsyncd &amp;&amp;
+<screen role="nodump"><userinput>systemctl stop rsyncd &amp;&amp;
 systemctl disable rsyncd &amp;&amp;
 systemctl enable rsyncd.socket &amp;&amp;
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ postlfs/security/gnupg2.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -132,5 +132,6 @@
 
 makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &amp;&amp;
-makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput></screen>
+makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi &amp;&amp;
+make -C doc html</userinput></screen>
 
     <para>If you have <xref linkend="texlive"/>
@@ -140,5 +141,5 @@
     the ps format):</para>
 
-<screen><userinput>make -C doc pdf ps html</userinput></screen>
+<screen remap="doc"><userinput>make -C doc pdf ps</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -155,5 +156,7 @@
                     /usr/share/doc/gnupg-&gnupg2-version;/html/gnupg.html &amp;&amp;
 install -v -m644    doc/*.texi doc/gnupg.txt \
-                    /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
+                    /usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
+install -v -m644    doc/gnupg.html/* \
+                    /usr/share/doc/gnupg-&gnupg2-version;/html</userinput></screen>
 <!-- Now intalls as gpg, not gpg2.  This should be no longer needed.
     <para>The BLFS editors recommend the creation of symlinks for compatibility
@@ -168,11 +171,10 @@
 unset f</userinput></screen>
 -->
-    <para>If you created alternate formats of the documentation, install it
+    <para>If you created alternate formats of the documentation, install them
     using the following command as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m644 doc/gnupg.html/* \
-                 /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
-install -v -m644 doc/gnupg.{pdf,dvi,ps} \
+<screen role="root"
+        remap="doc"><userinput>install -v -m644 doc/gnupg.{pdf,dvi,ps} \
                  /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
 
Index: postlfs/security/liboauth.xml
===================================================================
--- postlfs/security/liboauth.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ postlfs/security/liboauth.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -119,7 +119,9 @@
 
     <para>
-      If you have installed <xref linkend="doxygen"/>, issue
-      <command>make dox</command> to build the documentation.
-    </para>
+      If you wish to build the documentation (needs <xref linkend="doxygen"/>),
+      issue:
+    </para>
+
+<screen remap="doc"><userinput>make dox</userinput></screen>
 
     <para>
@@ -139,5 +141,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/liboauth-&liboauth-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -dm755 /usr/share/doc/liboauth-&liboauth-version; &amp;&amp;
 cp -rv doc/html/* /usr/share/doc/liboauth-&liboauth-version;</userinput></screen>
 
Index: x/installing/libinput.xml
===================================================================
--- x/installing/libinput.xml	(revision 1dbb694fce0f5ff64d603de356a04cb04cc512a3)
+++ x/installing/libinput.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
@@ -129,5 +129,5 @@
       during the testsuite from interfering with your desktop.  Copy the
       file <filename>test/50-litest.conf</filename> into
-      <filename class="directory"> ${XORG_PREFIX}/share/X11/xorg.conf.d</filename>
+      <filename class="directory">${XORG_PREFIX}/share/X11/xorg.conf.d</filename>
       and restart X. For further information see
       <ulink url="https://wayland.freedesktop.org/libinput/doc/&libinput-version;/test-suite.html">libinput test suite</ulink>.
@@ -187,5 +187,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -dm755      /usr/share/doc/libinput-&libinput-version;/{html,api} &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -dm755      /usr/share/doc/libinput-&libinput-version;/{html,api} &amp;&amp;
 cp -rv Documentation/* /usr/share/doc/libinput-&libinput-version;/html &amp;&amp;
 cp -rv api/*           /usr/share/doc/libinput-&libinput-version;/api</userinput></screen>
