19 files changed, 46 insertions, 46 deletions
diff --git a/chapter05/bash-static.sgml b/chapter05/bash-static.sgml
index a6b668eb0..90cbb4ea1 100644
--- a/chapter05/bash-static.sgml
+++ b/chapter05/bash-static.sgml
@@ -1,8 +1,8 @@
 <sect1 id="ch05-bash">
 <title>Installing Bash</title>
 
-&c5-pp-bash-inst;
-&c5-pp-bash-exp;
+&c5-bash-inst;
+&c5-bash-exp;
 &aa-bash-desc;
 
 </sect1>
diff --git a/chapter05/binutils-static.sgml b/chapter05/binutils-static.sgml
index fd13dfd20..8f50dd003 100644
--- a/chapter05/binutils-static.sgml
+++ b/chapter05/binutils-static.sgml
@@ -1,8 +1,8 @@
 <sect1 id="ch05-binutils">
 <title>Installing Binutils</title>
 
-&c5-pp-binutils-inst;
-&c5-pp-binutils-exp;
+&c5-binutils-inst;
+&c5-binutils-exp;
 &aa-binutils-desc;
 
 </sect1>
diff --git a/chapter05/bzip2-static.sgml b/chapter05/bzip2-static.sgml
index 1cf203aed..1040c59c4 100644
--- a/chapter05/bzip2-static.sgml
+++ b/chapter05/bzip2-static.sgml
@@ -1,8 +1,8 @@
 <sect1 id="ch05-bzip2">
 <title>Installing Bzip2</title>
 
-&c5-pp-bzip2-inst;
-&c5-pp-bzip2-exp;
+&c5-bzip2-inst;
+&c5-bzip2-exp;
 &aa-bzip2-desc;
 
 </sect1>
diff --git a/chapter05/chapter5.sgml b/chapter05/chapter5.sgml
index ad6e4116d..74af61cef 100644
--- a/chapter05/chapter5.sgml
+++ b/chapter05/chapter5.sgml
@@ -3,26 +3,26 @@
 
 &c5-introduction;
 
-&c5-pp-bash;
-&c5-pp-binutils;
-&c5-pp-bzip2;
-&c5-pp-diffutils;
-&c5-pp-fileutils;
-&c5-pp-gcc;
-&c5-pp-kernel;
-&c5-pp-grep;
-&c5-pp-gzip;
-&c5-pp-make;
-&c5-pp-sed;
-&c5-pp-shellutils;
-&c5-pp-tar;
-&c5-pp-textutils;
-&c5-pp-mawk;
-&c5-pp-texinfo;
-&c5-pp-gettext;
-&c5-pp-makedev;
-&c5-pp-pwdgroup;
-&c5-pp-proc;
+&c5-bash;
+&c5-binutils;
+&c5-bzip2;
+&c5-diffutils;
+&c5-fileutils;
+&c5-gcc;
+&c5-kernel;
+&c5-grep;
+&c5-gzip;
+&c5-make;
+&c5-sed;
+&c5-shellutils;
+&c5-tar;
+&c5-textutils;
+&c5-mawk;
+&c5-texinfo;
+&c5-gettext;
+&c5-makedev;
+&c5-pwdgroup;
+&c5-proc;
 
 </chapter>
 
diff --git a/chapter05/diffutils-static.sgml b/chapter05/diffutils-static.sgml
index c56846bf4..1bdabd3d9 100644
--- a/chapter05/diffutils-static.sgml
+++ b/chapter05/diffutils-static.sgml
@@ -1,8 +1,8 @@
 <sect1 id="ch05-diffutils">
 <title>Installing Diffutils</title>
 
-&c5-pp-diffutils-inst;
-&c5-pp-diffutils-exp;
+&c5-diffutils-inst;
+&c5-diffutils-exp;
 &aa-diffutils-desc;
 
 </sect1>
diff --git a/chapter05/fileutils-static.sgml b/chapter05/fileutils-static.sgml
index 6ca75bf0b..a7d4dae0e 100644
--- a/chapter05/fileutils-static.sgml
+++ b/chapter05/fileutils-static.sgml
@@ -1,8 +1,8 @@
 <sect1 id="ch05-fileutils">
 <title>Installing Fileutils</title>
 
-&c5-pp-fileutils-inst;
-&c5-pp-fileutils-exp;
+&c5-fileutils-inst;
+&c5-fileutils-exp;
 &aa-fileutils-desc;
 
 </sect1>
diff --git a/chapter05/gcc-static.sgml b/chapter05/gcc-static.sgml
index 813257ca0..4669674c1 100644
--- a/chapter05/gcc-static.sgml
+++ b/chapter05/gcc-static.sgml
@@ -1,8 +1,8 @@
 <sect1 id="ch05-gcc">
 <title>Installing GCC on the LFS system</title>
 
-&c5-pp-gcc-inst;
-&c5-pp-gcc-exp;
+&c5-gcc-inst;
+&c5-gcc-exp;
 &aa-gcc-desc;
 
 </sect1>
diff --git a/chapter05/gettext-static.sgml b/chapter05/gettext-static.sgml
index e2ae5065b..d45f63972 100644
--- a/chapter05/gettext-static.sgml
+++ b/chapter05/gettext-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-gettext">
 <title>Installing Gettext</title>
 
-&c5-pp-gettext-inst;
+&c5-gettext-inst;
 &aa-gettext-desc;
 
 </sect1>
diff --git a/chapter05/grep-static.sgml b/chapter05/grep-static.sgml
index 5887148af..0f5b1760b 100644
--- a/chapter05/grep-static.sgml
+++ b/chapter05/grep-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-grep">
 <title>Installing Grep</title>
 
-&c5-pp-grep-inst;
+&c5-grep-inst;
 &aa-grep-desc;
 
 </sect1>
diff --git a/chapter05/gzip-static.sgml b/chapter05/gzip-static.sgml
index 0737c6728..2f7a4f92d 100644
--- a/chapter05/gzip-static.sgml
+++ b/chapter05/gzip-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-gzip">
 <title>Installing Gzip</title>
 
-&c5-pp-gzip-inst;
+&c5-gzip-inst;
 &aa-gzip-desc;
 
 </sect1>
diff --git a/chapter05/kernel.sgml b/chapter05/kernel.sgml
index be1bf3b45..125aeb484 100644
--- a/chapter05/kernel.sgml
+++ b/chapter05/kernel.sgml
@@ -1,8 +1,8 @@
 <sect1 id="ch05-kernel">
 <title>Installing Linux Kernel</title>
 
-&c5-pp-kernel-inst;
-&c5-pp-kernel-exp;
+&c5-kernel-inst;
+&c5-kernel-exp;
 &aa-kernel-desc;
 
 </sect1>
diff --git a/chapter05/make-static.sgml b/chapter05/make-static.sgml
index 9380ad1c5..f75d727bb 100644
--- a/chapter05/make-static.sgml
+++ b/chapter05/make-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-make">
 <title>Installing Make</title>
 
-&c5-pp-make-inst;
+&c5-make-inst;
 &aa-make-desc;
 
 </sect1>
diff --git a/chapter05/makedev.sgml b/chapter05/makedev.sgml
index d16a99624..81e49a3b7 100644
--- a/chapter05/makedev.sgml
+++ b/chapter05/makedev.sgml
@@ -1,8 +1,8 @@
 <sect1 id="ch05-makedev">
 <title>Installing Makedev</title>
 
-&c5-pp-makedev-inst;
-&c5-pp-makedev-exp;
+&c5-makedev-inst;
+&c5-makedev-exp;
 &aa-makedev-desc;
 
 </sect1>
diff --git a/chapter05/mawk-static.sgml b/chapter05/mawk-static.sgml
index ff2ca9235..d4d787566 100644
--- a/chapter05/mawk-static.sgml
+++ b/chapter05/mawk-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-mawk">
 <title>Installing Mawk</title>
 
-&c5-pp-mawk-inst;
+&c5-mawk-inst;
 &aa-mawk-desc;
 
 </sect1>
diff --git a/chapter05/sed-static.sgml b/chapter05/sed-static.sgml
index 91cfdb6b9..e95f3bff2 100644
--- a/chapter05/sed-static.sgml
+++ b/chapter05/sed-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-sed">
 <title>Installing Sed</title>
 
-&c5-pp-sed-inst;
+&c5-sed-inst;
 &aa-sed-desc;
 
 </sect1>
diff --git a/chapter05/shellutils-static.sgml b/chapter05/shellutils-static.sgml
index 59b371b04..e63d944b4 100644
--- a/chapter05/shellutils-static.sgml
+++ b/chapter05/shellutils-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-shutils">
 <title>Installing Shellutils</title>
 
-&c5-pp-shellutils-inst;
+&c5-shellutils-inst;
 &aa-shellutils-desc;
 
 </sect1>
diff --git a/chapter05/tar-static.sgml b/chapter05/tar-static.sgml
index 17ca6b885..171a1de95 100644
--- a/chapter05/tar-static.sgml
+++ b/chapter05/tar-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-tar">
 <title>Installing Tar</title>
 
-&c5-pp-tar-inst;
+&c5-tar-inst;
 &aa-tar-desc;
 
 </sect1>
diff --git a/chapter05/texinfo-static.sgml b/chapter05/texinfo-static.sgml
index 6ebcd4384..1e47c21ee 100644
--- a/chapter05/texinfo-static.sgml
+++ b/chapter05/texinfo-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-texinfo">
 <title>Installing Texinfo</title>
 
-&c5-pp-texinfo-inst;
+&c5-texinfo-inst;
 &aa-texinfo-desc;
 
 </sect1>
diff --git a/chapter05/textutils-static.sgml b/chapter05/textutils-static.sgml
index 2870918e9..bad69bcb7 100644
--- a/chapter05/textutils-static.sgml
+++ b/chapter05/textutils-static.sgml
@@ -1,7 +1,7 @@
 <sect1 id="ch05-textutils">
 <title>Installing Textutils</title>
 
-&c5-pp-textutils-inst;
+&c5-textutils-inst;
 &aa-textutils-desc;
 
 </sect1>