Index: BOOK/final-system/common/autoconf.xml
===================================================================
--- BOOK/final-system/common/autoconf.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/autoconf.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,8 +34,11 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check VERBOSE=yes</userinput>. 17 tests are skipped that use
-    Automake and different GCC languages. For full test coverage, Autoconf can
-    be re-tested after Automake has been installed.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check VERBOSE=yes</userinput></screen>
+    
+    <para os="e3">17 tests are skipped that use Automake and different GCC languages.
+    For full test coverage, Autoconf can be re-tested after Automake has been
+    installed.</para>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/automake.xml
===================================================================
--- BOOK/final-system/common/automake.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/automake.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,6 +34,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/bash.xml
===================================================================
--- BOOK/final-system/common/bash.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/bash.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -53,6 +53,7 @@
 <screen os="e"><userinput>make</userinput></screen>
 
-    <para os="f">To test the results, issue:
-    <userinput>make tests</userinput>.</para>
+    <para os="f">To test the results, issue:</para>
+
+<screen os="f2"><userinput remap="test">make tests</userinput></screen>
 
     <para os="g">Install the package:</para>
Index: BOOK/final-system/common/bc.xml
===================================================================
--- BOOK/final-system/common/bc.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/bc.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -33,6 +33,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>echo "quit" | ./bc/bc -l Test/checklib.b</userinput></para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/binutils.xml
===================================================================
--- BOOK/final-system/common/binutils.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/binutils.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -98,5 +98,5 @@
     <para os="p">Test the results:</para>
 
-<screen os="q"><userinput>make check</userinput></screen>
+<screen os="q"><userinput remap="test">make check</userinput></screen>
 
     <para os="r">Install the package:</para>
Index: BOOK/final-system/common/bison.xml
===================================================================
--- BOOK/final-system/common/bison.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/bison.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -38,6 +38,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/cloog.xml
===================================================================
--- BOOK/final-system/common/cloog.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/cloog.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -45,5 +45,5 @@
     <para os="f">Test the results:</para>
 
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
 
     <para os="h">Install the package:</para>
Index: BOOK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/coreutils.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -67,5 +67,5 @@
     <systemitem class="username">root</systemitem>:</para>
 
-<screen os="i"><userinput>make NON_ROOT_USERNAME=dummy</userinput></screen>
+<screen os="i"><userinput remap="test">make NON_ROOT_USERNAME=dummy</userinput></screen>
 
     <para os="j">The testsuite will now be run as the
@@ -73,10 +73,10 @@
     for a few files to allow this:</para>
 
-<screen os="k"><userinput>chown -Rv dummy .</userinput></screen>
+<screen os="k"><userinput remap="test">chown -Rv dummy .</userinput></screen>
 
     <para os="l">Then run the remainder of the tests as the
     <systemitem class="username">dummy</systemitem> user:</para>
 
-<screen os="m"><userinput>su dummy -s /bin/bash \
+<screen os="m"><userinput remap="test">su dummy -s /bin/bash \
     -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
 
@@ -84,5 +84,5 @@
     <systemitem class="username">dummy</systemitem> user and groups:</para>
 
-<screen os="o"><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
+<screen os="o"><userinput remap="test">sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
 
     <para os="p">Install the package:</para>
Index: BOOK/final-system/common/diffutils.xml
===================================================================
--- BOOK/final-system/common/diffutils.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/diffutils.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -39,5 +39,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/e2fsprogs.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -73,6 +73,7 @@
 <screen os="g"><userinput>make</userinput></screen>
 
-    <para os="h">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="h">To test the results, issue:</para>
+
+<screen os="h2"><userinput remap="test">make check</userinput></screen>
 
     <para os="i">Install the binaries, documentation and shared libraries:</para>
Index: BOOK/final-system/common/eglibc.xml
===================================================================
--- BOOK/final-system/common/eglibc.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/eglibc.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -108,5 +108,5 @@
 <!-- items n,o,p no longer the master, use x86_64 which has no failures -->
 
-<screen os="n"><userinput>cp -v ../eglibc-&eglibc-version;/iconvdata/gconv-modules iconvdata
+<screen os="n"><userinput remap="test">cp -v ../eglibc-&eglibc-version;/iconvdata/gconv-modules iconvdata
 make -k check 2&gt;&amp;1 | tee eglibc-check-log; grep Error eglibc-check-log</userinput></screen>
 
Index: BOOK/final-system/common/eudev.xml
===================================================================
--- BOOK/final-system/common/eudev.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/eudev.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -39,5 +39,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="g">Install the package:</para>
Index: BOOK/final-system/common/file.xml
===================================================================
--- BOOK/final-system/common/file.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/file.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,5 +34,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">This package does not come with a test suite.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/findutils.xml
===================================================================
--- BOOK/final-system/common/findutils.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/findutils.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -51,6 +51,7 @@
 <screen os="e"><userinput>make</userinput></screen>
 
-    <para os="f">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="f">To test the results, issue:</para>
+
+<screen os="f2"><userinput remap="test">make check</userinput></screen>
 
     <para os="g">Install the package:</para>
Index: BOOK/final-system/common/flex.xml
===================================================================
--- BOOK/final-system/common/flex.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/flex.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,6 +34,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/gawk.xml
===================================================================
--- BOOK/final-system/common/gawk.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/gawk.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,6 +34,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/gcc.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -79,5 +79,5 @@
     <para os="m">Test the results, but do not stop at errors:</para>
 
-<screen os="n"><userinput>make -k check</userinput></screen>
+<screen os="n"><userinput remap="test">make -k check</userinput></screen>
 
     <para os="o">The <parameter>-k</parameter> flag is used to make the test suite
@@ -86,5 +86,5 @@
     failures. To receive a summary of the test suite results, run:</para>
 
-<screen os="p"><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
+<screen os="p"><userinput remap="test">../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
 
     <para os="q">For only the summaries, pipe the output through
Index: BOOK/final-system/common/gettext.xml
===================================================================
--- BOOK/final-system/common/gettext.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/gettext.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -36,5 +36,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/gmp.xml
===================================================================
--- BOOK/final-system/common/gmp.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/gmp.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -64,5 +64,5 @@
     <para os="f">Test the results:</para>
 
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
 
     <para os="h">Install the package:</para>
Index: BOOK/final-system/common/grep.xml
===================================================================
--- BOOK/final-system/common/grep.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/grep.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,6 +34,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/gzip.xml
===================================================================
--- BOOK/final-system/common/gzip.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/gzip.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,5 +34,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue: <command>make check</command>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/isl.xml
===================================================================
--- BOOK/final-system/common/isl.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/isl.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,5 +43,5 @@
     <para os="f">Test the results:</para>
 
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
 
     <para os="h">Install the package:</para>
Index: BOOK/final-system/common/kmod.xml
===================================================================
--- BOOK/final-system/common/kmod.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/kmod.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -58,5 +58,7 @@
 <screen os="e"><userinput>make</userinput></screen>
 
-    <para os="f">To test the results, issue: <userinput>make check</userinput></para>
+    <para os="f">To test the results, issue:</para>
+
+<screen os="f2"><userinput remap="test">make check</userinput></screen>
 
     <para os="g">Install the package:</para>
Index: BOOK/final-system/common/libtool.xml
===================================================================
--- BOOK/final-system/common/libtool.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/libtool.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -35,6 +35,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/m4.xml
===================================================================
--- BOOK/final-system/common/m4.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/m4.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -33,6 +33,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/make.xml
===================================================================
--- BOOK/final-system/common/make.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/make.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -33,6 +33,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/mpc.xml
===================================================================
--- BOOK/final-system/common/mpc.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/mpc.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,5 +43,5 @@
     <para os="f">Test the results:</para>
 
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
 
     <para os="h">Install the package:</para>
Index: BOOK/final-system/common/mpfr.xml
===================================================================
--- BOOK/final-system/common/mpfr.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/mpfr.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -48,5 +48,5 @@
     <para os="f">Test the results:</para>
 
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
 
     <para os="h">Install the package:</para>
Index: BOOK/final-system/common/patch.xml
===================================================================
--- BOOK/final-system/common/patch.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/patch.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -35,5 +35,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
@@ -77,2 +79,3 @@
 
 </sect1>
+
Index: BOOK/final-system/common/perl.xml
===================================================================
--- BOOK/final-system/common/perl.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/perl.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -39,13 +39,13 @@
       loopback device as well as set a hostname for some of the tests:</para>
 
-      <screen><userinput>ip link set lo up
+  <screen os="a01"><userinput remap="test">ip link set lo up
 hostname clfs</userinput></screen>
     </note>
 
-    <para os="a01">Before starting to configure, create a basic
+    <para os="a02">Before starting to configure, create a basic
     <filename>/etc/hosts</filename> file which will be referenced by one
     of Perl's configuration files as well as used by the testsuite:</para>
 
-<screen os="a02"><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
+<screen os="a03"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
     <para os="a">To have full control over the way Perl is set up, you can
@@ -101,6 +101,7 @@
 <screen os="e"><userinput>make</userinput></screen>
 
-    <para os="h">To test the results, issue:
-    <userinput>make test</userinput>.</para>
+    <para os="h">To test the results, issue:</para>
+
+<screen os="h2"><userinput remap="test">make test</userinput></screen>
 
     <para os="j">Install the package:</para>
Index: BOOK/final-system/common/pkg-config-lite.xml
===================================================================
--- BOOK/final-system/common/pkg-config-lite.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/pkg-config-lite.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,6 +34,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/rsyslog.xml
===================================================================
--- BOOK/final-system/common/rsyslog.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/rsyslog.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,5 +34,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/sed.xml
===================================================================
--- BOOK/final-system/common/sed.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/sed.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -37,6 +37,7 @@
 <screen os="f"><userinput>make html</userinput></screen>
 
-    <para os="g">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="g">To test the results, issue:</para>
+
+<screen os="g2"><userinput remap="test">make check</userinput></screen>
 
     <para os="h">Install the package:</para>
Index: BOOK/final-system/common/tar.xml
===================================================================
--- BOOK/final-system/common/tar.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/tar.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -39,6 +39,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/texinfo.xml
===================================================================
--- BOOK/final-system/common/texinfo.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/texinfo.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -34,6 +34,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/util-linux.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -65,10 +65,12 @@
     <para os="dummy1">Create two <systemitem class="groupname">dummy</systemitem> groups and a <systemitem class="username">dummy</systemitem> user to be used during Util-linux and Coreutils test suites:</para>
 
-<screen os="dummy2"><userinput>echo "dummy1:x:1000:" &gt;&gt; /etc/group
+<screen os="dummy2"><userinput remap="test">echo "dummy1:x:1000:" &gt;&gt; /etc/group
 echo "dummy2:x:1001:dummy" &gt;&gt; /etc/group
 echo "dummy:x:1000:1000::/root:/bin/bash" &gt;&gt; /etc/passwd</userinput></screen>
 
-    <para os="f">To test the results, issue:
-    <userinput>chown -Rv dummy . &amp;&amp; su dummy -s /bin/bash -c "PATH=$PATH make -k check"</userinput></para>
+    <para os="f">To test the results, issue:</para>
+
+<screen os="f2"><userinput remap="test">chown -Rv dummy . &amp;&amp;
+su dummy -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
 
     <para os="g">Install the package:</para>
Index: BOOK/final-system/common/vim.xml
===================================================================
--- BOOK/final-system/common/vim.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/vim.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -71,6 +71,9 @@
 <screen os="h"><userinput>make</userinput></screen>
 
-    <para os="i">To test the results, issue: <userinput>make test</userinput>.
-    However, this test suite outputs a lot of binary data to the
+    <para os="i">To test the results, issue:</para>
+
+<screen os="i2"><userinput remap="test">make test</userinput></screen>
+
+    <para os="i3">However, this test suite outputs a lot of binary data to the
     screen, which can cause issues with the settings of the current terminal.
     This can be resolved by redirecting the output to a log file.</para>
Index: BOOK/final-system/common/xz.xml
===================================================================
--- BOOK/final-system/common/xz.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/xz.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -36,7 +36,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the programs:</para>
Index: BOOK/final-system/common/zlib.xml
===================================================================
--- BOOK/final-system/common/zlib.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/common/zlib.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -37,6 +37,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2" ><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/mips64/pkg-config-lite.xml
===================================================================
--- BOOK/final-system/mips64/pkg-config-lite.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/mips64/pkg-config-lite.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -44,4 +44,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/pkg-config-lite.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/autoconf.xml
===================================================================
--- BOOK/final-system/multilib/autoconf.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/autoconf.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='e3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/automake.xml
===================================================================
--- BOOK/final-system/multilib/automake.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/automake.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -41,4 +41,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/automake.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='f'])"/>
Index: BOOK/final-system/multilib/bash.xml
===================================================================
--- BOOK/final-system/multilib/bash.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/bash.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -61,4 +61,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bash.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/bc.xml
===================================================================
--- BOOK/final-system/multilib/bc.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/bc.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bc.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/bison-64bit.xml
===================================================================
--- BOOK/final-system/multilib/bison-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/bison-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -50,4 +50,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/bison-n32.xml
===================================================================
--- BOOK/final-system/multilib/bison-n32.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/bison-n32.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -51,4 +51,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/bison.xml
===================================================================
--- BOOK/final-system/multilib/bison.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/bison.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -51,4 +51,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/diffutils.xml
===================================================================
--- BOOK/final-system/multilib/diffutils.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/diffutils.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -50,4 +50,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/diffutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -63,4 +63,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='h2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
Index: BOOK/final-system/multilib/eudev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/eudev-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/eudev-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -48,4 +48,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/eudev-n32.xml
===================================================================
--- BOOK/final-system/multilib/eudev-n32.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/eudev-n32.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -49,4 +49,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/eudev.xml
===================================================================
--- BOOK/final-system/multilib/eudev.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/eudev.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -48,4 +48,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/file-64bit.xml
===================================================================
--- BOOK/final-system/multilib/file-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/file-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,4 +43,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="file.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="file.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/file-n32.xml
===================================================================
--- BOOK/final-system/multilib/file-n32.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/file-n32.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="file.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="file.xml"
Index: BOOK/final-system/multilib/file.xml
===================================================================
--- BOOK/final-system/multilib/file.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/file.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,4 +43,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/file.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/file.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/findutils.xml
===================================================================
--- BOOK/final-system/multilib/findutils.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/findutils.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -54,4 +54,8 @@
     href="../common/findutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/findutils.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/flex-64bit.xml
===================================================================
--- BOOK/final-system/multilib/flex-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/flex-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='f'])"/>
Index: BOOK/final-system/multilib/gawk.xml
===================================================================
--- BOOK/final-system/multilib/gawk.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/gawk.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,4 +43,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/gettext-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gettext-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/gettext-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,4 +43,8 @@
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gettext.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/gettext-n32.xml
===================================================================
--- BOOK/final-system/multilib/gettext-n32.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/gettext-n32.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -44,4 +44,8 @@
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gettext.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/gettext.xml
===================================================================
--- BOOK/final-system/multilib/gettext.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/gettext.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"
Index: BOOK/final-system/multilib/grep.xml
===================================================================
--- BOOK/final-system/multilib/grep.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/grep.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,4 +43,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/grep.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/gzip.xml
===================================================================
--- BOOK/final-system/multilib/gzip.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/gzip.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gzip.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/kmod-64bit.xml
===================================================================
--- BOOK/final-system/multilib/kmod-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/kmod-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -50,4 +50,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/kmod-n32.xml
===================================================================
--- BOOK/final-system/multilib/kmod-n32.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/kmod-n32.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -51,4 +51,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/kmod.xml
===================================================================
--- BOOK/final-system/multilib/kmod.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/kmod.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -51,4 +51,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/libtool-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libtool-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/libtool-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -49,4 +49,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/m4.xml
===================================================================
--- BOOK/final-system/multilib/m4.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/m4.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/m4.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/make.xml
===================================================================
--- BOOK/final-system/multilib/make.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/make.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/make.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/make.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/patch.xml
===================================================================
--- BOOK/final-system/multilib/patch.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/patch.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/patch.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/perl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/perl-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/perl-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -102,4 +102,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='h2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
Index: BOOK/final-system/multilib/perl-n32.xml
===================================================================
--- BOOK/final-system/multilib/perl-n32.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/perl-n32.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -105,4 +105,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='h2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
Index: BOOK/final-system/multilib/perl.xml
===================================================================
--- BOOK/final-system/multilib/perl.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/perl.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -45,4 +45,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='a03'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -73,4 +77,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='h2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
Index: BOOK/final-system/multilib/pkg-config-lite.xml
===================================================================
--- BOOK/final-system/multilib/pkg-config-lite.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/pkg-config-lite.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,4 +43,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/pkg-config-lite.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/rsyslog.xml
===================================================================
--- BOOK/final-system/multilib/rsyslog.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/rsyslog.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,4 +43,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/sed.xml
===================================================================
--- BOOK/final-system/multilib/sed.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/sed.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -51,4 +51,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/sed.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
Index: BOOK/final-system/multilib/tar.xml
===================================================================
--- BOOK/final-system/multilib/tar.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/tar.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -52,4 +52,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/texinfo.xml
===================================================================
--- BOOK/final-system/multilib/texinfo.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/texinfo.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/util-linux-64bit.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/util-linux-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -51,4 +51,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/util-linux-n32.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-n32.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/util-linux-n32.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -48,4 +48,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/util-linux.xml
===================================================================
--- BOOK/final-system/multilib/util-linux.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/util-linux.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -56,4 +56,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/vim.xml
===================================================================
--- BOOK/final-system/multilib/vim.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/vim.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -68,4 +68,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='i2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='i3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
Index: BOOK/final-system/multilib/xz-64bit.xml
===================================================================
--- BOOK/final-system/multilib/xz-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/xz-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -42,4 +42,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="xz.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/xz-n32.xml
===================================================================
--- BOOK/final-system/multilib/xz-n32.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/xz-n32.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,4 +43,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="xz.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/xz.xml
===================================================================
--- BOOK/final-system/multilib/xz.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/xz.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -43,4 +43,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/xz.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/zlib-64bit.xml
===================================================================
--- BOOK/final-system/multilib/zlib-64bit.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/zlib-64bit.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -45,4 +45,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="zlib.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/zlib-n32.xml
===================================================================
--- BOOK/final-system/multilib/zlib-n32.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/zlib-n32.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -46,4 +46,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="zlib.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/multilib/zlib.xml
===================================================================
--- BOOK/final-system/multilib/zlib.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/multilib/zlib.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -46,4 +46,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/final-system/x86/grub.xml
===================================================================
--- BOOK/final-system/x86/grub.xml	(revision 3693f5720b9e09a6cfc7da542c94e743a5355acb)
+++ BOOK/final-system/x86/grub.xml	(revision 686839b2795fdf7b4909119c5e2fce7501a97c2d)
@@ -52,6 +52,7 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test GRUB you must have QEMU installed and then, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test GRUB you must have QEMU installed and then, issue:</para>
+
+<screen os="d2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
