Index: general/genlib/libdaemon.xml
===================================================================
--- general/genlib/libdaemon.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ general/genlib/libdaemon.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -100,5 +100,5 @@
     </para>
 
-<screen><userinput>make -C doc doxygen</userinput></screen>
+<screen remap="doc"><userinput>make -C doc doxygen</userinput></screen>
 
     <para>
@@ -117,5 +117,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/libdaemon-&libdaemon-version;/api &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libdaemon-&libdaemon-version;/api &amp;&amp;
 install -v -m644 doc/reference/html/* /usr/share/doc/libdaemon-&libdaemon-version;/api &amp;&amp;
 install -v -m644 doc/reference/man/man3/* /usr/share/man/man3</userinput></screen>
Index: general/genlib/libksba.xml
===================================================================
--- general/genlib/libksba.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ general/genlib/libksba.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -91,5 +91,5 @@
     then issue the following commands:</para>
 
-<screen><userinput>make -C doc ps pdf html</userinput></screen> -->
+<screen remap="doc"><userinput>make -C doc ps pdf html</userinput></screen> -->
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -108,5 +108,6 @@
     user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
 install -v -m644 doc/ksba.html/* \
                     /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ general/prog/subversion.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -191,6 +191,8 @@
     <para>
       If you have <xref linkend="doxygen"/> installed and you wish to build the
-      API documentation, issue: <command>doxygen doc/doxygen.conf</command>.
-    </para>
+      API documentation, issue:
+    </para>
+
+<screen remap="doc"><userinput>doxygen doc/doxygen.conf</userinput></screen>
 
     <para>
Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ general/sysutils/dbus.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -261,5 +261,5 @@
     </para>
 
-<screen><userinput>make distclean                     &amp;&amp;
+<screen remap="test"><userinput>make distclean                     &amp;&amp;
 ./configure --enable-tests         \
             --enable-asserts       \
Index: multimedia/cdwriteutils/libisoburn.xml
===================================================================
--- multimedia/cdwriteutils/libisoburn.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ multimedia/cdwriteutils/libisoburn.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -113,5 +113,5 @@
     </para>
 
-<screen><userinput>doxygen doc/doxygen.conf</userinput></screen>
+<screen remap="doc"><userinput>doxygen doc/doxygen.conf</userinput></screen>
 
     <para>
@@ -131,5 +131,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/libisoburn-&libisoburn-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -dm755 /usr/share/doc/libisoburn-&libisoburn-version; &amp;&amp;
 install -v -m644 doc/html/* /usr/share/doc/libisoburn-&libisoburn-version;</userinput></screen>
 
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ multimedia/libdriv/alsa-lib.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -131,5 +131,5 @@
    </para>
 
-<screen><userinput>make doc</userinput></screen>
+<screen remap="doc"><userinput>make doc</userinput></screen>
 
     <para>
@@ -148,5 +148,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -d -m755 /usr/share/doc/alsa-lib-&alsa-lib-version;/html/search &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/alsa-lib-&alsa-lib-version;/html/search &amp;&amp;
 install -v -m644 doc/doxygen/html/*.* \
                 /usr/share/doc/alsa-lib-&alsa-lib-version;/html &amp;&amp;
Index: multimedia/libdriv/libmusicbrainz5.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz5.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ multimedia/libdriv/libmusicbrainz5.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -119,5 +119,5 @@
     </para>
 
-<screen><userinput>doxygen ../Doxyfile</userinput></screen>
+<screen remap="doc"><userinput>doxygen ../Doxyfile</userinput></screen>
 
     <para>
@@ -136,5 +136,6 @@
     </para>
 
-<screen role="root"><userinput>rm -rf /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>rm -rf /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version; &amp;&amp;
 cp -vr docs/ /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version;</userinput></screen>
 
Index: multimedia/libdriv/sdl2.xml
===================================================================
--- multimedia/libdriv/sdl2.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ multimedia/libdriv/sdl2.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -92,5 +92,5 @@
     </para>
 
-<screen><userinput>pushd docs  &amp;&amp;
+<screen remap="doc"><userinput>pushd docs  &amp;&amp;
   doxygen   &amp;&amp;
 popd</userinput></screen>
@@ -110,5 +110,6 @@
     class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d        /usr/share/doc/SDL2-&sdl2-version;/html &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m755 -d        /usr/share/doc/SDL2-&sdl2-version;/html &amp;&amp;
 cp -Rv  docs/output/html/* /usr/share/doc/SDL2-&sdl2-version;/html</userinput></screen>
 
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ multimedia/libdriv/xine-lib.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -139,5 +139,5 @@
     must be installed and issue the following command:</para>
 
-<screen><userinput>doxygen doc/Doxyfile</userinput></screen>
+<screen remap="doc"><userinput>doxygen doc/Doxyfile</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -160,5 +160,6 @@
     the <systemitem class="username">root</systemitem> user to install it:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/xine-lib-&xine-lib-version;/api &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/xine-lib-&xine-lib-version;/api &amp;&amp;
 install -v -m644    doc/api/* \
                     /usr/share/doc/xine-lib-&xine-lib-version;/api</userinput></screen>
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ multimedia/videoutils/ffmpeg.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -277,6 +277,6 @@
     </para>
 
-<screen role="nodump"><userinput><command>rsync -vrltLW  --delete --timeout=60 --contimeout=60 \
-      rsync://fate-suite.ffmpeg.org/fate-suite/ fate-suite/</command></userinput></screen>
+<screen role="nodump"><userinput>rsync -vrltLW  --delete --timeout=60 --contimeout=60 \
+      rsync://fate-suite.ffmpeg.org/fate-suite/ fate-suite/</userinput></screen>
 
     <para>
Index: networking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ networking/mailnews/mutt.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -149,5 +149,5 @@
     the following command:</para>
 
-<screen><userinput>make -C doc manual.pdf</userinput></screen>
+<screen remap="doc"><userinput>make -C doc manual.pdf</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -164,5 +164,5 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role='root'><userinput>install -v -m644 doc/manual.pdf \
+<screen role='root' remap='doc'><userinput>install -v -m644 doc/manual.pdf \
     /usr/share/doc/mutt-&mutt-version;</userinput></screen>
 
Index: networking/netlibs/ldns.xml
===================================================================
--- networking/netlibs/ldns.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ networking/netlibs/ldns.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -113,5 +113,5 @@
     </para>
 
-<screen><userinput>make doc</userinput></screen>
+<screen remap="doc"><userinput>make doc</userinput></screen>
 
     <para>
@@ -130,5 +130,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ldns-&ldns-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/ldns-&ldns-version; &amp;&amp;
 install -v -m644 doc/html/* /usr/share/doc/ldns-&ldns-version;</userinput></screen>
 
Index: postlfs/filesystems/fuse3.xml
===================================================================
--- postlfs/filesystems/fuse3.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ postlfs/filesystems/fuse3.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -120,6 +120,8 @@
       The API documentation is included in the package, but 
       if you have <xref linkend="doxygen"/> installed and wish to rebuild 
-      it, issue <command>doxygen doc/Doxyfile</command>.
+      it, issue:
     </para> 
+
+<screen remap="doc"><userinput>doxygen doc/Doxyfile</userinput></screen>
 
     <para>
Index: postlfs/filesystems/parted.xml
===================================================================
--- postlfs/filesystems/parted.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ postlfs/filesystems/parted.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -114,5 +114,5 @@
     PDF and Postcript documentation issue the following commands:</para>
 
-<screen><userinput>texi2pdf             -o doc/parted.pdf doc/parted.texi &amp;&amp;
+<screen remap="doc"><userinput>texi2pdf             -o doc/parted.pdf doc/parted.texi &amp;&amp;
 texi2dvi             -o doc/parted.dvi doc/parted.texi &amp;&amp;
 dvips                -o doc/parted.ps  doc/parted.dvi</userinput></screen>
@@ -121,11 +121,19 @@
     fails in BLFS (because it needs a locale C.UTF-8):</para>
 
-<screen><userinput>sed -i '/t0251-gpt-unicode.sh/d' tests/Makefile</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.  Note that
-      many tests are skipped if not run as the <systemitem
-      class="username">root</systemitem> user.
-    </para>
+<screen remap="test"><userinput>sed -i '/t0251-gpt-unicode.sh/d' tests/Makefile</userinput></screen>
+
+    <para>
+      To test the results, issue, as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root" remap="test"><userinput>make check</userinput></screen>
+
+    <note>
+      <para>
+        Many tests are skipped if not run as the <systemitem
+        class="username">root</systemitem> user.
+      </para>
+    </note>
 
     <para>
@@ -144,5 +152,6 @@
     user:</para>
 
-<screen role="root"><userinput>install -v -m644 doc/FAT doc/API doc/parted.{pdf,ps,dvi} \
+<screen role="root"
+        remap="doc"><userinput>install -v -m644 doc/FAT doc/API doc/parted.{pdf,ps,dvi} \
                     /usr/share/doc/parted-&parted-version;</userinput></screen>
   </sect2>
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ server/major/bind.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -153,5 +153,5 @@
     To run the tests, as an unprivileged user, execute:</para>
 
-<screen><userinput>make -k check</userinput></screen>
+<screen remap="test"><userinput>make -k check</userinput></screen>
 
     <para>Again as <systemitem class="username">root</systemitem>, clean up the
Index: server/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ server/other/unbound.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -130,5 +130,5 @@
     </para>
 
-<screen><userinput>make doc</userinput></screen>
+<screen remap="doc"><userinput>make doc</userinput></screen>
 
     <para>To test the results, issue <command>make check</command>.</para>
@@ -146,5 +146,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/unbound-&unbound-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/unbound-&unbound-version; &amp;&amp;
 install -v -m644 doc/html/* /usr/share/doc/unbound-&unbound-version;</userinput></screen>
 
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ x/lib/fltk.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -124,5 +124,5 @@
     <para>If you wish to create the API documentation, issue:</para>
 
-<screen><userinput>make -C documentation html</userinput></screen>
+<screen remap="doc"><userinput>make -C documentation html</userinput></screen>
 
     <para>The tests for the package are interactive.  To execute the tests, run
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision 9eac4577268130a34a3502b0cfb670b99b0283cc)
+++ xsoft/other/pidgin.xml	(revision 2f3e3de9525903b2401285b236767856390e1e22)
@@ -157,6 +157,8 @@
       If you have <xref linkend="doxygen"/> installed
       (<xref linkend="graphviz"/> can be used also) and you wish to create the
-      API documentation, issue: <command>make docs</command>.
-    </para>
+      API documentation, issue:
+    </para>
+
+<screen remap="doc"><userinput>make docs</userinput></screen>
 
     <para>
@@ -178,5 +180,6 @@
     </para>
 
-<screen role="root"><userinput>mkdir -pv /usr/share/doc/pidgin-&pidgin-version;/api &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>mkdir -pv /usr/share/doc/pidgin-&pidgin-version;/api &amp;&amp;
 cp -v doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api</userinput></screen>
 
