Globally replace cpp0 with cpp. Add note re Chapter 5 Gettext test suite.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2970 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

42 files changed, 47 insertions, 46 deletions

diff --git a/appendixa/bash-dep.xml b/appendixa/bash-dep.xml
index 8bb56217a..b6cf2fedf 100644
--- a/appendixa/bash-dep.xml
+++ b/appendixa/bash-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chmod, cp, echo, expr, hostname, install,
              ln, ls, mkdir, mv, rm, sleep, tr, uname, uniq
 Diffutils: cmp
 Gawk: awk
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Grep: egrep, grep
 Make: make
 Ncurses: (libraries)
diff --git a/appendixa/binutils-dep.xml b/appendixa/binutils-dep.xml
index 1c9cc8e0f..2668f5a56 100644
--- a/appendixa/binutils-dep.xml
+++ b/appendixa/binutils-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chmod, cp, echo, expr, hostname, ln, ls, mkdir
              mv, rm, rmdir, sleep, sort, touch, tr, true, uname, uniq
 Diffutils: cmp
 Gawk: gawk
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Glibc: ldconfig
 Grep: egrep, fgrep, grep
 Make: make
diff --git a/appendixa/bison-dep.xml b/appendixa/bison-dep.xml
index ad0c66268..fa0999911 100644
--- a/appendixa/bison-dep.xml
+++ b/appendixa/bison-dep.xml
@@ -10,7 +10,7 @@ Binutils: ar, as, ld, ranlib
 Coreutils: basename, cat, chmod, cp, dirname, echo, expr, head, hostname,
              install, ln, ls, mkdir, mv, rm, rmdir, sleep, tr, uname, uniq
 Diffutils: cmp
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Grep: egrep, fgrep, grep
 Make: make
 Sed: sed
diff --git a/appendixa/bzip2-dep.xml b/appendixa/bzip2-dep.xml
index 8095fe593..2c3172101 100644
--- a/appendixa/bzip2-dep.xml
+++ b/appendixa/bzip2-dep.xml
@@ -8,7 +8,7 @@
 <literallayout>Bash: sh
 Binutils: ar, as, ld, ranlib
 Coreutils: cp, ln, rm
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Make: make</literallayout>
 
 </sect2>
diff --git a/appendixa/coreutils-dep.xml b/appendixa/coreutils-dep.xml
index 88ccce3d7..6f0cdb326 100644
--- a/appendixa/coreutils-dep.xml
+++ b/appendixa/coreutils-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chmod, chown, echo, expr, hostname,
              install, ls, mv, rm, sleep, tr, uname
 Diffutils: cmp
 Gawk: gawk
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Gettext: msgfmt, xgettext
 Glibc: getconf
 Grep: egrep, fgrep, grep
diff --git a/appendixa/diffutils-dep.xml b/appendixa/diffutils-dep.xml
index 523c993a0..64518cd7b 100644
--- a/appendixa/diffutils-dep.xml
+++ b/appendixa/diffutils-dep.xml
@@ -9,7 +9,7 @@
 Binutils: ld, as
 Coreutils: cat, chmod, cp,  date, hostname, install, mv, rm, tr
 Diffutils: cmp
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Grep: egrep, grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/e2fsprogs-dep.xml b/appendixa/e2fsprogs-dep.xml
index 5a04c26e4..d2a92bf8b 100644
--- a/appendixa/e2fsprogs-dep.xml
+++ b/appendixa/e2fsprogs-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chmod, cp, echo, expr, hostname,
              install, ln, mkdir, mv, rm, sync, tr, uname
 Diffutils: cmp
 Gawk: awk
-GCC: cc, cc1, collect2, cpp0
+GCC: cc, cc1, collect2, cpp
 Glibc: ldconfig
 Grep: egrep, grep
 Gzip: gzip
diff --git a/appendixa/ed-dep.xml b/appendixa/ed-dep.xml
index 60be9f4fd..fbc2cb40b 100644
--- a/appendixa/ed-dep.xml
+++ b/appendixa/ed-dep.xml
@@ -9,7 +9,7 @@
 Binutils: ar, as, ld, ranlib
 Coreutils: cat, chmod, cp, hostname, install, ln, mv, rm, touch, tr
 Diffutils: cmp
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Grep: egrep, grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/file-dep.xml b/appendixa/file-dep.xml
index 9ac88693a..96688680f 100644
--- a/appendixa/file-dep.xml
+++ b/appendixa/file-dep.xml
@@ -11,7 +11,7 @@ Coreutils: cat, chmod, echo, expr, hostname, install, ln, ls, mv, rm,
              sleep, touch, tr
 Diffutils: cmp
 Gawk: gawk
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Grep: egrep, grep
 M4: m4
 Make: make
diff --git a/appendixa/findutils-dep.xml b/appendixa/findutils-dep.xml
index 917ba8160..bef30bf4f 100644
--- a/appendixa/findutils-dep.xml
+++ b/appendixa/findutils-dep.xml
@@ -10,7 +10,7 @@ Binutils: ar, as, ld, ranlib
 Coreutils: basename, cat, chmod, cp, date, echo, hostname, install, mv, rm, tr
 Diffutils: cmp
 Grep: egrep, grep
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Make: make
 Patch: patch
 Sed: sed</literallayout>
diff --git a/appendixa/flex-dep.xml b/appendixa/flex-dep.xml
index 1e0323779..3df4091b3 100644
--- a/appendixa/flex-dep.xml
+++ b/appendixa/flex-dep.xml
@@ -10,7 +10,7 @@ Binutils: ar, as, ld, ranlib
 Bison: bison
 Coreutils: cat, chmod, cp, echo, hostname, install, ln, mv, rm, touch, tr
 Diffutils: cmp
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Grep: egrep, grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/gcc-dep.xml b/appendixa/gcc-dep.xml
index e288918d4..7612dd728 100644
--- a/appendixa/gcc-dep.xml
+++ b/appendixa/gcc-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chmod, cp, dirname, echo, expr, hostname, ln
              ls, mkdir, mv, rm, sleep, tail, touch, tr, true, uname
 Diffutils: cmp
 Find: find
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Grep: egrep, grep
 Make: make
 Sed: sed
diff --git a/appendixa/gcc-shortdesc.xml b/appendixa/gcc-shortdesc.xml
index 811bc9586..7dd329e90 100644
--- a/appendixa/gcc-shortdesc.xml
+++ b/appendixa/gcc-shortdesc.xml
@@ -6,7 +6,7 @@
 the C and C++ compilers.</para>
 
 <para><emphasis>Installed programs</emphasis>: c++, c++filt, cc (link to gcc),
-cc1, cc1plus, collect2, cpp, cpp0, g++, gcc, gccbug, gcov and tradcpp0</para>
+cc1, cc1plus, collect2, cpp, g++, gcc, gccbug, and gcov</para>
 
 <para><emphasis>Installed libraries</emphasis>: libgcc.a, libgcc_eh.a,
 libgcc_s.so, libiberty.a, libstdc++.[a,so] and libsupc++.a</para>
diff --git a/appendixa/gettext-dep.xml b/appendixa/gettext-dep.xml
index 8f431cbf6..96ed0655c 100644
--- a/appendixa/gettext-dep.xml
+++ b/appendixa/gettext-dep.xml
@@ -12,7 +12,7 @@ Coreutils: basename, cat, chmod, echo, expr, hostname, install, ln,
              ls, mkdir, mv, rm, rmdir, sleep, sort, tr, uname, uniq
 Diffutils: cmp
 Gawk: gawk
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Grep: egrep, fgrep, grep
 M4: m4
 Make: make
diff --git a/appendixa/grep-dep.xml b/appendixa/grep-dep.xml
index dd8faa2bb..7dca96fb1 100644
--- a/appendixa/grep-dep.xml
+++ b/appendixa/grep-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chmod, echo, expr, hostname, install,
              ls, mkdir, mv, rm, sleep, tr, uname
 Diffutils: cmp
 Gawk: gawk
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Gettext: msgfmt, xgettext
 Glibc: getconf
 Grep: egrep, fgrep, grep
diff --git a/appendixa/groff-dep.xml b/appendixa/groff-dep.xml
index a2e4a1fd3..c1bd49d06 100644
--- a/appendixa/groff-dep.xml
+++ b/appendixa/groff-dep.xml
@@ -12,7 +12,7 @@ Coreutils: basename, cat, chmod, cp, date, echo, expr, hostname, install,
              ln, ls, mkdir, mv, rm, touch, tr, uname
 Diffutils: cmp
 Gawk: awk
-GCC: cc1, cc1plus, collect2, cpp0, g++, gcc
+GCC: cc1, cc1plus, collect2, cpp, g++, gcc
 Grep: egrep, grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/gzip-dep.xml b/appendixa/gzip-dep.xml
index c4237c85d..53478d1a7 100644
--- a/appendixa/gzip-dep.xml
+++ b/appendixa/gzip-dep.xml
@@ -8,7 +8,7 @@
 <literallayout>Bash: sh
 Binutils: as, ld, nm
 Coreutils: cat, chmod, cp, hostname, install, ln, mv, rm, tr
-GCC: cc1, collect2, cpp, cpp0, gcc
+GCC: cc1, collect2, cpp, cpp, gcc
 Grep: egrep, grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/kbd-dep.xml b/appendixa/kbd-dep.xml
index a6ae6a205..65cc666b7 100644
--- a/appendixa/kbd-dep.xml
+++ b/appendixa/kbd-dep.xml
@@ -11,7 +11,7 @@ Bison: bison
 Coreutils: cp, install, ln, mv, rm, uname
 Diffutils: cmp
 Flex: flex
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Gettext: msgfmt, xgettext
 Grep: grep
 Gzip: gunzip, gzip
diff --git a/appendixa/kernel-dep.xml b/appendixa/kernel-dep.xml
index c6a163562..c054c10da 100644
--- a/appendixa/kernel-dep.xml
+++ b/appendixa/kernel-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, cp, date, expr, ln, md5sum, mkdir, mv,
              pwd, rm, sort, stty, tail, touch, uname, whoami, yes
 Findutils: find, xargs
 Gawk: awk
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Grep: grep
 Gzip: gzip
 Make: make
diff --git a/appendixa/less-dep.xml b/appendixa/less-dep.xml
index 26eebddbb..c0108fc56 100644
--- a/appendixa/less-dep.xml
+++ b/appendixa/less-dep.xml
@@ -10,7 +10,7 @@ Binutils: as, ld
 Coreutils: cat, chmod, expr, hostname, install, mv, rm, touch, tr, uname
 Diffutils: cmp
 Grep: egrep, grep
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Ncurses: (libraries)
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/libtool-dep.xml b/appendixa/libtool-dep.xml
index 443cc0d68..3b23027bb 100644
--- a/appendixa/libtool-dep.xml
+++ b/appendixa/libtool-dep.xml
@@ -10,7 +10,7 @@ Binutils: ar, as, ld, nm, ranlib, strip
 Coreutils: cat, chmod, cp, echo, expr, hostname, install, ln, ls,
              mkdir, mv, rm, rmdir, sleep, sort, tr, uname, uniq
 Diffutils: cmp
-GCC: cc, cc1, collect2, cpp0
+GCC: cc, cc1, collect2, cpp
 Glibc: ldconfig
 Grep: egrep, fgrep, grep
 Make: make
diff --git a/appendixa/m4-dep.xml b/appendixa/m4-dep.xml
index 7ac1c6802..191177f96 100644
--- a/appendixa/m4-dep.xml
+++ b/appendixa/m4-dep.xml
@@ -9,7 +9,7 @@
 Binutils: ar, as, ld, ranlib
 Coreutils: cat, chmod, cp, date, echo, hostname, install, mv, rm, tr
 Diffutils: cmp
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Grep: egrep, grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/make-dep.xml b/appendixa/make-dep.xml
index 2d07e7285..df2fdd1f9 100644
--- a/appendixa/make-dep.xml
+++ b/appendixa/make-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chgrp, chmod, echo, expr, hostname,
              install, ls, mv, rm, sleep, tr, uname
 Diffutils: cmp
 Gawk: gawk
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Glibc: getconf
 Grep: egrep, fgrep, grep
 M4: m4
diff --git a/appendixa/man-dep.xml b/appendixa/man-dep.xml
index 2f26f094f..2e6e48c2c 100644
--- a/appendixa/man-dep.xml
+++ b/appendixa/man-dep.xml
@@ -9,7 +9,7 @@
 Binutils: as, ld
 Coreutils: cat, chmod, cp, echo, install, mkdir, rm
 Gawk: awk
-GCC: c11, collect2, cpp0, gcc
+GCC: c11, collect2, cpp, gcc
 Grep: grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/modutils-dep.xml b/appendixa/modutils-dep.xml
index b83961243..2182ea61e 100644
--- a/appendixa/modutils-dep.xml
+++ b/appendixa/modutils-dep.xml
@@ -12,7 +12,7 @@ Coreutils: basename, cat, chmod, expr, hostname, install, ln,
              mkdir, mv, rm, tr, uname
 Diffutils: cmp
 Flex: flex
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Grep: egrep, grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/ncurses-dep.xml b/appendixa/ncurses-dep.xml
index 838e0f83c..6a6422fa2 100644
--- a/appendixa/ncurses-dep.xml
+++ b/appendixa/ncurses-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chmod, cp, date, echo, expr, hostname, install,
              ln, mkdir, mv, rm, sort, tr, uname, wc
 Diffutils: cmp
 Gawk: gawk
-GCC: c++, cc1, cc1plus, collect2, cpp0, gcc
+GCC: c++, cc1, cc1plus, collect2, cpp, gcc
 Glibc: ldconfig
 Grep: egrep, fgrep, grep
 Make: make
diff --git a/appendixa/nettools-dep.xml b/appendixa/nettools-dep.xml
index 4271cd976..ac670bbb6 100644
--- a/appendixa/nettools-dep.xml
+++ b/appendixa/nettools-dep.xml
@@ -8,7 +8,7 @@
 <literallayout>Bash: bash, sh
 Binutils: ar, as, ld
 Coreutils: echo, install, ln, ls, mv, rm
-GCC: cc, cc1, collect2, cpp0
+GCC: cc, cc1, collect2, cpp
 Make: make</literallayout>
 
 </sect2>
diff --git a/appendixa/patch-dep.xml b/appendixa/patch-dep.xml
index 657468014..11aa30f84 100644
--- a/appendixa/patch-dep.xml
+++ b/appendixa/patch-dep.xml
@@ -9,7 +9,7 @@
 Binutils: as, ld
 Coreutils: cat, chmod, echo, expr, hostname, install, mv, rm, tr, uname
 Diffutils: cmp
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Glibc: getconf
 Grep: egrep, grep
 Make: make
diff --git a/appendixa/perl-dep.xml b/appendixa/perl-dep.xml
index e1f8e067a..2eccd1f67 100644
--- a/appendixa/perl-dep.xml
+++ b/appendixa/perl-dep.xml
@@ -12,7 +12,7 @@ Coreutils: basename, cat, chmod, comm, cp, date, echo, expr, hostname, ln,
              whoami, uniq
 Diffutils: cmp
 Gawk: awk
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Grep: egrep, grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/procinfo-dep.xml b/appendixa/procinfo-dep.xml
index f55ccef44..6942ff2d3 100644
--- a/appendixa/procinfo-dep.xml
+++ b/appendixa/procinfo-dep.xml
@@ -7,7 +7,7 @@
 
 <literallayout>Binutils: as, ld
 Coreutils: install, mkdir
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Make: make</literallayout>
 
 </sect2>
diff --git a/appendixa/procps-dep.xml b/appendixa/procps-dep.xml
index a5caa1226..930224e81 100644
--- a/appendixa/procps-dep.xml
+++ b/appendixa/procps-dep.xml
@@ -9,7 +9,7 @@
 Binutils: as, ld, strip
 Coreutils: basename, install, ln, mv, pwd, rm, sort, tr
 Gawk: awk
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Grep: grep
 Make: make
 Sed: sed</literallayout>
diff --git a/appendixa/psmisc-dep.xml b/appendixa/psmisc-dep.xml
index a50b7ec24..b57bf1e39 100644
--- a/appendixa/psmisc-dep.xml
+++ b/appendixa/psmisc-dep.xml
@@ -12,7 +12,7 @@ Coreutils: basename, cat, chmod, echo, expr, hostname, install,
              ls, mkdir, mv, rm, sleep, tr, uname
 Diffutils: cmp
 Gawk: gawk
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Gettext: msgfmt, xgettext
 Grep: egrep, grep
 M4: m4
diff --git a/appendixa/sed-dep.xml b/appendixa/sed-dep.xml
index 8ba036c0c..9e48928f1 100644
--- a/appendixa/sed-dep.xml
+++ b/appendixa/sed-dep.xml
@@ -10,7 +10,7 @@ Binutils: ar, as, ld, ranlib
 Coreutils: cat, chmod, expr, hostname, install, ls, mv, rm, echo, sleep, tr
 Diffutils: cmp
 Gawk: gawk
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Glibc: getconf
 Grep: egrep, fgrep, grep
 M4: m4
diff --git a/appendixa/shadowpwd-dep.xml b/appendixa/shadowpwd-dep.xml
index 6402114b3..65970c76d 100644
--- a/appendixa/shadowpwd-dep.xml
+++ b/appendixa/shadowpwd-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chmod, cp, echo, expr, install, ln, ls,
              mkdir, mv, rm, rmdir, sleep, sort, tr, uname, uniq
 Diffutils: cmp
 Gawk: gawk
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Gettext: msgfmt, xgettext
 Glibc: ldconfig
 Grep: egrep, grep
diff --git a/appendixa/sysklogd-dep.xml b/appendixa/sysklogd-dep.xml
index 218294f82..11fb4b23a 100644
--- a/appendixa/sysklogd-dep.xml
+++ b/appendixa/sysklogd-dep.xml
@@ -7,7 +7,7 @@
 
 <literallayout>Binutils: as, ld, strip
 Coreutils: install
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Make: make</literallayout>
 
 </sect2>
diff --git a/appendixa/sysvinit-dep.xml b/appendixa/sysvinit-dep.xml
index ffaf88111..43f23ee80 100644
--- a/appendixa/sysvinit-dep.xml
+++ b/appendixa/sysvinit-dep.xml
@@ -8,7 +8,7 @@
 <literallayout>Bash: sh
 Binutils: as, ld
 Coreutils: chown, cp, install, ln, mknod, rm
-GCC: cc, cc1, collect2, cpp0
+GCC: cc, cc1, collect2, cpp
 Make: make
 Sed: sed</literallayout>
 
diff --git a/appendixa/tar-dep.xml b/appendixa/tar-dep.xml
index 1a06babce..c553fdba2 100644
--- a/appendixa/tar-dep.xml
+++ b/appendixa/tar-dep.xml
@@ -11,7 +11,7 @@ Coreutils: basename, cat, chmod, echo, expr, install, ls, mv, rm,
              sleep, tr, uname
 Diffutils: cmp
 Gawk: gawk
-GCC: cc, cc1, collect2, cpp0, gcc
+GCC: cc, cc1, collect2, cpp, gcc
 Gettext: msgfmt, xgettext
 Glibc: getconf
 Grep: egrep, fgrep, grep
diff --git a/appendixa/texinfo-dep.xml b/appendixa/texinfo-dep.xml
index 26acd6fed..a8bef16c8 100644
--- a/appendixa/texinfo-dep.xml
+++ b/appendixa/texinfo-dep.xml
@@ -10,7 +10,7 @@ Binutils: ar, as, ld, ranlib
 Coreutils: basename, cat, chmod, echo, expr, hostname, install, ln, ls,
              mkdir, mv, rm, sleep, tr
 Diffutils: cmp
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Grep: egrep, fgrep, grep
 Make: make
 Sed: sed
diff --git a/appendixa/utillinux-dep.xml b/appendixa/utillinux-dep.xml
index ea4ab07a4..2e876d7d4 100644
--- a/appendixa/utillinux-dep.xml
+++ b/appendixa/utillinux-dep.xml
@@ -9,7 +9,7 @@
 Binutils: as, ld
 Coreutils: cat, chgrp, chmod, cp, install, ln, mv, rm, uname, whoami
 Diffutils: cmp
-GCC: cc, cc1, collect2, cpp, cpp0
+GCC: cc, cc1, collect2, cpp, cpp
 Gettext: msgfmt, xgettext
 Glibc: rpcgen
 Grep: grep
diff --git a/appendixa/vim-dep.xml b/appendixa/vim-dep.xml
index 35529d728..4e5bb945a 100644
--- a/appendixa/vim-dep.xml
+++ b/appendixa/vim-dep.xml
@@ -11,7 +11,7 @@ Coreutils: cat, chmod, cp, echo, expr, ln, mkdir, mv, rm, touch, tr,
              uname, wc, whoami
 Diffutils: cmp, diff
 Find: find
-GCC: cc1, collect2, cpp0, gcc
+GCC: cc1, collect2, cpp, gcc
 Grep: egrep, grep
 Make: make
 Net-tools: hostname
diff --git a/appendixb/appendixb.xml b/appendixb/appendixb.xml
index 8a1348362..b4b7a47bb 100644
--- a/appendixb/appendixb.xml
+++ b/appendixb/appendixb.xml
@@ -92,7 +92,6 @@ to which it belongs.</para>
 <listitem><para>config.sub : <xref linkend="aa-automake"/></para></listitem>
 <listitem><para>cp : <xref linkend="aa-coreutils"/></para></listitem>
 <listitem><para>cpp : <xref linkend="aa-gcc"/></para></listitem>
-<listitem><para>cpp0 : <xref linkend="aa-gcc"/></para></listitem>
 <listitem><para>csplit : <xref linkend="aa-coreutils"/></para></listitem>
 <listitem><para>ctrlaltdel : <xref linkend="aa-utillinux"/></para></listitem>
 <listitem><para>cut : <xref linkend="aa-coreutils"/></para></listitem>
@@ -588,7 +587,6 @@ to which it belongs.</para>
 <listitem><para>touch : <xref linkend="aa-coreutils"/></para></listitem>
 <listitem><para>tput : <xref linkend="aa-ncurses"/></para></listitem>
 <listitem><para>tr : <xref linkend="aa-coreutils"/></para></listitem>
-<listitem><para>tradcpp0 : <xref linkend="aa-gcc"/></para></listitem>
 <listitem><para>trigger : <xref linkend="aa-gettext"/></para></listitem>
 <listitem><para>troff : <xref linkend="aa-groff"/></para></listitem>
 <listitem><para>true : <xref linkend="aa-coreutils"/></para></listitem>
diff --git a/chapter05/gettext-inst.xml b/chapter05/gettext-inst.xml
index 3721b6bb3..75919481b 100644
--- a/chapter05/gettext-inst.xml
+++ b/chapter05/gettext-inst.xml
@@ -9,15 +9,18 @@
 
 <para>Compile the programs:</para>
 
-<screen><userinput>make </userinput></screen>
+<screen><userinput>make</userinput></screen>
 
 <para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
+checks to ensure it built correctly. However, the Gettext test suite here in
+Chapter 5 is known to cause problems if for instance it finds a Java compiler
+on the host. It also takes a very long time to run and is considered not
+critical to the success of the overall build. We therefore recommend not to run
+it here. Should you choose to run it, the following command will do so:</para>
 
 <screen><userinput>make check</userinput></screen>
 
-<para>Then install them and their documentation:</para>
+<para>And install the package:</para>
 
 <screen><userinput>make install</userinput></screen>