diff --git a/appendixa/bash-down.xml b/appendixa/bash-down.xml
index 664715603..7fad8054c 100644
--- a/appendixa/bash-down.xml
+++ b/appendixa/bash-down.xml
@@ -5,6 +5,6 @@
Bash Patch (&bash-version;):
-
+
diff --git a/appendixa/ed-down.xml b/appendixa/ed-down.xml
index 63e6ac35d..591492437 100644
--- a/appendixa/ed-down.xml
+++ b/appendixa/ed-down.xml
@@ -5,5 +5,5 @@
Ed Patch (&ed-patch-version;):
-
+
diff --git a/appendixa/expect-down.xml b/appendixa/expect-down.xml
index b70dad6f1..f45f56bc1 100644
--- a/appendixa/expect-down.xml
+++ b/appendixa/expect-down.xml
@@ -5,5 +5,5 @@
Expect Patch (&expect-patch-version;):
-
+
diff --git a/appendixa/gawk-down.xml b/appendixa/gawk-down.xml
index 7911bb724..79a6ec546 100644
--- a/appendixa/gawk-down.xml
+++ b/appendixa/gawk-down.xml
@@ -5,5 +5,5 @@
Gawk Patch (&gawk-patch-version;):
-
+
diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml
index 0afb772fd..7ef567e0a 100644
--- a/appendixa/gcc-down.xml
+++ b/appendixa/gcc-down.xml
@@ -5,20 +5,20 @@
GCC No Fixincludes Patch (&gcc-nofixincludes-patch-version;):
-
+
GCC Specs Patch (&gcc-specs-patch-version;):
-
+
GCC Suppress Libiberty Patch (&gcc-suppress-libiberty-patch-version;):
-
+
GCC-2 Patch (&gcc-2953-patch-version;):
-
+
GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;):
-
+
GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;):
-
+
diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml
index d67c2c575..76fb1a03f 100644
--- a/appendixa/glibc-down.xml
+++ b/appendixa/glibc-down.xml
@@ -8,5 +8,5 @@ Glibc-linuxthreads (&glibc-version;):
Glibc Sscanf Patch (&glibc-sscanf-patch-version;):
-
+
diff --git a/appendixa/kbd-down.xml b/appendixa/kbd-down.xml
index 6a0944321..af5e6c8d6 100644
--- a/appendixa/kbd-down.xml
+++ b/appendixa/kbd-down.xml
@@ -5,5 +5,5 @@
Kbd Patch (&kbd-patch-version;):
-
+
diff --git a/appendixa/man-down.xml b/appendixa/man-down.xml
index 501bfd4ab..051da7ce4 100644
--- a/appendixa/man-down.xml
+++ b/appendixa/man-down.xml
@@ -5,11 +5,11 @@
Man 80Cols Patch (&man-80cols-patch-version;):
-
+
Man Manpath Patch (&man-manpath-patch-version;):
-
+
Man Pager Patch (&man-pager-patch-version;):
-
+
diff --git a/appendixa/zlib-down.xml b/appendixa/zlib-down.xml
index 1662ef0d5..c15da3c45 100644
--- a/appendixa/zlib-down.xml
+++ b/appendixa/zlib-down.xml
@@ -7,5 +7,5 @@
Zlib Patch (&zlib-version;):
-
+
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index e33f53ee1..0872aaac6 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -242,82 +242,82 @@ following:
Bash Patch (&bash-patch-version;) - &bash-patch-size;:
-
+
-Bison Attribute Patch:
-
+Bison Attribute Patch (&bison-patch-version;) - &bison-patch-size;:
+
Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;:
-
+
Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;:
-
+
Ed Patch (&ed-patch-version;) - &ed-patch-size;:
-
+
Expect Patch (&expect-patch-version;) - &expect-patch-size;:
-
+
Gawk Patch (&gawk-patch-version;) - &gawk-patch-size;:
-
+
GCC No Fixincludes Patch: (&gcc-nofixincludes-patch-version;) - &gcc-nofixincludes-patch-size;:
-
+
GCC Specs Patch: (&gcc-specs-patch-version;) - &gcc-specs-patch-size;:
-
+
GCC Suppress Libiberty Patch: (&gcc-suppress-libiberty-patch-version;) - &gcc-suppress-libiberty-patch-size;:
-
+
GCC-2 Patch (&gcc-2953-patch-version;) - &gcc-2953-patch-size;:
-
+
GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;) - &gcc-2953-no-fixinc-patch-size;:
-
+
GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;) - &gcc-2953-returntype-fix-patch-size;:
-
+
-Glibc Sscanf Patch: - &glibc-sscanf-patch-size;:
-
+Glibc Sscanf Patch: (&glibc-sscanf-patch-version;) - &glibc-sscanf-patch-size;:
+
Grub Patch (&grub-patch-version;) - &grub-patch-size;:
-
+
Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;:
-
+
Man 80Cols Patch (&man-80cols-patch-version;) - &man-80cols-patch-size;:
-
+
Man Manpath Patch (&man-manpath-patch-version;) - &man-manpath-patch-size;:
-
+
Man Pager Patch (&man-pager-patch-version;) - &man-pager-patch-size;:
-
+
Ncurses Etip Patch (&ncurses-etip-patch-version;) - &ncurses-etip-patch-size;:
-
+
Ncurses Vsscanf Patch (&ncurses-vsscanf-patch-version;) - &ncurses-vsscanf-patch-size;:
-
+
-Net-Tools mii-tool Patch (1.60) - 2k:
-
+Net-Tools Mii-Tool Patch (&net-tools-mii-patch-version;) - &net-tools-mii-patch-size;:
+
Perl Libc Patch (&perl-libc-patch-version;) - &perl-libc-patch-size;:
-
+
Procps Patch (&procps-patch-version;) - &procps-patch-size;:
-
+
Shadow Patch (&shadow-patch-version;) - &shadow-patch-size;:
-
+
Zlib Patch (&zlib-patch-version;) - &zlib-patch-size;:
-
+
In addition, there are a number of optional patches that have been
diff --git a/entities/bash.ent b/entities/bash.ent
index 05571a608..df7c5cf39 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -20,7 +20,7 @@
-
+
diff --git a/entities/bison.ent b/entities/bison.ent
index fc78ed892..e66758cb2 100644
--- a/entities/bison.ent
+++ b/entities/bison.ent
@@ -15,6 +15,8 @@
+
+
diff --git a/entities/expect.ent b/entities/expect.ent
index a29801c49..adebcb5ba 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -18,7 +18,7 @@
-
+
diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent
index e5102dda3..c587226f9 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -17,9 +17,9 @@
-
+
-
+
diff --git a/entities/man.ent b/entities/man.ent
index 92f7be964..ba9738e32 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -15,11 +15,11 @@
-
+
-
+
-
+
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index 5cc0d7a7e..5e0757673 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -17,9 +17,9 @@
-
+
-
+
diff --git a/entities/nettools.ent b/entities/nettools.ent
index 3a9d673a3..4025d9e5a 100644
--- a/entities/nettools.ent
+++ b/entities/nettools.ent
@@ -15,6 +15,8 @@
+
+
diff --git a/entities/shadow.ent b/entities/shadow.ent
index cc4728740..b9c3ebe0d 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -15,7 +15,7 @@
-
+