Index: appendixa/gawk-shortdesc.xml
===================================================================
--- appendixa/gawk-shortdesc.xml	(revision 8c643a0e68f133522fd514028778cee9bc49e49b)
+++ appendixa/gawk-shortdesc.xml	(revision 1eea81624e8c84d0356a0a3e0dc9ddcd37e53491)
@@ -6,6 +6,6 @@
 files.</para>
 
-<para><emphasis>Installed programs</emphasis>: awk, gawk, gawk-3.1.1, grcat,
-igawk, pgawk, pgawk-3.1.1 and pwcat</para>
+<para><emphasis>Installed programs</emphasis>: awk, gawk, gawk-&gawk-version;,
+grcat, igawk, pgawk, pgawk-&gawk-version; and pwcat</para>
 
 </sect2>
Index: appendixa/perl-shortdesc.xml
===================================================================
--- appendixa/perl-shortdesc.xml	(revision 8c643a0e68f133522fd514028778cee9bc49e49b)
+++ appendixa/perl-shortdesc.xml	(revision 1eea81624e8c84d0356a0a3e0dc9ddcd37e53491)
@@ -8,6 +8,6 @@
 
 <para><emphasis>Installed programs</emphasis>: a2p, c2ph, dprofpp, enc2xs,
-find2perl, h2ph, h2xs, libnetcfg, perl, perl5.8.0 (link to perl), perlbug,
-perlcc, perldoc, perlivp, piconv, pl2pm, pod2html, pod2latex, pod2man,
+find2perl, h2ph, h2xs, libnetcfg, perl, perl&perl-version; (link to perl),
+perlbug, perlcc, perldoc, perlivp, piconv, pl2pm, pod2html, pod2latex, pod2man,
 pod2text, pod2usage, podchecker, podselect, psed (link to s2p), pstruct (link
 to c2ph), s2p, splain and xsubpp</para> 
Index: chapter05/gcc-pass2-inst.xml
===================================================================
--- chapter05/gcc-pass2-inst.xml	(revision 8c643a0e68f133522fd514028778cee9bc49e49b)
+++ chapter05/gcc-pass2-inst.xml	(revision 1eea81624e8c84d0356a0a3e0dc9ddcd37e53491)
@@ -121,5 +121,5 @@
 <para>You can compare your results to those posted to the gcc-testresults
 mailing list for similar configurations to your own. For an example of how
-current GCC-3.3.1 should look on i686-pc-linux-gnu, see
+current GCC-&gcc-version; should look on i686-pc-linux-gnu, see
 <ulink url="http://gcc.gnu.org/ml/gcc-testresults/2003-08/msg01612.html"/>.</para>
 
Index: chapter05/glibc-inst.xml
===================================================================
--- chapter05/glibc-inst.xml	(revision 8c643a0e68f133522fd514028778cee9bc49e49b)
+++ chapter05/glibc-inst.xml	(revision 1eea81624e8c84d0356a0a3e0dc9ddcd37e53491)
@@ -29,5 +29,5 @@
 touch /tools/etc/ld.so.conf</userinput></screen>
 
-<para>Also, Glibc has a subtle problem when compiled with GCC 3.3.1.
+<para>Also, Glibc has a subtle problem when compiled with GCC &gcc-version;.
 Apply the following patch to fix this:</para>
 
Index: chapter05/perl-inst.xml
===================================================================
--- chapter05/perl-inst.xml	(revision 8c643a0e68f133522fd514028778cee9bc49e49b)
+++ chapter05/perl-inst.xml	(revision 1eea81624e8c84d0356a0a3e0dc9ddcd37e53491)
@@ -23,6 +23,6 @@
 
 <screen><userinput>cp perl pod/pod2man /tools/bin
-mkdir -p /tools/lib/perl5/5.8.0
-cp -R lib/* /tools/lib/perl5/5.8.0</userinput></screen>
+mkdir -p /tools/lib/perl5/&perl-version;
+cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
 
 </sect2>
Index: chapter06/gawk-inst.xml
===================================================================
--- chapter06/gawk-inst.xml	(revision 8c643a0e68f133522fd514028778cee9bc49e49b)
+++ chapter06/gawk-inst.xml	(revision 1eea81624e8c84d0356a0a3e0dc9ddcd37e53491)
@@ -21,12 +21,12 @@
 <listitem><para>The default data directory for gawk is <filename
 class="directory">$prefix/share/awk</filename>. A package specific
-directory should be named using the package and version (like gawk-3.1.3
-instead of awk) because there may be more than one awk interpreter on a
-system (and more than one version of gawk). The patch changes this to
-<filename class="directory">$prefix/share/gawk-3.1.3</filename> to be more
-correct.</para></listitem>
+directory should be named using the package and version (like
+gawk-&gawk-version; instead of awk) because there may be more than one awk
+interpreter on a system (and more than one version of gawk). The patch changes
+this to <filename class="directory">$prefix/share/gawk-&gawk-version;</filename>
+to be more correct.</para></listitem>
 
 <listitem><para>The patch ensures that this directory (<filename
-class="directory">$prefix/share/gawk-3.1.3</filename>) is removed along
+class="directory">$prefix/share/gawk-&gawk-version;</filename>) is removed along
 with its contents on a make uninstall.</para></listitem>
 </itemizedlist>
Index: chapter06/grub-inst.xml
===================================================================
--- chapter06/grub-inst.xml	(revision 8c643a0e68f133522fd514028778cee9bc49e49b)
+++ chapter06/grub-inst.xml	(revision 1eea81624e8c84d0356a0a3e0dc9ddcd37e53491)
@@ -10,5 +10,5 @@
 Grub.</para>
 
-<para>Grub needs a patch to fix a compilation problem with GCC-3.3.1</para>
+<para>Grub needs a patch to fix a compilation problem with GCC-&gcc-version;</para>
 
 <screen><userinput>patch -Np1 -i ../&grub-patch;</userinput></screen>
