Put package version in seperate entities

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

chapter04/all.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-All LFS Packages - 61,480 KB: 
-	<ulink
-url="ftp://packages.linuxfromscratch.org/intel-packages/lfs-packages.tar">
-ftp://packages.linuxfromscratch.org/intel-packages/lfs-packages.tar</ulink>
-
-</para></listitem>
+All LFS Packages - 61,480 KB:
+<ulink url="&ftp-common;/lfs-packages.tar">
+&ftp-common;/lfs-packages.tar</ulink>
+<ulink url="&http-common;/lfs-packages.tar">
+&http-common;/lfs-packages.tar</ulink>
 

chapter04/autoconf.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Autoconf (2.13) 333 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/autoconf-2.13.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/autoconf-2.13.tar.bz2</ulink>
-
-</para></listitem>
+Autoconf (&autoconf-version;) - 333 KB:
+<ulink url="&ftp-common;/autoconf-&autoconf-version;.tar.bz2">
+&ftp-common;/autoconf-&autoconf-version;.tar.bz2</ulink>
+<ulink url="&http-common;/autoconf-&autoconf-version;.tar.bz2">
+&http-common;/autoconf-&autoconf-version;.tar.bz2</ulink>
 

chapter04/automake.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Automake (1.4) 277 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/automake-1.4.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/automake-1.4.tar.bz2</ulink>
-
-</para></listitem>
+Automake (&automake-version;) - 277 KB:
+<ulink url="&ftp-intel;/automake-&automake-version;.tar.bz2">
+&ftp-intel;/automake-&automake-version;.tar.bz2</ulink>
+<ulink url="&http-intel;/automake-&automake-version'.tar.bz2">
+&http-intel;/automake-&automake-version;.tar.bz2</ulink>
 

chapter04/bash.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Bash (2.04) - 1,307 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/bash-2.04.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/bash-2.04.tar.bz2</ulink>
-
-</para></listitem>
+Bash (&bash-version;) - 1,307 KB:
+<ulink url="&ftp-common;/bash-&bash-version;.tar.bz2">
+&ftp-common;/bash-&bash-version;.tar.bz2</ulink>
+<ulink url="&http-common;/bash-&bash-version;.tar.bz2">
+&http-common;/bash-&bash-version;.tar.bz2</ulink>
 

chapter04/bin86.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Bin86 (0.15.4) 111 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/bin86-0.15.4.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/bin86-0.15.4.tar.bz2</ulink>
-
-</para></listitem>
+Bin86 (&bin86-version;) - 111 KB:
+<ulink url="&ftp-common;/bin86-$bin86-version;.tar.bz2">
+&ftp-common;/bin86-&bin86-version;.tar.bz2</ulink>
+<ulink url="&http-common;/bin86-&bin86-version;.tar.bz2">
+&http-common;/bin86-&bin86-version;.tar.bz2</ulink>
 

chapter04/binutils.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Binutils (2.10.1) 5,523 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/binutils-2.10.1.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/binutils-2.10.1.tar.bz2</ulink>
-
-</para></listitem>
+Binutils (&binutils-version;) - 5,523 KB:
+<ulink url="&ftp-common;/binutils-&binutils-version;.tar.bz2">
+&ftp-common;/binutils-&binutils-version;.tar.bz2</ulink>
+<ulink url="&http-common;/binutils-&binutils-version;.tar.bz2">
+&http-common;/binutils-&binutils-version;.tar.bz2</ulink>
 

chapter04/bison.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Bison (1.28) 321 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/bison-1.28.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/bison-1.28.tar.bz2</ulink>
-
-</para></listitem>
+Bison (&bison-version;) - 321 KB:
+<ulink url="&ftp-common;/bison-&bison-version;.tar.bz2">
+&ftp-common;/bison-&bison-version;.tar.bz2</ulink>
+<ulink url="&http-common;/bison-&bison-version;.tar.bz2">
+&http-common;/bison-&bison-version;.tar.bz2</ulink>
 

chapter04/bzip2.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Bzip2 (1.0.1) 454 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/bzip2-1.0.1.tar.gz">
-ftp://packages.linuxfromscratch.org/common-packages/bzip2-1.0.1.tar.gz</ulink>
-
-</para></listitem>
+Bzip2 (&bzip2-version;) - 454 KB:
+<ulink url="&ftp-common;/bzip2-&bzip2-version;.tar.bz2">
+&ftp-common;/bzip2-&bzip2-version;.tar.bz2</ulink>
+<ulink url="&http-common;/bzip2-&bzip2-version;.tar.bz2">
+&http-common;/bzip2-&bzip2-version;.tar.bz2</ulink>
 

chapter04/chapter04.xml

@@ -5,3 +5,4 @@
 &c3-packages;
 
 </chapter>
+

chapter04/consoledata.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Console-data (1999.08.29) 418 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/console-data-1999.08.29.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/console-data-1999.08.29.tar.bz2</ulink>
-
-</para></listitem>
+Console-data (&console-data-version;) - 418 KB:
+<ulink url="&ftp-common;/console-data-&console-data-version;.tar.bz2">
+&ftp-common;/console-data-&console-data-version;.tar.bz2</ulink>
+<ulink url="&http-common;/console-data-&console-data-version;.tar.bz2">
+&http-common;/console-data-&console-data-version;.tar.bz2</ulink>
 

chapter04/consoletools-patch.xml

@@ -1,9 +1,8 @@
-<listitem><para>
-
-Console-tools (0.2.3) Patch: 4 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/console-tools-0.2.3.patch.gz">
-ftp://packages.linuxfromscratch.org/common-packages/console-tools-0.2.3.patch.gz</ulink>
-
-</para></listitem>
+Console-tools Patch (&console-tools-version;) - 4 KB:
+<ulink
+url="&ftp-common;/console-tools-&console-tools-version;.patch.bz2">
+&ftp-common;/console-tools-&console-tools-version;.patch.bz2</ulink>
+<ulink
+url="&http-common;/console-tools-&console-tools-version;.patch.bz2">
+&http-common;/console-tools-&console-tools-version;.patch.bz2</ulink>
 

chapter04/consoletools.xml

@@ -1,9 +1,8 @@
-<listitem><para>
-
-Console-tools (0.2.3) 490 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/console-tools-0.2.3.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/console-tools-0.2.3.tar.bz2</ulink>
-
-</para></listitem>
+Console-tools (&console-tools-version;) - 490 KB:
+<ulink
+url="&ftp-common;/console-tools-&console-tools-version;.tar.bz2">
+&ftp-common;/console-tools-&console-tools-version;.tar.bz2</ulink>
+<ulink
+url="&http-common;/console-tools-&console-tools-version;.tar.bz2">
+&http-common;/console-tools-&console-tools-version;.tar.bz2</ulink>
 

chapter04/diffutils.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Diff Utils (2.7) 247 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/diffutils-2.7.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/diffutils-2.7.tar.bz2</ulink>
-
-</para></listitem>
+Diff Utils (&diffutils-version;) - 247 KB:
+<ulink url="&ftp-common;/diffutils-&diffutils-version;.tar.bz2">
+&ftp-common;/diffutils-&diffutils-version;.tar.bz2</ulink>
+<ulink url="&http-common;/diffutils-&diffutils-version;.tar.bz2">
+&http-common;/diffutils-&diffutils-version;.tar.bz2</ulink>
 

chapter04/e2fsprogs.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-E2fsprogs (1.19) 808 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/e2fsprogs-1.19.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/e2fsprogs-1.19.tar.bz2</ulink>
-
-</para></listitem>
+E2fsprogs (&e2fsprogs-version;) - 808 KB:
+<ulink url="&ftp-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
+&ftp-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
+<ulink url="&http-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
+&http-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
 

chapter04/ed.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-Ed (0.2) 158 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/ed-0.2.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/ed-0.2.tar.bz2</ulink>
-
-</para></listitem>
+Ed (&ed-version;) - 158 KB:
+<ulink url="&ftp-common;/ed-&ed-version;.tar.bz2">
+&ftp-common;/ed-&ed-version;.tar.bz2</ulink>
+<ulink url="&http-common;/ed-&ed-version;.tar.bz2">
+&http-common;/ed-&ed-version;.tar.bz2</ulink>
 

chapter04/file.xml

@@ -1,9 +1,7 @@
-<listitem><para>
+File (&file-version;) - 126 KB:
+<ulink url="&ftp-common;/file-&file-version;.tar.bz2">
+&ftp-common;/file-&file-version;.tar.bz2</ulink>
+<ulink url="&http-common;/file-&file-version;.tar.bz2">
+&http-common;/file-&file-version;.tar.bz2</ulink>
 
-File (3.33) 126 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/file-3.33.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/file-3.33.tar.bz2</ulink>
-
-</para></listitem>
 

chapter04/fileutils-patch.xml

@@ -1,9 +1,6 @@
-<listitem><para>
-
-File Utils Patch (4.0) 0.2 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/new-in-cvs/fileutils-4.0.patch.bz2">
-ftp://packages.linuxfromscratch.org/new-in-cvs/fileutils-4.0.patch.bz2</ulink>
-
-</para></listitem>
+File Utils Patch (&fileutils-version;) - 0.2 KB:
+<ulink url="&ftp-common;/fileutils-&fileutils-version;.patch.bz2">
+&ftp-common;/fileutils-&fileutils-version;.patch.bz2</ulink>
+<ulink url="&http-common;/fileutils-&fileutils-version;.patch;bz2">
+&http-common;/fileutils-&fileutils-version;.patch.bz2</ulink>
 

chapter04/fileutils.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 File Utils (4.0) 801 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/fileutils-4.0.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/fileutils-4.0.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/findutils-patch.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Find Utils Patch (4.1) 1 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.patch.gz">
 ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.patch.gz</ulink>
 
-</para></listitem>
-

chapter04/findutils.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Find Utils (4.1) 226 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/flex.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Flex (2.5.4a) 278 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/flex-2.5.4a.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/flex-2.5.4a.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/gcc.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 GCC (2.95.2.1) 9,551 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/new-in-cvs/gcc-2.95.2.1.tar.bz2">
 ftp://packages.linuxfromscratch.org/new-in-cvs/gcc-2.95.2.1.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/gettext.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Gettext (0.10.35) 525 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/gettext-0.10.35.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/gettext-0.10.35.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/glibc-threads.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Glibc-linuxthreads (2.2.1) 149 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-linuxthreads-2.2.1.tar.bz2">
 ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-linuxthreads-2.2.1.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/glibc.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Glibc (2.2.1) 10,137 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-2.2.1.tar.bz2">
 ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-2.2.1.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/grep.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Grep (2.4.2) 382 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/grep-2.4.2.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/grep-2.4.2.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/groff.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Groff (1.16.1) 1,173 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/groff-1.16.1.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/groff-1.16.1.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/gzip-patch.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Gzip Patch (1.2.4a) 1 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.patch.gz">
 ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.patch.gz</ulink>
 
-</para></listitem>
-

chapter04/gzip.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Gzip (1.2.4a) 178 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/kernel.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Linux Kernel (2.4.1) 19,505 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/new-in-cvs/linux-2.4.1.tar.bz2">
 ftp://packages.linuxfromscratch.org/new-in-cvs/linux-2.4.1.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/ldso.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Ld.so (1.9.9) 280 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/ld.so-1.9.9.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/ld.so-1.9.9.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/less.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Less (358) 178 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/less-358.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/less-358.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/libtool.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Libtool (1.3.5) 361 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/libtool-1.3.5.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/libtool-1.3.5.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/lilo.xml

@@ -1,8 +1,5 @@
-<listitem><para>
 Lilo (21.6) 172 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/intel-packages/lilo-21.6.tar.bz2">
 ftp://packages.linuxfromscratch.org/intel-packages/lilo-21.6.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/m4.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 M4 (1.4) 249 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/m4-1.4.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/m4-1.4.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/make.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Make (3.79.1) 749 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/make-3.79.1.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/make-3.79.1.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/makedev-patch.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 MAKEDEV Patch (2.5) - 0.5 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/new-in-cvs/MAKEDEV-2.5.patch.bz2">
 ftp://packages.linuxfromscratch.org/new-in-cvs/MAKEDEV-2.5.patch.bz2</ulink>
 
-</para></listitem>
-

chapter04/makedev.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 MAKEDEV (2.5) - 11 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/MAKEDEV-2.5.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/MAKEDEV-2.5.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/man.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Man (1.5h1) 156 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/man-1.5h1.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/man-1.5h1.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/manpages.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Man-pages (1.33) 475 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/man-pages-1.33.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/man-pages-1.33.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/mawk.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Mawk (1.3.3) 168 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/mawk1.3.3.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/mawk1.3.3.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/modutils.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Modutils (2.4.0) 195 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/modutils-2.4.0.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/modutils-2.4.0.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/ncurses.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Ncurses (5.2) 1,307 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/intel-packages/ncurses-5.2.tar.bz2">
 ftp://packages.linuxfromscratch.org/intel-packages/ncurses-5.2.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/netkitbase.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Netkit-base (0.17) 49 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/netkit-base-0.17.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/netkit-base-0.17.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/nettools.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Net-tools (1.57) 187 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/net-tools-1.57.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/net-tools-1.57.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/packages.xml

@@ -1,7 +1,7 @@
 <sect1 id="ch03-packages">
 <title>Packages you need to download</title>
 
-<itemizedlist>
+<literallayout>
 
 &c3-toplevel;
 &c3-all;
@@ -67,11 +67,9 @@
 &c3-netkitbase;
 &c3-nettools;
 
-<listitem><para>
 Total size of all intel-packages: 69,823 KB (68,19 MB)
-</para></listitem>
 
-</itemizedlist>
+</literallayout>
 
 </sect1>
 

chapter04/patch.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Patch (2.5.4) 149 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/patch-2.5.4.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/patch-2.5.4.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/perl.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Perl (5.6.0) 4,327 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/perl-5.6.0.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/perl-5.6.0.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/procinfo.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Procinfo (17) 21 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/procinfo-17.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/procinfo-17.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/procps.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Procps (2.0.7) 153 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/procps-2.0.7.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/procps-2.0.7.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/psmisc.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Psmisc (19) 20 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/psmisc-19.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/psmisc-19.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/sed.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Sed (3.02) 221 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/sed-3.02.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/sed-3.02.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/shadowpwd.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Shadow Password Suite (20000902) 557 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/shadow-20000902.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/shadow-20000902.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/shellutils.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Sh-utils (2.0) 824 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/sh-utils-2.0.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/sh-utils-2.0.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/sysklogd-patch.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Sysklogd Patch (1.4) 0.5 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.patch.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.patch.bz2</ulink>
 
-</para></listitem>
-

chapter04/sysklogd.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Sysklogd (1.4) 67 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/sysvinit-patch.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Sysvinit Patch (2.78) 1 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.patch">
 ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.patch</ulink>
 
-</para></listitem>
-

chapter04/sysvinit.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Sysvinit (2.78) 90 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/tar-patch.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Tar Patch (1.13) 2 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/gnutarpatch.txt">
 ftp://packages.linuxfromscratch.org/common-packages/gnutarpatch.txt</ulink>
 
-</para></listitem>
-

chapter04/tar.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Tar (1.13) 730 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/tar-1.13.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/tar-1.13.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/texinfo.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Texinfo (4.0) 812 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/texinfo-4.0.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/texinfo-4.0.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/textutils.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Text Utils (2.0) 1,040 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/textutils-2.0.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/textutils-2.0.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/toplevel.xml

@@ -1,17 +1,10 @@
-<listitem><para>
-
 Browse FTP: 
 	<ulink
 url="ftp://packages.linuxfromscratch.org/">
 ftp://packages.linuxfromscratch.org</ulink>
 
-</para></listitem>
-
-<listitem><para>
-
 Browse HTTP:
 	<ulink
 url="http://packages.linuxfromscrach.org/">
 http://packages.linuxfromscratch.org</ulink>
 
-</para></listitem>

chapter04/utillinux.xml

@@ -1,9 +1,5 @@
-<listitem><para>
-
 Util Linux (2.10r) 883 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/util-linux-2.10r.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/util-linux-2.10r.tar.bz2</ulink>
 
-</para></listitem>
-

chapter04/vim.xml

@@ -1,17 +1,10 @@
-<listitem><para>
-
 Vim-rt (5.7) 905 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-rt.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-rt.tar.bz2</ulink>
 
-</para></listitem>
-
-<listitem><para>
-
 Vim-src (5.7) 963 KB:
 	<ulink
 url="ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-src.tar.bz2">
 ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-src.tar.bz2</ulink>
 
-</para></listitem>