aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Schafer <greg@linuxfromscratch.org>2003-10-10 00:10:04 +0000
committerGreg Schafer <greg@linuxfromscratch.org>2003-10-10 00:10:04 +0000
commit4e7792e821b41480d772b48613547b4d3253c066 (patch)
tree7dbdb72d7b4386d6d5c792a93ef7826e3709c405
parent27d9bc1ab5b186abed78aecd159d480eef351d3e (diff)
Final stage of internal markup reworking.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2960 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--appendixa/autoconf-down.xml4
-rw-r--r--appendixa/automake-down.xml4
-rw-r--r--appendixa/bash-down.xml4
-rw-r--r--appendixa/binutils-down.xml4
-rw-r--r--appendixa/bison-down.xml4
-rw-r--r--appendixa/bootscripts-down.xml4
-rw-r--r--appendixa/bzip2-down.xml4
-rw-r--r--appendixa/coreutils-down.xml4
-rw-r--r--appendixa/dejagnu-down.xml4
-rw-r--r--appendixa/diffutils-down.xml4
-rw-r--r--appendixa/e2fsprogs-down.xml4
-rw-r--r--appendixa/ed-down.xml4
-rw-r--r--appendixa/expect-down.xml4
-rw-r--r--appendixa/file-down.xml4
-rw-r--r--appendixa/findutils-down.xml4
-rw-r--r--appendixa/flex-down.xml4
-rw-r--r--appendixa/gawk-down.xml4
-rw-r--r--appendixa/gcc-down.xml4
-rw-r--r--appendixa/gettext-down.xml4
-rw-r--r--appendixa/glibc-down.xml4
-rw-r--r--appendixa/grep-down.xml4
-rw-r--r--appendixa/groff-down.xml4
-rw-r--r--appendixa/grub-down.xml4
-rw-r--r--appendixa/gzip-down.xml4
-rw-r--r--appendixa/inetutils-down.xml4
-rw-r--r--appendixa/kbd-down.xml4
-rw-r--r--appendixa/kernel-down.xml4
-rw-r--r--appendixa/less-down.xml4
-rw-r--r--appendixa/lfs-utils-down.xml4
-rw-r--r--appendixa/libtool-down.xml4
-rw-r--r--appendixa/m4-down.xml4
-rw-r--r--appendixa/make-down.xml4
-rw-r--r--appendixa/makedev-down.xml4
-rw-r--r--appendixa/man-down.xml4
-rw-r--r--appendixa/manpages-down.xml4
-rw-r--r--appendixa/modutils-down.xml4
-rw-r--r--appendixa/ncurses-down.xml4
-rw-r--r--appendixa/nettools-down.xml4
-rw-r--r--appendixa/patch-down.xml4
-rw-r--r--appendixa/perl-down.xml4
-rw-r--r--appendixa/procinfo-down.xml4
-rw-r--r--appendixa/procps-down.xml4
-rw-r--r--appendixa/psmisc-down.xml4
-rw-r--r--appendixa/sed-down.xml4
-rw-r--r--appendixa/shadowpwd-down.xml4
-rw-r--r--appendixa/sysklogd-down.xml4
-rw-r--r--appendixa/sysvinit-down.xml4
-rw-r--r--appendixa/tar-down.xml4
-rw-r--r--appendixa/tcl-down.xml4
-rw-r--r--appendixa/texinfo-down.xml4
-rw-r--r--appendixa/utillinux-down.xml4
-rw-r--r--appendixa/vim-down.xml4
-rw-r--r--appendixa/zlib-down.xml4
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter02/askforhelp.xml3
55 files changed, 113 insertions, 107 deletions
diff --git a/appendixa/autoconf-down.xml b/appendixa/autoconf-down.xml
index 92e57b577..0e0d5ab0f 100644
--- a/appendixa/autoconf-down.xml
+++ b/appendixa/autoconf-down.xml
@@ -2,7 +2,7 @@
<title>Official Download Location</title>
-<para><literallayout>Autoconf (&autoconf-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/autoconf/"/></literallayout></para>
+<literallayout>Autoconf (&autoconf-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/autoconf/"/></literallayout>
</sect2>
diff --git a/appendixa/automake-down.xml b/appendixa/automake-down.xml
index bf4e70c82..14d061cf9 100644
--- a/appendixa/automake-down.xml
+++ b/appendixa/automake-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Automake (&automake-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/automake/"/></literallayout></para>
+<literallayout>Automake (&automake-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/automake/"/></literallayout>
</sect2>
diff --git a/appendixa/bash-down.xml b/appendixa/bash-down.xml
index 7833cb46d..c4c834a70 100644
--- a/appendixa/bash-down.xml
+++ b/appendixa/bash-down.xml
@@ -1,10 +1,10 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Bash (&bash-version;):
+<literallayout>Bash (&bash-version;):
<ulink url="ftp://ftp.gnu.org/gnu/bash/"/>
Bash Patch:
-<ulink url="&patches-root;&bash-patch;"/></literallayout></para>
+<ulink url="&patches-root;&bash-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/binutils-down.xml b/appendixa/binutils-down.xml
index 69bba3527..3e19ac787 100644
--- a/appendixa/binutils-down.xml
+++ b/appendixa/binutils-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Binutils (&binutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/binutils/"/></literallayout></para>
+<literallayout>Binutils (&binutils-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/binutils/"/></literallayout>
</sect2>
diff --git a/appendixa/bison-down.xml b/appendixa/bison-down.xml
index 3ae8b0c31..85820a3ec 100644
--- a/appendixa/bison-down.xml
+++ b/appendixa/bison-down.xml
@@ -1,10 +1,10 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Bison (&bison-version;):
+<literallayout>Bison (&bison-version;):
<ulink url="ftp://ftp.gnu.org/gnu/bison/"/>
Bison Attribute Patch:
-<ulink url="&patches-root;&bison-patch;"/></literallayout></para>
+<ulink url="&patches-root;&bison-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/bootscripts-down.xml b/appendixa/bootscripts-down.xml
index 6772b169b..8ddd1d5f4 100644
--- a/appendixa/bootscripts-down.xml
+++ b/appendixa/bootscripts-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>LFS-Bootscripts (&bootscripts-version;):
-<ulink url="&http;/"/></literallayout></para>
+<literallayout>LFS-Bootscripts (&bootscripts-version;):
+<ulink url="&http;/"/></literallayout>
</sect2>
diff --git a/appendixa/bzip2-down.xml b/appendixa/bzip2-down.xml
index d4893935a..9bede9c6b 100644
--- a/appendixa/bzip2-down.xml
+++ b/appendixa/bzip2-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Bzip2 (&bzip2-version;):
-<ulink url="http://sources.redhat.com/bzip2/"/></literallayout></para>
+<literallayout>Bzip2 (&bzip2-version;):
+<ulink url="http://sources.redhat.com/bzip2/"/></literallayout>
</sect2>
diff --git a/appendixa/coreutils-down.xml b/appendixa/coreutils-down.xml
index d701d132f..41ebbb9a3 100644
--- a/appendixa/coreutils-down.xml
+++ b/appendixa/coreutils-down.xml
@@ -1,12 +1,12 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Coreutils (&coreutils-version;):
+<literallayout>Coreutils (&coreutils-version;):
<ulink url="ftp://ftp.gnu.org/gnu/coreutils/"/>
Coreutils Hostname Patch:
<ulink url="&patches-root;&coreutils-hostname-patch;"/>
Coreutils Uname Patch:
-<ulink url="&patches-root;&coreutils-uname-patch;"/></literallayout></para>
+<ulink url="&patches-root;&coreutils-uname-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/dejagnu-down.xml b/appendixa/dejagnu-down.xml
index e758360c5..dac71702d 100644
--- a/appendixa/dejagnu-down.xml
+++ b/appendixa/dejagnu-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>DejaGnu (&dejagnu-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/dejagnu/"/></literallayout></para>
+<literallayout>DejaGnu (&dejagnu-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/dejagnu/"/></literallayout>
</sect2>
diff --git a/appendixa/diffutils-down.xml b/appendixa/diffutils-down.xml
index 666d37d01..1c83f5146 100644
--- a/appendixa/diffutils-down.xml
+++ b/appendixa/diffutils-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Diffutils (&diffutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/diffutils/"/></literallayout></para>
+<literallayout>Diffutils (&diffutils-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/diffutils/"/></literallayout>
</sect2>
diff --git a/appendixa/e2fsprogs-down.xml b/appendixa/e2fsprogs-down.xml
index e9315b1a5..86cb913ad 100644
--- a/appendixa/e2fsprogs-down.xml
+++ b/appendixa/e2fsprogs-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>E2fsprogs (&e2fsprogs-version;):
+<literallayout>E2fsprogs (&e2fsprogs-version;):
<ulink url="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/"/>
-<ulink url="http://download.sourceforge.net/e2fsprogs/"/></literallayout></para>
+<ulink url="http://download.sourceforge.net/e2fsprogs/"/></literallayout>
</sect2>
diff --git a/appendixa/ed-down.xml b/appendixa/ed-down.xml
index 3d270b618..a4d0092a6 100644
--- a/appendixa/ed-down.xml
+++ b/appendixa/ed-down.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Ed (&ed-version;):
+<literallayout>Ed (&ed-version;):
<ulink url="ftp://ftp.gnu.org/gnu/ed/"/>
Ed Mkstemp Patch:
-<ulink url="&patches-root;&ed-patch;"/></literallayout></para>
+<ulink url="&patches-root;&ed-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/expect-down.xml b/appendixa/expect-down.xml
index 9fc37d11e..2ace79359 100644
--- a/appendixa/expect-down.xml
+++ b/appendixa/expect-down.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Expect (&expect-version;):
+<literallayout>Expect (&expect-version;):
<ulink url="http://expect.nist.gov/src/"/>
Expect Spawn Patch:
-<ulink url="&patches-root;&expect-patch;"/></literallayout></para>
+<ulink url="&patches-root;&expect-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/file-down.xml b/appendixa/file-down.xml
index a36020fd6..0e4f1834e 100644
--- a/appendixa/file-down.xml
+++ b/appendixa/file-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>File (&file-version;):
-<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"/></literallayout></para>
+<literallayout>File (&file-version;):
+<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"/></literallayout>
</sect2>
diff --git a/appendixa/findutils-down.xml b/appendixa/findutils-down.xml
index e7d83c5df..e09b33c86 100644
--- a/appendixa/findutils-down.xml
+++ b/appendixa/findutils-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Findutils (&findutils-version;):
-<ulink url="ftp://alpha.gnu.org/gnu/findutils/"/></literallayout></para>
+<literallayout>Findutils (&findutils-version;):
+<ulink url="ftp://alpha.gnu.org/gnu/findutils/"/></literallayout>
</sect2>
diff --git a/appendixa/flex-down.xml b/appendixa/flex-down.xml
index 8c01714b3..1e99eafcd 100644
--- a/appendixa/flex-down.xml
+++ b/appendixa/flex-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Flex (&flex-version;):
-<ulink url="ftp://ftp.gnu.org/non-gnu/flex/"/></literallayout></para>
+<literallayout>Flex (&flex-version;):
+<ulink url="ftp://ftp.gnu.org/non-gnu/flex/"/></literallayout>
</sect2>
diff --git a/appendixa/gawk-down.xml b/appendixa/gawk-down.xml
index 5c0d5c0a5..148fb9909 100644
--- a/appendixa/gawk-down.xml
+++ b/appendixa/gawk-down.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Gawk (&gawk-version;):
+<literallayout>Gawk (&gawk-version;):
<ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/>
Gawk Libexecdir Patch:
-<ulink url="&patches-root;&gawk-patch;"/></literallayout></para>
+<ulink url="&patches-root;&gawk-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml
index 14d3a24a9..4387eb93d 100644
--- a/appendixa/gcc-down.xml
+++ b/appendixa/gcc-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>GCC (&gcc-version;):
+<literallayout>GCC (&gcc-version;):
<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
GCC No-Fixincludes Patch:
@@ -23,5 +23,5 @@ GCC-2 No-Fixincludes Patch:
<ulink url="&patches-root;&gcc-2953-no-fixinc-patch;"/>
GCC-2 Return-Type Patch:
-<ulink url="&patches-root;&gcc-2953-returntype-fix-patch;"/></literallayout></para>
+<ulink url="&patches-root;&gcc-2953-returntype-fix-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/gettext-down.xml b/appendixa/gettext-down.xml
index 480be8250..2c43578dc 100644
--- a/appendixa/gettext-down.xml
+++ b/appendixa/gettext-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Gettext (&gettext-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/gettext/"/></literallayout></para>
+<literallayout>Gettext (&gettext-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/gettext/"/></literallayout>
</sect2>
diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml
index ddafc95ac..91ae9d84d 100644
--- a/appendixa/glibc-down.xml
+++ b/appendixa/glibc-down.xml
@@ -1,12 +1,12 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Glibc (&glibc-version;):
+<literallayout>Glibc (&glibc-version;):
<ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
Glibc-linuxthreads (&glibc-version;):
<ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
Glibc Sscanf Patch:
-<ulink url="&patches-root;&glibc-sscanf-patch;"/></literallayout></para>
+<ulink url="&patches-root;&glibc-sscanf-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/grep-down.xml b/appendixa/grep-down.xml
index 1bcb60c73..d700f0a24 100644
--- a/appendixa/grep-down.xml
+++ b/appendixa/grep-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Grep (&grep-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/grep/"/></literallayout></para>
+<literallayout>Grep (&grep-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/grep/"/></literallayout>
</sect2>
diff --git a/appendixa/groff-down.xml b/appendixa/groff-down.xml
index 9fd8de534..5db8c3fc2 100644
--- a/appendixa/groff-down.xml
+++ b/appendixa/groff-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Groff (&groff-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/groff/"/></literallayout></para>
+<literallayout>Groff (&groff-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/groff/"/></literallayout>
</sect2>
diff --git a/appendixa/grub-down.xml b/appendixa/grub-down.xml
index 91fa69b6a..180f7e1e8 100644
--- a/appendixa/grub-down.xml
+++ b/appendixa/grub-down.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Grub (&grub-version;):
+<literallayout>Grub (&grub-version;):
<ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/>
Grub Gcc33 Patch:
-<ulink url="&patches-root;&grub-patch;"/></literallayout></para>
+<ulink url="&patches-root;&grub-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/gzip-down.xml b/appendixa/gzip-down.xml
index 688c3613f..ff8d09aff 100644
--- a/appendixa/gzip-down.xml
+++ b/appendixa/gzip-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Gzip (&gzip-version;):
-<ulink url="ftp://alpha.gnu.org/gnu/gzip/"/></literallayout></para>
+<literallayout>Gzip (&gzip-version;):
+<ulink url="ftp://alpha.gnu.org/gnu/gzip/"/></literallayout>
</sect2>
diff --git a/appendixa/inetutils-down.xml b/appendixa/inetutils-down.xml
index 41a6c0f9b..978bf3983 100644
--- a/appendixa/inetutils-down.xml
+++ b/appendixa/inetutils-down.xml
@@ -3,7 +3,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Inetutils (&inetutils-version;):
-<ulink url="http://freshmeat.net/projects/inetutils/"/></literallayout></para>
+<literallayout>Inetutils (&inetutils-version;):
+<ulink url="http://freshmeat.net/projects/inetutils/"/></literallayout>
</sect2>
diff --git a/appendixa/kbd-down.xml b/appendixa/kbd-down.xml
index 54c47b7e8..b55298522 100644
--- a/appendixa/kbd-down.xml
+++ b/appendixa/kbd-down.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Kbd (&kbd-version;):
+<literallayout>Kbd (&kbd-version;):
<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/"/>
Kbd More-Programs Patch:
-<ulink url="&patches-root;&kbd-patch;"/></literallayout></para>
+<ulink url="&patches-root;&kbd-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/kernel-down.xml b/appendixa/kernel-down.xml
index f9ac97ee6..a93ae3f70 100644
--- a/appendixa/kernel-down.xml
+++ b/appendixa/kernel-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Linux (&kernel-version;):
-<ulink url="ftp://ftp.kernel.org/pub/linux/kernel/"/></literallayout></para>
+<literallayout>Linux (&kernel-version;):
+<ulink url="ftp://ftp.kernel.org/pub/linux/kernel/"/></literallayout>
</sect2>
diff --git a/appendixa/less-down.xml b/appendixa/less-down.xml
index a642d6785..165e74e5a 100644
--- a/appendixa/less-down.xml
+++ b/appendixa/less-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Less (&less-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/less/"/></literallayout></para>
+<literallayout>Less (&less-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/less/"/></literallayout>
</sect2>
diff --git a/appendixa/lfs-utils-down.xml b/appendixa/lfs-utils-down.xml
index c3edd9887..cd72a2083 100644
--- a/appendixa/lfs-utils-down.xml
+++ b/appendixa/lfs-utils-down.xml
@@ -3,7 +3,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Lfs-utils (&lfs-utils-version;):
-<ulink url="http://www.linuxfromscratch.org/~winkie/downloads/lfs-utils/"/></literallayout></para>
+<literallayout>Lfs-utils (&lfs-utils-version;):
+<ulink url="http://www.linuxfromscratch.org/~winkie/downloads/lfs-utils/"/></literallayout>
</sect2>
diff --git a/appendixa/libtool-down.xml b/appendixa/libtool-down.xml
index 2774efbdc..850dde336 100644
--- a/appendixa/libtool-down.xml
+++ b/appendixa/libtool-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Libtool (&libtool-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/libtool/"/></literallayout></para>
+<literallayout>Libtool (&libtool-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/libtool/"/></literallayout>
</sect2>
diff --git a/appendixa/m4-down.xml b/appendixa/m4-down.xml
index caf51c8ba..b93677505 100644
--- a/appendixa/m4-down.xml
+++ b/appendixa/m4-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>M4 (&m4-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/m4/"/></literallayout></para>
+<literallayout>M4 (&m4-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/m4/"/></literallayout>
</sect2>
diff --git a/appendixa/make-down.xml b/appendixa/make-down.xml
index d8c7b90a0..6038e13f9 100644
--- a/appendixa/make-down.xml
+++ b/appendixa/make-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Make (&make-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/make/"/></literallayout></para>
+<literallayout>Make (&make-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/make/"/></literallayout>
</sect2>
diff --git a/appendixa/makedev-down.xml b/appendixa/makedev-down.xml
index 72a6e0174..9aa104a6d 100644
--- a/appendixa/makedev-down.xml
+++ b/appendixa/makedev-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>MAKEDEV (&makedev-version;):
-<ulink url="&http;/"/></literallayout></para>
+<literallayout>MAKEDEV (&makedev-version;):
+<ulink url="&http;/"/></literallayout>
</sect2>
diff --git a/appendixa/man-down.xml b/appendixa/man-down.xml
index d895501be..15793d546 100644
--- a/appendixa/man-down.xml
+++ b/appendixa/man-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Man (&man-version;):
+<literallayout>Man (&man-version;):
<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/>
Man 80-Columns Patch:
@@ -11,5 +11,5 @@ Man Manpath Patch:
<ulink url="&patches-root;&man-manpath-patch;"/>
Man Pager Patch:
-<ulink url="&patches-root;&man-pager-patch;"/></literallayout></para>
+<ulink url="&patches-root;&man-pager-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/manpages-down.xml b/appendixa/manpages-down.xml
index e9d836c25..dbafe211d 100644
--- a/appendixa/manpages-down.xml
+++ b/appendixa/manpages-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Man-pages (&man-pages-version;):
-<ulink url="ftp://ftp.kernel.org/pub/linux/docs/manpages/"/></literallayout></para>
+<literallayout>Man-pages (&man-pages-version;):
+<ulink url="ftp://ftp.kernel.org/pub/linux/docs/manpages/"/></literallayout>
</sect2>
diff --git a/appendixa/modutils-down.xml b/appendixa/modutils-down.xml
index 5fa964cfb..dccda1cc9 100644
--- a/appendixa/modutils-down.xml
+++ b/appendixa/modutils-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Modutils (&modutils-version;):
-<ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/"/></literallayout></para>
+<literallayout>Modutils (&modutils-version;):
+<ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/"/></literallayout>
</sect2>
diff --git a/appendixa/ncurses-down.xml b/appendixa/ncurses-down.xml
index e40954b36..5c268677d 100644
--- a/appendixa/ncurses-down.xml
+++ b/appendixa/ncurses-down.xml
@@ -1,12 +1,12 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Ncurses (&ncurses-version;):
+<literallayout>Ncurses (&ncurses-version;):
<ulink url="ftp://ftp.gnu.org/gnu/ncurses/"/>
Ncurses Etip Patch:
<ulink url="&patches-root;&ncurses-etip-patch;"/>
Ncurses Vsscanf Patch:
-<ulink url="&patches-root;&ncurses-vsscanf-patch;"/></literallayout></para>
+<ulink url="&patches-root;&ncurses-vsscanf-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/nettools-down.xml b/appendixa/nettools-down.xml
index 46b1a9ede..fa07468e6 100644
--- a/appendixa/nettools-down.xml
+++ b/appendixa/nettools-down.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Net-tools (&net-tools-version;):
+<literallayout>Net-tools (&net-tools-version;):
<ulink url="http://www.tazenda.demon.co.uk/phil/net-tools/"/>
Net-tools Mii-Tool-Gcc33 Patch:
-<ulink url="&patches-root;&net-tools-mii-patch;"/></literallayout></para>
+<ulink url="&patches-root;&net-tools-mii-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/patch-down.xml b/appendixa/patch-down.xml
index 279c36346..90e5d1142 100644
--- a/appendixa/patch-down.xml
+++ b/appendixa/patch-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Patch (&patch-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/patch/"/></literallayout></para>
+<literallayout>Patch (&patch-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/patch/"/></literallayout>
</sect2>
diff --git a/appendixa/perl-down.xml b/appendixa/perl-down.xml
index 4f81a78ea..82c5513c9 100644
--- a/appendixa/perl-down.xml
+++ b/appendixa/perl-down.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Perl (&perl-version;):
+<literallayout>Perl (&perl-version;):
<ulink url="http://www.perl.com/"/>
Perl Libc Patch:
-<ulink url="&patches-root;&perl-libc-patch;"/></literallayout></para>
+<ulink url="&patches-root;&perl-libc-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/procinfo-down.xml b/appendixa/procinfo-down.xml
index 9324cb2c7..fe53dbf93 100644
--- a/appendixa/procinfo-down.xml
+++ b/appendixa/procinfo-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Procinfo (&procinfo-version;):
-<ulink url="ftp://ftp.cistron.nl/pub/people/svm/"/></literallayout></para>
+<literallayout>Procinfo (&procinfo-version;):
+<ulink url="ftp://ftp.cistron.nl/pub/people/svm/"/></literallayout>
</sect2>
diff --git a/appendixa/procps-down.xml b/appendixa/procps-down.xml
index c86ad2e8f..5a698dc20 100644
--- a/appendixa/procps-down.xml
+++ b/appendixa/procps-down.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Procps (&procps-version;):
+<literallayout>Procps (&procps-version;):
<ulink url="http://procps.sourceforge.net/"/>
Procps Locale Patch:
-<ulink url="&patches-root;&procps-patch;"/></literallayout></para>
+<ulink url="&patches-root;&procps-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/psmisc-down.xml b/appendixa/psmisc-down.xml
index 5681d5b10..4a43fecbc 100644
--- a/appendixa/psmisc-down.xml
+++ b/appendixa/psmisc-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Psmisc (&psmisc-version;):
+<literallayout>Psmisc (&psmisc-version;):
<ulink url="http://download.sourceforge.net/psmisc/"/>
-<ulink url="ftp://download.sourceforge.net/pub/sourceforge/psmisc/"/></literallayout></para>
+<ulink url="ftp://download.sourceforge.net/pub/sourceforge/psmisc/"/></literallayout>
</sect2>
diff --git a/appendixa/sed-down.xml b/appendixa/sed-down.xml
index 48bbd589a..238726b20 100644
--- a/appendixa/sed-down.xml
+++ b/appendixa/sed-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Sed (&sed-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/sed/"/></literallayout></para>
+<literallayout>Sed (&sed-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/sed/"/></literallayout>
</sect2>
diff --git a/appendixa/shadowpwd-down.xml b/appendixa/shadowpwd-down.xml
index cacbafa37..6c1c90ec2 100644
--- a/appendixa/shadowpwd-down.xml
+++ b/appendixa/shadowpwd-down.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Shadow (&shadow-version;):
+<literallayout>Shadow (&shadow-version;):
<ulink url="ftp://ftp.pld.org.pl/software/shadow/"/>
Shadow Newgrp Patch:
-<ulink url="&patches-root;&shadow-patch;"/></literallayout></para>
+<ulink url="&patches-root;&shadow-patch;"/></literallayout>
</sect2>
diff --git a/appendixa/sysklogd-down.xml b/appendixa/sysklogd-down.xml
index e3cfb6c59..c79cf202b 100644
--- a/appendixa/sysklogd-down.xml
+++ b/appendixa/sysklogd-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Sysklogd (&sysklogd-version;):
-<ulink url="http://www.infodrom.org/projects/sysklogd/"/></literallayout></para>
+<literallayout>Sysklogd (&sysklogd-version;):
+<ulink url="http://www.infodrom.org/projects/sysklogd/"/></literallayout>
</sect2>
diff --git a/appendixa/sysvinit-down.xml b/appendixa/sysvinit-down.xml
index 3eb8191a1..0eab24636 100644
--- a/appendixa/sysvinit-down.xml
+++ b/appendixa/sysvinit-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Sysvinit (&sysvinit-version;):
-<ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/"/></literallayout></para>
+<literallayout>Sysvinit (&sysvinit-version;):
+<ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/"/></literallayout>
</sect2>
diff --git a/appendixa/tar-down.xml b/appendixa/tar-down.xml
index 58cfc164b..d8dab8ed0 100644
--- a/appendixa/tar-down.xml
+++ b/appendixa/tar-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Tar (&tar-version;):
-<ulink url="ftp://alpha.gnu.org/gnu/tar/"/></literallayout></para>
+<literallayout>Tar (&tar-version;):
+<ulink url="ftp://alpha.gnu.org/gnu/tar/"/></literallayout>
</sect2>
diff --git a/appendixa/tcl-down.xml b/appendixa/tcl-down.xml
index 3546b19e5..4eb5864a2 100644
--- a/appendixa/tcl-down.xml
+++ b/appendixa/tcl-down.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Tcl (&tcl-version;):
+<literallayout>Tcl (&tcl-version;):
<ulink url="http://download.sourceforge.net/tcl/"/>
-<ulink url="ftp://download.sourceforge.net/pub/sourceforge/tcl/"/></literallayout></para>
+<ulink url="ftp://download.sourceforge.net/pub/sourceforge/tcl/"/></literallayout>
</sect2>
diff --git a/appendixa/texinfo-down.xml b/appendixa/texinfo-down.xml
index fde8c69a1..4bce3bea3 100644
--- a/appendixa/texinfo-down.xml
+++ b/appendixa/texinfo-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Texinfo (&texinfo-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/texinfo/"/></literallayout></para>
+<literallayout>Texinfo (&texinfo-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/texinfo/"/></literallayout>
</sect2>
diff --git a/appendixa/utillinux-down.xml b/appendixa/utillinux-down.xml
index 9841da5ad..f6ed388e8 100644
--- a/appendixa/utillinux-down.xml
+++ b/appendixa/utillinux-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Util-linux (&util-linux-version;):
-<ulink url="http://ftp.cwi.nl/aeb/util-linux/"/></literallayout></para>
+<literallayout>Util-linux (&util-linux-version;):
+<ulink url="http://ftp.cwi.nl/aeb/util-linux/"/></literallayout>
</sect2>
diff --git a/appendixa/vim-down.xml b/appendixa/vim-down.xml
index 6d3ae1c52..f7feac1da 100644
--- a/appendixa/vim-down.xml
+++ b/appendixa/vim-down.xml
@@ -1,6 +1,6 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Vim (&vim-version;):
-<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/"/></literallayout></para>
+<literallayout>Vim (&vim-version;):
+<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/"/></literallayout>
</sect2>
diff --git a/appendixa/zlib-down.xml b/appendixa/zlib-down.xml
index 0d03e9265..76570bf1e 100644
--- a/appendixa/zlib-down.xml
+++ b/appendixa/zlib-down.xml
@@ -3,9 +3,9 @@
<sect2>
<title>Official Download Location</title>
-<para><literallayout>Zlib (&zlib-version;):
+<literallayout>Zlib (&zlib-version;):
<ulink url="http://www.gzip.org/zlib/"/>
Zlib Vsnprintf Patch:
-<ulink url="&patches-root;&zlib-patch;"/></literallayout></para>
+<ulink url="&patches-root;&zlib-patch;"/></literallayout>
</sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b2a002613..6326315b3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -95,6 +95,11 @@
</itemizedlist>
</listitem>
+<listitem><para>October 9th, 2003 [greg]: Performed internal markup reworking to
+fix an extraneous whitespace problem in "tidy generated" web site pages.
+Essentially replace all ocurrences of &lt;para&gt;&lt;screen&gt; with
+&lt;screen&gt; (and the matching closing tags).</para></listitem>
+
<listitem><para>October 8th, 2003 [alex]: Chapter 8 - Making bootable: Adapted
the style of the screens, and reworded some paragraphs.</para></listitem>
diff --git a/chapter02/askforhelp.xml b/chapter02/askforhelp.xml
index 71c10bb97..9f9884c22 100644
--- a/chapter02/askforhelp.xml
+++ b/chapter02/askforhelp.xml
@@ -69,7 +69,8 @@ make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/lfs/tmp/make-3.79.1'
make: *** [all-recursive-am] Error 2</screen>
-<para>In this case, many people just include the bottom section where it says</para>
+<para>In this case, many people just include the bottom section where it
+says:</para>
<screen>make [2]: *** [make] Error 1</screen>