diff options
| author | Mark Hymers <markh@linuxfromscratch.org> | 2001-07-22 19:45:10 +0000 |
|---|---|---|
| committer | Mark Hymers <markh@linuxfromscratch.org> | 2001-07-22 19:45:10 +0000 |
| commit | b822811980a5f82726cb641cbeff66be9eb6d92a (patch) | |
| tree | 27c4db3c62aaea065b053e43c39b2ba44c04a05f | |
| parent | 46f5461af92bc70c62bbb92895032b930954d835 (diff) | |
XML changes
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@827 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
424 files changed, 2504 insertions, 5345 deletions
diff --git a/Attic/appendixb/books.xml b/Attic/appendixb/books.xml index 615495859..b5d9cfeea 100644 --- a/Attic/appendixb/books.xml +++ b/Attic/appendixb/books.xml @@ -3,14 +3,11 @@ <itemizedlist> -<listitem><para> - Linux Network Administrator's Guide published by O'Reilly. ISBN: - 1-56502-087-2 -</para></listitem> +<listitem><para>Linux Network Administrator's Guide published by +O'Reilly. ISBN: 1-56502-087-2</para></listitem> -<listitem><para> - Running Linux published by O'Reilly. ISBN: 1-56592-151-8 -</para></listitem> +<listitem><para>Running Linux published by O'Reilly. +ISBN: 1-56592-151-8</para></listitem> </itemizedlist> diff --git a/Attic/appendixb/howtoguides.xml b/Attic/appendixb/howtoguides.xml index 273213700..d25df49a8 100644 --- a/Attic/appendixb/howtoguides.xml +++ b/Attic/appendixb/howtoguides.xml @@ -1,21 +1,15 @@ <sect1 id="ab-howtoguides"> <title>HOWTOs and Guides</title> -<para> -All of the following HOWTOs can be downloaded from the Linux +<para>All of the following HOWTOs can be downloaded from the Linux Documentation Project site at <ulink url="http://www.linuxdoc.org"> -http://www.linuxdoc.org</ulink> -</para> +http://www.linuxdoc.org</ulink></para> <itemizedlist> -<listitem><para> - Linux Network Administrator's Guide -</para></listitem> +<listitem><para>Linux Network Administrator's Guide</para></listitem> -<listitem><para> - Powerup2Bash-HOWTO -</para></listitem> +<listitem><para>Powerup2Bash-HOWTO</para></listitem> </itemizedlist> diff --git a/Attic/appendixb/introduction.xml b/Attic/appendixb/introduction.xml index 1eced9af8..add3fcc4b 100644 --- a/Attic/appendixb/introduction.xml +++ b/Attic/appendixb/introduction.xml @@ -1,13 +1,11 @@ <sect1 id="ab-introduction"> <title>Introduction</title> -<para> -A list of books, HOWTOs and other documents that might be useful to +<para>A list of books, HOWTOs and other documents that might be useful to download or buy follows. This list is just a small list to start with. We hope to be able to expand this list in time as we come across more -useful documents or books. -</para> +useful documents or books.</para> </sect1> diff --git a/Attic/appendixb/other.xml b/Attic/appendixb/other.xml index 3b40bf3e4..5ad193fcc 100644 --- a/Attic/appendixb/other.xml +++ b/Attic/appendixb/other.xml @@ -3,9 +3,8 @@ <itemizedlist> -<listitem><para> - The various man and info pages that come with the packages -</para></listitem> +<listitem><para>The various man and info pages that +come with the packages</para></listitem> </itemizedlist> diff --git a/Attic/appendixc/autoconf.xml b/Attic/appendixc/autoconf.xml index bd7563a2f..c7054de31 100644 --- a/Attic/appendixc/autoconf.xml +++ b/Attic/appendixc/autoconf.xml @@ -1,4 +1,3 @@ Autoconf (&autoconf-version;): -<ulink url="ftp://ftp.gnu.org/gnu/autoconf/"> -ftp://ftp.gnu.org/gnu/autoconf/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/autoconf/">ftp://ftp.gnu.org/gnu/autoconf/</ulink> diff --git a/Attic/appendixc/automake.xml b/Attic/appendixc/automake.xml index ed829b08a..08ffc2ba6 100644 --- a/Attic/appendixc/automake.xml +++ b/Attic/appendixc/automake.xml @@ -1,4 +1,2 @@ Automake (&automake-version;): -<ulink url="ftp://ftp.gnu.org/gnu/automake/"> -ftp://ftp.gnu.org/gnu/automake/</ulink> - +<ulink url="ftp://ftp.gnu.org/gnu/automake/">ftp://ftp.gnu.org/gnu/automake/</ulink> diff --git a/Attic/appendixc/bash.xml b/Attic/appendixc/bash.xml index 72eac6202..2d791a83d 100644 --- a/Attic/appendixc/bash.xml +++ b/Attic/appendixc/bash.xml @@ -1,4 +1,3 @@ Bash (&bash-version;): -<ulink url="ftp://ftp.gnu.org/gnu/bash/"> -ftp://ftp.gnu.org/gnu/bash/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/bash/">ftp://ftp.gnu.org/gnu/bash/</ulink> diff --git a/Attic/appendixc/bin86.xml b/Attic/appendixc/bin86.xml index e22be3dd9..4873bab8e 100644 --- a/Attic/appendixc/bin86.xml +++ b/Attic/appendixc/bin86.xml @@ -1,4 +1,3 @@ Bin86 (&bin86-version;): -<ulink url="http://www.cix.co.uk/~mayday/"> -http://www.cix.co.uk/~mayday/</ulink> +<ulink url="http://www.cix.co.uk/~mayday/">http://www.cix.co.uk/~mayday/</ulink> diff --git a/Attic/appendixc/binutils.xml b/Attic/appendixc/binutils.xml index 152efacf1..e271c91fe 100644 --- a/Attic/appendixc/binutils.xml +++ b/Attic/appendixc/binutils.xml @@ -1,4 +1,3 @@ Binutils (&binutils-version;): -<ulink url="ftp://ftp.gnu.org/gnu/binutils/"> -ftp://ftp.gnu.org/gnu/binutils/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/binutils/">ftp://ftp.gnu.org/gnu/binutils/</ulink> diff --git a/Attic/appendixc/bison.xml b/Attic/appendixc/bison.xml index 9565847ca..f5c6be988 100644 --- a/Attic/appendixc/bison.xml +++ b/Attic/appendixc/bison.xml @@ -1,4 +1,3 @@ Bison (&bison-version;): -<ulink url="ftp://ftp.gnu.org/gnu/bison/"> -ftp://ftp.gnu.org/gnu/bison/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/bison/">ftp://ftp.gnu.org/gnu/bison/</ulink> diff --git a/Attic/appendixc/bzip2.xml b/Attic/appendixc/bzip2.xml index 74d74897e..ea50865ad 100644 --- a/Attic/appendixc/bzip2.xml +++ b/Attic/appendixc/bzip2.xml @@ -1,4 +1,3 @@ Bzip2 (&bzip2-version;): -<ulink url="ftp://sourceware.cygnus.com/pub/bzip2/"> -ftp://sourceware.cygnus.com/pub/bzip2/</ulink> +<ulink url="ftp://sourceware.cygnus.com/pub/bzip2/">ftp://sourceware.cygnus.com/pub/bzip2/</ulink> diff --git a/Attic/appendixc/diffutils.xml b/Attic/appendixc/diffutils.xml index 8b89bc508..d6d28e3df 100644 --- a/Attic/appendixc/diffutils.xml +++ b/Attic/appendixc/diffutils.xml @@ -1,4 +1,3 @@ Diff Utils (&diffutils-version;): -<ulink url="ftp://ftp.gnu.org/gnu/diffutils/"> -ftp://ftp.gnu.org/gnu/diffutils/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/diffutils/">ftp://ftp.gnu.org/gnu/diffutils/</ulink> diff --git a/Attic/appendixc/e2fsprogs.xml b/Attic/appendixc/e2fsprogs.xml index 63baded7c..bb3c2e2d9 100644 --- a/Attic/appendixc/e2fsprogs.xml +++ b/Attic/appendixc/e2fsprogs.xml @@ -1,6 +1,4 @@ E2fsprogs (&e2fsprogs-version;): -<ulink url="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/"> -ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/</ulink> -<ulink url="http://download.sourceforge.net/e2fsprogs/"> -http://download.sourceforge.net/e2fsprogs/</ulink> +<ulink url="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/">ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/</ulink> +<ulink url="http://download.sourceforge.net/e2fsprogs/">http://download.sourceforge.net/e2fsprogs/</ulink> diff --git a/Attic/appendixc/ed.xml b/Attic/appendixc/ed.xml index dbad3e9c7..b02168359 100644 --- a/Attic/appendixc/ed.xml +++ b/Attic/appendixc/ed.xml @@ -1,4 +1,3 @@ Ed (&ed-version;): -<ulink url="ftp://ftp.gnu.org/gnu/ed/"> -ftp://ftp.gnu.org/gnu/ed/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/ed/">ftp://ftp.gnu.org/gnu/ed/</ulink> diff --git a/Attic/appendixc/file.xml b/Attic/appendixc/file.xml index d8d8285b0..44d3c51aa 100644 --- a/Attic/appendixc/file.xml +++ b/Attic/appendixc/file.xml @@ -1,4 +1,3 @@ File (&file-version;): -<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"> -ftp://ftp.gw.com/mirrors/pub/unix/file/</ulink> +<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/">ftp://ftp.gw.com/mirrors/pub/unix/file/</ulink> diff --git a/Attic/appendixc/fileutils.xml b/Attic/appendixc/fileutils.xml index f99586faf..86626918b 100644 --- a/Attic/appendixc/fileutils.xml +++ b/Attic/appendixc/fileutils.xml @@ -1,4 +1,3 @@ File Utils (&fileutils-version;): -<ulink url="ftp://ftp.gnu.org/gnu/fileutils/"> -ftp://ftp.gnu.org/gnu/fileutils/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/fileutils/">ftp://ftp.gnu.org/gnu/fileutils/</ulink> diff --git a/Attic/appendixc/findutils-patch.xml b/Attic/appendixc/findutils-patch.xml index df2798bed..afa8ed5a5 100644 --- a/Attic/appendixc/findutils-patch.xml +++ b/Attic/appendixc/findutils-patch.xml @@ -1,6 +1,4 @@ Find Utils Patch (&findutils-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/findutils.xml b/Attic/appendixc/findutils.xml index 40b017767..29ecf2b11 100644 --- a/Attic/appendixc/findutils.xml +++ b/Attic/appendixc/findutils.xml @@ -1,4 +1,3 @@ Find Utils (&findutils-version;): -<ulink url="ftp://ftp.gnu.org/gnu/findutils/"> -ftp://ftp.gnu.org/gnu/findutils/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/findutils/">ftp://ftp.gnu.org/gnu/findutils/</ulink> diff --git a/Attic/appendixc/flex.xml b/Attic/appendixc/flex.xml index 6d9469578..aa9c091bc 100644 --- a/Attic/appendixc/flex.xml +++ b/Attic/appendixc/flex.xml @@ -1,4 +1,3 @@ Flex (&flex-version;): -<ulink url="ftp://ftp.gnu.org/non-gnu/flex/"> -ftp://ftp.gnu.org/non-gnu/flex/</ulink> +<ulink url="ftp://ftp.gnu.org/non-gnu/flex/">ftp://ftp.gnu.org/non-gnu/flex/</ulink> diff --git a/Attic/appendixc/gcc-patch.xml b/Attic/appendixc/gcc-patch.xml index 958da3f41..538806381 100644 --- a/Attic/appendixc/gcc-patch.xml +++ b/Attic/appendixc/gcc-patch.xml @@ -1,6 +1,4 @@ GCC Patch (&gcc-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/gcc.xml b/Attic/appendixc/gcc.xml index 91e4a8b01..89a59a337 100644 --- a/Attic/appendixc/gcc.xml +++ b/Attic/appendixc/gcc.xml @@ -1,4 +1,3 @@ GCC (&gcc-version;): -<ulink url="ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/"> -ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/</ulink> +<ulink url="ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/">ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/</ulink> diff --git a/Attic/appendixc/gettext.xml b/Attic/appendixc/gettext.xml index e8ebdbfeb..ef42a47e0 100644 --- a/Attic/appendixc/gettext.xml +++ b/Attic/appendixc/gettext.xml @@ -1,4 +1,3 @@ Gettext (&gettext-version;): -<ulink url="ftp://ftp.gnu.org/gnu/gettext/"> -ftp://ftp.gnu.org/gnu/gettext/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/gettext/">ftp://ftp.gnu.org/gnu/gettext/</ulink> diff --git a/Attic/appendixc/glibc-threads.xml b/Attic/appendixc/glibc-threads.xml index 69ec47b12..dbead6651 100644 --- a/Attic/appendixc/glibc-threads.xml +++ b/Attic/appendixc/glibc-threads.xml @@ -1,4 +1,3 @@ Glibc-linuxthreads (&glibc-version;): -<ulink url="ftp://ftp.gnu.org/gnu/glibc/"> -ftp://ftp.gnu.org/gnu/glibc/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/glibc/">ftp://ftp.gnu.org/gnu/glibc/</ulink> diff --git a/Attic/appendixc/glibc.xml b/Attic/appendixc/glibc.xml index 4e8b72ab9..8e7cf9a23 100644 --- a/Attic/appendixc/glibc.xml +++ b/Attic/appendixc/glibc.xml @@ -1,4 +1,3 @@ Glibc (&glibc-version;): -<ulink url="ftp://ftp.gnu.org/gnu/glibc/"> -ftp://ftp.gnu.org/gnu/glibc/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/glibc/">ftp://ftp.gnu.org/gnu/glibc/</ulink> diff --git a/Attic/appendixc/grep.xml b/Attic/appendixc/grep.xml index 6c26dd732..66ec272e4 100644 --- a/Attic/appendixc/grep.xml +++ b/Attic/appendixc/grep.xml @@ -1,4 +1,3 @@ Grep (&grep-version;): -<ulink url="ftp://ftp.gnu.org/gnu/grep/"> -ftp://ftp.gnu.org/gnu/grep/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/grep/">ftp://ftp.gnu.org/gnu/grep/</ulink> diff --git a/Attic/appendixc/groff.xml b/Attic/appendixc/groff.xml index bdd504928..087396cc3 100644 --- a/Attic/appendixc/groff.xml +++ b/Attic/appendixc/groff.xml @@ -1,4 +1,3 @@ Groff (&groff-version;): -<ulink url="ftp://ftp.gnu.org/gnu/groff/"> -ftp://ftp.gnu.org/gnu/groff/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/groff/">ftp://ftp.gnu.org/gnu/groff/</ulink> diff --git a/Attic/appendixc/gzip-patch.xml b/Attic/appendixc/gzip-patch.xml index e88fb75e1..5ad72ffa7 100644 --- a/Attic/appendixc/gzip-patch.xml +++ b/Attic/appendixc/gzip-patch.xml @@ -1,6 +1,4 @@ Gzip Patch (&gzip-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/gzip.xml b/Attic/appendixc/gzip.xml index 9b22b835d..03aa9aef5 100644 --- a/Attic/appendixc/gzip.xml +++ b/Attic/appendixc/gzip.xml @@ -1,4 +1,3 @@ Gzip (&gzip-version;): -<ulink url="ftp://ftp.gnu.org/gnu/gzip/"> -ftp://ftp.gnu.org/gnu/gzip/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/gzip/">ftp://ftp.gnu.org/gnu/gzip/</ulink> diff --git a/Attic/appendixc/kbd.xml b/Attic/appendixc/kbd.xml index fb0039080..cecb9ec30 100644 --- a/Attic/appendixc/kbd.xml +++ b/Attic/appendixc/kbd.xml @@ -1,4 +1,3 @@ Kbd (&kbd-version;): -<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/"> -ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/</ulink> +<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/">ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/</ulink> diff --git a/Attic/appendixc/kernel.xml b/Attic/appendixc/kernel.xml index e84383e42..014415b75 100644 --- a/Attic/appendixc/kernel.xml +++ b/Attic/appendixc/kernel.xml @@ -1,4 +1,3 @@ Linux Kernel (&kernel-version;): -<ulink url="ftp://ftp.kernel.org/pub/linux/kernel/"> -ftp://ftp.kernel.org/pub/linux/kernel/</ulink> +<ulink url="ftp://ftp.kernel.org/pub/linux/kernel/">ftp://ftp.kernel.org/pub/linux/kernel/</ulink> diff --git a/Attic/appendixc/less.xml b/Attic/appendixc/less.xml index ef356d6db..3a8b92c36 100644 --- a/Attic/appendixc/less.xml +++ b/Attic/appendixc/less.xml @@ -1,4 +1,3 @@ Less (&less-version;): -<ulink url="ftp://ftp.gnu.org/gnu/less/"> -ftp://ftp.gnu.org/gnu/less/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/less/">ftp://ftp.gnu.org/gnu/less/</ulink> diff --git a/Attic/appendixc/libtool.xml b/Attic/appendixc/libtool.xml index 00929f236..c20a48988 100644 --- a/Attic/appendixc/libtool.xml +++ b/Attic/appendixc/libtool.xml @@ -1,4 +1,3 @@ Libtool (&libtool-version;): -<ulink url="ftp://ftp.gnu.org/gnu/libtool/"> -ftp://ftp.gnu.org/gnu/libtool/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/libtool/">ftp://ftp.gnu.org/gnu/libtool/</ulink> diff --git a/Attic/appendixc/lilo.xml b/Attic/appendixc/lilo.xml index c2889de1e..1973966ad 100644 --- a/Attic/appendixc/lilo.xml +++ b/Attic/appendixc/lilo.xml @@ -1,4 +1,3 @@ Lilo (&lilo-version;): -<ulink url="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo"> -ftp://metalab.unc.edu/pub/Linux/system/boot/lilo</ulink> +<ulink url="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo">ftp://metalab.unc.edu/pub/Linux/system/boot/lilo</ulink> diff --git a/Attic/appendixc/m4.xml b/Attic/appendixc/m4.xml index 810f00e9e..b790075ef 100644 --- a/Attic/appendixc/m4.xml +++ b/Attic/appendixc/m4.xml @@ -1,4 +1,3 @@ M4 (&m4-version;): -<ulink url="ftp://ftp.gnu.org/gnu/m4/"> -ftp://ftp.gnu.org/gnu/m4/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/m4/">ftp://ftp.gnu.org/gnu/m4/</ulink> diff --git a/Attic/appendixc/make.xml b/Attic/appendixc/make.xml index b29801a8e..548a9183d 100644 --- a/Attic/appendixc/make.xml +++ b/Attic/appendixc/make.xml @@ -1,4 +1,3 @@ Make (&make-version;): -<ulink url="ftp://ftp.gnu.org/gnu/make/"> -ftp://ftp.gnu.org/gnu/make/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/make/">ftp://ftp.gnu.org/gnu/make/</ulink> diff --git a/Attic/appendixc/makedev.xml b/Attic/appendixc/makedev.xml index ad209807a..1203b9b8b 100644 --- a/Attic/appendixc/makedev.xml +++ b/Attic/appendixc/makedev.xml @@ -1,6 +1,4 @@ MAKEDEV: -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/man-patch.xml b/Attic/appendixc/man-patch.xml index 1bebeb494..3a75d3a99 100644 --- a/Attic/appendixc/man-patch.xml +++ b/Attic/appendixc/man-patch.xml @@ -1,6 +1,4 @@ Man Patch (&man-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/man.xml b/Attic/appendixc/man.xml index 4e58848e3..e342b42af 100644 --- a/Attic/appendixc/man.xml +++ b/Attic/appendixc/man.xml @@ -1,4 +1,3 @@ Man (&man-version;): -<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"> -ftp://ftp.win.tue.nl/pub/linux-local/utils/man/</ulink> +<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/">ftp://ftp.win.tue.nl/pub/linux-local/utils/man/</ulink> diff --git a/Attic/appendixc/manpages-patch.xml b/Attic/appendixc/manpages-patch.xml index 3c32cd6dd..d54c5b2b7 100644 --- a/Attic/appendixc/manpages-patch.xml +++ b/Attic/appendixc/manpages-patch.xml @@ -1,6 +1,4 @@ Man-pages Patch (&man-pages-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/manpages.xml b/Attic/appendixc/manpages.xml index 9a7302b1d..ae973d3cb 100644 --- a/Attic/appendixc/manpages.xml +++ b/Attic/appendixc/manpages.xml @@ -1,4 +1,3 @@ Man-pages (&man-pages-version;): -<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/manpages/"> -ftp://ftp.win.tue.nl/pub/linux-local/manpages/</ulink> +<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/manpages/">ftp://ftp.win.tue.nl/pub/linux-local/manpages/</ulink> diff --git a/Attic/appendixc/mawk.xml b/Attic/appendixc/mawk.xml index 249cb4946..440fd229a 100644 --- a/Attic/appendixc/mawk.xml +++ b/Attic/appendixc/mawk.xml @@ -1,4 +1,3 @@ Mawk (&mawk-version;): -<ulink url="ftp://ftp.whidbey.net/pub/brennan/"> -ftp://ftp.whidbey.net/pub/brennan/</ulink> +<ulink url="ftp://ftp.whidbey.net/pub/brennan/">ftp://ftp.whidbey.net/pub/brennan/</ulink> diff --git a/Attic/appendixc/modutils.xml b/Attic/appendixc/modutils.xml index 1c1e56428..b5181666d 100644 --- a/Attic/appendixc/modutils.xml +++ b/Attic/appendixc/modutils.xml @@ -1,4 +1,3 @@ Modutils (&modutils-version;): -<ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils"> -ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils</ulink> +<ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils">ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils</ulink> diff --git a/Attic/appendixc/ncurses-patch.xml b/Attic/appendixc/ncurses-patch.xml index 8d80b80ad..38aa67518 100644 --- a/Attic/appendixc/ncurses-patch.xml +++ b/Attic/appendixc/ncurses-patch.xml @@ -1,6 +1,4 @@ Ncurses Patch (&ncurses-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/ncurses.xml b/Attic/appendixc/ncurses.xml index bb94bb949..9874e392e 100644 --- a/Attic/appendixc/ncurses.xml +++ b/Attic/appendixc/ncurses.xml @@ -1,4 +1,3 @@ Ncurses (&ncurses-version;): -<ulink url="ftp://ftp.gnu.org/gnu/ncurses/"> -ftp://ftp.gnu.org/gnu/ncurses/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/ncurses/">ftp://ftp.gnu.org/gnu/ncurses/</ulink> diff --git a/Attic/appendixc/netkitbase.xml b/Attic/appendixc/netkitbase.xml index bf2f6dbc1..e2c1edaf6 100644 --- a/Attic/appendixc/netkitbase.xml +++ b/Attic/appendixc/netkitbase.xml @@ -1,4 +1,3 @@ Netkit-base (&netkit-base-version;): -<ulink url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"> -ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/</ulink> +<ulink url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/">ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/</ulink> diff --git a/Attic/appendixc/nettools.xml b/Attic/appendixc/nettools.xml index b24bddd78..15a61dcb0 100644 --- a/Attic/appendixc/nettools.xml +++ b/Attic/appendixc/nettools.xml @@ -1,4 +1,3 @@ Net-tools (&net-tools-version;): -<ulink url="http://www.tazenda.demon.co.uk/phil/net-tools/"> -http://www.tazenda.demon.co.uk/phil/net-tools/</ulink> +<ulink url="http://www.tazenda.demon.co.uk/phil/net-tools/">http://www.tazenda.demon.co.uk/phil/net-tools/</ulink> diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml index b81aa4266..aecea646a 100644 --- a/Attic/appendixc/packages.xml +++ b/Attic/appendixc/packages.xml @@ -1,11 +1,9 @@ <sect1 id="ac-packages"> <title>Official download locations</title> -<para> -Below is the list with packages from chapter 3 with their original +<para>Below is the list with packages from chapter 3 with their original download locations. This might help to find a newer version of a -package quicker. -</para> +package quicker.</para> <literallayout> &ac-bash; diff --git a/Attic/appendixc/patch.xml b/Attic/appendixc/patch.xml index 9a4bee7a5..19af249fa 100644 --- a/Attic/appendixc/patch.xml +++ b/Attic/appendixc/patch.xml @@ -1,4 +1,3 @@ Patch (&patch-version;): -<ulink url="ftp://ftp.gnu.org/gnu/patch/"> -ftp://ftp.gnu.org/gnu/patch/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/patch/">ftp://ftp.gnu.org/gnu/patch/</ulink> diff --git a/Attic/appendixc/perl.xml b/Attic/appendixc/perl.xml index 7eaf708ae..9cf1b196d 100644 --- a/Attic/appendixc/perl.xml +++ b/Attic/appendixc/perl.xml @@ -1,4 +1,3 @@ Perl (&perl-version;): -<ulink url="http://www.perl.com"> -http://www.perl.com</ulink> +<ulink url="http://www.perl.com">http://www.perl.com</ulink> diff --git a/Attic/appendixc/procinfo.xml b/Attic/appendixc/procinfo.xml index 193ba80e0..2f1109ece 100644 --- a/Attic/appendixc/procinfo.xml +++ b/Attic/appendixc/procinfo.xml @@ -1,4 +1,3 @@ Procinfo (&procinfo-version;): -<ulink url="ftp://ftp.cistron.nl/pub/people/svm/"> -ftp://ftp.cistron.nl/pub/people/svm/</ulink> +<ulink url="ftp://ftp.cistron.nl/pub/people/svm/">ftp://ftp.cistron.nl/pub/people/svm/</ulink> diff --git a/Attic/appendixc/procps.xml b/Attic/appendixc/procps.xml index 02f485c0e..a8ca507dd 100644 --- a/Attic/appendixc/procps.xml +++ b/Attic/appendixc/procps.xml @@ -1,4 +1,3 @@ Procps (&procps-version;): -<ulink url="ftp://people.redhat.com/johnsonm/procps/"> -ftp://people.redhat.com/johnsonm/procps/</ulink> +<ulink url="ftp://people.redhat.com/johnsonm/procps/">ftp://people.redhat.com/johnsonm/procps/</ulink> diff --git a/Attic/appendixc/psmisc.xml b/Attic/appendixc/psmisc.xml index 43f5cf2e2..ca84b6a61 100644 --- a/Attic/appendixc/psmisc.xml +++ b/Attic/appendixc/psmisc.xml @@ -1,6 +1,4 @@ Psmisc (&psmisc-version;): -<ulink url="http://download.sourceforge.net/psmisc/"> -http://download.sourceforge.net/psmisc/</ulink> -<ulink url="ftp://download.sourceforge.net/pub/sourceforge/psmisc/"> -ftp://download.sourceforge.net/pub/sourceforge/psmisc/</ulink> +<ulink url="http://download.sourceforge.net/psmisc/">http://download.sourceforge.net/psmisc/</ulink> +<ulink url="ftp://download.sourceforge.net/pub/sourceforge/psmisc/">ftp://download.sourceforge.net/pub/sourceforge/psmisc/</ulink> diff --git a/Attic/appendixc/sed.xml b/Attic/appendixc/sed.xml index 8af300721..a35fcfb38 100644 --- a/Attic/appendixc/sed.xml +++ b/Attic/appendixc/sed.xml @@ -1,4 +1,3 @@ Sed (&sed-version;): -<ulink url="ftp://ftp.gnu.org/gnu/sed/"> -ftp://ftp.gnu.org/gnu/sed/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/sed/">ftp://ftp.gnu.org/gnu/sed/</ulink> diff --git a/Attic/appendixc/shadowpwd-patch.xml b/Attic/appendixc/shadowpwd-patch.xml index bdf42b642..53081833e 100644 --- a/Attic/appendixc/shadowpwd-patch.xml +++ b/Attic/appendixc/shadowpwd-patch.xml @@ -1,6 +1,4 @@ Shadow Password Suite Patch (&shadow-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/shadowpwd.xml b/Attic/appendixc/shadowpwd.xml index d28b90dad..cef68188e 100644 --- a/Attic/appendixc/shadowpwd.xml +++ b/Attic/appendixc/shadowpwd.xml @@ -1,4 +1,3 @@ Shadow Password Suite (&shadow-version;): -<ulink url="ftp://ftp.pld.org.pl/software/shadow/"> -ftp://ftp.pld.org.pl/software/shadow/</ulink> +<ulink url="ftp://ftp.pld.org.pl/software/shadow/">ftp://ftp.pld.org.pl/software/shadow/</ulink> diff --git a/Attic/appendixc/shellutils-patch.xml b/Attic/appendixc/shellutils-patch.xml index 9e71f4871..c67fa6460 100644 --- a/Attic/appendixc/shellutils-patch.xml +++ b/Attic/appendixc/shellutils-patch.xml @@ -1,6 +1,4 @@ Sh-utils Patch (&sh-utils-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/shellutils.xml b/Attic/appendixc/shellutils.xml index 4880ae923..14c8e55af 100644 --- a/Attic/appendixc/shellutils.xml +++ b/Attic/appendixc/shellutils.xml @@ -1,4 +1,3 @@ Sh-utils (&sh-utils-version;): -<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/"> -ftp://ftp.gnu.org/gnu/sh-utils/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/">ftp://ftp.gnu.org/gnu/sh-utils/</ulink> diff --git a/Attic/appendixc/sysklogd.xml b/Attic/appendixc/sysklogd.xml index b18be0328..26981340f 100644 --- a/Attic/appendixc/sysklogd.xml +++ b/Attic/appendixc/sysklogd.xml @@ -1,4 +1,3 @@ Sysklogd (&sysklogd-version;): -<ulink url="ftp://ftp.ibiblio.org/pub/Linux/system/daemons/"> -ftp://ftp.ibiblio.org/pub/Linux/system/daemons/</ulink> +<ulink url="ftp://ftp.ibiblio.org/pub/Linux/system/daemons/">ftp://ftp.ibiblio.org/pub/Linux/system/daemons/</ulink> diff --git a/Attic/appendixc/sysvinit-patch.xml b/Attic/appendixc/sysvinit-patch.xml index 83dcb1701..7824920e6 100644 --- a/Attic/appendixc/sysvinit-patch.xml +++ b/Attic/appendixc/sysvinit-patch.xml @@ -1,6 +1,4 @@ Sysvinit Patch (&sysvinit-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/sysvinit.xml b/Attic/appendixc/sysvinit.xml index cf854f882..0aa688742 100644 --- a/Attic/appendixc/sysvinit.xml +++ b/Attic/appendixc/sysvinit.xml @@ -1,4 +1,3 @@ Sysvinit (&sysvinit-version;): -<ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/"> -ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/</ulink> +<ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/">ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/</ulink> diff --git a/Attic/appendixc/tar-patch.xml b/Attic/appendixc/tar-patch.xml index 9ea6a6a51..76ebd7e53 100644 --- a/Attic/appendixc/tar-patch.xml +++ b/Attic/appendixc/tar-patch.xml @@ -1,4 +1,3 @@ Tar Patch (&tar-version;): -<ulink url="http://sourceware.cygnus.com/bzip2/"> -http://sourceware.cygnus.com/bzip2/</ulink> +<ulink url="http://sourceware.cygnus.com/bzip2/">http://sourceware.cygnus.com/bzip2/</ulink> diff --git a/Attic/appendixc/tar.xml b/Attic/appendixc/tar.xml index 77dd9763e..02c3dbadc 100644 --- a/Attic/appendixc/tar.xml +++ b/Attic/appendixc/tar.xml @@ -1,4 +1,3 @@ Tar (&tar-version;): -<ulink url="ftp://ftp.gnu.org/gnu/tar/"> -ftp://ftp.gnu.org/gnu/tar/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/tar/">ftp://ftp.gnu.org/gnu/tar/</ulink> diff --git a/Attic/appendixc/texinfo-patch.xml b/Attic/appendixc/texinfo-patch.xml index f19d2bc89..c2a3ff62b 100644 --- a/Attic/appendixc/texinfo-patch.xml +++ b/Attic/appendixc/texinfo-patch.xml @@ -1,6 +1,4 @@ Texinfo Patch (&texinfo-version;): -<ulink url="&ftp;/"> -&ftp;/</ulink> -<ulink url="&http;/"> -&http;/</ulink> +<ulink url="&ftp;/">&ftp;/</ulink> +<ulink url="&http;/">&http;/</ulink> diff --git a/Attic/appendixc/texinfo.xml b/Attic/appendixc/texinfo.xml index b9c81c7eb..4044cdebf 100644 --- a/Attic/appendixc/texinfo.xml +++ b/Attic/appendixc/texinfo.xml @@ -1,4 +1,3 @@ Texinfo (&texinfo-version;): -<ulink url="ftp://ftp.gnu.org/gnu/texinfo/"> -ftp://ftp.gnu.org/gnu/texinfo/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/texinfo/">ftp://ftp.gnu.org/gnu/texinfo/</ulink> diff --git a/Attic/appendixc/textutils.xml b/Attic/appendixc/textutils.xml index 4e2881b52..bf0331361 100644 --- a/Attic/appendixc/textutils.xml +++ b/Attic/appendixc/textutils.xml @@ -1,4 +1,3 @@ Text Utils (&textutils-version;): -<ulink url="ftp://ftp.gnu.org/gnu/textutils/"> -ftp://ftp.gnu.org/gnu/textutils/</ulink> +<ulink url="ftp://ftp.gnu.org/gnu/textutils/">ftp://ftp.gnu.org/gnu/textutils/</ulink> diff --git a/Attic/appendixc/toplevel.xml b/Attic/appendixc/toplevel.xml index 0574f82cb..1a358eafb 100644 --- a/Attic/appendixc/toplevel.xml +++ b/Attic/appendixc/toplevel.xml @@ -1,8 +1,6 @@ Browse FTP: -<ulink url="ftp-root;/"> -&ftp-root;/</ulink> +<ulink url="ftp-root;/">&ftp-root;/</ulink> Browse HTTP: -<ulink url="&http-root;/"> -&http-root;/</ulink> +<ulink url="&http-root;/">&http-root;/</ulink> diff --git a/Attic/appendixc/utillinux.xml b/Attic/appendixc/utillinux.xml index 7a9e42eac..0e7f01113 100644 --- a/Attic/appendixc/utillinux.xml +++ b/Attic/appendixc/utillinux.xml @@ -1,4 +1,3 @@ Util Linux (&util-linux-version;): -<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/"> -ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/</ulink> +<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/">ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/</ulink> diff --git a/Attic/appendixc/vim.xml b/Attic/appendixc/vim.xml index 1a1d30c47..dcabb757a 100644 --- a/Attic/appendixc/vim.xml +++ b/Attic/appendixc/vim.xml @@ -1,8 +1,6 @@ Vim-rt (&vim-version;): -<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/"> -ftp://ftp.vim.org/pub/editors/vim/unix/</ulink> +<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">ftp://ftp.vim.org/pub/editors/vim/unix/</ulink> Vim-src (&vim-version;): -<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/"> -ftp://ftp.vim.org/pub/editors/vim/unix/</ulink> +<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">ftp://ftp.vim.org/pub/editors/vim/unix/</ulink> diff --git a/appendixa/autoconf-desc.xml b/appendixa/autoconf-desc.xml index 081973535..b2df66adb 100644 --- a/appendixa/autoconf-desc.xml +++ b/appendixa/autoconf-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The Autoconf package contains the autoconf, autoheader, autoreconf, -autoscan, autoupdate and ifnames programs -</para> +<para>The Autoconf package contains the autoconf, autoheader, autoreconf, +autoscan, autoupdate and ifnames programs</para> </sect2> @@ -12,69 +10,57 @@ autoscan, autoupdate and ifnames programs <sect3><title>autoconf</title> -<para> -Autoconf is a tool for producing shell scripts that automatically +<para>Autoconf is a tool for producing shell scripts that automatically configure software source code packages to adapt to many kinds of UNIX-like systems. The configuration scripts produced by Autoconf are independent of Autoconf when they are run, so their users do not need to -have Autoconf. -</para> +have Autoconf.</para> </sect3> <sect3><title>autoheader</title> -<para> -The autoheader program can create a template file of C #define -statements for configure to use -</para> +<para>The autoheader program can create a template file of C #define +statements for configure to use</para> </sect3> <sect3><title>autoreconf</title> -<para> -If there are a lot of Autoconf-generated configure scripts, the +<para>If there are a lot of Autoconf-generated configure scripts, the autoreconf program can save some work. It runs autoconf (and autoheader, where appropriate) repeatedly to remake the Autoconf configure scripts and configuration header templates in the directory -tree rooted at the current directory. -</para> +tree rooted at the current directory.</para> </sect3> <sect3><title>autoscan</title> -<para> -The autoscan program can help to create a configure.in file for +<para>The autoscan program can help to create a configure.in file for a software package. autoscan examines source files in the directory tree rooted at a directory given as a command line argument, or the current directory if none is given. It searches the source files for common portability problems and creates a file configure.scan which -is a preliminary configure.in for that package. -</para> +is a preliminary configure.in for that package.</para> </sect3> <sect3><title>autoupdate</title> -<para> -The autoupdate program updates a configure.in file that calls -Autoconf macros by their old names to use the current macro names. -</para> +<para>The autoupdate program updates a configure.in file that calls +Autoconf macros by their old names to use the current macro names.</para> </sect3> <sect3><title>ifnames</title> -<para> -ifnames can help when writing a configure.in for a software +<para>ifnames can help when writing a configure.in for a software package. It prints the identifiers that the package already uses in C preprocessor conditionals. If a package has already been set up to have some portability, this program can help to figure out what its configure needs to check for. It may help fill in some gaps in a -configure.in generated by autoscan. -</para> +configure.in generated by autoscan.</para> </sect3> diff --git a/appendixa/automake-desc.xml b/appendixa/automake-desc.xml index 82ae11569..b308d3049 100644 --- a/appendixa/automake-desc.xml +++ b/appendixa/automake-desc.xml @@ -1,9 +1,7 @@ <sect2> <title>Contents</title> -<para> -The Automake package contains the aclocal and automake programs -</para> +<para>The Automake package contains the aclocal and automake programs</para> </sect2> @@ -11,30 +9,24 @@ The Automake package contains the aclocal and automake programs <sect3><title>aclocal</title> -<para> -Automake includes a number of Autoconf macros which can be used in +<para>Automake includes a number of Autoconf macros which can be used in packages; some of them are actually required by Automake in certain situations. These macros must be defined in the aclocal.m4-file; -otherwise they will not be seen by autoconf. -</para> +otherwise they will not be seen by autoconf.</para> -<para> -The aclocal program will automatically generate aclocal.m4 files +<para>The aclocal program will automatically generate aclocal.m4 files based on the contents of configure.in. This provides a convenient way to get Automake-provided macros, without having to search around. -Also, the aclocal mechanism is extensible for use by other packages. -</para> +Also, the aclocal mechanism is extensible for use by other packages.</para> </sect3> <sect3><title>automake</title> -<para> -To create all the Makefile.in's for a package, run the automake +<para>To create all the Makefile.in's for a package, run the automake program in the top level directory, with no arguments. automake will automatically find each appropriate Makefile.am (by scanning -configure.in) and generate the corresponding Makefile.in. -</para> +configure.in) and generate the corresponding Makefile.in.</para> </sect3> diff --git a/appendixa/bash-desc.xml b/appendixa/bash-desc.xml index aef324cbb..d85617f24 100644 --- a/appendixa/bash-desc.xml +++ b/appendixa/bash-desc.xml @@ -1,20 +1,16 @@ <sect2> <title>Contents</title> -<para> -The Bash package contains the bash program -</para> +<para>The Bash package contains the bash program</para> </sect2> <sect2><title>Description</title> -<para> -Bash is the Bourne-Again SHell, which is a widely used command +<para>Bash is the Bourne-Again SHell, which is a widely used command interpreter on Unix systems. Bash is a program that reads from standard input, the keyboard. A user types something and the program will evaluate -what he has typed and do something with it, like running a program. -</para> +what he has typed and do something with it, like running a program.</para> </sect2> diff --git a/appendixa/bin86-desc.xml b/appendixa/bin86-desc.xml index 6c5aa8b64..df1f33bfc 100644 --- a/appendixa/bin86-desc.xml +++ b/appendixa/bin86-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The Bin86 contains the as86, as86_encap, ld86, objdump86, nm86 and -size86 programs. -</para> +<para>The Bin86 contains the as86, as86_encap, ld86, objdump86, nm86 and +size86 programs.</para> </sect2> @@ -12,52 +10,40 @@ size86 programs. <sect3><title>as86</title> -<para> -as86 is an assembler for the 8086...80386 processors. -</para> +<para>as86 is an assembler for the 8086...80386 processors.</para> </sect3> <sect3><title>as86_encap</title> -<para> -as86_encap is a shell script to call as86 and convert the created binary +<para>as86_encap is a shell script to call as86 and convert the created binary into a C file prog.v to be included in or linked with programs like boot -block installers. -</para> +block installers.</para> </sect3> <sect3><title>ld86</title> -<para> -ld86 understands only the object files produced by the as86 assembler, it -can link them into either an impure or a separate I&D executable. -</para> +<para>ld86 understands only the object files produced by the as86 assembler, it +can link them into either an impure or a separate I&D executable.</para> </sect3> <sect3><title>objdump86</title> -<para> -No description available. -</para> +<para>No description available.</para> </sect3> <sect3><title>nm86</title> -<para> -No description available. -</para> +<para>No description available.</para> </sect3> <sect3><title>size86</title> -<para> -No description available. -</para> +<para>No description available.</para> </sect3> diff --git a/appendixa/binutils-desc.xml b/appendixa/binutils-desc.xml index 486bb07be..9bc945db8 100644 --- a/appendixa/binutils-desc.xml +++ b/appendixa/binutils-desc.xml @@ -1,11 +1,9 @@ <sect2> <title>Description</title> -<para> -The Binutils package contains the gasp, gprof, ld, as, ar, nm, objcopy, +<para>The Binutils package contains the gasp, gprof, ld, as, ar, nm, objcopy, objdump, ranlib, readelf, size, strings, strip, c++filt and addr2line -programs -</para> +programs</para> </sect2> @@ -13,159 +11,127 @@ programs <sect3><title>gasp</title> -<para> -Gasp is the Assembler Macro Preprocessor. -</para> +<para>Gasp is the Assembler Macro Preprocessor.</para> </sect3> <sect3><title>gprof</title> -<para> -gprof displays call graph profile data. -</para> +<para>gprof displays call graph profile data.</para> </sect3> <sect3><title>ld</title> -<para> -ld combines a number of object and archive files, relocates their data +<para>ld combines a number of object and archive files, relocates their data and ties up symbol references. Often the last step in building a new compiled -program to run is a call to ld. -</para> +program to run is a call to ld.</para> </sect3> <sect3><title>as</title> -<para> -as is primarily intended to assemble the output of the GNU C compiler gcc -for use by the linker ld. -</para> +<para>as is primarily intended to assemble the output of the GNU C compiler gcc +for use by the linker ld.</para> </sect3> <sect3><title>ar</title> -<para> -The ar program creates, modifies, and extracts from archives. An archive is -a single file holding a collection of other files in a structure that makes +<para>The ar program creates, modifies, and extracts from archives. An archive +is a single file holding a collection of other files in a structure that makes it possible to retrieve the original individual files (called members of -the archive). -</para> +the archive).</para> </sect3> <sect3><title>nm</title> -<para> -nm lists the symbols from object files. -</para> +<para>nm lists the symbols from object files.</para> </sect3> <sect3><title>objcopy</title> -<para> -objcopy utility copies the contents of an object file to another. objcopy +<para>objcopy utility copies the contents of an object file to another. objcopy uses the GNU BFD Library to read and write the object files. It can write the destination object file in a format different from that of the source -object file. -</para> +object file.</para> </sect3> <sect3><title>objdump</title> -<para> -objdump displays information about one or more object files. The options +<para>objdump displays information about one or more object files. The options control what particular information to display. This information is mostly useful to programmers who are working on the compilation tools, as opposed to -programmers who just want their program to compile and work. -</para> +programmers who just want their program to compile and work.</para> </sect3> <sect3><title>ranlib</title> -<para> -ranlib generates an index to the contents of an archive, and stores it in +<para>ranlib generates an index to the contents of an archive, and stores it in the archive. The index lists each symbol defined by a member of an archive -that is a relocatable object file. -</para> +that is a relocatable object file.</para> </sect3> <sect3><title>readelf</title> -<para> -readelf displays information about elf type binaries. -</para> +<para>readelf displays information about elf type binaries.</para> </sect3> <sect3><title>size</title> -<para> -size lists the section sizes --and the total size-- for each of the object -files objfile in its argument list. By default, one line of output is -generated for each object file or each module in an archive. -</para> +<para>size lists the section sizes --and the total size-- for each of the +object files objfile in its argument list. By default, one line of output is +generated for each object file or each module in an archive.</para> </sect3> <sect3><title>strings</title> -<para> -For each file given, strings prints the printable character sequences +<para>For each file given, strings prints the printable character sequences that are at least 4 characters long (or the number specified with an option to the program) and are followed by an unprintable character. By default, it only prints the strings from the initialized and loaded sections of object files; for other types of files, it prints the strings -from the whole file. -</para> +from the whole file.</para> -<para> -strings is mainly useful for determining the contents of non-text files. -</para> +<para>strings is mainly useful for determining the contents of non-text files.</para> </sect3> <sect3><title>strip</title> -<para> -strip discards all or specific symbols from object files. The list of +<para>strip discards all or specific symbols from object files. The list of object files may include archives. At least one object file must be given. strip modifies the files named in its argument, rather than writing -modified copies under different names. -</para> +modified copies under different names.</para> </sect3> <sect3><title>c++filt</title> -<para> -The C++ language provides function overloading, which means that it is +<para>The C++ language provides function overloading, which means that it is possible to write many functions with the same name (providing each takes parameters of different types). All C++ function names are encoded into a low-level assembly label (this process is known as mangling). The c++filt program does the inverse mapping: it decodes (demangles) low-level names into user-level names so that the linker can keep these overloaded functions -from clashing. -</para> +from clashing.</para> </sect3> <sect3><title>addr2line</title> -<para> -addr2line translates program addresses into file names and line numbers. +<para>addr2line translates program addresses into file names and line numbers. Given an address and an executable, it uses the debugging information in the executable to figure out which file name and line number are associated -with a given address. -</para> +with a given address.</para> </sect3> diff --git a/appendixa/bison-desc.xml b/appendixa/bison-desc.xml index 15d68fc7b..f360f9fbd 100644 --- a/appendixa/bison-desc.xml +++ b/appendixa/bison-desc.xml @@ -1,57 +1,41 @@ <sect2> <title>Contents</title> -<para> -The Bison package contains the bison program. -</para> +<para>The Bison package contains the bison program.</para> </sect2> <sect2><title>Description</title> -<para> -Bison is a parser generator, a replacement for YACC. YACC stands for Yet +<para>Bison is a parser generator, a replacement for YACC. YACC stands for Yet Another Compiler Compiler. What is Bison then? It is a program that generates a program that analyzes the structure of a text file. Instead of writing the actual program a user specifies how things should be connected and with -those rules a program is constructed that analyzes the text file. -</para> +those rules a program is constructed that analyzes the text file.</para> -<para> -There are a lot of examples where structure is needed and one of them is -the -calculator. -</para> +<para>There are a lot of examples where structure is needed and one of them is +the calculator.</para> -<para> -Given the string : -</para> +<para>Given the string :</para> -<blockquote><literallayout> - 1 + 2 * 3 -</literallayout></blockquote> +<blockquote><literallayout> 1 + 2 * 3</literallayout></blockquote> -<para> -A human can easily come to the result 7. Why? Because of the structure. +<para>A human can easily come to the result 7. Why? Because of the structure. Our brain knows how to interpret the string. The computer doesn't know that and Bison is a tool to help it understand by presenting the string in the following way -to the compiler: -</para> +to the compiler:</para> -<blockquote><literallayout> - + +<blockquote><literallayout> + / \ * 1 / \ - 2 3 -</literallayout></blockquote> + 2 3</literallayout></blockquote> -<para> -Starting at the bottom of a tree and coming across the numbers 2 and +<para>Starting at the bottom of a tree and coming across the numbers 2 and 3 which are joined by the multiplication symbol, the computer multiplies 2 and 3. The result of that multiplication is remembered and the next thing that the computer sees is the result of 2*3 and the @@ -59,8 +43,7 @@ number 1 which are joined by the add symbol. Adding 1 to the previous result makes 7. In calculating the most complex calculations can be broken down in this tree format and the computer just starts at the bottom and works it's way up to the top and comes with the correct -answer. Of course, Bison isn't only used for calculators alone. -</para> +answer. Of course, Bison isn't only used for calculators alone.</para> </sect2> diff --git a/appendixa/bzip2-desc.xml b/appendixa/bzip2-desc.xml index 1bda00d6f..c49f16820 100644 --- a/appendixa/bzip2-desc.xml +++ b/appendixa/bzip2-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The Bzip2 packages contains the bzip2, bunzip2, bzcat and bzip2recover -programs. -</para> +<para>The Bzip2 packages contains the bzip2, bunzip2, bzcat and bzip2recover +programs.</para> </sect2> @@ -12,37 +10,30 @@ programs. <sect3><title>Bzip2</title> -<para> -bzip2 compresses files using the Burrows-Wheeler block sorting text +<para>bzip2 compresses files using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression is generally considerably better than that achieved by more conventional LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical -compressors. -</para> +compressors.</para> </sect3> <sect3><title>Bunzip2</title> -<para> -Bunzip2 decompresses files that are compressed with bzip2. -</para> +<para>Bunzip2 decompresses files that are compressed with bzip2.</para> </sect3> <sect3><title>bzcat</title> -<para> -bzcat (or bzip2 -dc) decompresses all specified files to the standard output. -</para> +<para>bzcat (or bzip2 -dc) decompresses all specified files to the standard +output.</para> </sect3> <sect3><title>bzip2recover</title> -<para> -bzip2recover recovers data from damaged bzip2 files. -</para> +<para>bzip2recover recovers data from damaged bzip2 files.</para> </sect3> diff --git a/appendixa/diffutils-desc.xml b/appendixa/diffutils-desc.xml index 4344ceed0..cfaddc851 100644 --- a/appendixa/diffutils-desc.xml +++ b/appendixa/diffutils-desc.xml @@ -1,9 +1,7 @@ <sect2> <title>Contents</title> -<para> -The Diffutils package contains the cmp, diff, diff3 and sdiff programs. -</para> +<para>The Diffutils package contains the cmp, diff, diff3 and sdiff programs.</para> </sect2> @@ -11,27 +9,21 @@ The Diffutils package contains the cmp, diff, diff3 and sdiff programs. <sect3><title>cmp and diff</title> -<para> -cmp and diff both compare two files and report their differences. Both -programs have extra options which compare files in different situations. -</para> +<para>cmp and diff both compare two files and report their differences. Both +programs have extra options which compare files in different situations.</para> </sect3> <sect3><title>diff3</title> -<para> -The difference between diff and diff3 is that diff compares 2 files, -diff3 compares 3 files. -</para> +<para>The difference between diff and diff3 is that diff compares 2 files, +diff3 compares 3 files.</para> </sect3> <sect3><title>sdiff</title> -<para> -sdiff merges two files and interactively outputs the results. -</para> +<para>sdiff merges two files and interactively outputs the results.</para> </sect3> diff --git a/appendixa/e2fsprogs-desc.xml b/appendixa/e2fsprogs-desc.xml index 52618e3ef..dba04427b 100644 --- a/appendixa/e2fsprogs-desc.xml +++ b/appendixa/e2fsprogs-desc.xml @@ -1,11 +1,9 @@ <sect2> <title>Contents</title> -<para> -The e2fsprogs package contains the chattr, lsattr, uuidgen, badblocks, +<para>The e2fsprogs package contains the chattr, lsattr, uuidgen, badblocks, debugfs, dumpe2fs, e2fsck, e2label, fsck, fsck.ext2, mke2fs, mkfs.ext2, -mklost+found and tune2fs programs. -</para> +mklost+found and tune2fs programs.</para> </sect2> @@ -13,109 +11,86 @@ mklost+found and tune2fs programs. <sect3><title>chattr</title> -<para> -chattr changes the file attributes on a Linux second extended file system. -</para> +<para>chattr changes the file attributes on a Linux second extended file +system. </para> </sect3> <sect3><title>lsattr</title> -<para> -lsattr lists the file attributes on a second extended file system. -</para> +<para>lsattr lists the file attributes on a second extended file system.</para> </sect3> <sect3><title>uuidgen</title> -<para> -The uuidgen program creates a new universally unique identifier (UUID) +<para>The uuidgen program creates a new universally unique identifier (UUID) using the libuuid library. The new UUID can reasonably be considered unique among all UUIDs created on the local system, and among UUIDs created on other -systems in the past and in the future. -</para> +systems in the past and in the future.</para> </sect3> <sect3><title>badblocks</title> -<para> -badblocks is used to search for bad blocks on a device (usually a disk -partition). -</para> +<para>badblocks is used to search for bad blocks on a device (usually a disk +partition).</para> </sect3> <sect3><title>debugfs</title> -<para> -The debugfs program is a file system debugger. It can be used to examine -and change the state of an ext2 file system. -</para> +<para>The debugfs program is a file system debugger. It can be used to examine +and change the state of an ext2 file system.</para> </sect3> <sect3><title>dumpe2fs</title> -<para> -dumpe2fs prints the super block and blocks group information for the -filesystem present on a specified device. -</para> +<para>dumpe2fs prints the super block and blocks group information for the +filesystem present on a specified device.</para> </sect3> <sect3><title>e2fsck and fsck.ext2</title> -<para> -e2fsck is used to check a Linux second extended file system. fsck.ext2 -does the same as e2fsck. -</para> +<para>e2fsck is used to check a Linux second extended file system. fsck.ext2 +does the same as e2fsck.</para> </sect3> <sect3><title>e2label</title> -<para> -e2label will display or change the filesystem label on the ext2 filesystem -located on the specified device. -</para> +<para>e2label will display or change the filesystem label on the ext2 +filesystem located on the specified device.</para> </sect3> <sect3><title>fsck</title> -<para> -fsck is used to check and optionally repair a Linux file system. -</para> +<para>fsck is used to check and optionally repair a Linux file system.</para> </sect3> <sect3><title>mke2fs and mkfs.ext2</title> -<para> -mke2fs is used to create a Linux second extended file system on a device -(usually a disk partition). mkfs.ext2 does the same as mke2fs. -</para> +<para>mke2fs is used to create a Linux second extended file system on a device +(usually a disk partition). mkfs.ext2 does the same as mke2fs.</para> </sect3> <sect3><title>mklost+found</title> -<para> -mklost+found is used to create a lost+found directory in the current +<para>mklost+found is used to create a lost+found directory in the current working directory on a Linux second extended file system. mklost+found -pre-allocates disk blocks to the directory to make it usable by e2fsck. -</para> +pre-allocates disk blocks to the directory to make it usable by e2fsck.</para> </sect3> <sect3><title>tune2fs</title> -<para> -tune2fs adjusts tunable filesystem parameters on a Linux second extended -filesystem. -</para> +<para>tune2fs adjusts tunable filesystem parameters on a Linux second extended +filesystem.</para> </sect3> diff --git a/appendixa/ed-desc.xml b/appendixa/ed-desc.xml index 6cc438ae9..214cc1f53 100644 --- a/appendixa/ed-desc.xml +++ b/appendixa/ed-desc.xml @@ -1,19 +1,15 @@ <sect2> <title>Contents</title> -<para> -The Ed package contains the ed program. -</para> +<para>The Ed package contains the ed program.</para> </sect2> <sect2><title>Description</title> -<para> -Ed is a line-oriented text editor. It is used to create, display, +<para>Ed is a line-oriented text editor. It is used to create, display, modify and -otherwise manipulate text files. -</para> +otherwise manipulate text files.</para> </sect2> diff --git a/appendixa/file-desc.xml b/appendixa/file-desc.xml index b93a53355..d9998c42a 100644 --- a/appendixa/file-desc.xml +++ b/appendixa/file-desc.xml @@ -1,20 +1,16 @@ <sect2> <title>Contents</title> -<para> -The File package contains the file program. -</para> +<para>The File package contains the file program.</para> </sect2> <sect2><title>Description</title> -<para> -File tests each specified file in an attempt to classify it. There are +<para>File tests each specified file in an attempt to classify it. There are three sets of tests, performed in this order: filesystem tests, magic number tests, and language tests. The first test that succeeds -causes the file type to be printed. -</para> +causes the file type to be printed.</para> </sect2> diff --git a/appendixa/fileutils-desc.xml b/appendixa/fileutils-desc.xml index f32d510bb..ca8dc0aa0 100644 --- a/appendixa/fileutils-desc.xml +++ b/appendixa/fileutils-desc.xml @@ -1,11 +1,9 @@ <sect2> <title>Contents</title> -<para> -The Fileutils package contains the chgrp, chmod, chown, cp, dd, df, dir, +<para>The Fileutils package contains the chgrp, chmod, chown, cp, dd, df, dir, dircolors, du, install, ln, ls, mkdir, mkfifo, mknod, mv, rm, rmdir, -sync, touch and vdir programs. -</para> +sync, touch and vdir programs.</para> </sect2> @@ -13,181 +11,141 @@ sync, touch and vdir programs. <sect3><title>chgrp</title> -<para> -chgrp changes the group ownership of each given file to the named group, -which can be either a group name or a numeric group ID. -</para> +<para>chgrp changes the group ownership of each given file to the named group, +which can be either a group name or a numeric group ID.</para> </sect3> <sect3><title>chmod</title> -<para> -chmod changes the permissions of each given file according to mode, which +<para>chmod changes the permissions of each given file according to mode, which can be either a symbolic representation of changes to make, or an octal -number representing the bit pattern for the new permissions. -</para> +number representing the bit pattern for the new permissions.</para> </sect3> <sect3><title>chown</title> -<para> -chown changes the user and/or group ownership of each given file. -</para> +<para>chown changes the user and/or group ownership of each given file.</para> </sect3> <sect3><title>cp</title> -<para> -cp copies files from one place to another. -</para> +<para>cp copies files from one place to another.</para> </sect3> <sect3><title>dd</title> -<para> -dd copies a file (from the standard input to the standard output, by default) -with a user-selectable blocksize, while optionally performing conversions -on it. -</para> +<para>dd copies a file (from the standard input to the standard output, by +default) with a user-selectable blocksize, while optionally performing +conversions on it.</para> </sect3> <sect3><title>df</title> -<para> -df displays the amount of disk space available on the filesystem +<para>df displays the amount of disk space available on the filesystem containing each file name argument. If no file name is given, the space -available on all currently mounted filesystems is shown. -</para> +available on all currently mounted filesystems is shown.</para> </sect3> <sect3><title>ls, dir and vdir</title> -<para> -dir and vdir are versions of ls with different default output formats. +<para>dir and vdir are versions of ls with different default output formats. These programs list each given file or directory name. Directory contents are sorted alphabetically. For ls, files are by default listed in columns, sorted vertically, if the standard output is a terminal; otherwise they are listed one per line. For dir, files are by default listed in columns, -sorted vertically. For vdir, files are by default listed in long format. -</para> +sorted vertically. For vdir, files are by default listed in long format.</para> </sect3> <sect3><title>dircolors</title> -<para> -dircolors outputs commands to set the LS_COLOR environment variable. +<para>dircolors outputs commands to set the LS_COLOR environment variable. The LS_COLOR variable is use to change the default color scheme used by -ls and related utilities. -</para> +ls and related utilities.</para> </sect3> <sect3><title>du</title> -<para> -du displays the amount of disk space used by each argument and for each -subdirectory of directory arguments. -</para> +<para>du displays the amount of disk space used by each argument and for each +subdirectory of directory arguments.</para> </sect3> <sect3><title>install</title> -<para> -install copies files and sets their permission modes and, if possible, -their owner and group. -</para> +<para>install copies files and sets their permission modes and, if possible, +their owner and group.</para> </sect3> <sect3><title>ln</title> -<para> -ln makes hard or soft (symbolic) links between files. -</para> +<para>ln makes hard or soft (symbolic) links between files.</para> </sect3> <sect3><title>mkdir</title> -<para> -mkdir creates directories with a given name. -</para> +<para>mkdir creates directories with a given name.</para> </sect3> <sect3><title>mkfifo</title> -<para> -mkfifo creates a FIFO with each given name. -</para> +<para>mkfifo creates a FIFO with each given name.</para> </sect3> <sect3><title>mknod</title> -<para> -mknod creates a FIFO, character special file, or block special file with the -given file name. -</para> +<para>mknod creates a FIFO, character special file, or block special file +with the given file name.</para> </sect3> <sect3><title>mv</title> -<para> -mv moves files from one directory to another or renames files, depending -on the arguments given to mv. -</para> +<para>mv moves files from one directory to another or renames files, depending +on the arguments given to mv.</para> </sect3> <sect3><title>rm</title> -<para> -rm removes files or directories. -</para> +<para>rm removes files or directories.</para> </sect3> <sect3><title>rmdir</title> -<para> -rmdir removes directories, if they are empty. -</para> +<para>rmdir removes directories, if they are empty.</para> </sect3> <sect3><title>shred</title> -<para> -shred deletes a file securely, overwriting it first so that its contents can't -be recovered. -</para> +<para>shred deletes a file securely, overwriting it first so that its +contents can't be recovered.</para> </sect3> <sect3><title>sync</title> -<para> -sync forces changed blocks to disk and updates the super block. -</para> +<para>sync forces changed blocks to disk and updates the super block.</para> </sect3> <sect3><title>touch</title> -<para> -touch changes the access and modification times of each given file to the -current time. Files that do not exist are created empty. -</para> +<para>touch changes the access and modification times of each given file to the +current time. Files that do not exist are created empty.</para> </sect3> diff --git a/appendixa/findutils-desc.xml b/appendixa/findutils-desc.xml index d95301f06..0ed5f361d 100644 --- a/appendixa/findutils-desc.xml +++ b/appendixa/findutils-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The Findutils package contains the find, locate, updatedb, xargs, -frcode, code and bigram programs. -</para> +<para>The Findutils package contains the find, locate, updatedb, xargs, +frcode, code and bigram programs.</para> </sect2> @@ -12,75 +10,63 @@ frcode, code and bigram programs. <sect3><title>Find</title> -<para> -The find program searches for files in a directory hierarchy which match +<para>The find program searches for files in a directory hierarchy which match a certain criteria. If no criteria is given, it lists all files in the -current directory and it's subdirectories. -</para> +current directory and it's subdirectories.</para> </sect3> <sect3><title>Locate</title> -<para> -Locate scans a database which contain all files and directories on a +<para>Locate scans a database which contain all files and directories on a filesystem. This program lists the files and directories in this database matching a certain criteria. If a user is looking for a file this program will scan the database and tell him exactly where the files he requested are located. This only makes sense if the locate database is -fairly up-to-date else it will provide out-of-date information. -</para> +fairly up-to-date else it will provide out-of-date information.</para> </sect3> <sect3><title>Updatedb</title> -<para> -The updatedb program updates the locate database. It scans the entire +<para>The updatedb program updates the locate database. It scans the entire file system (including other file system that are currently mounted unless it is told not to do so) and puts every directory and file it finds into the database that's used by the locate program which retrieves this information. It's a good practice to update this database once a day to -have it up-to-date whenever it is needed. -</para> +have it up-to-date whenever it is needed.</para> </sect3> <sect3><title>Xargs</title> -<para> -The xargs command applies a command to a list of files. If there is a need to -perform the same command on multiple files, a file can be created that -contains all these files (one per line) and use xargs to perform that -command on the list. -</para> +<para>The xargs command applies a command to a list of files. If there is +a need to perform the same command on multiple files, a file can be created +that contains all these files (one per line) and use xargs to perform that +command on the list.</para> </sect3> <sect3><title>frcode</title> -<para> -updatedb runs a program called frcode to compress the list of file names +<para>updatedb runs a program called frcode to compress the list of file names using front-compression, which reduces the database size by a factor of -4 to 5. -</para> +4 to 5.</para> </sect3> <sect3><title>code</title> -<para> -code is the ancestor of frcode. It was used in older-style locate databases. -</para> +<para>code is the ancestor of frcode. It was used in older-style locate +databases.</para> </sect3> <sect3><title>bigram</title> -<para> -bigram is used together with code to produce older-style locate databases. To -learn more about these last three programs, read the locatedb.5 manual page. -</para> +<para>bigram is used together with code to produce older-style locate +databases. To learn more about these last three programs, read the locatedb.5 +manual page.</para> </sect3> diff --git a/appendixa/flex-desc.xml b/appendixa/flex-desc.xml index 504feac53..64e23ee75 100644 --- a/appendixa/flex-desc.xml +++ b/appendixa/flex-desc.xml @@ -1,22 +1,18 @@ <sect2> <title>Contents</title> -<para> -The Flex package contains the flex program -</para> +<para>The Flex package contains the flex program</para> </sect2> <sect2><title>Description</title> -<para> -Flex is a tool for generating programs which recognizes patterns in text. +<para>Flex is a tool for generating programs which recognizes patterns in text. Pattern recognition is very useful in many applications. A user sets up rules what to look for and flex will make a program that looks for those patterns. The reason people use flex is that it is much easier to set up rules for what to look for than to write the actual program that finds -the text. -</para> +the text.</para> </sect2> diff --git a/appendixa/gcc-desc.xml b/appendixa/gcc-desc.xml index f2223a1e2..8b112c12c 100644 --- a/appendixa/gcc-desc.xml +++ b/appendixa/gcc-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The GCC package contains compilers, preprocessors and the GNU C++ -Library. -</para> +<para>The GCC package contains compilers, preprocessors and the GNU C++ +Library.</para> </sect2> @@ -12,38 +10,32 @@ Library. <sect3><title>Compiler</title> -<para> -A compiler translates source code in text format to a format +<para>A compiler translates source code in text format to a format that a computer understands. After a source code file is compiled into an object file, a linker will create an executable file from one or more -of these compiler generated object files. -</para> +of these compiler generated object files.</para> </sect3> <sect3><title>Preprocessor</title> -<para> -A preprocessor pre-processes a source file, such as including +<para>A preprocessor pre-processes a source file, such as including the contents of header files into the source file. It's a good idea to not do this manually to save a lot of time. Someone just inserts a line like #include <filename>. The preprocessor inserts the contents of that file into the source file. That's one of the things a -preprocessor does. -</para> +preprocessor does.</para> </sect3> <sect3><title>C++ Library</title> -<para> -The C++ library is used by C++ programs. The C++ library contains +<para>The C++ library is used by C++ programs. The C++ library contains functions that are frequently used in C++ programs. This way the programmer doesn't have to write certain functions (such as writing a string of text to the screen) from scratch every time he creates a -program. -</para> +program.</para> </sect3> diff --git a/appendixa/gettext-desc.xml b/appendixa/gettext-desc.xml index a83b3f202..1fa231ccf 100644 --- a/appendixa/gettext-desc.xml +++ b/appendixa/gettext-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The gettext package contains the gettext, gettextize, msgcmp, msgcomm, -msgfmt, msgmerge, msgunfmt and xgettext programs. -</para> +<para>The gettext package contains the gettext, gettextize, msgcmp, msgcomm, +msgfmt, msgmerge, msgunfmt and xgettext programs.</para> </sect2> @@ -12,13 +10,11 @@ msgfmt, msgmerge, msgunfmt and xgettext programs. <sect3><title>gettext</title> -<para> -The gettext package is used for internationalization (also known as +<para>The gettext package is used for internationalization (also known as i18n) and for localization (also known as l10n). Programs can be compiled with Native Language Support (NLS) which enable them to output messages in the users native language rather than in the default English -language. -</para> +language.</para> </sect3> diff --git a/appendixa/glibc-desc.xml b/appendixa/glibc-desc.xml index dace3b634..d456652aa 100644 --- a/appendixa/glibc-desc.xml +++ b/appendixa/glibc-desc.xml @@ -1,23 +1,18 @@ <sect2> <title>Contents</title> -<para> -The Glibc package contains the GNU C Library. -</para> +<para>The Glibc package contains the GNU C Library.</para> </sect2> <sect2><title>Description</title> -<para> -The C Library is a collection of commonly used functions in programs. +<para>The C Library is a collection of commonly used functions in programs. This way a programmer doesn't need to create his own functions for every single task. The most common things like writing a string to the screen -are already present and at the disposal of the programmer. -</para> +are already present and at the disposal of the programmer.</para> -<para> -The C library (actually almost every library) come in two flavors: +<para>The C library (actually almost every library) come in two flavors: dynamic ones and static ones. In short when a program uses a static C library, the code from the C library will be copied into the executable file. When a program uses a dynamic library, that executable will not @@ -25,8 +20,7 @@ contain the code from the C library, but instead a routine that loads the functions from the library at the time the program is run. This means a significant decrease in the file size of a program. The documentation that comes with the C Library describes this in more -detail, as it is too complicated to explain here in one or two lines. -</para> +detail, as it is too complicated to explain here in one or two lines.</para> </sect2> diff --git a/appendixa/grep-desc.xml b/appendixa/grep-desc.xml index ae0500583..e591e3124 100644 --- a/appendixa/grep-desc.xml +++ b/appendixa/grep-desc.xml @@ -1,9 +1,7 @@ <sect2> <title>Contents</title> -<para> -The grep package contains the egrep, fgrep and grep programs. -</para> +<para>The grep package contains the egrep, fgrep and grep programs.</para> </sect2> @@ -11,28 +9,22 @@ The grep package contains the egrep, fgrep and grep programs. <sect3><title>egrep</title> -<para> -egrep prints lines from files matching an extended regular expression -pattern. -</para> +<para>egrep prints lines from files matching an extended regular expression +pattern.</para> </sect3> <sect3><title>fgrep</title> -<para> -fgrep prints lines from files matching a list of fixed strings, -separated by newlines, any of which is to be matched. -</para> +<para>fgrep prints lines from files matching a list of fixed strings, +separated by newlines, any of which is to be matched.</para> </sect3> <sect3><title>grep</title> -<para> -grep prints lines from files matching a basic regular expression -pattern. -</para> +<para>grep prints lines from files matching a basic regular expression +pattern.</para> </sect3> diff --git a/appendixa/groff-desc.xml b/appendixa/groff-desc.xml index 954f0441d..75d4f57b1 100644 --- a/appendixa/groff-desc.xml +++ b/appendixa/groff-desc.xml @@ -1,12 +1,10 @@ <sect2> <title>Contents</title> -<para> -The Groff packages contains the addftinfo, afmtodit, eqn, grodvi, groff, +<para>The Groff packages contains the addftinfo, afmtodit, eqn, grodvi, groff, grog, grohtml, grolj4, grops, grotty, hpftodit, indxbib, lkbib, lookbib, neqn, nroff, pfbtops, pic, psbb, refer, soelim, tbl, tfmtodit and troff -programs. -</para> +programs.</para> </sect2> @@ -14,219 +12,172 @@ programs. <sect3><title>addftinfo</title> -<para> -addftinfo reads a troff font file and adds some additional font-metric -information that is used by the groff system. -</para> +<para>addftinfo reads a troff font file and adds some additional font-metric +information that is used by the groff system.</para> </sect3> <sect3><title>afmtodit</title> -<para> -afmtodit creates a font file for use with groff and grops. -</para> +<para>afmtodit creates a font file for use with groff and grops.</para> </sect3> <sect3><title>eqn</title> -<para> -eqn compiles descriptions of equations embedded within troff input files -into commands that are understood by troff. -</para> +<para>eqn compiles descriptions of equations embedded within troff input files +into commands that are understood by troff.</para> </sect3> <sect3><title>grodvi</title> -<para> -grodvi is a driver for groff that produces TeX dvi format. -</para> +<para>grodvi is a driver for groff that produces TeX dvi format.</para> </sect3> <sect3><title>groff</title> -<para> -groff is a front-end to the groff document formatting system. Normally it +<para>groff is a front-end to the groff document formatting system. Normally it runs the troff program and a post-processor appropriate for the selected -device. -</para> +device.</para> </sect3> <sect3><title>grog</title> -<para> -grog reads files and guesses which of the groff options -e, -man, -me, -mm, --ms, -p, -s, and -t are required for printing files, and prints the groff -command including those options on the standard output. -</para> +<para>grog reads files and guesses which of the groff options -e, -man, -me, +-mm, -ms, -p, -s, and -t are required for printing files, and prints the groff +command including those options on the standard output.</para> </sect3> <sect3><title>grohtml</title> -<para> -grohtml translates the output of GNU troff to html -</para> +<para>grohtml translates the output of GNU troff to html</para> </sect3> <sect3><title>grolj4</title> -<para> -grolj4 is a driver for groff that produces output in PCL5 format suitable -for an HP Laserjet 4 printer. -</para> +<para>grolj4 is a driver for groff that produces output in PCL5 format suitable +for an HP Laserjet 4 printer.</para> </sect3> <sect3><title>grops</title> -<para> -grops translates the output of GNU troff to Postscript. -</para> +<para>grops translates the output of GNU troff to Postscript.</para> </sect3> <sect3><title>grotty</title> -<para> -grotty translates the output of GNU troff into a form suitable for -typewriter-like devices. -</para> +<para>grotty translates the output of GNU troff into a form suitable for +typewriter-like devices.</para> </sect3> <sect3><title>hpftodit</title> -<para> -hpftodit creates a font file for use with groff -Tlj4 from an HP -tagged font metric file. -</para> +<para>hpftodit creates a font file for use with groff -Tlj4 from an HP +tagged font metric file.</para> </sect3> <sect3><title>indxbib</title> -<para> -indxbib makes an inverted index for the bibliographic databases a -specified file for use with refer, lookbib, and lkbib. -</para> +<para>indxbib makes an inverted index for the bibliographic databases a +specified file for use with refer, lookbib, and lkbib.</para> </sect3> <sect3><title>lkbib</title> -<para> -lkbib searches bibliographic databases for references that contain -specified keys and prints any references found on the standard output. -</para> +<para>lkbib searches bibliographic databases for references that contain +specified keys and prints any references found on the standard output.</para> </sect3> <sect3><title>lookbib</title> -<para> -lookbib prints a prompt on the standard error (unless the standard input +<para>lookbib prints a prompt on the standard error (unless the standard input is not a terminal), reads from the standard input a line containing a set of keywords, searches the bibliographic databases in a specified file for references containing those keywords, prints any references found on the -standard output, and repeats this process until the end of input. -</para> +standard output, and repeats this process until the end of input.</para> </sect3> <sect3><title>neqn</title> -<para> -The neqn script formats equations for ascii output. -</para> +<para>The neqn script formats equations for ascii output.</para> </sect3> <sect3><title>nroff</title> -<para> -The nroff script emulates the nroff command using groff. -</para> +<para>The nroff script emulates the nroff command using groff.</para> </sect3> <sect3><title>pfbtops</title> -<para> -pfbtops translates a Postscript font in .pfb format to ASCII. -</para> +<para>pfbtops translates a Postscript font in .pfb format to ASCII.</para> </sect3> <sect3><title>pic</title> -<para> -pic compiles descriptions of pictures embedded within troff or TeX input -files into commands that are understood by TeX or troff. -</para> +<para>pic compiles descriptions of pictures embedded within troff or TeX input +files into commands that are understood by TeX or troff.</para> </sect3> <sect3><title>psbb</title> -<para> -psbb reads a file which should be a Postscript document conforming to the -Document Structuring conventions and looks for a %%BoundingBox comment. -</para> +<para>psbb reads a file which should be a Postscript document conforming to the +Document Structuring conventions and looks for a %%BoundingBox comment.</para> </sect3> <sect3><title>refer</title> -<para> -refer copies the contents of a file to the standard output, except that +<para>refer copies the contents of a file to the standard output, except that lines between .[ and .] are interpreted as citations, and lines between .R1 and .R2 are interpreted as commands about how citations are to be -processed. -</para> +processed.</para> </sect3> <sect3><title>soelim</title> -<para> -soelim reads files and replaces lines of the form +<para>soelim reads files and replaces lines of the form <emphasis>.so file</emphasis> by the contents of -<emphasis>file</emphasis>. -</para> +<emphasis>file</emphasis>.</para> </sect3> <sect3><title>tbl</title> -<para> -tbl compiles descriptions of tables embedded within troff input files -into commands that are understood by troff. -</para> +<para>tbl compiles descriptions of tables embedded within troff input files +into commands that are understood by troff.</para> </sect3> <sect3><title>tfmtodit</title> -<para> -tfmtodit creates a font file for use with <userinput>groff --Tdvi</userinput> -</para> +<para>tfmtodit creates a font file for use with <userinput>groff +-Tdvi</userinput></para> </sect3> <sect3><title>troff</title> -<para> -troff is highly compatible with Unix troff. Usually it should be invoked +<para>troff is highly compatible with Unix troff. Usually it should be invoked using the groff command, which will also run preprocessors and -post-processors in the appropriate order and with the appropriate options. -</para> +post-processors in the appropriate order and with the appropriate +options.</para> </sect3> diff --git a/appendixa/gzip-desc.xml b/appendixa/gzip-desc.xml index dbfe0f719..7f66f985a 100644 --- a/appendixa/gzip-desc.xml +++ b/appendixa/gzip-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The Gzip package contains the compress, gunzip, gzexe, gzip, uncompress, -zcat, zcmp, zdiff, zforce, zgrep, zmore and znew programs. -</para> +<para>The Gzip package contains the compress, gunzip, gzexe, gzip, uncompress, +zcat, zcmp, zdiff, zforce, zgrep, zmore and znew programs.</para> </sect2> @@ -12,88 +10,70 @@ zcat, zcmp, zdiff, zforce, zgrep, zmore and znew programs. <sect3><title>gunzip</title> -<para> -gunzip decompresses files that are compressed with gzip. -</para> +<para>gunzip decompresses files that are compressed with gzip.</para> </sect3> <sect3><title>gzexe</title> -<para> -gzexe allows to compress executables in place and have them +<para>gzexe allows to compress executables in place and have them automatically uncompress and execute when they are run (at a penalty in -performance). -</para> +performance).</para> </sect3> <sect3><title>gzip</title> -<para> -gzip reduces the size of the named files using Lempel-Ziv coding (LZ77). -</para> +<para>gzip reduces the size of the named files using +Lempel-Ziv coding (LZ77).</para> </sect3> <sect3><title>zcat</title> -<para> -zcat uncompresses either a list of files on the command line or its -standard input and writes the uncompressed data on standard output -</para> +<para>zcat uncompresses either a list of files on the command line or its +standard input and writes the uncompressed data on standard output</para> </sect3> <sect3><title>zcmp</title> -<para> -zcmp invokes the cmp program on compressed files. -</para> +<para>zcmp invokes the cmp program on compressed files.</para> </sect3> <sect3><title>zdiff</title> -<para> -zdiff invokes the diff program on compressed files. -</para> +<para>zdiff invokes the diff program on compressed files.</para> </sect3> <sect3><title>zforce</title> -<para> -zforce forces a .gz extension on all gzip files so that gzip will not +<para>zforce forces a .gz extension on all gzip files so that gzip will not compress them twice. This can be useful for files with names truncated -after a file transfer. -</para> +after a file transfer.</para> </sect3> <sect3><title>zgrep</title> -<para> -zgrep invokes the grep program on compressed files. -</para> +<para>zgrep invokes the grep program on compressed files.</para> </sect3> <sect3><title>zmore</title> -<para> -zmore is a filter which allows examination of compressed or plain text +<para>zmore is a filter which allows examination of compressed or plain text files one screen at a time on a soft-copy terminal (similar to the -more program). -</para> +more program).</para> </sect3> <sect3><title>znew</title> -<para> -znew re-compresses files from .Z (compress) format to .gz (gzip) format. -</para> +<para>znew re-compresses files from .Z (compress) format to +.gz (gzip) format.</para> </sect3> diff --git a/appendixa/introduction.xml b/appendixa/introduction.xml index 609a8a17b..7e61dbb8d 100644 --- a/appendixa/introduction.xml +++ b/appendixa/introduction.xml @@ -2,51 +2,37 @@ <title>Introduction</title> -<para> -This appendix describes the following aspect of each and every package -that is installed in this book: -</para> +<para>This appendix describes the following aspect of each and every package +that is installed in this book:</para> <itemizedlist> -<listitem><para> - What every package contains -</para></listitem> +<listitem><para> What every package contains</para></listitem> -<listitem><para> - What every program from a package does -</para></listitem> +<listitem><para> What every program from a package does</para></listitem> </itemizedlist> -<para> -The packages are listed in the same order as they are installed in -chapter 5 (Intel system) or chapter 11 (PPC systems). -</para> +<para>The packages are listed in the same order as they are installed in +chapter 5 (Intel system) or chapter 11 (PPC systems).</para> -<para> -Most information about these packages (especially the descriptions of +<para>Most information about these packages (especially the descriptions of it) come from the man pages from those packages. I'm not going to print the entire man page, just the core elements to make it possible to understand what a program does. To get knowledge of all details on a program, I suggest -to start by reading the complete man page in addition to this appendix. -</para> +to start by reading the complete man page in addition to this appendix.</para> -<para> -Certain packages are documented more in depth +<para>Certain packages are documented more in depth than others, because I just happen to know more about certain packages than I know about others. If anything should be added on the following descriptions, please don't hesitate to email me. This list is going to contain an in depth description of every package installed, but I can't do this on my own. I have had help from various people but more -help is needed. -</para> +help is needed.</para> -<para> -Please note that currently only what a package does is described and not -why it needs to be installed. That will be added later. -</para> +<para>Please note that currently only what a package does is described and not +why it needs to be installed. That will be added later.</para> </sect1> diff --git a/appendixa/kbd-desc.xml b/appendixa/kbd-desc.xml index d1eb43576..5f95a8ad5 100644 --- a/appendixa/kbd-desc.xml +++ b/appendixa/kbd-desc.xml @@ -1,8 +1,7 @@ <sect2> <title>Contents</title> -<para> -The Kbd package contains the chvt, +<para>The Kbd package contains the chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn, psfxtable, @@ -11,8 +10,7 @@ setkeycodes, setleds, setmetamode, setvesablank, showfont, showkey, unicode_start, and unicode_stop programs. There are some other programs that don't get installed by default, as they are very optional. Take a look at the -Kbd package contents if you have trouble with your console. -</para> +Kbd package contents if you have trouble with your console.</para> </sect2> @@ -22,203 +20,161 @@ Kbd package contents if you have trouble with your console. <sect3> <title>chvt</title> -<para> -chvt changes foreground virtual terminal. -</para> +<para>chvt changes foreground virtual terminal.</para> </sect3> <sect3> <title>deallocvt</title> -<para> -deallocvt deallocates unused virtual terminals. -</para> +<para>deallocvt deallocates unused virtual terminals.</para> </sect3> <sect3> <title>dumpkeys</title> -<para> -dumpkeys dumps keyboard translation tables. -</para> +<para>dumpkeys dumps keyboard translation tables.</para> </sect3> <sect3> <title>fgconsole</title> -<para> -fgconsole prints the number of the active virtual terminal. -</para> +<para>fgconsole prints the number of the active virtual terminal.</para> </sect3> <sect3> <title>getkeycodes</title> -<para> -getkeycodes prints the kernel scancode-to-keycode mapping table. -</para> +<para>getkeycodes prints the kernel scancode-to-keycode mapping table.</para> </sect3> <sect3> <title>kbd_mode</title> -<para> -kbd_mode reports or sets the keyboard mode. -</para> +<para>kbd_mode reports or sets the keyboard mode.</para> </sect3> <sect3> <title>kbdrate</title> -<para> -kbdrate sets the keyboard repeat and delay rates. -</para> +<para>kbdrate sets the keyboard repeat and delay rates.</para> </sect3> <sect3> <title>loadkeys</title> -<para> -loadkeys loads keyboard translation tables. -</para> +<para>loadkeys loads keyboard translation tables.</para> </sect3> <sect3> <title>loadunimap</title> -<para> -loadunimap loads the kernel unicode-to-font mapping table. -</para> +<para>loadunimap loads the kernel unicode-to-font mapping table.</para> </sect3> <sect3> <title>mapscrn</title> -<para> -mapscrn loads a user defined output character +<para>mapscrn loads a user defined output character mapping table into the console driver. Note that it is obsolete and that its -features are built into setfont. -</para> +features are built into setfont.</para> </sect3> <sect3> <title>psfxtable</title> -<para> -psfxtable is a tool for handling Unicode character tables for console fonts. -</para> +<para>psfxtable is a tool for handling Unicode character tables for +console fonts.</para> </sect3> <sect3> <title>resizecons</title> -<para> -resizecons changes the kernel idea of the console size. -</para> +<para>resizecons changes the kernel idea of the console size.</para> </sect3> <sect3> <title>screendump</title> -<para> -A screen shot utility for the console. -</para> +<para>A screen shot utility for the console.</para> </sect3> <sect3> <title>setfont</title> -<para> -This lets you change the EGA/VGA fonts in console. -</para> +<para>This lets you change the EGA/VGA fonts in console.</para> </sect3> <sect3> <title>setkeycodes</title> -<para> -setkeycodes loads kernel scancode-to-keycode mapping table entries. -</para> +<para>setkeycodes loads kernel scancode-to-keycode mapping table entries.</para> </sect3> <sect3> <title>setleds</title> -<para> -setleds sets the keyboard LEDs. Many people find it useful to have numlock -enabled by default, and it is by using this program that you can achieve this. -</para> +<para>setleds sets the keyboard LEDs. Many people find it useful to have numlock +enabled by default, and it is by using this program that you can +achieve this.</para> </sect3> <sect3> <title>setmetamode</title> -<para> -setmetamode defines the keyboard meta key handling. -</para> +<para>setmetamode defines the keyboard meta key handling.</para> </sect3> <sect3> <title>setvesablank</title> -<para> -This lets you fiddle with the built-in hardware screensaver (not toasters, only -a blank screen). -</para> +<para>This lets you fiddle with the built-in hardware screensaver +(not toasters, only a blank screen).</para> </sect3> <sect3> <title>showfont</title> -<para> -showfont displays data about a font. The information shown includes font -information, font properties, character metrics, and character bitmaps. -</para> +<para>showfont displays data about a font. The information shown includes font +information, font properties, character metrics, and character bitmaps.</para> </sect3> <sect3> <title>showkey</title> -<para> -showkey examines the scancodes and keycodes sent by the keyboard. -</para> +<para>showkey examines the scancodes and keycodes sent by the keyboard.</para> </sect3> <sect3> <title>unicode_start</title> -<para> -unicode_start puts the console in Unicode mode. -</para> +<para>unicode_start puts the console in Unicode mode.</para> </sect3> <sect3> <title>unicode_stop</title> -<para> -unicode_stop reverts keyboard and console from unicode mode. -</para> +<para>unicode_stop reverts keyboard and console from unicode mode.</para> </sect3> diff --git a/appendixa/kernel-desc.xml b/appendixa/kernel-desc.xml index da3c8d6ec..5d406cfe5 100644 --- a/appendixa/kernel-desc.xml +++ b/appendixa/kernel-desc.xml @@ -1,22 +1,18 @@ <sect2><title>Contents</title> -<para> -The Linux kernel package contains the Linux kernel. -</para> +<para>The Linux kernel package contains the Linux kernel.</para> </sect2> <sect2><title>Description</title> -<para> -The Linux kernel is at the core of every Linux system. It's what makes +<para>The Linux kernel is at the core of every Linux system. It's what makes Linux tick. When a computer is turned on and boots a Linux system, the very first piece of Linux software that gets loaded is the kernel. The kernel initializes the system's hardware components such as serial ports, parallel ports, sound cards, network cards, IDE controllers, SCSI controllers and a lot more. In a nutshell the kernel makes the hardware -available so that the software can run. -</para> +available so that the software can run.</para> </sect2> diff --git a/appendixa/less-desc.xml b/appendixa/less-desc.xml index 5ad7702dc..1a3121f81 100644 --- a/appendixa/less-desc.xml +++ b/appendixa/less-desc.xml @@ -1,15 +1,12 @@ <sect2><title>Contents</title> -<para> -The Less package contains the less program -</para> +<para>The Less package contains the less program</para> </sect2> <sect2><title>Description</title> -<para> -The less program is a file pager (or text viewer). It displays the +<para>The less program is a file pager (or text viewer). It displays the contents of a file with the ability to scroll. Less is an improvement on the common @@ -17,8 +14,7 @@ pager called <quote>more</quote>. Less has the ability to scroll backwards through files as well and it doesn't need to read the entire file when it -starts, which makes it faster when reading large files. -</para> +starts, which makes it faster when reading large files.</para> </sect2> diff --git a/appendixa/libtool-desc.xml b/appendixa/libtool-desc.xml index 7618e78fc..996fc74b4 100644 --- a/appendixa/libtool-desc.xml +++ b/appendixa/libtool-desc.xml @@ -1,9 +1,7 @@ <sect2><title>Contents</title> -<para> -The Libtool package contains the libtool and libtoolize programs. It -also contains the ltdl library. -</para> +<para>The Libtool package contains the libtool and libtoolize programs. It +also contains the ltdl library.</para> </sect2> @@ -11,27 +9,21 @@ also contains the ltdl library. <sect3><title>libtool</title> -<para> -Libtool provides generalized library-building support services. -</para> +<para>Libtool provides generalized library-building support services.</para> </sect3> <sect3><title>libtoolize</title> -<para> -libtoolize provides a standard way to add libtool support to a -package. -</para> +<para>libtoolize provides a standard way to add libtool support to a +package.</para> </sect3> <sect3><title>ltdl library</title> -<para> -Libtool provides a small library, called `libltdl', that aims at hiding -the various difficulties of dlopening libraries from programmers. -</para> +<para>Libtool provides a small library, called `libltdl', that aims at hiding +the various difficulties of dlopening libraries from programmers.</para> </sect3> diff --git a/appendixa/lilo-desc.xml b/appendixa/lilo-desc.xml index 016bffb9f..1d6575612 100644 --- a/appendixa/lilo-desc.xml +++ b/appendixa/lilo-desc.xml @@ -1,18 +1,14 @@ <sect2> <title>Contents</title> -<para> -The Lilo package contains the lilo program. -</para> +<para>The Lilo package contains the lilo program.</para> </sect2> <sect2><title>Description</title> -<para> -lilo installs the Linux boot loader which is used to start a Linux -system. -</para> +<para>lilo installs the Linux boot loader which is used to start a Linux +system.</para> </sect2> diff --git a/appendixa/m4-desc.xml b/appendixa/m4-desc.xml index 83c01550d..a62317f38 100644 --- a/appendixa/m4-desc.xml +++ b/appendixa/m4-desc.xml @@ -1,23 +1,19 @@ <sect2> <title>Contents</title> -<para> -The M4 package contains the M4 processor -</para> +<para>The M4 package contains the M4 processor</para> </sect2> <sect2> <title>Description</title> -<para> -M4 is a macro processor. It copies input to output expanding macros as it +<para>M4 is a macro processor. It copies input to output expanding macros as it goes. Macros are either built-in or user-defined and can take any number of arguments. Besides just doing macro expansion m4 has built-in functions for including named files, running UNIX commands, doing integer arithmetic, manipulating text in various ways, recursion, etc. M4 can be used either -as a front-end to a compiler or as a macro processor in its own right. -</para> +as a front-end to a compiler or as a macro processor in its own right.</para> </sect2> diff --git a/appendixa/make-desc.xml b/appendixa/make-desc.xml index 80257b54e..88f8ed6c9 100644 --- a/appendixa/make-desc.xml +++ b/appendixa/make-desc.xml @@ -1,17 +1,13 @@ <sect2><title>Contents</title> -<para> -The Make package contains the make program. -</para> +<para>The Make package contains the make program.</para> </sect2> <sect2><title>Description</title> -<para> -make determines automatically which pieces of a large program need to be -recompiled, and issues the commands to recompile them. -</para> +<para>make determines automatically which pieces of a large program need to be +recompiled, and issues the commands to recompile them.</para> </sect2> diff --git a/appendixa/makedev-desc.xml b/appendixa/makedev-desc.xml index 541aeaa31..07042d910 100644 --- a/appendixa/makedev-desc.xml +++ b/appendixa/makedev-desc.xml @@ -1,17 +1,13 @@ <sect2><title>Contents</title> -<para> -The MAKEDEV package contains the MAKEDEV script. -</para> +<para>The MAKEDEV package contains the MAKEDEV script.</para> </sect2> <sect2><title>Description</title> -<para> -MAKEDEV is a script that can help in creating the necessary static -device files that usually reside in the /dev directory. -</para> +<para>MAKEDEV is a script that can help in creating the necessary static +device files that usually reside in the /dev directory.</para> </sect2> diff --git a/appendixa/man-desc.xml b/appendixa/man-desc.xml index bb42984a1..5842fed54 100644 --- a/appendixa/man-desc.xml +++ b/appendixa/man-desc.xml @@ -1,9 +1,7 @@ <sect2><title>Contents</title> -<para> -The Man package contains the man, apropos whatis and makewhatis -programs. -</para> +<para>The Man package contains the man, apropos whatis and makewhatis +programs.</para> </sect2> @@ -11,42 +9,34 @@ programs. <sect3><title>man</title> -<para> -man formats and displays the on-line manual pages. -</para> +<para>man formats and displays the on-line manual pages.</para> </sect3> <sect3><title>apropos</title> -<para> -apropos searches a set of database files containing short descriptions +<para>apropos searches a set of database files containing short descriptions of system commands for keywords and displays the result on the standard -output. -</para> +output.</para> </sect3> <sect3><title>whatis</title> -<para> -whatis searches a set of database files containing short descriptions +<para>whatis searches a set of database files containing short descriptions of system commands for keywords and displays the result on the standard -output. Only complete word matches are displayed. -</para> +output. Only complete word matches are displayed.</para> </sect3> <sect3><title>makewhatis</title> -<para> -makewhatis reads all the manual pages contained in given sections of +<para>makewhatis reads all the manual pages contained in given sections of manpath or the pre-formatted pages contained in the given sections of catpath. For each page, it writes a line in the whatis database; each line consists of the name of the page and a short description, separated by a dash. The description is extracted using the content of -the NAME section of the manual page. -</para> +the NAME section of the manual page.</para> </sect3> diff --git a/appendixa/manpages-desc.xml b/appendixa/manpages-desc.xml index 2fa30e7bf..a0d73e323 100644 --- a/appendixa/manpages-desc.xml +++ b/appendixa/manpages-desc.xml @@ -1,18 +1,14 @@ <sect2><title>Contents</title> -<para> -The Man-pages package contains various manual pages that don't come with -the packages. -</para> +<para>The Man-pages package contains various manual pages that don't come with +the packages.</para> </sect2> <sect2><title>Description</title> -<para> -Examples of provided manual pages are the manual pages describing all -the C and C++ functions, few important /dev/ files and more. -</para> +<para>Examples of provided manual pages are the manual pages describing all +the C and C++ functions, few important /dev/ files and more.</para> </sect2> diff --git a/appendixa/mawk-desc.xml b/appendixa/mawk-desc.xml index 216f05f7e..baa962375 100644 --- a/appendixa/mawk-desc.xml +++ b/appendixa/mawk-desc.xml @@ -1,8 +1,6 @@ <sect2><title>Contents</title> -<para> -The Mawk package contains the mawk program. -</para> +<para>The Mawk package contains the mawk program.</para> </sect2> @@ -10,11 +8,9 @@ The Mawk package contains the mawk program. <sect3><title>mawk</title> -<para> -Mawk is an interpreter for the AWK Programming Language. The AWK +<para>Mawk is an interpreter for the AWK Programming Language. The AWK language is useful for manipulation of data files, text retrieval and -processing, and for prototyping and experimenting with algorithms. -</para> +processing, and for prototyping and experimenting with algorithms.</para> </sect3> diff --git a/appendixa/modutils-desc.xml b/appendixa/modutils-desc.xml index cf0fb85fe..b11491521 100644 --- a/appendixa/modutils-desc.xml +++ b/appendixa/modutils-desc.xml @@ -1,11 +1,9 @@ <sect2> <title>Contents</title> -<para> -The Modutils package contains the depmod, genksyms, insmod, +<para>The Modutils package contains the depmod, genksyms, insmod, insmod_ksymoops_clean, kerneld, kernelversion, ksyms, lsmod, modinfo, -modprobe and rmmod programs. -</para> +modprobe and rmmod programs.</para> </sect2> @@ -13,95 +11,73 @@ modprobe and rmmod programs. <sect3><title>depmod</title> -<para> -depmod handles dependency descriptions for loadable kernel modules. -</para> +<para>depmod handles dependency descriptions for loadable kernel modules.</para> </sect3> <sect3><title>genksyms</title> -<para> -genksyms reads (on standard input) the output from gcc -E source.c -and generates a file containing version information. -</para> +<para>genksyms reads (on standard input) the output from gcc -E source.c +and generates a file containing version information.</para> </sect3> <sect3><title>insmod</title> -<para> -insmod installs a loadable module in the running kernel. -</para> +<para>insmod installs a loadable module in the running kernel.</para> </sect3> <sect3><title>insmod_ksymoops_clean</title> -<para> -insmod_ksymoops_clean deletes saved ksyms and modules not accessed in -2 days. -</para> +<para>insmod_ksymoops_clean deletes saved ksyms and modules not accessed in +2 days.</para> </sect3> <sect3><title>kerneld</title> -<para> -kerneld performs kernel action in user space (such as on-demand loading of -modules) -</para> +<para>kerneld performs kernel action in user space (such as on-demand loading +of modules)</para> </sect3> <sect3><title>kernelversion</title> -<para> -kernelversion reports the major version of the running kernel. -</para> +<para>kernelversion reports the major version of the running kernel.</para> </sect3> <sect3><title>ksyms</title> -<para> -ksyms displays exported kernel symbols. -</para> +<para>ksyms displays exported kernel symbols.</para> </sect3> <sect3><title>lsmod</title> -<para> -lsmod shows information about all loaded modules. -</para> +<para>lsmod shows information about all loaded modules.</para> </sect3> <sect3><title>modinfo</title> -<para> -modinfo examines an object file associated with a kernel module and -displays any information that it can glean. -</para> +<para>modinfo examines an object file associated with a kernel module and +displays any information that it can glean.</para> </sect3> <sect3><title>modprobe</title> -<para> -Modprobe uses a Makefile-like dependency file, created by depmod, +<para>Modprobe uses a Makefile-like dependency file, created by depmod, to automatically load the relevant module(s) from the set of modules -available in predefined directory trees. -</para> +available in predefined directory trees.</para> </sect3> <sect3><title>rmmod</title> -<para> -rmmod unloads loadable modules from the running kernel. -</para> +<para>rmmod unloads loadable modules from the running kernel.</para> </sect3> diff --git a/appendixa/ncurses-desc.xml b/appendixa/ncurses-desc.xml index a8e2c3b9a..2824c6a10 100644 --- a/appendixa/ncurses-desc.xml +++ b/appendixa/ncurses-desc.xml @@ -1,11 +1,9 @@ <sect2> <title>Contents</title> -<para> -The Ncurses package contains the ncurses, panel, menu and form +<para>The Ncurses package contains the ncurses, panel, menu and form libraries. It also contains the tic, infocmp, clear, tput, toe and tset -programs. -</para> +programs.</para> </sect2> @@ -13,80 +11,66 @@ programs. <sect3><title>The libraries</title> -<para> -The libraries that make up the Ncurses library are used to display text +<para>The libraries that make up the Ncurses library are used to display text (often in a fancy way) on the screen. An example where ncurses is used is in the kernel's <quote>make menuconfig</quote> process. The libraries contain routines to create panels, menu's, form and general text display -routines. -</para> +routines.</para> </sect3> <sect3><title>Tic</title> -<para> -Tic is the terminfo entry-description compiler. The program translates a +<para>Tic is the terminfo entry-description compiler. The program translates a terminfo file from source format into the binary format for use with the ncurses library routines. Terminfo files contain information about the -capabilities of a terminal. -</para> +capabilities of a terminal.</para> </sect3> <sect3><title>Infocmp</title> -<para> -The infocmp program can be used to compare a binary terminfo entry with +<para>The infocmp program can be used to compare a binary terminfo entry with other terminfo entries, rewrite a terminfo description to take advantage of the use= terminfo field, or print out a terminfo description from the binary -file (term) in a variety of formats (the opposite of what tic does). -</para> +file (term) in a variety of formats (the opposite of what tic does).</para> </sect3> <sect3><title>clear</title> -<para> -The clear program clears the screen if this is possible. It looks in +<para>The clear program clears the screen if this is possible. It looks in the environment for the terminal type and then in the terminfo database to -figure out how to clear the screen. -</para> +figure out how to clear the screen.</para> </sect3> <sect3><title>tput</title> -<para> -The tput program uses the terminfo database to make the values of +<para>The tput program uses the terminfo database to make the values of terminal-dependent capabilities and information available to the shell, to initialize or reset the terminal, or return the long name of the requested -terminal type. -</para> +terminal type.</para> </sect3> <sect3><title>toe</title> -<para> -The toe program lists all available terminal types by primary name with -descriptions. -</para> +<para>The toe program lists all available terminal types by primary name with +descriptions.</para> </sect3> <sect3><title>tset</title> -<para> -The Tset program initializes terminals so they can be used, but it's not -widely used anymore. It's provided for 4.4BSD compatibility. -</para> +<para>The Tset program initializes terminals so they can be used, but it's not +widely used anymore. It's provided for 4.4BSD compatibility.</para> </sect3> diff --git a/appendixa/netkitbase-desc.xml b/appendixa/netkitbase-desc.xml index 2d5f982f6..a66745525 100644 --- a/appendixa/netkitbase-desc.xml +++ b/appendixa/netkitbase-desc.xml @@ -1,9 +1,7 @@ <sect2> <title>Contents</title> -<para> -The Netkit-base package contains the inetd and ping programs. -</para> +<para>The Netkit-base package contains the inetd and ping programs.</para> </sect2> @@ -13,19 +11,16 @@ The Netkit-base package contains the inetd and ping programs. <sect3> <title>inetd</title> -<para> -inetd is the mother of all daemons. It listens for connections, and transfers -the call to the appropriate daemon. -</para> +<para>inetd is the mother of all daemons. It listens for connections, and +transfers the call to the appropriate daemon.</para> </sect3> <sect3> <title>ping</title> -<para> -ping sends ICMP ECHO_REQUEST packets to a host and determines its response time. -</para> +<para>ping sends ICMP ECHO_REQUEST packets to a host and determines its +response time.</para> </sect3> diff --git a/appendixa/nettools-desc.xml b/appendixa/nettools-desc.xml index b0d12f9fe..21943e6e8 100644 --- a/appendixa/nettools-desc.xml +++ b/appendixa/nettools-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The Net-tools package contains the arp, hostname, ifconfig, netstat, plipconfig -rarp, route, and slattach programs. -</para> +<para>The Net-tools package contains the arp, hostname, ifconfig, netstat, +plipconfig rarp, route, and slattach programs.</para> </sect2> @@ -14,79 +12,66 @@ rarp, route, and slattach programs. <sect3> <title>arp</title> -<para> -arp is used to manipulate the kernel's ARP cache, usually to add or delete an -entry, or to dump the ARP cache. -</para> +<para>arp is used to manipulate the kernel's ARP cache, usually to add +or delete an entry, or to dump the ARP cache.</para> </sect3> <sect3> <title>hostname</title> -<para> -hostname, with its symlinks domainname, dnsdomainname, nisdomainname, +<para>hostname, with its symlinks domainname, dnsdomainname, nisdomainname, ypdomainname, and nodename, is used to set or show the system's hostname (or -other, depending on the symlink used). -</para> +other, depending on the symlink used).</para> </sect3> <sect3> <title>ifconfig</title> -<para> -The ifconfig command is the general command used to configure network -interfaces. -</para> +<para>The ifconfig command is the general command used to configure network +interfaces.</para> </sect3> <sect3> <title>netstat</title> -<para> -netstat is a multi-purpose tool used to print the network connections, routing -tables, interface statistics, masquerade connections, and multicast memberships. -</para> +<para>netstat is a multi-purpose tool used to print the network connections, +routing tables, interface statistics, masquerade connections, and multicast +memberships.</para> </sect3> <sect3> <title>plipconfig</title> -<para> -plipconfig is used to fine-tune the PLIP device parameters, hopefully making it -faster. -</para> +<para>plipconfig is used to fine-tune the PLIP device parameters, hopefully +making it faster.</para> </sect3> <sect3> <title>rarp</title> -<para> -Akin to the arp program, the rarp program manipulates the system's RARP table. -</para> +<para>Akin to the arp program, the rarp program manipulates the system's +RARP table.</para> </sect3> <sect3> <title>route</title> -<para> -route is the general utility which is used to manipulate the IP routing table. -</para> +<para>route is the general utility which is used to manipulate the IP +routing table.</para> </sect3> <sect3> <title>slattach</title> -<para> -slattach attaches a network interface to a serial line, i.e.. puts a normal -terminal line into one of several "network" modes. -</para> +<para>slattach attaches a network interface to a serial line, i.e.. puts a +normal terminal line into one of several "network" modes.</para> </sect3> diff --git a/appendixa/patch-desc.xml b/appendixa/patch-desc.xml index c59f6b836..729a52acb 100644 --- a/appendixa/patch-desc.xml +++ b/appendixa/patch-desc.xml @@ -1,16 +1,13 @@ <sect2> <title>Contents</title> -<para> -The Patch package contains the patch program. -</para> +<para>The Patch package contains the patch program.</para> </sect2> <sect2><title>Description</title> -<para> -The patch program modifies a file according to a patch file. A patch +<para>The patch program modifies a file according to a patch file. A patch file usually is a list created by the diff program that contains instructions on how an original file needs to be modified. Patch is used a lot for source code patches since it saves time and space. Imagine @@ -19,8 +16,7 @@ only has changes in two files of the first version. It can be shipped as an entirely new package of 1MB or just as a patch file of 1KB which will update the first version to make it identical to the second version. So if the first version was downloaded already, a patch file avoids -a second large download. -</para> +a second large download.</para> </sect2> diff --git a/appendixa/perl-desc.xml b/appendixa/perl-desc.xml index 52eaac0c2..6c68f8a32 100644 --- a/appendixa/perl-desc.xml +++ b/appendixa/perl-desc.xml @@ -1,20 +1,16 @@ <sect2> <title>Contents</title> -<para> -The Perl package contains Perl - Practical Extraction and Report -Language -</para> +<para>The Perl package contains Perl - Practical Extraction and Report +Language</para> </sect2> <sect2> <title>Description</title> -<para> -Perl combines the features and capabilities of C, awk, sed and sh into -one powerful programming language. -</para> +<para>Perl combines the features and capabilities of C, awk, sed and sh into +one powerful programming language.</para> </sect2> diff --git a/appendixa/procinfo-desc.xml b/appendixa/procinfo-desc.xml index 8c6ff015c..a22d5dcfb 100644 --- a/appendixa/procinfo-desc.xml +++ b/appendixa/procinfo-desc.xml @@ -1,18 +1,14 @@ <sect2> <title>Contents</title> -<para> -The Procinfo package contains the procinfo program. -</para> +<para>The Procinfo package contains the procinfo program.</para> </sect2> <sect2><title>Description</title> -<para> -procinfo gathers some system data from the /proc directory -and prints it nicely formatted on the standard output device. -</para> +<para>procinfo gathers some system data from the /proc directory +and prints it nicely formatted on the standard output device.</para> </sect2> diff --git a/appendixa/procps-desc.xml b/appendixa/procps-desc.xml index 01418b7f9..c3064a56a 100644 --- a/appendixa/procps-desc.xml +++ b/appendixa/procps-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The Procps package contains the free, kill, oldps, ps, skill, snice, -sysctl, tload, top, uptime, vmstat, w and watch programs. -</para> +<para>The Procps package contains the free, kill, oldps, ps, skill, snice, +sysctl, tload, top, uptime, vmstat, w and watch programs.</para> </sect2> @@ -12,103 +10,83 @@ sysctl, tload, top, uptime, vmstat, w and watch programs. <sect3><title>free</title> -<para> -free displays the total amount of free and used physical and swap memory -in the system, as well as the shared memory and buffers used by the kernel. -</para> +<para>free displays the total amount of free and used physical and swap memory +in the system, as well as the shared memory and buffers used by the +kernel.</para> </sect3> <sect3><title>kill</title> -<para> -kills sends signals to processes. -</para> +<para>kills sends signals to processes.</para> </sect3> <sect3><title>oldps and ps</title> -<para> -ps gives a snapshot of the current processes. -</para> +<para>ps gives a snapshot of the current processes.</para> </sect3> <sect3><title>skill</title> -<para> -skill sends signals to process matching a criteria. -</para> +<para>skill sends signals to process matching a criteria.</para> </sect3> <sect3><title>snice</title> -<para> -snice changes the scheduling priority for process matching a criteria. -</para> +<para>snice changes the scheduling priority for process matching a +criteria.</para> </sect3> <sect3><title>sysctl</title> -<para> -sysctl modifies kernel parameters at runtime. -</para> +<para>sysctl modifies kernel parameters at runtime.</para> </sect3> <sect3><title>tload</title> -<para> -tload prints a graph of the current system load average to the specified -tty (or the tty of the tload process if none is specified). -</para> +<para>tload prints a graph of the current system load average to the +specified tty (or the tty of the tload process if none is specified).</para> </sect3> <sect3><title>top</title> -<para> -top provides an ongoing look at processor activity in real time. -</para> +<para>top provides an ongoing look at processor activity in real time.</para> </sect3> <sect3><title>uptime</title> -<para> -uptime gives a one line display of the following information: the current +<para>uptime gives a one line display of the following information: the current time, how long the system has been running, how many users are currently -logged on, and the system load averages for the past 1, 5, and 15 minutes. -</para> +logged on, and the system load averages for the past 1, 5, and 15 +minutes.</para> </sect3> <sect3><title>vmstat</title> -<para> -vmstat reports information about processes, memory, paging, block IO, -traps, and cpu activity. -</para> +<para>vmstat reports information about processes, memory, paging, block IO, +traps, and cpu activity.</para> </sect3> <sect3><title>w</title> -<para> -w displays information about the users currently on the machine, and -their processes. -</para> +<para>w displays information about the users currently on the machine, and +their processes.</para> </sect3> <sect3><title>watch</title> -<para> -watch runs command repeatedly, displaying its output (the first screen full). -</para> +<para>watch runs command repeatedly, displaying its output (the first +screen full).</para> </sect3> diff --git a/appendixa/psmisc-desc.xml b/appendixa/psmisc-desc.xml index a8cd4fe56..090face99 100644 --- a/appendixa/psmisc-desc.xml +++ b/appendixa/psmisc-desc.xml @@ -1,9 +1,7 @@ <sect2> <title>Contents</title> -<para> -The Psmisc package contains the fuser, killall and pstree programs. -</para> +<para>The Psmisc package contains the fuser, killall and pstree programs.</para> </sect2> @@ -11,27 +9,21 @@ The Psmisc package contains the fuser, killall and pstree programs. <sect3><title>fuser</title> -<para> -fuser displays the PIDs of processes using the specified files or file -systems. -</para> +<para>fuser displays the PIDs of processes using the specified files or file +systems.</para> </sect3> <sect3><title>killall</title> -<para> -killall sends a signal to all processes running any of the specified -commands. -</para> +<para>killall sends a signal to all processes running any of the specified +commands.</para> </sect3> <sect3><title>pstree</title> -<para> -pstree shows running processes as a tree. -</para> +<para>pstree shows running processes as a tree.</para> </sect3> diff --git a/appendixa/sed-desc.xml b/appendixa/sed-desc.xml index 401fa9a82..4863ae9b3 100644 --- a/appendixa/sed-desc.xml +++ b/appendixa/sed-desc.xml @@ -1,18 +1,14 @@ <sect2> <title>Contents</title> -<para> -The Sed package contains the sed program. -</para> +<para>The Sed package contains the sed program.</para> </sect2> <sect2><title>Description</title> -<para> -sed is a stream editor. A stream editor is used to perform basic text -transformations on an input stream (a file or input from a pipeline). -</para> +<para>sed is a stream editor. A stream editor is used to perform basic text +transformations on an input stream (a file or input from a pipeline).</para> </sect2> diff --git a/appendixa/shadowpwd-desc.xml b/appendixa/shadowpwd-desc.xml index 38aca4369..93caf7368 100644 --- a/appendixa/shadowpwd-desc.xml +++ b/appendixa/shadowpwd-desc.xml @@ -1,13 +1,11 @@ <sect2> <title>Contents</title> -<para> -The Shadow Password Suite contains the chage, chfn, chsh, expiry, +<para>The Shadow Password Suite contains the chage, chfn, chsh, expiry, faillog, gpasswd, lastlog, login, newgrp, passwd, sg, su, chpasswd, dpasswd, groupadd, groupdel, groupmod, grpck, grpconv, grpunconv, logoutd, mkpasswd, newusers, pwck, pwconv, pwunconv, useradd, userdel, usermod -and vipw programs. -</para> +and vipw programs.</para> </sect2> @@ -15,257 +13,204 @@ and vipw programs. <sect3><title>chage</title> -<para> -chage changes the number of days between password changes and the date of -the last password change. -</para> +<para>chage changes the number of days between password changes and the date of +the last password change.</para> </sect3> <sect3><title>chfn</title> -<para> -chfn changes user full name, office number, office extension, and home -phone number information for a user's account. -</para> +<para>chfn changes user full name, office number, office extension, and home +phone number information for a user's account.</para> </sect3> <sect3><title>chsh</title> -<para> -chsh changes the user login shell. -</para> +<para>chsh changes the user login shell.</para> </sect3> <sect3><title>expiry</title> -<para> -Checks and enforces password expiration policy. -</para> +<para>Checks and enforces password expiration policy.</para> </sect3> <sect3><title>faillog</title> -<para> -faillog formats the contents of the failure log,/var/log/faillog, and -maintains failure counts and limits. -</para> +<para>faillog formats the contents of the failure log,/var/log/faillog, and +maintains failure counts and limits.</para> </sect3> <sect3><title>gpasswd</title> -<para> -gpasswd is used to administer the /etc/group file -</para> +<para>gpasswd is used to administer the /etc/group file</para> </sect3> <sect3><title>lastlog</title> -<para> -lastlog formats and prints the contents of the last login log, -/var/log/lastlog. The login-name, port, and last login time will be printed. -</para> +<para>lastlog formats and prints the contents of the last login log, +/var/log/lastlog. The login-name, port, and last login time will be +printed.</para> </sect3> <sect3><title>login</title> -<para> -login is used to establish a new session with the system. -</para> +<para>login is used to establish a new session with the system.</para> </sect3> <sect3><title>newgrp</title> -<para> -newgrp is used to change the current group ID during a login session. -</para> +<para>newgrp is used to change the current group ID during a +login session.</para> </sect3> <sect3><title>passwd</title> -<para> -passwd changes passwords for user and group accounts. -</para> +<para>passwd changes passwords for user and group accounts.</para> </sect3> <sect3><title>sg</title> -<para> -sg executes command as a different group ID. -</para> +<para>sg executes command as a different group ID.</para> </sect3> <sect3><title>su</title> -<para> -Change the effective user id and group id to that of a user. This -replaces the su programs that's installed from the Shellutils package. -</para> +<para>Change the effective user id and group id to that of a user. This +replaces the su programs that's installed from the Shellutils package.</para> </sect3> <sect3><title>chpasswd</title> -<para> -chpasswd reads a file of user name and password pairs from standard -input and uses this information to update a group of existing users. -</para> +<para>chpasswd reads a file of user name and password pairs from standard +input and uses this information to update a group of existing users.</para> </sect3> <sect3><title>dpasswd</title> -<para> -dpasswd adds, deletes, and updates dial-up passwords for user login shells. -</para> +<para>dpasswd adds, deletes, and updates dial-up passwords for +user login shells.</para> </sect3> <sect3><title>groupadd</title> -<para> -The groupadd command creates a new group account using the values -specified on the command line and the default values from the system. -</para> +<para>The groupadd command creates a new group account using the values +specified on the command line and the default values from the system.</para> </sect3> <sect3><title>groupdel</title> -<para> -The groupdel command modifies the system account files, deleting all -entries that refer to group. -</para> +<para>The groupdel command modifies the system account files, deleting all +entries that refer to group.</para> </sect3> <sect3><title>groupmod</title> -<para> -The groupmod command modifies the system account files to reflect the -changes that are specified on the command line. -</para> +<para>The groupmod command modifies the system account files to reflect the +changes that are specified on the command line.</para> </sect3> <sect3><title>grpck</title> -<para> -grpck verifies the integrity of the system authentication information. -</para> +<para>grpck verifies the integrity of the system authentication +information.</para> </sect3> <sect3><title>grpconv</title> -<para> -grpunconv converts to shadow group files from normal group files. -</para> +<para>grpunconv converts to shadow group files from normal group files.</para> </sect3> <sect3><title>grpunconv</title> -<para> -grpunconv converts from shadow group files to normal group files. -</para> +<para>grpunconv converts from shadow group files to normal group files.</para> </sect3> <sect3><title>logoutd</title> -<para> -logoutd enforces the login time and port restrictions specified in -/etc/porttime. -</para> +<para>logoutd enforces the login time and port restrictions specified in +/etc/porttime.</para> </sect3> <sect3><title>mkpasswd</title> -<para> -mkpasswd reads a file in the format given by the flags and converts it -to the corresponding database file format. -</para> +<para>mkpasswd reads a file in the format given by the flags and converts it +to the corresponding database file format.</para> </sect3> <sect3><title>newusers</title> -<para> -newusers reads a file of user name and clear text password pairs and uses -this information to update a group of existing users or to create new users. -</para> +<para>newusers reads a file of user name and clear text password pairs and uses +this information to update a group of existing users or to create new +users.</para> </sect3> <sect3><title>pwck</title> -<para> -pwck verifies the integrity of the system authentication information. -</para> +<para>pwck verifies the integrity of the system authentication +information.</para> </sect3> <sect3><title>pwconv</title> -<para> -pwconv converts to shadow passwd files from normal passwd files. -</para> +<para>pwconv converts to shadow passwd files from normal passwd +files.</para> </sect3> <sect3><title>pwunconv</title> -<para> -pwunconv converts from shadow passwd files to normal files. -</para> +<para>pwunconv converts from shadow passwd files to normal files.</para> </sect3> <sect3><title>useradd</title> -<para> -useradd creates a new user or update default new user information. -</para> +<para>useradd creates a new user or update default new user information.</para> </sect3> <sect3><title>userdel</title> -<para> -userdel modifies the system account files, deleting all entries that -refer to a specified login name. -</para> +<para>userdel modifies the system account files, deleting all entries that +refer to a specified login name.</para> </sect3> <sect3><title>usermod</title> -<para> -usermod modifies the system account files to reflect the changes that -are specified on the command line. -</para> +<para>usermod modifies the system account files to reflect the changes that +are specified on the command line.</para> </sect3> <sect3><title>vipw and vigr</title> -<para> -vipw and vigr will edit the files /etc/passwd and /etc/group, +<para>vipw and vigr will edit the files /etc/passwd and /etc/group, respectively. With the -s flag, they will edit the shadow versions of -those files, /etc/shadow and /etc/gshadow, respectively. -</para> +those files, /etc/shadow and /etc/gshadow, respectively.</para> </sect3> diff --git a/appendixa/shellutils-desc.xml b/appendixa/shellutils-desc.xml index ef29138e8..c00be7060 100644 --- a/appendixa/shellutils-desc.xml +++ b/appendixa/shellutils-desc.xml @@ -1,13 +1,11 @@ <sect2> <title>Contents</title> -<para> -The Sh-utils package contains the basename, chroot, date, dirname, +<para>The Sh-utils package contains the basename, chroot, date, dirname, echo, env, expr, factor, false, groups, hostid, hostname, id, logname, nice, nohup, pathchk, pinky, printenv, printf, pwd, seq, sleep, stty, su, tee, test, true, tty, uname, uptime, users, who, whoami and yes -programs. -</para> +programs.</para> </sect2> @@ -15,286 +13,219 @@ programs. <sect3><title>basename</title> -<para> -basename strips directory and suffixes from filenames. -</para> +<para>basename strips directory and suffixes from filenames.</para> </sect3> <sect3><title>chroot</title> -<para> -chroot runs a command or interactive shell with special root directory. -</para> +<para>chroot runs a command or interactive shell with special +root directory.</para> </sect3> <sect3><title>date</title> -<para> -date displays the current time in a specified format, or sets the system -date. -</para> +<para>date displays the current time in a specified format, or sets +the system date.</para> </sect3> <sect3><title>dirname</title> -<para> -dirname strips non-directory suffixes from file name. -</para> +<para>dirname strips non-directory suffixes from file name.</para> </sect3> <sect3><title>echo</title> -<para> -echo displays a line of text. -</para> +<para>echo displays a line of text.</para> </sect3> <sect3><title>env</title> -<para> -env runs a program in a modified environment. -</para> +<para>env runs a program in a modified environment.</para> </sect3> <sect3><title>expr</title> -<para> -expr evaluates expressions. -</para> +<para>expr evaluates expressions.</para> </sect3> <sect3><title>factor</title> -<para> -factor prints the prime factors of all specified integer numbers. -</para> +<para>factor prints the prime factors of all specified integer numbers.</para> </sect3> <sect3><title>false</title> -<para> -false always exits with a status code indicating failure. -</para> +<para>false always exits with a status code indicating failure.</para> </sect3> <sect3><title>groups</title> -<para> -groups prints the groups a user is in. -</para> +<para>groups prints the groups a user is in.</para> </sect3> <sect3><title>hostid</title> -<para> -hostid prints the numeric identifier (in hexadecimal) for the current -host. -</para> +<para>hostid prints the numeric identifier (in hexadecimal) for the current +host.</para> </sect3> <sect3><title>hostname</title> -<para> -hostname sets or prints the name of the current host system -</para> +<para>hostname sets or prints the name of the current host system</para> </sect3> <sect3><title>id</title> -<para> -id prints the real and effective UIDs and GIDs of a user or the current -user. -</para> +<para>id prints the real and effective UIDs and GIDs of a user or the current +user.</para> </sect3> <sect3><title>logname</title> -<para> -logname prints the current user's login name. -</para> +<para>logname prints the current user's login name.</para> </sect3> <sect3><title>nice</title> -<para> -nice runs a program with modified scheduling priority. -</para> +<para>nice runs a program with modified scheduling priority.</para> </sect3> <sect3><title>nohup</title> -<para> -nohup runs a command immune to hangups, with output to a non-tty -</para> +<para>nohup runs a command immune to hangups, with output to a non-tty</para> </sect3> <sect3><title>pathchk</title> -<para> -pathchk checks whether file names are valid or portable. -</para> +<para>pathchk checks whether file names are valid or portable.</para> </sect3> <sect3><title>pinky</title> -<para> -pinky is a lightweight finger utility which retrieves information about -a certain user -</para> +<para>pinky is a lightweight finger utility which retrieves information about +a certain user</para> </sect3> <sect3><title>printenv</title> -<para> -printenv prints all or part of the environment. -</para> +<para>printenv prints all or part of the environment.</para> </sect3> <sect3><title>printf</title> -<para> -printf formats and print data (the same as the printf C function). -</para> +<para>printf formats and print data (the same as the printf C function).</para> </sect3> <sect3><title>pwd</title> -<para> -pwd prints the name of the current/working directory -</para> +<para>pwd prints the name of the current/working directory</para> </sect3> <sect3><title>seq</title> -<para> -seq prints numbers in a certain range with a certain increment. -</para> +<para>seq prints numbers in a certain range with a certain increment.</para> </sect3> <sect3><title>sleep</title> -<para> -sleep delays for a specified amount of time. -</para> +<para>sleep delays for a specified amount of time.</para> </sect3> <sect3><title>stty</title> -<para> -stty changes and prints terminal line settings. -</para> +<para>stty changes and prints terminal line settings.</para> </sect3> <sect3><title>su</title> -<para> -su runs a shell with substitute user and group IDs -</para> +<para>su runs a shell with substitute user and group IDs</para> </sect3> <sect3><title>tee</title> -<para> -tee reads from standard input and write to standard output and files. -</para> +<para>tee reads from standard input and write to standard output and +files.</para> </sect3> <sect3><title>test</title> -<para> -test checks file types and compares values. -</para> +<para>test checks file types and compares values.</para> </sect3> <sect3><title>true</title> -<para> -True always exits with a status code indicating success. -</para> +<para>True always exits with a status code indicating success.</para> </sect3> <sect3><title>tty</title> -<para> -tty prints the file name of the terminal connected to standard input. -</para> +<para>tty prints the file name of the terminal connected to standard +input.</para> </sect3> <sect3><title>uname</title> -<para> -uname prints system information. -</para> +<para>uname prints system information.</para> </sect3> <sect3><title>uptime</title> -<para> -uptime tells how long the system has been running. -</para> +<para>uptime tells how long the system has been running.</para> </sect3> <sect3><title>users</title> -<para> -users prints the user names of users currently logged in to the -current host. -</para> +<para>users prints the user names of users currently logged in to the +current host.</para> </sect3> <sect3><title>who</title> -<para> -who shows who is logged on. -</para> +<para>who shows who is logged on.</para> </sect3> <sect3><title>whoami</title> -<para> -whoami prints the users effective userid. -</para> +<para>whoami prints the users effective userid.</para> </sect3> <sect3><title>yes</title> -<para> -yes outputs a string repeatedly until killed. -</para> +<para>yes outputs a string repeatedly until killed.</para> </sect3> diff --git a/appendixa/sysklogd-desc.xml b/appendixa/sysklogd-desc.xml index b6ecc5ae3..8a942cfbc 100644 --- a/appendixa/sysklogd-desc.xml +++ b/appendixa/sysklogd-desc.xml @@ -1,9 +1,7 @@ <sect2> <title>Contents</title> -<para> -The Sysklogd package contains the klogd and syslogd programs. -</para> +<para>The Sysklogd package contains the klogd and syslogd programs.</para> </sect2> @@ -11,20 +9,17 @@ The Sysklogd package contains the klogd and syslogd programs. <sect3><title>klogd</title> -<para> -klogd is a system daemon which intercepts and logs Linux kernel messages. -</para> +<para>klogd is a system daemon which intercepts and logs Linux kernel +messages.</para> </sect3> <sect3><title>syslogd</title> -<para> -Syslogd provides a kind of logging that many modern programs use. Every +<para>Syslogd provides a kind of logging that many modern programs use. Every logged message contains at least a time and a hostname field, normally a program name field, too, but that depends on how trusty the logging -program is. -</para> +program is.</para> </sect3> diff --git a/appendixa/sysvinit-desc.xml b/appendixa/sysvinit-desc.xml index 0a58b2923..59964e9f7 100644 --- a/appendixa/sysvinit-desc.xml +++ b/appendixa/sysvinit-desc.xml @@ -1,11 +1,9 @@ <sect2> <title>Contents</title> -<para> -The Sysvinit package contains the pidof, last, lastb, mesg, utmpdump, +<para>The Sysvinit package contains the pidof, last, lastb, mesg, utmpdump, wall, halt, init, killall5, poweroff, reboot, runlevel, shutdown, -sulogin and telinit programs. -</para> +sulogin and telinit programs.</para> </sect2> @@ -13,146 +11,117 @@ sulogin and telinit programs. <sect3><title>pidof</title> -<para> -Pidof finds the process id's (pids) of the named programs and prints -those id's on standard output. -</para> +<para>Pidof finds the process id's (pids) of the named programs and prints +those id's on standard output.</para> </sect3> <sect3><title>last</title> -<para> -last searches back through the file /var/log/wtmp (or the file designated +<para>last searches back through the file /var/log/wtmp (or the file designated by the -f flag) and displays a list of all users logged in (and out) -since that file was created. -</para> +since that file was created.</para> </sect3> <sect3><title>lastb</title> -<para> -lastb is the same as last, except that by default it shows a log of the -file /var/log/btmp, which contains all the bad login attempts. - -</para> +<para>lastb is the same as last, except that by default it shows a log of the +file /var/log/btmp, which contains all the bad login attempts.</para> </sect3> <sect3><title>mesg</title> -<para> -Mesg controls the access to the users terminal by others. It's typically -used to allow or disallow other users to write to his terminal. -</para> +<para>Mesg controls the access to the users terminal by others. It's typically +used to allow or disallow other users to write to his terminal.</para> </sect3> <sect3><title>utmpdump</title> -<para> -utmpdumps prints the content of a file (usually /var/run/utmp) on -standard output in a user friendly format. -</para> +<para>utmpdumps prints the content of a file (usually /var/run/utmp) on +standard output in a user friendly format.</para> </sect3> <sect3><title>wall</title> -<para> -Wall sends a message to everybody logged in with their mesg permission -set to yes. -</para> +<para>Wall sends a message to everybody logged in with their mesg permission +set to yes.</para> </sect3> <sect3><title>halt</title> -<para> -Halt notes that the system is being brought down in the file +<para>Halt notes that the system is being brought down in the file /var/log/wtmp, and then either tells the kernel to halt, reboot or poweroff the system. If halt or reboot is called when the system is not -in runlevel 0 or 6, shutdown will be invoked instead (with the flag -h or -r). -</para> +in runlevel 0 or 6, shutdown will be invoked instead (with +the flag -h or -r).</para> </sect3> <sect3><title>init</title> -<para> -Init is the parent of all processes. Its primary role is to create +<para>Init is the parent of all processes. Its primary role is to create processes from a script stored in the file /etc/inittab. This file usually has entries which cause init to spawn gettys on each line that users can log in. It also controls autonomous processes required by any -particular system. -</para> +particular system.</para> </sect3> <sect3><title>killall5</title> -<para> -killall5 is the SystemV killall command. It sends a signal to all +<para>killall5 is the SystemV killall command. It sends a signal to all processes except the processes in its own session, so it won't kill the -shell that is running the script it was called from. -</para> +shell that is running the script it was called from.</para> </sect3> <sect3><title>poweroff</title> -<para> -poweroff is equivalent to shutdown -h -p now. It halts the computer and +<para>poweroff is equivalent to shutdown -h -p now. It halts the computer and switches off the computer (when using an APM compliant BIOS and APM is -enabled in the kernel). -</para> +enabled in the kernel).</para> </sect3> <sect3><title>reboot</title> -<para> -reboot is equivalent to shutdown -r now. It reboots the computer. -</para> +<para>reboot is equivalent to shutdown -r now. It reboots the computer.</para> </sect3> <sect3><title>runlevel</title> -<para> -Runlevel reads the system utmp file (typically /var/run/utmp) to locate +<para>Runlevel reads the system utmp file (typically /var/run/utmp) to locate the runlevel record, and then prints the previous and current system -runlevel on its standard output, separated by a single space. -</para> +runlevel on its standard output, separated by a single space.</para> </sect3> <sect3><title>shutdown</title> -<para> -shutdown brings the system down in a secure way. All logged-in users are -notified that the system is going down, and login is blocked. -</para> +<para>shutdown brings the system down in a secure way. All logged-in users are +notified that the system is going down, and login is blocked.</para> </sect3> <sect3><title>sulogin</title> -<para> -sulogin is invoked by init when the system goes into single user mode +<para>sulogin is invoked by init when the system goes into single user mode (this is done through an entry in /etc/inittab). Init also tries to -execute sulogin when it is passed the -b flag from the boot loader (eg, LILO). -</para> +execute sulogin when it is passed the -b flag from the boot loader +(eg, LILO).</para> </sect3> <sect3><title>telinit</title> -<para> -telinit sends appropriate signals to init, telling it which runlevel to -change to. -</para> +<para>telinit sends appropriate signals to init, telling it which runlevel to +change to.</para> </sect3> diff --git a/appendixa/tar-desc.xml b/appendixa/tar-desc.xml index cbafddad6..259ea479f 100644 --- a/appendixa/tar-desc.xml +++ b/appendixa/tar-desc.xml @@ -1,9 +1,7 @@ <sect2> <title>Contents</title> -<para> -The tar package contains the tar and rmt programs. -</para> +<para>The tar package contains the tar and rmt programs.</para> </sect2> @@ -11,20 +9,16 @@ The tar package contains the tar and rmt programs. <sect3><title>tar</title> -<para> -tar is an archiving program designed to store and extract files from -an archive file known as a tar file. -</para> +<para>tar is an archiving program designed to store and extract files from +an archive file known as a tar file.</para> </sect3> <sect3><title>rmt</title> -<para> -rmt is a program used by the remote dump and restore programs in +<para>rmt is a program used by the remote dump and restore programs in manipulating a magnetic tape drive through an interprocess communication -connection. -</para> +connection.</para> </sect3> diff --git a/appendixa/texinfo-desc.xml b/appendixa/texinfo-desc.xml index dca6f1b6c..5829a4833 100644 --- a/appendixa/texinfo-desc.xml +++ b/appendixa/texinfo-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The Texinfo package contains the info, install-info, makeinfo, texi2dvi -and texindex programs -</para> +<para>The Texinfo package contains the info, install-info, makeinfo, texi2dvi +and texindex programs</para> </sect2> @@ -13,50 +11,41 @@ and texindex programs <sect3><title>info</title> -<para> -The info program reads Info documents, usually contained in the +<para>The info program reads Info documents, usually contained in the /usr/doc/info directory. Info documents are like man(ual) pages, but they tend to be more in depth than just explaining the options to a -program. -</para> +program.</para> </sect3> <sect3><title>install-info</title> -<para> -The install-info program updates the info entries. When the info +<para>The install-info program updates the info entries. When the info program is run a list with available topics (ie: available info documents) will be presented. The install-info program is used to maintain this list of available topics. If info files are removed manually, it is also necessary to delete the topic in the index file as well. This program is used for -that. It also works the other way around when info documents are added. -</para> +that. It also works the other way around when info documents are +added.</para> </sect3> <sect3><title>makeinfo</title> -<para> -The makeinfo program translates Texinfo source documents into various formats. -Available formats are: info files, plain text and HTML. -</para> +<para>The makeinfo program translates Texinfo source documents into various +formats. Available formats are: info files, plain text and HTML.</para> </sect3> <sect3><title>texi2dvi</title> -<para> -The texi2dvi program prints Texinfo documents -</para> +<para>The texi2dvi program prints Texinfo documents</para> </sect3> <sect3><title>texindex</title> -<para> -The texindex program is used to sort Texinfo index files. -</para> +<para>The texindex program is used to sort Texinfo index files.</para> </sect3> diff --git a/appendixa/textutils-desc.xml b/appendixa/textutils-desc.xml index 750134b45..1945e2974 100644 --- a/appendixa/textutils-desc.xml +++ b/appendixa/textutils-desc.xml @@ -1,11 +1,9 @@ <sect2> <title>Contents</title> -<para> -The Textutils package contains the cat, cksum, comm, split, cut, expand, +<para>The Textutils package contains the cat, cksum, comm, split, cut, expand, fmt, fold, head, join, md5sum, nl, od, paste, pr, ptx, sort, split, sum, -tac, tail, tr, tsort, unexpand, uniq and wc programs. -</para> +tac, tail, tr, tsort, unexpand, uniq and wc programs.</para> </sect2> @@ -15,246 +13,198 @@ tac, tail, tr, tsort, unexpand, uniq and wc programs. <sect3> <title>cat</title> -<para> -cat concatenates file(s) or standard input to standard output. -</para> +<para>cat concatenates file(s) or standard input to standard output.</para> </sect3> <sect3> <title>cksum</title> -<para> -cksum prints CRC checksum and byte counts of each specified file. -</para> +<para>cksum prints CRC checksum and byte counts of each specified file.</para> </sect3> <sect3> <title>comm</title> -<para> -comm compares two sorted files line by line. -</para> +<para>comm compares two sorted files line by line.</para> </sect3> <sect3> <title>csplit</title> -<para> -cplit outputs pieces of a file separated by (a) pattern(s) to files -xx01, xx02, ..., and outputs byte counts of each piece to standard output. -</para> +<para>cplit outputs pieces of a file separated by (a) pattern(s) to files +xx01, xx02, ..., and outputs byte counts of each piece to standard +output.</para> </sect3> <sect3> <title>cut</title> -<para> -cut prints selected parts of lines from specified files to standard output. -</para> +<para>cut prints selected parts of lines from specified files to standard +output.</para> </sect3> <sect3> <title>expand</title> -<para> -expand converts tabs in files to spaces, writing to standard output. -</para> +<para>expand converts tabs in files to spaces, writing to standard +output.</para> </sect3> <sect3> <title>fmt</title> -<para> -fmt reformats each paragraph in the specified file(s), writing to standard -output. -</para> +<para>fmt reformats each paragraph in the specified file(s), writing to +standard output.</para> </sect3> <sect3> <title>fold</title> -<para> -fold wraps input lines in each specified file (standard input by default), -writing to standard output. -</para> +<para>fold wraps input lines in each specified file (standard input by default), +writing to standard output.</para> </sect3> <sect3> <title>head</title> -<para> -Print first xx (10 by default) lines of each specified file to standard -output. -</para> +<para>Print first xx (10 by default) lines of each specified file to standard +output.</para> </sect3> <sect3> <title>join</title> -<para> -join joins lines of two files on a common field. -</para> +<para>join joins lines of two files on a common field.</para> </sect3> <sect3> <title>md5sum</title> -<para> -md5sum prints or checks MD5 checksums. -</para> +<para>md5sum prints or checks MD5 checksums.</para> </sect3> <sect3> <title>nl</title> -<para> -nl writes each specified file to standard output, with line numbers -added. -</para> +<para>nl writes each specified file to standard output, with line numbers +added.</para> </sect3> <sect3> <title>od</title> -<para> -od writes an unambiguous representation, octal bytes by default, of a -specified file to standard output. -</para> +<para>od writes an unambiguous representation, octal bytes by default, of a +specified file to standard output.</para> </sect3> <sect3> <title>paste</title> -<para> -paste writes lines consisting of the sequentially corresponding -lines from each specified file, separated by TABs, to standard output. -</para> +<para>paste writes lines consisting of the sequentially corresponding +lines from each specified file, separated by TABs, to standard output.</para> </sect3> <sect3> <title>pr</title> -<para> -pr paginates or columnates files for printing. -</para> +<para>pr paginates or columnates files for printing.</para> </sect3> <sect3> <title>ptx</title> -<para> -ptx produces a permuted index of file contents. -</para> +<para>ptx produces a permuted index of file contents.</para> </sect3> <sect3> <title>sort</title> -<para> -sort writes sorted concatenation of files to standard output. -</para> +<para>sort writes sorted concatenation of files to standard output.</para> </sect3> <sect3> <title>split</title> -<para> -split outputs fixed-size pieces of an input file to PREFIXaa, PREFIXab, ... -</para> +<para>split outputs fixed-size pieces of an input file to +PREFIXaa, PREFIXab, ...</para> </sect3> <sect3> <title>sum</title> -<para> -sum prints checksum and block counts for each specified file. -</para> +<para>sum prints checksum and block counts for each specified file.</para> </sect3> <sect3> <title>tac</title> -<para> -tac writes each specified file to standard output, last line first. -</para> +<para>tac writes each specified file to standard output, last line first.</para> </sect3> <sect3> <title>tail</title> -<para> -tail print the last xx (10 by default) lines of each specified file to -standard output. -</para> +<para>tail print the last xx (10 by default) lines of each specified file to +standard output.</para> </sect3> <sect3> <title>tr</title> -<para> -tr translates, squeezes, and/or deletes characters from standard -input, writing to standard output. -</para> +<para>tr translates, squeezes, and/or deletes characters from standard +input, writing to standard output.</para> </sect3> <sect3> <title>tsort</title> -<para> -tsort writes totally ordered lists consistent with the partial ordering -in specified files. -</para> +<para>tsort writes totally ordered lists consistent with the partial ordering +in specified files.</para> </sect3> <sect3> <title>unexpand</title> -<para> -unexpand converts spaces in each file to tabs, writing to standard -output. -</para> +<para>unexpand converts spaces in each file to tabs, writing to standard +output.</para> </sect3> <sect3> <title>uniq</title> -<para> -Uniq removes duplicate lines from a sorted file. -</para> +<para>Uniq removes duplicate lines from a sorted file.</para> </sect3> <sect3> <title>wc</title> -<para> -wc prints line, word, and byte counts for each specified file, and a -total line if more than one file is specified. -</para> +<para>wc prints line, word, and byte counts for each specified file, and a +total line if more than one file is specified.</para> </sect3> diff --git a/appendixa/utillinux-desc.xml b/appendixa/utillinux-desc.xml index 56fe867b8..f0e1d877e 100644 --- a/appendixa/utillinux-desc.xml +++ b/appendixa/utillinux-desc.xml @@ -1,16 +1,14 @@ <sect2> <title>Contents</title> -<para> -The Util-linux package contains the arch, dmesg, kill, more, +<para>The Util-linux package contains the arch, dmesg, kill, more, mount, umount, agetty, blockdev, cfdisk, ctrlaltdel, elvtune, fdisk, fsck.minix, hwclock, kbdrate, losetup, mkfs, mkfs.bfs, mkfs.minix, mkswap, sfdisk, swapoff, swapon, cal, chkdupexe, col, colcrt, colrm, column, cytune, ddate, fdformat, getopt, hexdump, ipcrm, ipcs, logger, look, mcookie, namei, rename, renice, rev, script, setfdprm, setsid, setterm, ul, whereis, write, ramsize, rdev, readprofile, rootflags, -swapdev, tunelp and vidmode programs. -</para> +swapdev, tunelp and vidmode programs.</para> </sect2> @@ -20,524 +18,415 @@ swapdev, tunelp and vidmode programs. <sect3> <title>arch</title> -<para> -arch prints the machine architecture. -</para> +<para>arch prints the machine architecture.</para> </sect3> <sect3> <title>dmesg</title> -<para> -dmesg is used to examine or control the kernel ring buffer (boot -messages from the kernel). -</para> +<para>dmesg is used to examine or control the kernel ring buffer (boot +messages from the kernel).</para> </sect3> <sect3> <title>kill</title> -<para> -kill sends a specified signal to the specified process. -</para> +<para>kill sends a specified signal to the specified process.</para> </sect3> <sect3> <title>more</title> -<para> -more is a filter for paging through text one screen full at a time. -</para> +<para>more is a filter for paging through text one screen full at a time.</para> </sect3> <sect3> <title>mount</title> -<para> -mount mounts a filesystem from a device to a directory (mount point). -</para> +<para>mount mounts a filesystem from a device to a directory (mount +point).</para> </sect3> <sect3> <title>umount</title> -<para> -umount unmounts a mounted filesystem. -</para> +<para>umount unmounts a mounted filesystem.</para> </sect3> <sect3> <title>agetty</title> -<para> -agetty opens a tty port, prompts for a login name and invokes the -/bin/login command. -</para> +<para>agetty opens a tty port, prompts for a login name and invokes the +/bin/login command.</para> </sect3> <sect3> <title>blockdev</title> -<para> -blockdev allows to call block device ioctls from the command line -</para> +<para>blockdev allows to call block device ioctls from the command +line</para> </sect3> <sect3> <title>cfdisk</title> -<para> -cfdisk is an libncurses based disk partition table manipulator. -</para> +<para>cfdisk is an libncurses based disk partition table manipulator.</para> </sect3> <sect3> <title>ctrlaltdel</title> -<para> -ctrlaltdel sets the function of the CTRL+ALT+DEL key combination (hard -or soft reset). -</para> +<para>ctrlaltdel sets the function of the CTRL+ALT+DEL key combination (hard +or soft reset).</para> </sect3> <sect3> <title>elvtune</title> -<para> -elvtune allows to tune the I/O elevator per block device queue basis. -</para> +<para>elvtune allows to tune the I/O elevator per block device queue +basis.</para> </sect3> <sect3> <title>fdisk</title> -<para> -fdisk is a disk partition table manipulator. -</para> +<para>fdisk is a disk partition table manipulator.</para> </sect3> <sect3> <title>fsck.minix</title> -<para> -fsck.minix performs a consistency check for the Linux MINIX filesystem. -</para> +<para>fsck.minix performs a consistency check for the Linux MINIX +filesystem.</para> </sect3> <sect3> <title>hwclock</title> -<para> -hwclock queries and sets the hardware clock (Also called the RTC or BIOS -clock). -</para> +<para>hwclock queries and sets the hardware clock (Also called the RTC or BIOS +clock).</para> </sect3> <sect3> <title>kbdrate</title> -<para> -kbdrate resets the keyboard repeat rate and delay time. -</para> +<para>kbdrate resets the keyboard repeat rate and delay time.</para> </sect3> <sect3> <title>losetup</title> -<para> -losetup sets up and controls loop devices. -</para> +<para>losetup sets up and controls loop devices.</para> </sect3> <sect3> <title>mkfs</title> -<para> -mkfs builds a Linux filesystem on a device, usually a harddisk -partition. -</para> +<para>mkfs builds a Linux filesystem on a device, usually a harddisk +partition.</para> </sect3> <sect3> <title>mkfs.bfs</title> -<para> -mkfs.bfs creates a SCO bfs file system on a device, usually a harddisk -partition. -</para> +<para>mkfs.bfs creates a SCO bfs file system on a device, usually a harddisk +partition.</para> </sect3> <sect3> <title>mkfs.minix</title> -<para> -mkfs.minix creates a Linux MINIX filesystem on a device, usually a -harddisk partition. -</para> +<para>mkfs.minix creates a Linux MINIX filesystem on a device, usually a +harddisk partition.</para> </sect3> <sect3> <title>mkswap</title> -<para> -mkswap sets up a Linux swap area on a device or in a file. -</para> +<para>mkswap sets up a Linux swap area on a device or in a file.</para> </sect3> <sect3> <title>sfdisk</title> -<para> -sfdisk is a disk partition table manipulator. -</para> +<para>sfdisk is a disk partition table manipulator.</para> </sect3> <sect3> <title>swapoff</title> -<para> -swapoff disables devices and files for paging an swapping. -</para> +<para>swapoff disables devices and files for paging and swapping.</para> </sect3> <sect3> <title>swapon</title> -<para> -swapon enables devices and files for paging and swapping. -</para> +<para>swapon enables devices and files for paging and swapping.</para> </sect3> <sect3> <title>cal</title> -<para> -cal displays a simple calender. -</para> +<para>cal displays a simple calender.</para> </sect3> <sect3> <title>chkdupexe</title> -<para> -chkdupexe finds duplicate executables. -</para> +<para>chkdupexe finds duplicate executables.</para> </sect3> <sect3> <title>col</title> -<para> -col filters reverse line feeds from input. -</para> +<para>col filters reverse line feeds from input.</para> </sect3> <sect3> <title>colcrt</title> -<para> -colcrt filters nroff output for CRT previewing. -</para> +<para>colcrt filters nroff output for CRT previewing.</para> </sect3> <sect3> <title>colrm</title> -<para> -colrm removes columns from a file. -</para> +<para>colrm removes columns from a file.</para> </sect3> <sect3> <title>column</title> -<para> -column columnates lists. -</para> +<para>column columnates lists.</para> </sect3> <sect3> <title>cytune</title> -<para> -cytune queries and modifies the interruption threshold for the Cyclades -driver. -</para> +<para>cytune queries and modifies the interruption threshold for the Cyclades +driver.</para> </sect3> <sect3> <title>ddate</title> -<para> -ddate converts Gregorian dates to Discordian dates. -</para> +<para>ddate converts Gregorian dates to Discordian dates.</para> </sect3> <sect3> <title>fdformat</title> -<para> -fdformat low-level formats a floppy disk. -</para> +<para>fdformat low-level formats a floppy disk.</para> </sect3> <sect3> <title>getopt</title> -<para> -getops parses command options the same way as the getopt C command. -</para> +<para>getops parses command options the same way as the getopt C command.</para> </sect3> <sect3> <title>hexdump</title> -<para> -hexdump displays specified files, or standard input, in a user specified -format (ascii, decimal, hexadecimal, octal). -</para> +<para>hexdump displays specified files, or standard input, in a user specified +format (ascii, decimal, hexadecimal, octal).</para> </sect3> <sect3> <title>ipcrm</title> -<para> -ipcrm removes a specified resource. -</para> +<para>ipcrm removes a specified resource.</para> </sect3> <sect3> <title>ipcs</title> -<para> -ipcs provides information on IPC facilities. -</para> +<para>ipcs provides information on IPC facilities.</para> </sect3> <sect3> <title>logger</title> -<para> -logger makes entries in the system log. -</para> +<para>logger makes entries in the system log.</para> </sect3> <sect3> <title>look</title> -<para> -look displays lines beginning with a given string. -</para> +<para>look displays lines beginning with a given string.</para> </sect3> <sect3> <title>mcookie</title> -<para> -mcookie generates magic cookies for xauth. -</para> +<para>mcookie generates magic cookies for xauth.</para> </sect3> <sect3> <title>namei</title> -<para> -namei follows a pathname until a terminal point is found. -</para> +<para>namei follows a pathname until a terminal point is found.</para> </sect3> <sect3> <title>rename</title> -<para> -rename renames files. -</para> +<para>rename renames files.</para> </sect3> <sect3> <title>renice</title> -<para> -renice alters priority of running processes. -</para> +<para>renice alters priority of running processes.</para> </sect3> <sect3> <title>rev</title> -<para> -rev reverses lines of a file. -</para> +<para>rev reverses lines of a file.</para> </sect3> <sect3> <title>script</title> -<para> -script makes typescript of terminal session. -</para> +<para>script makes typescript of terminal session.</para> </sect3> <sect3> <title>setfdprm</title> -<para> -setfdprm sets user-provides floppy disk parameters. -</para> +<para>setfdprm sets user-provides floppy disk parameters.</para> </sect3> <sect3> <title>setsid</title> -<para> -setsid runs programs in a new session. -</para> +<para>setsid runs programs in a new session.</para> </sect3> <sect3> <title>setterm</title> -<para> -setterm sets terminal attributes. -</para> +<para>setterm sets terminal attributes.</para> </sect3> <sect3> <title>ul</title> -<para> -ul reads a file and translates occurrences of underscores to the sequence -which indicates underlining for the terminal in use. -</para> +<para>ul reads a file and translates occurrences of underscores to the sequence +which indicates underlining for the terminal in use.</para> </sect3> <sect3> <title>whereis</title> -<para> -whereis locates a binary, source and manual page for a command. -</para> +<para>whereis locates a binary, source and manual page for a command.</para> </sect3> <sect3> <title>write</title> -<para> -write sends a message to another user. -</para> +<para>write sends a message to another user.</para> </sect3> <sect3> <title>ramsize</title> -<para> -ramsize queries and sets RAM disk size. -</para> +<para>ramsize queries and sets RAM disk size.</para> </sect3> <sect3> <title>rdev</title> -<para> -rdev queries and sets image root device, swap device, RAM disk size, or -video mode. -</para> +<para>rdev queries and sets image root device, swap device, RAM disk size, or +video mode.</para> </sect3> <sect3> <title>readprofile</title> -<para> -readprofile reads kernel profiling information. -</para> +<para>readprofile reads kernel profiling information.</para> </sect3> <sect3> <title>rootflags</title> -<para> -rootflags queries and sets extra information used when mounting root. -</para> +<para>rootflags queries and sets extra information used when mounting +root.</para> </sect3> <sect3> <title>swapdev</title> -<para> -swapdev queries and sets swap device. -</para> +<para>swapdev queries and sets swap device.</para> </sect3> <sect3> <title>tunelp</title> -<para> -tunelp sets various parameters for the LP device. -</para> +<para>tunelp sets various parameters for the LP device.</para> </sect3> <sect3> <title>vidmode</title> -<para> -vidmode queries and sets the video mode. -</para> +<para>vidmode queries and sets the video mode.</para> </sect3> diff --git a/appendixa/vim-desc.xml b/appendixa/vim-desc.xml index 9aa6c298d..c60274b7a 100644 --- a/appendixa/vim-desc.xml +++ b/appendixa/vim-desc.xml @@ -1,10 +1,8 @@ <sect2> <title>Contents</title> -<para> -The Vim package contains the ctags, etags, ex, gview, gvim, rgview, -rgvim, rview, rvim, view, vim, vimtutor and xxd programs. -</para> +<para>The Vim package contains the ctags, etags, ex, gview, gvim, rgview, +rgvim, rview, rvim, view, vim, vimtutor and xxd programs.</para> </sect2> @@ -14,121 +12,95 @@ rgvim, rview, rvim, view, vim, vimtutor and xxd programs. <sect3> <title>ctags</title> -<para> -ctags generate tag files for source code. -</para> +<para>ctags generate tag files for source code.</para> </sect3> <sect3> <title>etags</title> -<para> -etags does the same as ctags but it can generate cross reference files +<para>etags does the same as ctags but it can generate cross reference files which list information about the various source objects found in a set -of language files. -</para> +of language files.</para> </sect3> <sect3> <title>ex</title> -<para> -ex starts vim in Ex mode. -</para> +<para>ex starts vim in Ex mode.</para> </sect3> <sect3> <title>gview</title> -<para> -gview is the GUI version of view. -</para> +<para>gview is the GUI version of view.</para> </sect3> <sect3> <title>gvim</title> -<para> -gvim is the GUI version of vim. -</para> +<para>gvim is the GUI version of vim.</para> </sect3> <sect3> <title>rgview</title> -<para> -rgview is the GUI version of rview. -</para> +<para>rgview is the GUI version of rview.</para> </sect3> <sect3> <title>rgvim</title> -<para> -rgvim is the GUI version of rvim. -</para> +<para>rgvim is the GUI version of rvim.</para> </sect3> <sect3> <title>rview</title> -<para> -rview is a restricted version of view. No shell commands can be started -and Vim can't be suspended. -</para> +<para>rview is a restricted version of view. No shell commands can be started +and Vim can't be suspended.</para> </sect3> <sect3> <title>rvim</title> -<para> -rvim is the restricted version of vim. No shell commands can be started -and Vim can't be suspended. -</para> +<para>rvim is the restricted version of vim. No shell commands can be started +and Vim can't be suspended.</para> </sect3> <sect3> <title>view</title> -<para> -view starts vim in read-only mode. -</para> +<para>view starts vim in read-only mode.</para> </sect3> <sect3> <title>vim</title> -<para> -vim starts vim in the normal, default way. -</para> +<para>vim starts vim in the normal, default way.</para> </sect3> <sect3> <title>vimtutor</title> -<para> -vimtutor starts the Vim tutor. -</para> +<para>vimtutor starts the Vim tutor.</para> </sect3> <sect3> <title>xxd</title> -<para> -xxd makes a hexdump or does the reverse. -</para> +<para>xxd makes a hexdump or does the reverse.</para> </sect3> diff --git a/bookinfo/abstract.xml b/bookinfo/abstract.xml index 7881ba262..53ae0f4a2 100644 --- a/bookinfo/abstract.xml +++ b/bookinfo/abstract.xml @@ -1,10 +1,8 @@ <abstract> -<para> -This book describes the process of creating a Linux system +<para>This book describes the process of creating a Linux system from scratch from an already installed Linux distribution, using nothing but -the sources of software that are needed. -</para> +the sources of software that are needed.</para> </abstract> diff --git a/bookinfo/authorgroup.xml b/bookinfo/authorgroup.xml index 3bdc9f028..25b279c43 100644 --- a/bookinfo/authorgroup.xml +++ b/bookinfo/authorgroup.xml @@ -1,8 +1,6 @@ <authorgroup> -<author> - <firstname>Gerard</firstname><surname>Beekmans</surname> -</author> +<author><firstname>Gerard</firstname><surname>Beekmans</surname></author> </authorgroup> diff --git a/bookinfo/copyright.xml b/bookinfo/copyright.xml index d0bb15c69..2c6f39bf4 100644 --- a/bookinfo/copyright.xml +++ b/bookinfo/copyright.xml @@ -2,7 +2,7 @@ <year>1999</year> <year>2000</year> - <year>2001</year> + <year>2001</year> <holder>Gerard Beekmans</holder> </copyright> diff --git a/bookinfo/legalnotice.xml b/bookinfo/legalnotice.xml index 820682751..473506f78 100644 --- a/bookinfo/legalnotice.xml +++ b/bookinfo/legalnotice.xml @@ -1,41 +1,28 @@ <legalnotice> -<para> -Copyright (c) 1999-2001, Gerard Beekmans -</para> +<para>Copyright (c) 1999-2001, Gerard Beekmans</para> -<para> -All rights reserved. -</para> +<para>All rights reserved.</para> -<para> -Redistribution and use in source and binary forms, with or without +<para>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are -met: -</para> +met:</para> <itemizedlist> -<listitem><para> -Redistributions in any form must retain the above copyright notice, this -list of conditions and the following disclaimer. -</para></listitem> +<listitem><para>Redistributions in any form must retain the above copyright +notice, this list of conditions and the following disclaimer.</para></listitem> -<listitem><para> -Neither the name of "Linux From Scratch" nor the names of its contributors -may be used to endorse or promote products derived from this material -without specific prior written permission. -</para></listitem> +<listitem><para>Neither the name of "Linux From Scratch" nor the names of +its contributors may be used to endorse or promote products derived from +this material without specific prior written permission.</para></listitem> -<listitem><para> -Any material derived from Linux From Scratch must contain a reference to -the "Linux From Scratch" project. -</para></listitem> +<listitem><para>Any material derived from Linux From Scratch must contain +a reference to the "Linux From Scratch" project.</para></listitem> </itemizedlist> -<para> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS +<para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR @@ -45,8 +32,7 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -</para> +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para> </legalnotice> diff --git a/chapter01/acknowledgements.xml b/chapter01/acknowledgements.xml index 0b4777a39..03d67cbdd 100644 --- a/chapter01/acknowledgements.xml +++ b/chapter01/acknowledgements.xml @@ -1,92 +1,60 @@ <sect1 id="ch01-acknowledgments"> <title>Acknowledgments</title> -<para> -We would like to thank the following people and organizations for their -contributions toward the Linux From Scratch project: -</para> +<para>We would like to thank the following people and organizations for their +contributions toward the Linux From Scratch project:</para> <itemizedlist> -<listitem><para> -<ulink url="mailto:mstone@linux.com">Mark Stone</ulink> for -donating the linuxfromscratch.org server. -</para></listitem> +<listitem><para><ulink url="mailto:mstone@linux.com">Mark Stone</ulink> for +donating the linuxfromscratch.org server.</para></listitem> -<listitem><para> -<ulink url="http://www.valinux.com">VA Linux Systems</ulink> for -providing rackspace and bandwidth for the linuxfromscratch.org server. -</para></listitem> +<listitem><para><ulink url="http://www.valinux.com">VA Linux Systems</ulink> for +providing rackspace and bandwidth for the linuxfromscratch.org server.</para></listitem> -<listitem><para> -<ulink url="http://www.dreamwvr.com/services">DREAMWVR.COM</ulink> for +<listitem><para><ulink url="http://www.dreamwvr.com/services">DREAMWVR.COM</ulink> for their ongoing sponsorship by donating various resources to the LFS and -related sub-projects . -</para></listitem> - -<listitem><para> -<ulink url="mailto:jan.niemann@tu-bs.de">Jan Niemann</ulink> for providing -<ulink url="http://helga.lk.etc.tu-bs.de"> -http://helga.lk.etc.tu-bs.de</ulink> as the 134.169.139.209 mirror. -</para></listitem> - -<listitem><para> -<ulink url="mailto:johanlenglet@linuxfromscratch.org">Johan Lenglet</ulink> for -leading the French translation project at <ulink -url="http://www.fr.linuxfromscratch.org"> -http://www.fr.linuxfromscratch.org</ulink>. -</para></listitem> - -<listitem><para> -<ulink url="mailto:mpeters@mac.com">Michael Peters</ulink> for -contributing the Apple PowerPC modifications. -</para></listitem> - -<listitem><para> -<ulink url="http://www.valinux.com">VA Linux Systems</ulink> who, on -behalf of <ulink url="http://www.linux.com">Linux.com</ulink>, donated a -VA Linux 420 (formerly StartX SP2) workstation toward this project. -</para></listitem> - -<listitem><para> -<ulink url="mailto:highos@highos.com">Jesse Tie Ten Quee</ulink> who -donated a Yamaha CDRW 8824E CD-RW. -</para></listitem> - -<listitem><para> -<ulink url="mailto:highos@highos.com">Jesse Tie Ten Quee</ulink> for -providing highos.com as the www.ca.linuxfromscratch.org -mirror. -</para></listitem> - -<listitem><para> -<ulink url="http://www.oreilly.com">O'Reilly</ulink> for donating books -on SQL and PHP. -</para></listitem> - -<listitem><para> -Robert Briggs for donating the linuxfromscratch.org and -linuxfromscratch.com domain names. -</para></listitem> - -<listitem><para> -<ulink url="mailto:westermann@linux-provider.net">Torsten +related sub-projects.</para></listitem> + +<listitem><para><ulink url="mailto:jan.niemann@tu-bs.de">Jan Niemann</ulink> +for providing +<ulink url="http://helga.lk.etc.tu-bs.de">http://helga.lk.etc.tu-bs.de</ulink> +as the 134.169.139.209 mirror.</para></listitem> + +<listitem><para><ulink url="mailto:johanlenglet@linuxfromscratch.org">Johan Lenglet</ulink> +for leading the French translation project at <ulink +url="http://www.fr.linuxfromscratch.org">http://www.fr.linuxfromscratch.org</ulink>.</para></listitem> + +<listitem><para><ulink url="mailto:mpeters@mac.com">Michael Peters</ulink> for +contributing the Apple PowerPC modifications.</para></listitem> + +<listitem><para><ulink url="http://www.valinux.com">VA Linux Systems</ulink> +who, on behalf of <ulink url="http://www.linux.com">Linux.com</ulink>, donated a +VA Linux 420 (formerly StartX SP2) workstation toward this project.</para></listitem> + +<listitem><para><ulink url="mailto:highos@highos.com">Jesse Tie Ten Quee</ulink> + who donated a Yamaha CDRW 8824E CD-RW.</para></listitem> + +<listitem><para><ulink url="mailto:highos@highos.com">Jesse Tie Ten Quee</ulink> for providing highos.com as the www.ca.linuxfromscratch.org mirror.</para></listitem> + +<listitem><para><ulink url="http://www.oreilly.com">O'Reilly</ulink> for +donating books on SQL and PHP.</para></listitem> + +<listitem><para>Robert Briggs for donating the linuxfromscratch.org and +linuxfromscratch.com domain names.</para></listitem> + +<listitem><para><ulink url="mailto:westermann@linux-provider.net">Torsten Westermann</ulink> for running the lfs.linux-provider.net HTTP and FTP -mirror sites. -</para></listitem> +mirror sites.</para></listitem> -<listitem><para> -<ulink url="mailto:dag@stenstad.net">Dag Stenstad</ulink> for providing -the hardware and bandwidth to run the Norwegian mirror and +<listitem><para><ulink url="mailto:dag@stenstad.net">Dag Stenstad</ulink> + for providing the hardware and bandwidth to run the Norwegian mirror and <ulink url="mailto:ian@ichilton.co.uk">Ian Chilton</ulink> for maintaining -this mirror. -</para></listitem> - -<listitem><para> -Countless other people from the various LFS mailing lists who are making -this book happen by making suggestions, testing, and submitting bug -reports. -</para></listitem> +this mirror.</para></listitem> + +<listitem><para>Countless other people from the various LFS mailing lists +who are making this book happen by making suggestions, testing, and submitting +bug reports.</para></listitem> </itemizedlist> diff --git a/chapter01/alfsbackend.xml b/chapter01/alfsbackend.xml index f94e9d8a5..8877cfe16 100644 --- a/chapter01/alfsbackend.xml +++ b/chapter01/alfsbackend.xml @@ -1,10 +1,8 @@ <sect2> <title>alfs-backend</title> -<para> -The alfs-backend mailinglist discusses matters regarding the ALFS -backend. -</para> +<para>The alfs-backend mailinglist discusses matters regarding the ALFS +backend.</para> </sect2> diff --git a/chapter01/alfsdiscuss.xml b/chapter01/alfsdiscuss.xml index a8a637b9d..b7f2fd49c 100644 --- a/chapter01/alfsdiscuss.xml +++ b/chapter01/alfsdiscuss.xml @@ -1,13 +1,11 @@ <sect2> <title>alfs-discuss</title> -<para> -The alfs-discuss list discusses the development of ALFS, which stands for +<para>The alfs-discuss list discusses the development of ALFS, which stands for Automated Linux From Scratch. The goal of this project is to develop an installation tool that can install an LFS system automatically. It's main goal is to speed up compilation by taking away the need to -manually enter the commands to configure, compile, and install packages. -</para> +manually enter the commands to configure, compile, and install packages.</para> </sect2> diff --git a/chapter01/alfsdocs.xml b/chapter01/alfsdocs.xml index 8128ac309..3c0bd9d58 100644 --- a/chapter01/alfsdocs.xml +++ b/chapter01/alfsdocs.xml @@ -1,10 +1,8 @@ <sect2> <title>alfs-docs</title> -<para> -ALFS-docs is the ALFS documentation project which creates and maintains -all of the ALFS documentation. -</para> +<para>ALFS-docs is the ALFS documentation project which creates and maintains +all of the ALFS documentation.</para> </sect2> diff --git a/chapter01/alfsipc.xml b/chapter01/alfsipc.xml index 493163830..3d995b215 100644 --- a/chapter01/alfsipc.xml +++ b/chapter01/alfsipc.xml @@ -1,9 +1,7 @@ <sect2> <title>alfs-ipc</title> -<para> -The alfs-ipc list discusses the ALFS InterProcess Communication issues. -</para> +<para>The alfs-ipc list discusses the ALFS InterProcess Communication issues.</para> </sect2> diff --git a/chapter01/alfsprofile.xml b/chapter01/alfsprofile.xml index 96efae918..3f81fe0db 100644 --- a/chapter01/alfsprofile.xml +++ b/chapter01/alfsprofile.xml @@ -1,10 +1,8 @@ <sect2> <title>alfs-profile</title> -<para> -The alfs-profile list discusses the development of the ALFS XML profile -and DTD. -</para> +<para>The alfs-profile list discusses the development of the ALFS XML profile +and DTD.</para> </sect2> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 9fa95f14d..0fc685608 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -1,14 +1,11 @@ -sect1 id="ch01-changelog"> +<sect1 id="ch01-changelog"> <title>Changelog</title> -<para> -&version; - &releasedate; -</para> +<para>&version; - &releasedate;</para> <itemizedlist> -<listitem><para> -Updated to: +<listitem><para>Updated to: <itemizedlist> @@ -25,302 +22,217 @@ Updated to: </para></listitem> -<listitem><para> -Chapter 5: Removed kernel patch for gcc-3.0 compilation -</para></listitem> +<listitem><para>Chapter 5: Removed kernel patch for gcc-3.0 +compilation</para></listitem> -<listitem><para> -Chapter 5: Added gcc-patch to fix re_max_failure compile problems -</para></listitem> +<listitem><para>Chapter 5: Added gcc-patch to fix re_max_failure +compile problems</para></listitem> -<listitem><para> -Chapter 5: Added missing chown root.root $LFS/usr/include/linux to -kernel installation -</para></listitem> +<listitem><para>Chapter 5: Added missing chown root.root +$LFS/usr/include/linux to kernel installation </para></listitem> -<listitem><para> -Chapter 6: Removed the Groff command explanation regarding CXXFLAGS -which has been made obsolete with the update to groff-1.17.1 -</para></listitem> +<listitem><para> Chapter 6: Removed the Groff command explanation +regarding CXXFLAGS which has been made obsolete with the update +to groff-1.17.1</para></listitem> -<listitem><para> -Chapter 7: Changed $* into "$@" in the functions script. "$@" allows -usage of quoted arguments with blanks. -</para></listitem> +<listitem><para>Chapter 7: Changed $* into "$@" in the functions script. +"$@" allows usage of quoted arguments with blanks.</para></listitem> </itemizedlist> -<para> -3.0-pre4 - June 22nd, 2001 -</para> +<para>3.0-pre4 - June 22nd, 2001</para> <itemizedlist> -<listitem><para> -Chapter 5: Reordered the installations alphabetically. -</para></listitem> +<listitem><para>Chapter 5: Reordered the installations +alphabetically.</para></listitem> -<listitem><para> -Chapter 6: Moved the installations of ed and patch into their -alphabetical positions. -</para></listitem> +<listitem><para>Chapter 6: Moved the installations of ed and +patch into their alphabetical positions.</para></listitem> -<listitem><para> -Chapter 7: Added [ ATTN ] warning message to the functions script. When -you attemp to start a service that's arleady running or stop a service -that's not running, it'll not print FAILED anymore but [ ATTN ] along -with "Already running" or "Not running". -</para></listitem> +<listitem><para>Chapter 7: Added [ ATTN ] warning message to +the functions script. When you attemp to start a service that's +already running or stop a service that's not running, it'll not +print FAILED anymore but [ ATTN ] along with "Already running" +or "Not running".</para></listitem> -<listitem><para> -Chapter 9: Renamed the network-scripts directory in nic-config. -</para></listitem> +<listitem><para>Chapter 9: Renamed the network-scripts +directory in nic-config.</para></listitem> </itemizedlist> -<para> -3.0-pre3 - May 12th, 2001 -</para> +<para>3.0-pre3 - May 12th, 2001</para> <itemizedlist> -<listitem><para> -Added numerous FHS compliance notes. These instructions can be followed -if one wishes to build a fully FHS-compliant system. -</para></listitem> +<listitem><para>Added numerous FHS compliance notes. These +instructions can be followed if one wishes to build a fully +FHS-compliant system.</para></listitem> -<listitem><para> -Chapter 4: Updated the directory list to be more FHS compliant. Mainly -this meant adding the opt directories and removing /usr/tmp and -/usr/local/tmp -</para></listitem> +<listitem><para>Chapter 4: Updated the directory list to be more +FHS compliant. Mainly this meant adding the opt directories and +removing /usr/tmp and /usr/local/tmp</para></listitem> -<listitem><para> -Chapter 5: We now copy the kernel include directories instead of linking -to them. This is theoretically safer if we plan on upgrading the kernel. -</para></listitem> +<listitem><para>Chapter 5: We now copy the kernel include directories +instead of linking to them. This is theoretically safer if we plan on +upgrading the kernel.</para></listitem> -<listitem><para> -Chapter 5+6: Removed fileutils-patch. After upgrading to fileutils-4.1 -the patch isn't needed anymore. -</para></listitem> +<listitem><para>Chapter 5+6: Removed fileutils-patch. After upgrading +to fileutils-4.1 the patch isn't needed anymore.</para></listitem> -<listitem><para> -Chapter 5+6: Put back the instructions on how to copy/remove the old NSS -library files, in case the original distribution uses glibc-2.0.x. -</para></listitem> +<listitem><para>Chapter 5+6: Put back the instructions on how to +copy/remove the old NSS library files, in case the original distribution +uses glibc-2.0.x.</para></listitem> -<listitem><para> -Chapter 5: Added the notice about an old version of install-info. -</para></listitem> +<listitem><para>Chapter 5: Added the notice about an old version +of install-info.</para></listitem> -<listitem><para> -Chapter 5: Removed the installation of a static gettext. -</para></listitem> +<listitem><para>Chapter 5: Removed the installation of a static +gettext.</para></listitem> -<listitem><para> -Chapter 6: Changed bin86's installation from "make PREFIX=/usr install" -to "make INSTALL_OPTS="-m 755" PREFIX=/usr install". This will prevent -install from invoking strip -s on the files. This fails because a -couple of the installed files are shell scripts rather than programs, -so they can't be stripped. -</para></listitem> +<listitem><para>Chapter 6: Changed bin86's installation from +"make PREFIX=/usr install" to "make INSTALL_OPTS="-m 755" +PREFIX=/usr install". This will prevent install from invoking strip -s +on the files. This fails because a couple of the installed files are +shell scripts rather than programs, so they can't be stripped.</para></listitem> -<listitem><para> -Chapter 6: Removed the ld.so section since we only used the man pages -and replaced it with a patch to man-pages. -</para></listitem> +<listitem><para>Chapter 6: Removed the ld.so section since we +only used the man pages and replaced it with a patch to man-pages.</para></listitem> -<listitem><para> -Chapter 7+8: Moved the creation of /etc/fstab to chapter 8. -</para></listitem> +<listitem><para>Chapter 7+8: Moved the creation of /etc/fstab +to chapter 8.</para></listitem> -<listitem><para> -Appendix A: Added missing descriptions of frcode, code and bigram in -the findutils-4.1 package. -</para></listitem> +<listitem><para>Appendix A: Added missing descriptions of frcode, +code and bigram in the findutils-4.1 package.</para></listitem> </itemizedlist> -<para> -3.0-pre2 - April 14th, 2001 -</para> +<para>3.0-pre2 - April 14th, 2001</para> <itemizedlist> -<listitem><para> -Chapter 5: Simplified ln commands. -</para></listitem> +<listitem><para>Chapter 5: Simplified ln commands.</para></listitem> -<listitem><para> -Chapter 5: Removed prefix=$LFS/usr from tar's make install. -</para></listitem> +<listitem><para>Chapter 5: Removed prefix=$LFS/usr from tar's +make install.</para></listitem> -<listitem><para> -Chapter 5+6: Removed --disable-nls from configuration of programs that -don't need it (bash, diffutils, gzip, sed, m4). -</para></listitem> +<listitem><para>Chapter 5+6: Removed --disable-nls from configuration +of programs that don't need it (bash, diffutils, gzip, sed, +m4).</para></listitem> -<listitem><para> -Chapter 5+6: Changed from "cd dir && make" to "make -C dir" -(gettext-static, sysvinit). -</para></listitem> +<listitem><para>Chapter 5+6: Changed from "cd dir && make" +to "make -C dir" (gettext-static, sysvinit).</para></listitem> -<listitem><para> -Chapter 5: Beautified the static link process for mawk. -</para></listitem> +<listitem><para>Chapter 5: Beautified the static link process +for mawk.</para></listitem> -<listitem><para> -Chapter 5: Changed the links we create during gcc-installation to -$LFS/usr/bin/cpp. -</para></listitem> +<listitem><para>Chapter 5: Changed the links we create during +gcc-installation to $LFS/usr/bin/cpp.</para></listitem> -<listitem><para> -Chapter 6: Changed the procps installation from sed'ing to an easier -way. -</para></listitem> +<listitem><para>Chapter 6: Changed the procps installation +from sed'ing to an easier way.</para></listitem> -<listitem><para> -Chapter 6: Changed all "rm file && ln -s dest file" into -"ln -sf file" (in glibc, bzip2 and gzip installations). -</para></listitem> +<listitem><para> Chapter 6: Changed all "rm file && ln -s dest +file" into "ln -sf file" (in glibc, bzip2 and gzip +installations).</para></listitem> -<listitem><para> -Chapter 6: Added a sed to fix a problem during glibc-installation. -pt_chown can not be installed setuid root, because "root" is not known -by glibc yet (kind of hen and egg-problem). -</para></listitem> +<listitem><para>Chapter 6: Added a sed to fix a problem during +glibc-installation. pt_chown can not be installed setuid root, +because "root" is not known by glibc yet (kind of hen and +egg-problem).</para></listitem> -<listitem><para> -Chapter 6: Changed consoledata/tools to kbd, which is more actively -developed, and less of a pain to install. -</para></listitem> +<listitem><para>Chapter 6: Changed consoledata/tools to kbd, which +is more actively developed, and less of a pain to install.</para></listitem> -<listitem><para> -Appendix A: Added the description of the Netkit-base and Net-tools -packages. -</para></listitem> +<listitem><para>Appendix A: Added the description of the Netkit-base +and Net-tools packages.</para></listitem> </itemizedlist> -<para> -3.0-pre1 - February 27th, 2001 -</para> +<para>3.0-pre1 - February 27th, 2001</para> <itemizedlist> -<listitem><para> -Converted the SGML source to XML. -</para></listitem> +<listitem><para>Converted the SGML source to XML.</para></listitem> -<listitem><para> -Chapter 4: Tell the user to use cfdisk rather than fdisk. The fdisk man -page recommends cfdisk over fdisk because it's more stable. -</para></listitem> +<listitem><para>Chapter 4: Tell the user to use cfdisk rather than +fdisk. The fdisk man page recommends cfdisk over fdisk because +it's more stable.</para></listitem> -<listitem><para> -Chapter 4: Changed the wording to make it more general as ext2 no -longer is the only used file system. Reiser for example is often used -too now. -</para></listitem> +<listitem><para>Chapter 4: Changed the wording to make it more general +as ext2 no longer is the only used file system. Reiser for example is +often used too now.</para></listitem> -<listitem><para> -Chapter 5: Added static mawk, texinfo and partially gettext to faciliate -the move of Glibc from Chapter 5 to Chapter 6. -</para></listitem> +<listitem><para>Chapter 5: Added static mawk, texinfo and partially +gettext to faciliate the move of Glibc from Chapter 5 +to Chapter 6.</para></listitem> -<listitem><para> -Chapter 5: Added Makedev to chapter 5. We don't create the device files -here, only copy the MAKEDEV script and make a temp copy which will be -used to create device files. This second file (MAKEDEV-temp) doesn't -contain user names and group names but only user id's and group id's. We -need a few device files to get Glibc installed, but before GLibc is -installed user and group names are not recognized yet; only the numeric -id's. This requires a slightly modified MAKEDEV script which will be -generated by patching the original one. This patching is done here in -chapter 5. Also, fixed the explanations on both makedev installations. -</para></listitem> +<listitem><para>Chapter 5: Added Makedev to chapter 5. We don't create +the device files here, only copy the MAKEDEV script and make a temp +copy which will be used to create device files. This second file +(MAKEDEV-temp) doesn't contain user names and group names but only user +id's and group id's. We need a few device files to get Glibc installed, +but before GLibc is installed user and group names are not recognized yet; +only the numeric id's. This requires a slightly modified MAKEDEV script +which will be generated by patching the original one. This patching is done +here in chapter 5. Also, fixed the explanations on both +makedev installations.</para></listitem> -<listitem><para> -Chapter 5: Recommended to install all the software while logged in (or -su'ed to) user root. -</para></listitem> +<listitem><para>Chapter 5: Recommended to install all the software +while logged in (or su'ed to) user root.</para></listitem> -<listitem><para> -Chapter 5+6: Added the fileutils-4.0 patch which is needed to compile -the fileutils package on Glibc-2.2 based systems (such as the upcoming -LFS-3.0 system). -</para></listitem> +<listitem><para>Chapter 5+6: Added the fileutils-4.0 patch which is +needed to compile the fileutils package on Glibc-2.2 based systems +(such as the upcoming LFS-3.0 system).</para></listitem> -<listitem><para> -Chapter 5+6: Upgraded from gcc-2.95.2 to gcc-2.95.2.1 -</para></listitem> +<listitem><para>Chapter 5+6: Upgraded from gcc-2.95.2 to +gcc-2.95.2.1</para></listitem> -<listitem><para> -Chapter 5+6: Moved Glibc from chapter 5 to chapter 6 -</para></listitem> +<listitem><para>Chapter 5+6: Moved Glibc from chapter 5 to +chapter 6</para></listitem> -<listitem><para> -Chapter 6: Changed libexecdir=/usr/bin in fileutils to libexecdir=/bin -</para></listitem> +<listitem><para>Chapter 6: Changed libexecdir=/usr/bin in fileutils +to libexecdir=/bin</para></listitem> -<listitem><para> -Chapter 6: Updated Glibc installation instructions. 'configparms' file -creation has been deleted. No need to pick a compiler (either distro's -native or the /usr/local/gcc2952/bin/gcc one); we're in chroot -now so we'll use the one we have -</para></listitem> +<listitem><para>Chapter 6: Updated Glibc installation instructions. +'configparms' file creation has been deleted. No need to pick a compiler +(either distro's native or the /usr/local/gcc2952/bin/gcc one); +we're in chroot now so we'll use the one we have</para></listitem> -<listitem><para> -Chapter 6: Only copy the man pages from the ld.so package. We don't need -the ldconfig and ldd programs anymore; Glibc-2.2.1 comes with good -working versions. -</para></listitem> +<listitem><para>Chapter 6: Only copy the man pages from the +ld.so package. We don't need the ldconfig and ldd programs anymore; +Glibc-2.2.1 comes with good working versions.</para></listitem> -<listitem><para> -Chapter 6: Added the creation of the lex symlink to the flex -installation. -</para></listitem> +<listitem><para>Chapter 6: Added the creation of the lex symlink +to the flex installation.</para></listitem> -<listitem><para> -Chapter 6: Changed $* into "$@" in the yacc script during bison's -installation. "$@" allows usage of quoted arguments with blanks. -</para></listitem> +<listitem><para>Chapter 6: Changed $* into "$@" in the yacc script +during bison's installation. "$@" allows usage of quoted arguments +with blanks. </para></listitem> -<listitem><para> -Chapter 6: Fixed the man page installation during console-tools' -installation. -</para></listitem> +<listitem><para>Chapter 6: Fixed the man page installation during +console-tools' installation.</para></listitem> -<listitem><para> -Chapter 6: When entering chroot the $TERM variable inside chroot is set -properly. This is accomplished by: chroot ... -i HOME=/root TERM=$TERM -... -</para></listitem> +<listitem><para>Chapter 6: When entering chroot the $TERM variable +inside chroot is set properly. This is accomplished by: chroot ... +-i HOME=/root TERM=$TERM...</para></listitem> -<listitem><para> -Chapter 6: Merged the different sulogin lines from the inittab file -into one line. -</para></listitem> +<listitem><para>Chapter 6: Merged the different sulogin lines from +the inittab file into one line.</para></listitem> -<listitem><para> -Chapter 7: Fixed the delays in the killproc function in the functions -script. Now after kill, first check PIDs, then sleep 2 if needed. More -details can be read in the comments in the script itself. -</para></listitem> +<listitem><para>Chapter 7: Fixed the delays in the killproc function +in the functions script. Now after kill, first check PIDs, then +sleep 2 if needed. More details can be read in the comments +in the script itself.</para></listitem> -<listitem><para> -Chapter 7: Added the explanation how the runlevels and boot process -works when using the LFS scripts. -</para></listitem> +<listitem><para>Chapter 7: Added the explanation how the runlevels +and boot process works when using the LFS scripts.</para></listitem> -<listitem><para> -Chapter 10: Added this chapter. It contains "thanks and good luck" -notes and suggest creating the /etc/lfs-&version; file -</para></listitem> +<listitem><para>Chapter 10: Added this chapter. It contains "thanks +and good luck"notes and suggest creating the /etc/lfs-&version; +file</para></listitem> </itemizedlist> - </sect1> diff --git a/chapter01/contactinfo.xml b/chapter01/contactinfo.xml index 8dad8a3db..98132fcbe 100644 --- a/chapter01/contactinfo.xml +++ b/chapter01/contactinfo.xml @@ -1,18 +1,11 @@ <sect1 id="ch01-contactinfo"> <title>Contact information</title> -<para> -Direct all emails to the -lfs-discuss mailing list at -<ulink url="mailto:lfs-discuss@linuxfromscratch.org"> -lfs-discuss@linuxfromscratch.org</ulink> preferably. -</para> +<para>Direct all emails to the lfs-discuss mailing list at +<ulink url="mailto:lfs-discuss@linuxfromscratch.org">lfs-discuss@linuxfromscratch.org</ulink> preferably.</para> -<para> -If you need to reach Gerard Beekmans personally, send an email to -<ulink url="mailto:gerard@linuxfromscratch.org"> -gerard@linuxfromscratch.org</ulink> -</para> +<para>If you need to reach Gerard Beekmans personally, send an email to +<ulink url="mailto:gerard@linuxfromscratch.org">gerard@linuxfromscratch.org</ulink></para> </sect1> diff --git a/chapter01/conventions.xml b/chapter01/conventions.xml index 1533fc350..05f671034 100644 --- a/chapter01/conventions.xml +++ b/chapter01/conventions.xml @@ -1,55 +1,36 @@ <sect1 id="ch01-conventions"> <title>Conventions used in this book</title> -<para> -To make things easy to follow, there are a number of conventions used -throughout the book. Following are some examples: -</para> +<para>To make things easy to follow, there are a number of conventions used +throughout the book. Following are some examples:</para> -<para> -<userinput>./configure --prefix=/usr</userinput> -</para> +<para><userinput>./configure --prefix=/usr</userinput></para> -<blockquote><para> -This form of text is designed to be typed exactly as seen unless otherwise -noted in the surrounding text. It is also used in the explanation sections to -identify which of the commands is being referred to. -</para></blockquote> +<blockquote><para>This form of text is designed to be typed exactly +as seen unless otherwise noted in the surrounding text. It is also used +in the explanation sections to identify which of the commands is being +referred to.</para></blockquote> -<para> -<filename> -install-info: unknown option `--dir-file=/mnt/lfs/usr/info/dir' -</filename> -</para> +<para><filename>install-info: unknown option +`--dir-file=/mnt/lfs/usr/info/dir'</filename></para> -<blockquote><para> -This form of text (fixed width text) is showing screen output, probably as the -result of commands issued and is also used to show filenames such as -<filename>/etc/lilo.conf</filename> -</para></blockquote> +<blockquote><para>This form of text (fixed width text) is showing screen +output, probably as the result of commands issued and is also used to +show filenames such as <filename>/etc/lilo.conf</filename></para></blockquote> -<para> -<emphasis>Emphasis</emphasis> -</para> +<para><emphasis>Emphasis</emphasis></para> -<blockquote><para> -This form of text is used for several purposes in the book but mainly to -emphasise important points or to give examples as to what to type. -</para></blockquote> +<blockquote><para>This form of text is used for several purposes in the +book but mainly to emphasise important points or to give examples as to +what to type.</para></blockquote> -<para> -<ulink url="http://www.linuxfromscratch.org/"> -http://www.linuxfromscratch.org/</ulink> -</para> +<para><ulink url="http://www.linuxfromscratch.org/">http://www.linuxfromscratch.org/</ulink></para> -<blockquote><para> -This form of text is used for hyperlinks, both within the book and to external -pages such as HowTo's,download locations and websites etc. -</para></blockquote> +<blockquote><para>This form of text is used for hyperlinks, both within the +book and to external pages such as HowTo's,download locations and +websites etc.</para></blockquote> -<para> -<screen> -<userinput>cat > $LFS/etc/group << "EOF"</userinput> +<para><screen><userinput>cat > $LFS/etc/group << "EOF"</userinput> root:x:0: bin:x:1: ...... @@ -57,12 +38,11 @@ pages such as HowTo's,download locations and websites etc. </screen> </para> -<blockquote><para> -This type of section is used mainly when creating configuration files. The -first command (in bold) tells the system to create the file $LFS/etc/group from -whatever is typed on the following lines until the sequence EOF is encountered. -Therefore, this whole section is generally typed as seen. -</para></blockquote> +<blockquote><para>This type of section is used mainly when creating +configuration files. The first command (in bold) tells the system to create +the file $LFS/etc/group from whatever is typed on the following lines until +the sequence EOF is encountered. Therefore, this whole section is generally +typed as seen.</para></blockquote> </sect1> diff --git a/chapter01/how.xml b/chapter01/how.xml index 47ec186bd..0b02798c1 100644 --- a/chapter01/how.xml +++ b/chapter01/how.xml @@ -1,56 +1,42 @@ <sect1 id="ch01-how"> <title>How things are going to be done</title> -<para> -We are going to build the LFS system by using an already installed Linux +<para>We are going to build the LFS system by using an already installed Linux distribution such as Debian, SuSe, Slackware, Mandrake, RedHat, etc. There is no need to have any kind of bootdisk. We will use an existing Linux system as the base (since we need a compiler, linker, text editor, and -other tools). -</para> +other tools).</para> -<para> -After you have downloaded the necessary packages that make up an LFS +<para>After you have downloaded the necessary packages that make up an LFS system you will create a new Linux native partition where the LFS system -will be installed onto. -</para> +will be installed onto.</para> -<para> -The next step, chapter 5, will be the installation of a number of +<para>The next step, chapter 5, will be the installation of a number of packages that are statically linked and installed on the LFS partition. These packages form a basic development suite which will be used to -install the actual system. -</para> +install the actual system.</para> -<para> -Chapter 6 installs the actual base system. We use the chroot program to +<para>Chapter 6 installs the actual base system. We use the chroot program to start a new shell who's root directory will be set to the LFS partition. This, in essence, is the same as rebooting and have the kernel mount the LFS partition as the root partition. The reason that we don't actually reboot, but instead chroot, is that this way you can still use your host system. While software is being installed you can simply switch to a different VC (Virtual Console) or X desktop and -continue using your computer. -</para> +continue using your computer.</para> -<para> -When all the software is installed, chapter 7 will setup the boot +<para>When all the software is installed, chapter 7 will setup the boot scripts. Chapter 8 will setup the Linux boot loader and you can finally -reboot your system into your new LFS-system. -</para> +reboot your system into your new LFS-system.</para> -<para> -This is the process in a nutshell. Detailed information on the steps +<para>This is the process in a nutshell. Detailed information on the steps you are taking are provided in the chapters as you go through them. If something isn't completely clear yet, don't worry. It will become very -clear shortly. -</para> +clear shortly.</para> -<para> -Please read chapter 2 carefully as it explains a few important things +<para>Please read chapter 2 carefully as it explains a few important things you need to be aware of before you work your way through chapters 5 and -above. -</para> +above.</para> </sect1> diff --git a/chapter01/lfsannounce.xml b/chapter01/lfsannounce.xml index 09889052b..960fdb757 100644 --- a/chapter01/lfsannounce.xml +++ b/chapter01/lfsannounce.xml @@ -1,16 +1,14 @@ <sect2> <title>lfs-announce</title> -<para> -The lfs-announce list is a moderated list. It can be subscribed to, but +<para>The lfs-announce list is a moderated list. It can be subscribed to, but you can't post any messages to this list. This list is used to announce new stable releases. The lfs-discuss list will carry information about development releases as well. If a user is already on the lfs-discuss list, there's little use subscribing to this list as well because everything that is posted to the lfs-announce -list will be posted to the lfs-discuss list as well. -</para> +list will be posted to the lfs-discuss list as well.</para> </sect2> diff --git a/chapter01/lfsapps.xml b/chapter01/lfsapps.xml index be8da7f9f..d0ca3da28 100644 --- a/chapter01/lfsapps.xml +++ b/chapter01/lfsapps.xml @@ -1,10 +1,8 @@ <sect2> <title>lfs-apps</title> -<para> -The lfs-apps list deals with everything that does not fit on the -lfs-discuss list. -</para> +<para>The lfs-apps list deals with everything that does not fit on the +lfs-discuss list.</para> </sect2> diff --git a/chapter01/lfsdiscuss.xml b/chapter01/lfsdiscuss.xml index 145c2bb83..e4a4b1bed 100644 --- a/chapter01/lfsdiscuss.xml +++ b/chapter01/lfsdiscuss.xml @@ -1,16 +1,12 @@ <sect2> <title>lfs-discuss</title> -<para> -The lfs-discuss mailing list discusses matters strictly related to the +<para>The lfs-discuss mailing list discusses matters strictly related to the LFS-BOOK. If problems with the book come up, a bug or two need to be reported, or suggestions to improve the book should be made, -this mailing list is the right one. -</para> +this mailing list is the right one.</para> -<para> -Any other mail is to be posted on the lfs-apps list. -</para> +<para>Any other mail is to be posted on the lfs-apps list.</para> </sect2> diff --git a/chapter01/lfssecurity.xml b/chapter01/lfssecurity.xml index 9ee8766b0..677f00fa7 100644 --- a/chapter01/lfssecurity.xml +++ b/chapter01/lfssecurity.xml @@ -1,11 +1,9 @@ <sect2> <title>lfs-security</title> -<para> -The lfs-security mailing list discusses security-related matters. +<para>The lfs-security mailing list discusses security-related matters. Security concerns or security problems with a package used by LFS, -should be addressed on this list. -</para> +should be addressed on this list.</para> </sect2> diff --git a/chapter01/mailarchive.xml b/chapter01/mailarchive.xml index 690f38234..3ad0bfdf0 100644 --- a/chapter01/mailarchive.xml +++ b/chapter01/mailarchive.xml @@ -1,15 +1,11 @@ <sect2> <title>Mail archives</title> -<para> -All these lists are archived and can be viewed online at -<ulink url="http://archive.linuxfromscratch.org/mail-archives"> -http://archive.linuxfromscratch.org/mail-archives</ulink> or downloaded -from <ulink url="http://download.linuxfromscratch.org/mail-archives"> -http://download.linuxfromscratch.org/mail-archives</ulink> or <ulink -url="ftp://download.linuxfromscratch.org/mail-archives"> -ftp://download.linuxfromscratch.org/mail-archives</ulink>. -</para> +<para>All these lists are archived and can be viewed online at +<ulink url="http://archive.linuxfromscratch.org/mail-archives">http://archive.linuxfromscratch.org/mail-archives</ulink> or downloaded +from <ulink url="http://download.linuxfromscratch.org/mail-archives">http://download.linuxfromscratch.org/mail-archives</ulink> +or +<ulink url="ftp://download.linuxfromscratch.org/mail-archives">ftp://download.linuxfromscratch.org/mail-archives</ulink>.</para> </sect2> diff --git a/chapter01/maillists.xml b/chapter01/maillists.xml index a8f4f76e4..53fb4bffc 100644 --- a/chapter01/maillists.xml +++ b/chapter01/maillists.xml @@ -1,32 +1,20 @@ <sect1 id="ch01-maillists"> <title>Mailing lists and archives</title> -<para> -The linuxfromscratch.org server is hosting the following publicly accessible -mailing lists: -</para> +<para>The linuxfromscratch.org server is hosting the following publicly +accessible mailing lists:</para> <itemizedlist> -<listitem><para> - lfs-discuss -</para></listitem> +<listitem><para> lfs-discuss</para></listitem> -<listitem><para> - lfs-apps -</para></listitem> +<listitem><para> lfs-apps</para></listitem> -<listitem><para> - lfs-announce -</para></listitem> +<listitem><para> lfs-announce</para></listitem> -<listitem><para> - lfs-security -</para></listitem> +<listitem><para> lfs-security</para></listitem> -<listitem><para> - alfs-discuss -</para></listitem> +<listitem><para> alfs-discuss</para></listitem> </itemizedlist> diff --git a/chapter01/othermodes.xml b/chapter01/othermodes.xml index 36aa35efa..6e6a9449c 100644 --- a/chapter01/othermodes.xml +++ b/chapter01/othermodes.xml @@ -1,27 +1,21 @@ <sect2> <title>Other list modes</title> -<para> -The modes that can be set by a user require to send an email to -<ulink url="mailto:listar@linuxfromscratch.org"> -listar@linuxfromscratch.org</ulink>. The modes themselves are set by writing -the appropriate commands in the subject headers of the message. -</para> +<para>The modes that can be set by a user require to send an email to +<ulink url="mailto:listar@linuxfromscratch.org">listar@linuxfromscratch.org</ulink>. +The modes themselves are set by writing +the appropriate commands in the subject headers of the message.</para> -<para> -As the name implies, the <emphasis>Set command</emphasis> tells what +<para>As the name implies, the <emphasis>Set command</emphasis> tells what to write to set a mode. The <emphasis>Unset command</emphasis> tells -what to write to unset a mode. -</para> +what to write to unset a mode.</para> -<para> -The listname in the example subject headers should be replaced with the +<para>The listname in the example subject headers should be replaced with the listname to which the mode is going to be applied to. If more than one mode is to be set (to the same list or multiple lists) with one email, this can be done by leaving the subject header blank and write all the commands in the body of -the message instead. -</para> +the message instead.</para> </sect2> @@ -33,21 +27,17 @@ Set command: <emphasis>set listname digest</emphasis> Unset command: <emphasis>unset listname digest</emphasis> </literallayout> -<para> -All lists have the digest mode available which can be set after a user +<para>All lists have the digest mode available which can be set after a user has subscribed to a list. Being in digest mode will cause to stop receiving individual messages as they are posted to the list and instead send one email daily containing all -the messages posted to the list during that day. -</para> +the messages posted to the list during that day.</para> -<para> -There is a second digest mode called digest2. When a user is set to this +<para>There is a second digest mode called digest2. When a user is set to this mode he will receive the daily digests but will also continue to receive the individual messages to the lists as they are posted. To set this mode <emphasis>digest2</emphasis> has to be written instead of -<emphasis>digest</emphasis> in the subject header. -</para> +<emphasis>digest</emphasis> in the subject header.</para> </sect2> @@ -59,13 +49,11 @@ Set command: <emphasis>set listname vacation</emphasis> Unset command: <emphasis>unset listname vacation</emphasis> </literallayout> -<para> -If a user is going to be away for a while or wishes to stop receiving +<para>If a user is going to be away for a while or wishes to stop receiving messages from the lists but doesn't want to unsubscribe, he can set to vacation mode. This has the same effect as unsubscribing, but without having to go through the unsubscribe process and -then later through the subscribe process again. -</para> +then later through the subscribe process again.</para> </sect2> diff --git a/chapter01/subscribe.xml b/chapter01/subscribe.xml index 4ba8f1fc9..d7cfd105b 100644 --- a/chapter01/subscribe.xml +++ b/chapter01/subscribe.xml @@ -1,35 +1,27 @@ <sect2> <title>How to subscribe?</title> -<para> -Any of the above-mentioned mailinglists can be subscribed to by sending -an email to <ulink url="mailto:listar@linuxfromscratch.org"> -listar@linuxfromscratch.org</ulink> and writing <emphasis>subscribe -listname</emphasis> as the subject header of the message. -</para> +<para>Any of the above-mentioned mailinglists can be subscribed to by sending +an email to <ulink url="mailto:listar@linuxfromscratch.org">listar@linuxfromscratch.org</ulink> +and writing <emphasis>subscribe listname</emphasis> as the subject +header of the message.</para> -<para> -Multiple lists at the same time can be subscribed to by using +<para>Multiple lists at the same time can be subscribed to by using one email. This is done by leaving the subject blank and putting all the -commands in the body of the email. The email will look like: -</para> +commands in the body of the email. The email will look like:</para> -<blockquote><literallayout> -To: listar@linuxfromscratch.org +<blockquote><literallayout>To: listar@linuxfromscratch.org Subject: subscribe lfs-discuss subscribe lfs-apps -subscribe alfs-discuss -</literallayout></blockquote> +subscribe alfs-discuss</literallayout></blockquote> -<para> -After the email is sent, the Listar program will reply with an +<para>After the email is sent, the Listar program will reply with an email requesting a confirmation of the subscription request. After this confirmation email was sent back, Listar will send an email again with the message that the user has been subscribed to the -list(s) along with an introduction message for that particular list. -</para> +list(s) along with an introduction message for that particular list.</para> </sect2> diff --git a/chapter01/unsubscribe.xml b/chapter01/unsubscribe.xml index 425071d95..d9916af21 100644 --- a/chapter01/unsubscribe.xml +++ b/chapter01/unsubscribe.xml @@ -1,36 +1,28 @@ <sect2> <title>How to unsubscribe?</title> -<para> -To unsubscribe from a list, send an email to -<ulink url="mailto:listar@linuxfromscratch.org"> -listar@linuxfromscratch.org</ulink> and write <emphasis>unsubscribe -listname</emphasis> as the subject header of the message. -</para> +<para>To unsubscribe from a list, send an email to +<ulink url="mailto:listar@linuxfromscratch.org">listar@linuxfromscratch.org</ulink> +and write <emphasis>unsubscribe +listname</emphasis> as the subject header of the message.</para> -<para> -Multiple lists can be unsubscribed at the same time +<para>Multiple lists can be unsubscribed at the same time using one email. This is done by leaving the subject header blank and putting all the commands in the body of the email. The email will look -like: -</para> +like: </para> -<blockquote><literallayout> -To: listar@linuxfromscratch.org +<blockquote><literallayout>To: listar@linuxfromscratch.org Subject: unsubscribe lfs-discuss unsubscribe lfs-apps -unsubscribe alfs-discuss -</literallayout></blockquote> +unsubscribe alfs-discuss</literallayout></blockquote> -<para> -After the email was sent, the Listar program will reply with an +<para>After the email was sent, the Listar program will reply with an email requesting a confirmation of the unsubscription request. After this confirmation email is sent back, Listar will send an email again with the message that the user has been unsubscribed -from the list(s). -</para> +from the list(s).</para> </sect2> diff --git a/chapter01/versions.xml b/chapter01/versions.xml index a4e30b1a9..689382499 100644 --- a/chapter01/versions.xml +++ b/chapter01/versions.xml @@ -1,84 +1,49 @@ <sect1 id="ch01-version"> <title>Book version</title> -<para> -This is LFS-BOOK version &version; dated &releasedate;. If this +<para>This is LFS-BOOK version &version; dated &releasedate;. If this version is older than a month a newer version might be available for download -at the LFS homepage. -</para> +at the LFS homepage.</para> -<para> -Below is a list of our current HTTP and FTP mirror sites as +<para>Below is a list of our current HTTP and FTP mirror sites as of June 24th, 2001. This list might not be accurate anymore. The latest info can be found on our website at -<ulink url="http://www.linuxfromscratch.org"> -http://www.linuxfromscratch.org</ulink>. -</para> +<ulink url="http://www.linuxfromscratch.org">http://www.linuxfromscratch.org</ulink>.</para> <sect2> <title>HTTP Mirrors</title> <itemizedlist> -<listitem><para> -Fremont, USA [100 Mbit] - <ulink -url="http://www.linuxfromscratch.org/intro/"> -http://www.linuxfromscratch.org/intro/</ulink> -</para></listitem> - -<listitem><para> -Canmore, Alberta, Canada [2 Mbit] - <ulink -url="http://www.ca.linuxfromscratch.org/intro/"> -http://www.ca.linuxfromscratch.org/intro/</ulink> -</para></listitem> - -<listitem><para> -Columbus, Ohio, United States [1 Mbit] - <ulink -url="http://www.us.linuxfromscratch.org/intro/"> -http://www.us.linuxfromscratch.org/intro/</ulink> -</para></listitem> - -<listitem><para> -Braunschweig, Germany [10 Mbit] - <ulink -url="http://www.de.linuxfromscratch.org/intro/"> -http://www.de.linuxfromscratch.org/intro/</ulink> -</para></listitem> - -<listitem><para> -Mainz, Germany [1.5 Mbit] - <ulink -url="http://lfs.linux-provider.net/intro/"> -http://lfs.linux-provider.net/intro/</ulink> -</para></listitem> - -<listitem><para> -Vienna Univ. of Technology, Austria [16 Mbit] - <ulink -url="http://www.at.linuxfromscratch.org/intro/"> -http://www.at.linuxfromscratch.org/intro/</ulink> -</para></listitem> - -<listitem><para> -Bistrita, Romania [2 Mbit] - <ulink -url="http://www.ro.linuxfromscratch.org/intro/"> -http://www.ro.linuxfromscratch.org/intro/</ulink> -</para></listitem> - -<listitem><para> -Oslo, Norway [100 Mbit] - <ulink -url="http://www.no.linuxfromscratch.org/intro/"> -http://www.no.linuxfromscratch.org/intro/</ulink> -</para></listitem> - -<listitem><para> -Teeside, United Kingdom [256 Kbit] - <ulink -url="http://www.linuxfromscratch.co.uk/"> -http://www.linuxfromscratch.co.uk</ulink> -</para></listitem> - -<listitem><para> -Brisbane, Australia [155 Mbit] - <ulink -url="http://www.au.linuxfromscratch.org/intro/"> -http://www.au.linuxfromscratch.org/intro/</ulink> -</para></listitem> +<listitem><para>Fremont, USA [100 Mbit] - <ulink +url="http://www.linuxfromscratch.org/intro/">http://www.linuxfromscratch.org/intro/</ulink></para></listitem> + +<listitem><para>Canmore, Alberta, Canada [2 Mbit] - <ulink +url="http://www.ca.linuxfromscratch.org/intro/">http://www.ca.linuxfromscratch.org/intro/</ulink></para></listitem> + +<listitem><para>Columbus, Ohio, United States [1 Mbit] - <ulink +url="http://www.us.linuxfromscratch.org/intro/">http://www.us.linuxfromscratch.org/intro/</ulink></para></listitem> + +<listitem><para>Braunschweig, Germany [10 Mbit] - <ulink +url="http://www.de.linuxfromscratch.org/intro/">http://www.de.linuxfromscratch.org/intro/</ulink></para></listitem> + +<listitem><para>Mainz, Germany [1.5 Mbit] - <ulink +url="http://lfs.linux-provider.net/intro/">http://lfs.linux-provider.net/intro/</ulink></para></listitem> + +<listitem><para>Vienna Univ. of Technology, Austria [16 Mbit] - <ulink +url="http://www.at.linuxfromscratch.org/intro/">http://www.at.linuxfromscratch.org/intro/</ulink></para></listitem> + +<listitem><para>Bistrita, Romania [2 Mbit] - <ulink +url="http://www.ro.linuxfromscratch.org/intro/">http://www.ro.linuxfromscratch.org/intro/</ulink></para></listitem> + +<listitem><para>Oslo, Norway [100 Mbit] - <ulink +url="http://www.no.linuxfromscratch.org/intro/">http://www.no.linuxfromscratch.org/intro/</ulink></para></listitem> + +<listitem><para>Teeside, United Kingdom [256 Kbit] - <ulink +url="http://www.linuxfromscratch.co.uk/">http://www.linuxfromscratch.co.uk</ulink></para></listitem> + +<listitem><para>Brisbane, Australia [155 Mbit] - <ulink +url="http://www.au.linuxfromscratch.org/intro/">http://www.au.linuxfromscratch.org/intro/</ulink></para></listitem> </itemizedlist> @@ -89,65 +54,35 @@ http://www.au.linuxfromscratch.org/intro/</ulink> <itemizedlist> -<listitem><para> -Fremont, California, USA [FTP] [100 Mbit] - <ulink -url="ftp://packages.linuxfromscratch.org"> -ftp://packages.linuxfromscratch.org</ulink> -</para></listitem> - -<listitem><para> -Fremont, California, USA [HTTP] [100 Mbit] - <ulink -url="http://packages.linuxfromscratch.org"> -http://packages.linuxfromscratch.org</ulink> -</para></listitem> - -<listitem><para> -Canmore, Alberta, Canada [FTP] [2 Mbit] - <ulink -url="ftp://ftp.ca.linuxfromscratch.org/pub/lfs/"> -ftp://ftp.ca.linuxfromscratch.org/pub/lfs/</ulink> -</para></listitem> - -<listitem><para> -Canmore, Alberta, Canada [HTTP] [2 Mbit] - <ulink -url="http://ftp.ca.linuxfromscratch.org/pub/lfs/"> -http://ftp.ca.linuxfromscratch.org/pub/lfs/</ulink> -</para></listitem> - -<listitem><para> -Mainz, Germany, Europe [FTP] PPC packages only [1.5 Mbit] - <ulink -url="ftp://ftp.linux-provider.net/pub/lfs/"> -ftp://ftp.linux-provider.net/pub/lfs/</ulink> -</para></listitem> - -<listitem><para> -Mainz, Germany, Europe [HTTP] PPC packages only [1.5 Mbit] - <ulink -url="http://ftp.linux-provider.net/lfs/"> -http://ftp.linux-provider.net/lfs/</ulink> -</para></listitem> - -<listitem><para> -Vienna Univ. of Tech., Austria [FTP] [16 Mbit] - <ulink -url="ftp://ftp.at.linuxfromscratch.org/lfs/packages"> -ftp://ftp.at.linuxfromscratch.org/lfs/packages</ulink> -</para></listitem> - -<listitem><para> -Vienna Univ. of Tech., Austria [HTTP] [16 Mbit] - <ulink -url="http://ftp.at.linuxfromscratch.org/lfs/packages"> -http://ftp.at.linuxfromscratch.org/lfs/packages</ulink> -</para></listitem> - -<listitem><para> -Oslo, Norway [FTP] [100 Mbit] - <ulink -url="ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/"> -ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/</ulink> -</para></listitem> - -<listitem><para> -Brisbane, Australia [FTP] [155 Mbit] - <ulink -url="ftp://ftp.planetmirror.com/pub/lfs/"> -ftp://ftp.planetmirror.com/pub/lfs/</ulink> -</para></listitem> +<listitem><para>Fremont, California, USA [FTP] [100 Mbit] - <ulink +url="ftp://packages.linuxfromscratch.org">ftp://packages.linuxfromscratch.org</ulink></para></listitem> + +<listitem><para>Fremont, California, USA [HTTP] [100 Mbit] - <ulink +url="http://packages.linuxfromscratch.org">http://packages.linuxfromscratch.org</ulink></para></listitem> + +<listitem><para>Canmore, Alberta, Canada [FTP] [2 Mbit] - <ulink +url="ftp://ftp.ca.linuxfromscratch.org/pub/lfs/">ftp://ftp.ca.linuxfromscratch.org/pub/lfs/</ulink></para></listitem> + +<listitem><para>Canmore, Alberta, Canada [HTTP] [2 Mbit] - <ulink +url="http://ftp.ca.linuxfromscratch.org/pub/lfs/">http://ftp.ca.linuxfromscratch.org/pub/lfs/</ulink></para></listitem> + +<listitem><para>Mainz, Germany, Europe [FTP] [1.5 Mbit] - <ulink +url="ftp://ftp.linux-provider.net/pub/lfs/">ftp://ftp.linux-provider.net/pub/lfs/</ulink></para></listitem> + +<listitem><para>Mainz, Germany, Europe [HTTP] [1.5 Mbit] - <ulink +url="http://ftp.linux-provider.net/lfs/">http://ftp.linux-provider.net/lfs/</ulink></para></listitem> + +<listitem><para>Vienna Univ. of Tech., Austria [FTP] [16 Mbit] - <ulink +url="ftp://ftp.at.linuxfromscratch.org/lfs/packages">ftp://ftp.at.linuxfromscratch.org/lfs/packages</ulink></para></listitem> + +<listitem><para>Vienna Univ. of Tech., Austria [HTTP] [16 Mbit] - <ulink +url="http://ftp.at.linuxfromscratch.org/lfs/packages">http://ftp.at.linuxfromscratch.org/lfs/packages</ulink></para></listitem> + +<listitem><para>Oslo, Norway [FTP] [100 Mbit] - <ulink +url="ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/">ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/</ulink></para></listitem> + +<listitem><para>Brisbane, Australia [FTP] [155 Mbit] - <ulink +url="ftp://ftp.planetmirror.com/pub/lfs/">ftp://ftp.planetmirror.com/pub/lfs/</ulink></para></listitem> </itemizedlist> diff --git a/chapter02/aboutlfs.xml b/chapter02/aboutlfs.xml index 6711ec3b1..8533f7382 100644 --- a/chapter02/aboutlfs.xml +++ b/chapter02/aboutlfs.xml @@ -1,56 +1,42 @@ <sect1 id="ch02-aboutlfs"> <title>About $LFS</title> -<para> -Please read the following carefully: throughout this book +<para>Please read the following carefully: throughout this book the variable $LFS will be used frequently. $LFS must at all times be replaced by the directory where the partition that contains the LFS system is mounted. How to create and where to mount the partition will be explained in full detail in chapter 4. In my case, the LFS -partition is mounted on /mnt/lfs. -</para> +partition is mounted on /mnt/lfs.</para> -<para> -For example when you are told to run a command like +<para>For example when you are told to run a command like <userinput>./configure --prefix=$LFS</userinput> you actually have to -execute <userinput>./configure --prefix=/mnt/lfs</userinput> -</para> +execute <userinput>./configure --prefix=/mnt/lfs</userinput></para> -<para> -It's important that this is done no matter where it is read; be it in -commands entered in a shell, or in a file edited or created. -</para> +<para>It's important that this is done no matter where it is read; be it in +commands entered in a shell, or in a file edited or created.</para> -<para> -A possible solution is to set the environment variable LFS. +<para>A possible solution is to set the environment variable LFS. This way $LFS can be entered literally instead of replacing it by /mnt/lfs. This is accomplished by running <userinput>export -LFS=/mnt/lfs</userinput>. -</para> +LFS=/mnt/lfs</userinput>.</para> -<para> -Now, if you are told to run a command like <userinput>./configure +<para>Now, if you are told to run a command like <userinput>./configure --prefix=$LFS</userinput> you can type that literally. Your shell will replace $LFS with /mnt/lfs when it processes the command line (meaning -when you hit enter after having typed the command). -</para> +when you hit enter after having typed the command).</para> -<para> -If you plan to use $LFS, do not forget to set the $LFS variable at all +<para>If you plan to use $LFS, do not forget to set the $LFS variable at all times. If the variable is not set and is used in a command, $LFS will be ignored and whatever is left will be executed. A command like <userinput>echo "root:x:0:0:root:/root:/bin/bash" > $LFS/etc/passwd</userinput> without the $LFS variable set will re-create your host system's /etc/passwd file. Simply put: it will -destroy your current password database file. -</para> +destroy your current password database file.</para> -<para> -One way to make sure that $LFS is set at all times is adding it to +<para>One way to make sure that $LFS is set at all times is adding it to the /root/.bash_profile and/or /root/.bashrc file(s) so that every time you login as user root, or you 'su' to user root, the $LFS variable is -set. -</para> +set.</para> </sect1> diff --git a/chapter02/bootscripts.xml b/chapter02/bootscripts.xml index fb7f49dc4..96cd852c6 100644 --- a/chapter02/bootscripts.xml +++ b/chapter02/bootscripts.xml @@ -1,20 +1,14 @@ <sect1 id="ch02-bootscripts"> <title>Download the bootscripts</title> -<para> -Typing out all the bootscripts in chapters 7 and 9 can be a long, tedious -process, not to mention very error-prone. -</para> +<para>Typing out all the bootscripts in chapters 7 and 9 can be a long, tedious +process, not to mention very error-prone.</para> -<para> -To save some time, the bootscripts can be downloaded -from <ulink -url="http://packages.linuxfromscratch.org/bootscripts/&bootscripts-version;.tar.bz2"> -http://packages.linuxfromscratch.org/bootscripts/&bootscripts-version;.tar.bz2</ulink> +<para>To save some time, the bootscripts can be downloaded from <ulink +url="&http-root;/bootscripts/&bootscripts-version;.tar.bz2">&http-root;/bootscripts/&bootscripts-version;.tar.bz2</ulink> or <ulink -url="ftp://packages.linuxfromscratch.org/bootscripts/&bootscripts-version;.tar.bz2"> -ftp://packages.linuxfromscratch.org/bootscripts/&bootscripts-version;.tar.bz2</ulink>. -</para> +url="&ftp-root;/bootscripts/&bootscripts-version;.tar.bz2">&ftp-root;/bootscripts/&bootscripts-version;.tar.bz2</ulink> +.</para> </sect1> diff --git a/chapter02/commands.xml b/chapter02/commands.xml index ee973ab5a..2fbbb6dde 100644 --- a/chapter02/commands.xml +++ b/chapter02/commands.xml @@ -1,39 +1,30 @@ <sect1 id="ch02-commands"> <title>Download the LFS Commands</title> -<para> -LFS Commands is a tarball containing files which list the installation -commands for the packages installed in this book. -</para> +<para>LFS Commands is a tarball containing files which list the installation +commands for the packages installed in this book.</para> -<para> -These files can also be used to quickly find out which commands have +<para>These files can also be used to quickly find out which commands have been changed between the different LFS versions as well. Download the lfs-commands tarball for this book version and the previous book version and run a diff on the files. That way it is possible to see which packages have updated installation instructions, so any scripts you may have can be modified, or you can reinstall a package if you think that -necessary. -</para> +necessary.</para> -<para> -A side effect is that these files can be used to dump to a shell and +<para>A side effect is that these files can be used to dump to a shell and install the packages, though some files need to be modified (for example, when the kbd package is installed, you needed to select the keyboard layout file, because it can't reliably be guessed). Keep in mind, please, that these files are not checked for correctness, integrity and so forth. There may be bugs in the files (since they are manually created, typo's are often inevitable) so do check them and -don't blindly trust them. -</para> +don't blindly trust them.</para> -<para> -The lfscommands can be downloaded from <ulink -url="http://packages.linuxfromscratch.org/lfs-commands/"> -http://packages.linuxfromscratch.org/lfs-commands/</ulink> or <ulink -url="ftp://packages.linuxfromscratch.org/lfs-commands/"> -ftp://packages.linuxfromscratch.org/lfs-commands/</ulink>. -</para> +<para>The lfscommands can be downloaded from <ulink +url="http://packages.linuxfromscratch.org/lfs-commands/">http://packages.linuxfromscratch.org/lfs-commands/</ulink> +or <ulink +url="ftp://packages.linuxfromscratch.org/lfs-commands/">ftp://packages.linuxfromscratch.org/lfs-commands/</ulink>.</para> </sect1> diff --git a/chapter02/download.xml b/chapter02/download.xml index a895230e6..c5c3840b3 100644 --- a/chapter02/download.xml +++ b/chapter02/download.xml @@ -1,13 +1,10 @@ <sect1 id="ch02-download"> <title>How to download the software</title> -<para> -Throughout this document, I will assume that all the -packages that were downloaded are placed somewhere in $LFS/usr/src. -</para> +<para>Throughout this document, I will assume that all the +packages that were downloaded are placed somewhere in $LFS/usr/src.</para> -<para> -I use the convention of having a $LFS/usr/src/sources directory. +<para>I use the convention of having a $LFS/usr/src/sources directory. Under sources, I have the directory 0-9 and the directories a through z. A package like sysvinit-2.78.tar.gz is stored under $LFS/usr/src/sources/s/. A package like bash-2.04.tar.gz is stored under @@ -15,17 +12,14 @@ $LFS/usr/src/sources/b/, and so forth. This convention does not have to be followed, of course; I was just giving an example. It's better to keep the packages out of $LFS/usr/src and move them to a subdirectory, so we'll have a clean $LFS/usr/src directory in which we will unpack the -packages and work with them. -</para> +packages and work with them.</para> -<para> -The next chapter contains the list of all the packages that need to be +<para>The next chapter contains the list of all the packages that need to be downloaded, but the partition that is going to contain our LFS system isn't created yet. Therefore, the files are temporarily stored somewhere else (it's up to you to decide where this 'else' is) and later moved to $LFS/usr/src/ when -the chapter in which the new partition is prepared has been finished. -</para> +the chapter in which the new partition is prepared has been finished.</para> </sect1> diff --git a/chapter02/install.xml b/chapter02/install.xml index bb7beff87..5826fab11 100644 --- a/chapter02/install.xml +++ b/chapter02/install.xml @@ -1,104 +1,59 @@ <sect1 id="ch02-install"> <title>How to install the software</title> -<para> -Before you can actually start doing something with a package, you need +<para>Before you can actually start doing something with a package, you need to unpack it first. Often the package files are tar'ed and gzip'ed or bzip2'ed. I'm not going to write down every time how to unpack an archive. I will explain how to do that once, in this -section. -</para> +section.</para> -<para> -To start with, change to the $LFS/usr/src directory by running: -</para> +<para>To start with, change to the $LFS/usr/src directory by running:</para> -<para> -<screen> -<userinput>cd $LFS/usr/src</userinput> -</screen> -</para> +<para><screen><userinput>cd $LFS/usr/src</userinput></screen></para> -<para> -If a file is tar'ed and gzip'ed, it is unpacked by +<para>If a file is tar'ed and gzip'ed, it is unpacked by running either one of the following two commands, depending on the -filename: -</para> - -<para> -<screen> -<userinput>tar xvzf filename.tar.gz</userinput> -<userinput>tar xvzf filename.tgz</userinput> -</screen> -</para> - - -<para> -If a file is tar'ed and bzip2'ed, it is unpacked by -running: -</para> - -<para> -<screen> -<userinput>bzcat filename.tar.bz2 | tar xv</userinput> -</screen> -</para> - -<para> -Some tar programs (most of them nowadays but not all of them) are +filename:</para> + +<para><screen><userinput>tar xvzf filename.tar.gz</userinput> +<userinput>tar xvzf filename.tgz</userinput></screen></para> + + +<para>If a file is tar'ed and bzip2'ed, it is unpacked by +running:</para> + +<para><screen><userinput>bzcat filename.tar.bz2 | tar xv</userinput></screen></para> + +<para>Some tar programs (most of them nowadays but not all of them) are slightly modified to be able to use bzip2 files directly using either the I or the y tar parameter, which works the same as the z tar parameter to handle gzip archives. The above construction works no matter how -your host system decided to patch bzip2. -</para> +your host system decided to patch bzip2.</para> -<para> -If a file is just tar'ed, it is unpacked by running: -</para> +<para>If a file is just tar'ed, it is unpacked by running:</para> -<para> -<screen> -<userinput>tar xvf filename.tar</userinput> -</screen> -</para> +<para><screen><userinput>tar xvf filename.tar</userinput></screen></para> -<para> -When an archive is unpacked, a new directory will be created under the +<para>When an archive is unpacked, a new directory will be created under the current directory (and this book assumes that the archives are unpacked under the $LFS/usr/src directory). Please enter that new directory before continuing with the installation instructions. Again, every time this book is going to install a package, it's up to you to unpack the source -archive and cd into the newly created directory. -</para> +archive and cd into the newly created directory.</para> -<para> -From time to time you will be dealing with single files such as patch +<para>From time to time you will be dealing with single files such as patch files. These files are generally gzip'ed or bzip2'ed. Before such files -can be used they need to be uncompressed first. -</para> - -<para> -If a file is gzip'ed, it is unpacked by running: -</para> - -<para> -<screen> -<userinput>gunzip filename.gz</userinput> -</screen> -</para> - -<para> -If a file is bzip2'ed, it is unpacked by running: -</para> - -<para> -<screen> -<userinput>bunzip2 filename.bz2</userinput> -</screen> -</para> - -<para> -After a package has been installed, two things can be done with it: +can be used they need to be uncompressed first.</para> + +<para>If a file is gzip'ed, it is unpacked by running:</para> + +<para><screen><userinput>gunzip filename.gz</userinput></screen></para> + +<para>If a file is bzip2'ed, it is unpacked by running:</para> + +<para><screen><userinput>bunzip2 filename.bz2</userinput></screen></para> + +<para>After a package has been installed, two things can be done with it: either the directory that contains the sources can be deleted, or it can be kept. If it is kept, that's fine with me, but if the same package is needed again in a later chapter, the directory @@ -106,19 +61,14 @@ needs to be deleted first before using it again. If this is not done, you might end up in trouble because old settings will be used (settings that apply to the host system but which don't always apply to the LFS system). Doing a simple make clean or make distclean does not -always guarantee a totally clean source tree. -</para> +always guarantee a totally clean source tree.</para> -<para> -So, save yourself a lot of hassle and just remove the source directory -immediately after you have installed it. -</para> +<para>So, save yourself a lot of hassle and just remove the source directory +immediately after you have installed it.</para> -<para> -There is one exception; the kernel source tree. Keep it around as you +<para>There is one exception; the kernel source tree. Keep it around as you will need it later in this book when building a kernel. Nothing will use -the kernel tree so it won't be in your way. -</para> +the kernel tree so it won't be in your way.</para> </sect1> diff --git a/chapter03/creatingdirs.xml b/chapter03/creatingdirs.xml index d581f3ffd..a37be20bd 100644 --- a/chapter03/creatingdirs.xml +++ b/chapter03/creatingdirs.xml @@ -1,16 +1,12 @@ <sect1 id="ch04-creatingdirs"> <title>Creating directories</title> -<para> -Let's create the directory tree on the LFS partition based on the FHS +<para>Let's create the directory tree on the LFS partition based on the FHS standard, which can be found at <ulink url="http://www.pathname.com/fhs/">http://www.pathname.com/fhs/</ulink>. -Issuing the following commands will create a default directory layout: -</para> +Issuing the following commands will create a default directory layout:</para> -<para> -<screen> -<userinput>cd $LFS</userinput> +<para><screen><userinput>cd $LFS</userinput> <userinput>mkdir -p bin boot dev/pts etc/opt home lib mnt proc root sbin tmp var opt</userinput> <userinput>for dirname in $LFS/usr $LFS/usr/local</userinput> <userinput><literal> do</literal></userinput> @@ -30,50 +26,38 @@ Issuing the following commands will create a default directory layout: <userinput>cd $LFS/opt</userinput> <userinput>mkdir bin doc include info lib man</userinput> <userinput>cd $LFS/usr</userinput> -<userinput>ln -s ../var/tmp tmp</userinput> -</screen></para> +<userinput>ln -s ../var/tmp tmp</userinput></screen></para> -<para> -Normally, directories are created with permission mode 755, which isn't +<para>Normally, directories are created with permission mode 755, which isn't desired for all directories. The first change is a mode 0750 for the $LFS/root directory. This is to make sure that not just everybody can enter the /root directory (the same a user would do with /home/username directories). The second change is a mode 1777 for the tmp directories. This way, any user can write data to the /tmp or /var/tmp directory but cannot remove another user's files (the latter is caused -by the so-called "sticky bit" - bit 1 of the 1777 bit mask). -</para> +by the so-called "sticky bit" - bit 1 of the 1777 bit mask).</para> -<para> -<screen> -<userinput>cd $LFS &&</userinput> +<para><screen><userinput>cd $LFS &&</userinput> <userinput>chmod 0750 root &&</userinput> -<userinput>chmod 1777 tmp var/tmp</userinput> -</screen> -</para> +<userinput>chmod 1777 tmp var/tmp</userinput></screen></para> -<para> -Now that the directories are created, copy the source files that were +<para>Now that the directories are created, copy the source files that were downloaded in chapter 3 to some subdirectory under $LFS/usr/src (you -will need to create the desired directory yourself). -</para> +will need to create the desired directory yourself).</para> <sect2> <title>FHS compliance notes</title> -<para> -The FHS stipulates that the /usr/local directory should contain the bin, games, -include, lib, man, sbin, and share subdirectories. You can alter your /usr/local -directory yourself if you want your system to be FHS-compliant. -</para> +<para>The FHS stipulates that the /usr/local directory should contain the +bin, games,include, lib, man, sbin, and share subdirectories. You can +alter your /usr/local directory yourself if you want your system +to be FHS-compliant.</para> -<para> -Also, the standard says that there should exist a /usr/share/games directory, -which we don't much like for a base system. But feel free to make your system -FHS-compliant if you wish. The FHS isn't precise as to the structure of the -/usr/local/share subdirectories, so we took the liberty of creating the -directories that we felt needed. -</para> +<para>Also, the standard says that there should exist a /usr/share/games +directory, which we don't much like for a base system. But feel free to +make your system FHS-compliant if you wish. The FHS isn't precise as +to the structure of the /usr/local/share subdirectories, so we took the +liberty of creating the directories that we felt needed.</para> </sect2> diff --git a/chapter03/creatingfs.xml b/chapter03/creatingfs.xml index 00130a99b..69e799205 100644 --- a/chapter03/creatingfs.xml +++ b/chapter03/creatingfs.xml @@ -1,29 +1,19 @@ <sect1 id="ch04-creatingfs"> <title>Creating a file system on the new partition</title> -<para> -Once the partition is created, we have to create a new file system on +<para>Once the partition is created, we have to create a new file system on that partition. The standard file system used these days is the ext2 file system, but the socalled journaling file systems are becoming increasingly popular too. It's of course up to you to decide which file system you want to create, but because we have to assume and work with -something, we will assume you chose the ext2 file system. -</para> +something, we will assume you chose the ext2 file system.</para> -<para> -To create an ext2 file system, use the mke2fs command. The LFS partition -is used as the only option to the command and the file system is created. -</para> +<para>To create an ext2 file system, use the mke2fs command. The LFS partition +is used as the only option to the command and the file system is created.</para> -<para> -<screen> -<userinput>mke2fs /dev/xxx</userinput> -</screen> -</para> +<para><screen><userinput>mke2fs /dev/xxx</userinput></screen></para> -<para> -Replace "xxx" by the partition's designation (like hda11). -</para> +<para>Replace "xxx" by the partition's designation (like hda11).</para> </sect1> diff --git a/chapter03/creatingpart.xml b/chapter03/creatingpart.xml index f12cedbd7..90b2568fb 100644 --- a/chapter03/creatingpart.xml +++ b/chapter03/creatingpart.xml @@ -1,43 +1,35 @@ <sect1 id="ch04-creatingpart"> <title>Creating a new partition</title> -<para> -First, let me tell you that it is possible to build LFS on only one partition, -which is where your original distribution is installed. This is not recommended -if it is the first time you try LFS, but may be useful if you are short on disk -space. If you feel brave, take a look at the one partition hint at +<para>First, let me tell you that it is possible to build LFS on only +one partition, which is where your original distribution is installed. This +is not recommended if it is the first time you try LFS, but may be useful +if you are short on disk space. If you feel brave, take a look at the +one partition hint at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/one-partition-hint.txt"> -http://archive.linuxfromscratch.org/lfs-hints/one-partition-hint.txt</ulink>. -</para> +url="http://archive.linuxfromscratch.org/lfs-hints/one-partition-hint.txt">http://archive.linuxfromscratch.org/lfs-hints/one-partition-hint.txt</ulink>.</para> -<para> -Before we can build our new Linux system, we need to have an empty Linux +<para>Before we can build our new Linux system, we need to have an empty Linux partition on which we can build our new system. I recommend a partition size of at least 750 MB. This gives enough space to store all the tarballs and to compile all packages without worrying about running out of the necessary temporary disk space. But you probably want more space than that if you plan to use the LFS system as your primary Linux system. If that's the case you'd want more space so you can install additional software. If a -Linux Native partition is already available, this subsection can be skipped. -</para> +Linux Native partition is already available, this subsection can be skipped.</para> -<para> -The cfdisk program (or another fdisk like program you prefer)) is +<para>The cfdisk program (or another fdisk like program you prefer)) is started with the appropriate hard disk as the option (like /dev/hda if a new partition is to be created on the primary master IDE disk). It is used to create a Linux Native partition, write the partition table and exit the cfdisk program. Please refer to the documentation that comes with your fdisk program of choice (the man pages are often a good place to start) and read the procedures about how to create a new Linux native -partition and how to write the partition table. -</para> +partition and how to write the partition table.</para> -<para> -The new partition's designation should be remembered. It +<para>The new partition's designation should be remembered. It could be something like hda11. This newly created partition will be -referred to as the LFS partition in this book. -</para> +referred to as the LFS partition in this book.</para> </sect1> diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml index 92b7d6d17..336d1d901 100644 --- a/chapter03/introduction.xml +++ b/chapter03/introduction.xml @@ -1,12 +1,10 @@ <sect1 id="ch04-introduction"> <title>Introduction</title> -<para> -In this chapter, the partition that is going to host the LFS system is +<para>In this chapter, the partition that is going to host the LFS system is going to be prepared. We will be creating the partition itself, a file system and the directory structure. When this is done, we can move on -to the next chapter and start the actual building process. -</para> +to the next chapter and start the actual building process.</para> </sect1> diff --git a/chapter03/mounting.xml b/chapter03/mounting.xml index d6c3b08e5..3832af808 100644 --- a/chapter03/mounting.xml +++ b/chapter03/mounting.xml @@ -1,44 +1,26 @@ <sect1 id="ch04-mounting"> <title>Mounting the new partition</title> -<para> -Now that we have created a file system, it is ready for use. All we have +<para>Now that we have created a file system, it is ready for use. All we have to do to be able to access the partition (as in reading data from and writing data to) is mount it. If it is mounted under /mnt/lfs, this partition can be accessed by cd'ing to the /mnt/lfs directory. This book will assume that the partition was mounted under /mnt/lfs. It doesn't matter which -directory is chosen, just make sure you remember what you chose. -</para> - -<para> -Create the /mnt/lfs directory by running: -</para> - -<para> -<screen> -<userinput>mkdir -p /mnt/lfs</userinput> -</screen> -</para> - -<para> -Now mount the LFS partition by running: -</para> - -<para> -<screen> -<userinput>mount /dev/xxx /mnt/lfs</userinput> -</screen> -</para> - -<para> -Replace <quote>xxx</quote> by the partition's designation (like hda11). -</para> - -<para> -This directory (/mnt/lfs) is the $LFS variable you have read about earlier. -If you were planning to make use of the $LFS environment variable, -<userinput>export LFS=/mnt/lfs</userinput> has to be executed now. -</para> +directory is chosen, just make sure you remember what you chose.</para> + +<para>Create the /mnt/lfs directory by running:</para> + +<para><screen><userinput>mkdir -p /mnt/lfs</userinput></screen></para> + +<para>Now mount the LFS partition by running:</para> + +<para><screen><userinput>mount /dev/xxx /mnt/lfs</userinput></screen></para> + +<para>Replace <quote>xxx</quote> by the partition's designation (like hda11).</para> + +<para>This directory (/mnt/lfs) is the $LFS variable you have read about +earlier. If you were planning to make use of the $LFS environment variable, +<userinput>export LFS=/mnt/lfs</userinput> has to be executed now.</para> </sect1> diff --git a/chapter04/all.xml b/chapter04/all.xml index f0ed24459..dbff46163 100644 --- a/chapter04/all.xml +++ b/chapter04/all.xml @@ -3,10 +3,8 @@ to compile an LFS system: All LFS Packages - &all-size-kb;: -<ulink url="&ftp;/lfs-packages-&all-version;.tar"> -&ftp;/lfs-packages-&all-version;.tar</ulink> -<ulink url="&http;/lfs-packages-&all-version;.tar"> -&http;/lfs-packages-&all-version;.tar</ulink> +<ulink url="&ftp;/lfs-packages-&all-version;.tar">&ftp;/lfs-packages-&all-version;.tar</ulink> +<ulink url="&http;/lfs-packages-&all-version;.tar">&http;/lfs-packages-&all-version;.tar</ulink> Or download the following packages individually: diff --git a/chapter04/autoconf.xml b/chapter04/autoconf.xml index 2f1fb3f0d..e2fd4cee5 100644 --- a/chapter04/autoconf.xml +++ b/chapter04/autoconf.xml @@ -1,6 +1,4 @@ Autoconf (&autoconf-version;) - &autoconf-size;: -<ulink url="&ftp;/autoconf-&autoconf-version;.tar.bz2"> -&ftp;/autoconf-&autoconf-version;.tar.bz2</ulink> -<ulink url="&http;/autoconf-&autoconf-version;.tar.bz2"> -&http;/autoconf-&autoconf-version;.tar.bz2</ulink> +<ulink url="&ftp;/autoconf-&autoconf-version;.tar.bz2">&ftp;/autoconf-&autoconf-version;.tar.bz2</ulink> +<ulink url="&http;/autoconf-&autoconf-version;.tar.bz2">&http;/autoconf-&autoconf-version;.tar.bz2</ulink> diff --git a/chapter04/automake.xml b/chapter04/automake.xml index 767887ea3..9304cb35d 100644 --- a/chapter04/automake.xml +++ b/chapter04/automake.xml @@ -1,6 +1,4 @@ Automake (&automake-version;) - &automake-size;: -<ulink url="&ftp;/automake-&automake-version;.tar.bz2"> -&ftp;/automake-&automake-version;.tar.bz2</ulink> -<ulink url="&http;/automake-&automake-version;.tar.bz2"> -&http;/automake-&automake-version;.tar.bz2</ulink> +<ulink url="&ftp;/automake-&automake-version;.tar.bz2">&ftp;/automake-&automake-version;.tar.bz2</ulink> +<ulink url="&http;/automake-&automake-version;.tar.bz2">&http;/automake-&automake-version;.tar.bz2</ulink> diff --git a/chapter04/bash.xml b/chapter04/bash.xml index f900ba134..c2ea9d93f 100644 --- a/chapter04/bash.xml +++ b/chapter04/bash.xml @@ -1,6 +1,4 @@ Bash (&bash-version;) - &bash-size;: -<ulink url="&ftp;/bash-&bash-version;.tar.bz2"> -&ftp;/bash-&bash-version;.tar.bz2</ulink> -<ulink url="&http;/bash-&bash-version;.tar.bz2"> -&http;/bash-&bash-version;.tar.bz2</ulink> +<ulink url="&ftp;/bash-&bash-version;.tar.bz2">&ftp;/bash-&bash-version;.tar.bz2</ulink> +<ulink url="&http;/bash-&bash-version;.tar.bz2">&http;/bash-&bash-version;.tar.bz2</ulink> diff --git a/chapter04/bin86.xml b/chapter04/bin86.xml index 2ad1d7912..c5640ad87 100644 --- a/chapter04/bin86.xml +++ b/chapter04/bin86.xml @@ -1,6 +1,4 @@ Bin86 (&bin86-version;) - &bin86-size;: -<ulink url="&ftp;/bin86-&bin86-version;.tar.bz2"> -&ftp;/bin86-&bin86-version;.tar.bz2</ulink> -<ulink url="&http;/bin86-&bin86-version;.tar.bz2"> -&http;/bin86-&bin86-version;.tar.bz2</ulink> +<ulink url="&ftp;/bin86-&bin86-version;.tar.bz2">&ftp;/bin86-&bin86-version;.tar.bz2</ulink> +<ulink url="&http;/bin86-&bin86-version;.tar.bz2">&http;/bin86-&bin86-version;.tar.bz2</ulink> diff --git a/chapter04/binutils.xml b/chapter04/binutils.xml index 0bb181119..8432e3bf8 100644 --- a/chapter04/binutils.xml +++ b/chapter04/binutils.xml @@ -1,6 +1,4 @@ Binutils (&binutils-version;) - &binutils-size;: -<ulink url="&ftp;/binutils-&binutils-version;.tar.bz2"> -&ftp;/binutils-&binutils-version;.tar.bz2</ulink> -<ulink url="&http;/binutils-&binutils-version;.tar.bz2"> -&http;/binutils-&binutils-version;.tar.bz2</ulink> +<ulink url="&ftp;/binutils-&binutils-version;.tar.bz2">&ftp;/binutils-&binutils-version;.tar.bz2</ulink> +<ulink url="&http;/binutils-&binutils-version;.tar.bz2">&http;/binutils-&binutils-version;.tar.bz2</ulink> diff --git a/chapter04/bison.xml b/chapter04/bison.xml index 40a39b993..013d31dc1 100644 --- a/chapter04/bison.xml +++ b/chapter04/bison.xml @@ -1,6 +1,4 @@ Bison (&bison-version;) - &bison-size;: -<ulink url="&ftp;/bison-&bison-version;.tar.bz2"> -&ftp;/bison-&bison-version;.tar.bz2</ulink> -<ulink url="&http;/bison-&bison-version;.tar.bz2"> -&http;/bison-&bison-version;.tar.bz2</ulink> +<ulink url="&ftp;/bison-&bison-version;.tar.bz2">&ftp;/bison-&bison-version;.tar.bz2</ulink> +<ulink url="&http;/bison-&bison-version;.tar.bz2">&http;/bison-&bison-version;.tar.bz2</ulink> diff --git a/chapter04/bzip2.xml b/chapter04/bzip2.xml index d7fc95864..d6e672ac3 100644 --- a/chapter04/bzip2.xml +++ b/chapter04/bzip2.xml @@ -1,6 +1,4 @@ Bzip2 (&bzip2-version;) - &bzip2-size;: -<ulink url="&ftp;/bzip2-&bzip2-version;.tar.bz2"> -&ftp;/bzip2-&bzip2-version;.tar.bz2</ulink> -<ulink url="&http;/bzip2-&bzip2-version;.tar.bz2"> -&http;/bzip2-&bzip2-version;.tar.bz2</ulink> +<ulink url="&ftp;/bzip2-&bzip2-version;.tar.bz2">&ftp;/bzip2-&bzip2-version;.tar.bz2</ulink> +<ulink url="&http;/bzip2-&bzip2-version;.tar.bz2">&http;/bzip2-&bzip2-version;.tar.bz2</ulink> diff --git a/chapter04/diffutils.xml b/chapter04/diffutils.xml index 402c3022c..4214ea2c4 100644 --- a/chapter04/diffutils.xml +++ b/chapter04/diffutils.xml @@ -1,6 +1,4 @@ Diff Utils (&diffutils-version;) - &diffutils-size;: -<ulink url="&ftp;/diffutils-&diffutils-version;.tar.bz2"> -&ftp;/diffutils-&diffutils-version;.tar.bz2</ulink> -<ulink url="&http;/diffutils-&diffutils-version;.tar.bz2"> -&http;/diffutils-&diffutils-version;.tar.bz2</ulink> +<ulink url="&ftp;/diffutils-&diffutils-version;.tar.bz2">&ftp;/diffutils-&diffutils-version;.tar.bz2</ulink> +<ulink url="&http;/diffutils-&diffutils-version;.tar.bz2">&http;/diffutils-&diffutils-version;.tar.bz2</ulink> diff --git a/chapter04/e2fsprogs.xml b/chapter04/e2fsprogs.xml index 84538f390..24c7f6978 100644 --- a/chapter04/e2fsprogs.xml +++ b/chapter04/e2fsprogs.xml @@ -1,6 +1,4 @@ E2fsprogs (&e2fsprogs-version;) - &e2fsprogs-size;: -<ulink url="&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2"> -&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink> -<ulink url="&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2"> -&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink> +<ulink url="&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2">&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink> +<ulink url="&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2">&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink> diff --git a/chapter04/ed.xml b/chapter04/ed.xml index ec7336862..7c91a8996 100644 --- a/chapter04/ed.xml +++ b/chapter04/ed.xml @@ -1,6 +1,4 @@ Ed (&ed-version;) - &ed-size;: -<ulink url="&ftp;/ed-&ed-version;.tar.bz2"> -&ftp;/ed-&ed-version;.tar.bz2</ulink> -<ulink url="&http;/ed-&ed-version;.tar.bz2"> -&http;/ed-&ed-version;.tar.bz2</ulink> +<ulink url="&ftp;/ed-&ed-version;.tar.bz2">&ftp;/ed-&ed-version;.tar.bz2</ulink> +<ulink url="&http;/ed-&ed-version;.tar.bz2">&http;/ed-&ed-version;.tar.bz2</ulink> diff --git a/chapter04/file.xml b/chapter04/file.xml index 882854be6..ccdc1f236 100644 --- a/chapter04/file.xml +++ b/chapter04/file.xml @@ -1,7 +1,5 @@ File (&file-version;) - &file-size;: -<ulink url="&ftp;/file-&file-version;.tar.bz2"> -&ftp;/file-&file-version;.tar.bz2</ulink> -<ulink url="&http;/file-&file-version;.tar.bz2"> -&http;/file-&file-version;.tar.bz2</ulink> +<ulink url="&ftp;/file-&file-version;.tar.bz2">&ftp;/file-&file-version;.tar.bz2</ulink> +<ulink url="&http;/file-&file-version;.tar.bz2">&http;/file-&file-version;.tar.bz2</ulink> diff --git a/chapter04/fileutils.xml b/chapter04/fileutils.xml index cfa7140a6..92717b29b 100644 --- a/chapter04/fileutils.xml +++ b/chapter04/fileutils.xml @@ -1,6 +1,4 @@ File Utils (&fileutils-version;) - &fileutils-size;: -<ulink url="&ftp;/fileutils-&fileutils-version;.tar.bz2"> -&ftp;/fileutils-&fileutils-version;.tar.bz2</ulink> -<ulink url="&http;/fileutils-&fileutils-version;.tar.bz2"> -&http;/fileutils-&fileutils-version;.tar.bz2</ulink> +<ulink url="&ftp;/fileutils-&fileutils-version;.tar.bz2">&ftp;/fileutils-&fileutils-version;.tar.bz2</ulink> +<ulink url="&http;/fileutils-&fileutils-version;.tar.bz2">&http;/fileutils-&fileutils-version;.tar.bz2</ulink> diff --git a/chapter04/findutils-patch.xml b/chapter04/findutils-patch.xml index ca603e94c..41e712a83 100644 --- a/chapter04/findutils-patch.xml +++ b/chapter04/findutils-patch.xml @@ -1,6 +1,4 @@ Find Utils Patch (&findutils-version;) - &findutils-size;: -<ulink url="&ftp;/findutils-&findutils-version;.patch.bz2"> -&ftp;/findutils-&findutils-version;.patch.bz2</ulink> -<ulink url="&http;/findutils-&findutils-version;.patch.bz2"> -&http;/findutils-&findutils-version;.patch.bz2</ulink> +<ulink url="&ftp;/findutils-&findutils-version;.patch.bz2">&ftp;/findutils-&findutils-version;.patch.bz2</ulink> +<ulink url="&http;/findutils-&findutils-version;.patch.bz2">&http;/findutils-&findutils-version;.patch.bz2</ulink> diff --git a/chapter04/findutils.xml b/chapter04/findutils.xml index c36ee7b86..14416b57a 100644 --- a/chapter04/findutils.xml +++ b/chapter04/findutils.xml @@ -1,6 +1,4 @@ Find Utils (&findutils-version;) - &findutils-size;: -<ulink url="&ftp;/findutils-&findutils-version;.tar.bz2"> -&ftp;/findutils-&findutils-version;.tar.bz2</ulink> -<ulink url="&http;/findutils-&findutils-version;.tar.bz2"> -&http;/findutils-&findutils-version;.tar.bz2</ulink> +<ulink url="&ftp;/findutils-&findutils-version;.tar.bz2">&ftp;/findutils-&findutils-version;.tar.bz2</ulink> +<ulink url="&http;/findutils-&findutils-version;.tar.bz2">&http;/findutils-&findutils-version;.tar.bz2</ulink> diff --git a/chapter04/flex.xml b/chapter04/flex.xml index 8092a1841..39de1f18d 100644 --- a/chapter04/flex.xml +++ b/chapter04/flex.xml @@ -1,6 +1,4 @@ Flex (&flex-version;) - &flex-size;: -<ulink url="&ftp;/flex-&flex-version;.tar.bz2"> -&ftp;/flex-&flex-version;.tar.bz2</ulink> -<ulink url="&http;/flex-&flex-version;.tar.bz2"> -&http;/flex-&flex-version;.tar.bz2</ulink> +<ulink url="&ftp;/flex-&flex-version;.tar.bz2">&ftp;/flex-&flex-version;.tar.bz2</ulink> +<ulink url="&http;/flex-&flex-version;.tar.bz2">&http;/flex-&flex-version;.tar.bz2</ulink> diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml index 34ba4ef19..09a24c068 100644 --- a/chapter04/gcc-patch.xml +++ b/chapter04/gcc-patch.xml @@ -1,6 +1,4 @@ GCC Patch (&gcc-version;) - &gcc-patch-size;: -<ulink url="&ftp;/gcc-&gcc-version;.patch.bz2"> -&ftp;/gcc-&gcc-version;.patch.bz2</ulink> -<ulink url="&http;/gcc-&gcc-version;.patch.bz2"> -&http;/gcc-&gcc-version;.patch.bz2</ulink> +<ulink url="&ftp;/gcc-&gcc-version;.patch.bz2">&ftp;/gcc-&gcc-version;.patch.bz2</ulink> +<ulink url="&http;/gcc-&gcc-version;.patch.bz2">&http;/gcc-&gcc-version;.patch.bz2</ulink> diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml index 492e2d7eb..6fdb2869b 100644 --- a/chapter04/gcc.xml +++ b/chapter04/gcc.xml @@ -1,6 +1,4 @@ GCC (&gcc-version;) - &gcc-size;: -<ulink url="&ftp;/gcc-&gcc-version;.tar.bz2"> -&ftp;/gcc-&gcc-version;.tar.bz2</ulink> -<ulink url="&http;/gcc-&gcc-version;.tar.bz2"> -&http;/gcc-&gcc-version;.tar.bz2</ulink> +<ulink url="&ftp;/gcc-&gcc-version;.tar.bz2">&ftp;/gcc-&gcc-version;.tar.bz2</ulink> +<ulink url="&http;/gcc-&gcc-version;.tar.bz2">&http;/gcc-&gcc-version;.tar.bz2</ulink> diff --git a/chapter04/gettext.xml b/chapter04/gettext.xml index 5914bdadc..c3bcdf980 100644 --- a/chapter04/gettext.xml +++ b/chapter04/gettext.xml @@ -1,6 +1,4 @@ Gettext (&gettext-version;) - &gettext-size;: -<ulink url="&ftp;/gettext-&gettext-version;.tar.bz2"> -&ftp;/gettext-&gettext-version;.tar.bz2</ulink> -<ulink url="&http;/gettext-&gettext-version;.tar.bz2"> -&http;/gettext-&gettext-version;.tar.bz2</ulink> +<ulink url="&ftp;/gettext-&gettext-version;.tar.bz2">&ftp;/gettext-&gettext-version;.tar.bz2</ulink> +<ulink url="&http;/gettext-&gettext-version;.tar.bz2">&http;/gettext-&gettext-version;.tar.bz2</ulink> diff --git a/chapter04/glibc-threads.xml b/chapter04/glibc-threads.xml index d9475d578..1da3d1b5b 100644 --- a/chapter04/glibc-threads.xml +++ b/chapter04/glibc-threads.xml @@ -1,6 +1,4 @@ Glibc-linuxthreads (&glibc-version;) - &glibc-threads-size;: -<ulink url="&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2"> -&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink> -<ulink url="&http;/glibc-linuxthreads-&glibc-version;.tar.bz2"> -&http;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink> +<ulink url="&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2">&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink> +<ulink url="&http;/glibc-linuxthreads-&glibc-version;.tar.bz2">&http;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink> diff --git a/chapter04/glibc.xml b/chapter04/glibc.xml index e3cc063da..f3502eb6e 100644 --- a/chapter04/glibc.xml +++ b/chapter04/glibc.xml @@ -1,6 +1,4 @@ Glibc (&glibc-version;) - &glibc-size;: -<ulink url="&ftp;/glibc-&glibc-version;.tar.bz2"> -&ftp;/glibc-&glibc-version;.tar.bz2</ulink> -<ulink url="&http;/glibc-&glibc-version;.tar.bz2"> -&http;/glibc-&glibc-version;.tar.bz2</ulink> +<ulink url="&ftp;/glibc-&glibc-version;.tar.bz2">&ftp;/glibc-&glibc-version;.tar.bz2</ulink> +<ulink url="&http;/glibc-&glibc-version;.tar.bz2">&http;/glibc-&glibc-version;.tar.bz2</ulink> diff --git a/chapter04/grep.xml b/chapter04/grep.xml index a0523b2cf..20a4bc43b 100644 --- a/chapter04/grep.xml +++ b/chapter04/grep.xml @@ -1,6 +1,4 @@ Grep (&grep-version;) - &grep-size;: -<ulink url="&ftp;/grep-&grep-version;.tar.bz2"> -&ftp;/grep-&grep-version;.tar.bz2</ulink> -<ulink url="&http;/grep-&grep-version;.tar.bz2"> -&http;/grep-&grep-version;.tar.bz2</ulink> +<ulink url="&ftp;/grep-&grep-version;.tar.bz2">&ftp;/grep-&grep-version;.tar.bz2</ulink> +<ulink url="&http;/grep-&grep-version;.tar.bz2">&http;/grep-&grep-version;.tar.bz2</ulink> diff --git a/chapter04/groff.xml b/chapter04/groff.xml index d330af586..faa1ba6c5 100644 --- a/chapter04/groff.xml +++ b/chapter04/groff.xml @@ -1,6 +1,4 @@ Groff (&groff-version;) - &groff-size;: -<ulink url="&ftp;/groff-&groff-version;.tar.bz2"> -&ftp;/groff-&groff-version;.tar.bz2</ulink> -<ulink url="&http;/groff-&groff-version;.tar.bz2"> -&http;/groff-&groff-version;.tar.bz2</ulink> +<ulink url="&ftp;/groff-&groff-version;.tar.bz2">&ftp;/groff-&groff-version;.tar.bz2</ulink> +<ulink url="&http;/groff-&groff-version;.tar.bz2">&http;/groff-&groff-version;.tar.bz2</ulink> diff --git a/chapter04/gzip-patch.xml b/chapter04/gzip-patch.xml index fe38d012b..0cceaea3c 100644 --- a/chapter04/gzip-patch.xml +++ b/chapter04/gzip-patch.xml @@ -1,6 +1,4 @@ Gzip Patch (&gzip-version;) - &gzip-patch-size;: -<ulink url="&ftp;/gzip-&gzip-version;.patch.bz2"> -&ftp;/gzip-&gzip-version;.patch.bz2</ulink> -<ulink url="&http;/gzip-&gzip-version;.patch.bz2"> -&http;/gzip-&gzip-version;.patch.bz2</ulink> +<ulink url="&ftp;/gzip-&gzip-version;.patch.bz2">&ftp;/gzip-&gzip-version;.patch.bz2</ulink> +<ulink url="&http;/gzip-&gzip-version;.patch.bz2">&http;/gzip-&gzip-version;.patch.bz2</ulink> diff --git a/chapter04/gzip.xml b/chapter04/gzip.xml index d1ac3c7db..1b79ca635 100644 --- a/chapter04/gzip.xml +++ b/chapter04/gzip.xml @@ -1,6 +1,4 @@ Gzip (&gzip-version;) - &gzip-size;: -<ulink url="&ftp;/gzip-&gzip-version;.tar.bz2"> -&ftp;/gzip-&gzip-version;.tar.bz2</ulink> -<ulink url="&http;/gzip-&gzip-version;.tar.bz2"> -&http;/gzip-&gzip-version;.tar.bz2</ulink> +<ulink url="&ftp;/gzip-&gzip-version;.tar.bz2">&ftp;/gzip-&gzip-version;.tar.bz2</ulink> +<ulink url="&http;/gzip-&gzip-version;.tar.bz2">&http;/gzip-&gzip-version;.tar.bz2</ulink> diff --git a/chapter04/introduction.xml b/chapter04/introduction.xml index 12fb9f13b..83b69e8a1 100644 --- a/chapter04/introduction.xml +++ b/chapter04/introduction.xml @@ -1,41 +1,33 @@ <sect1 id="ch03-introduction"> <title>Introduction</title> -<para> -Below is a list of all the packages that are needed to download for building -the basic system. The version numbers printed correspond to versions of +<para>Below is a list of all the packages that are needed to download for +building the basic system. The version numbers printed correspond to versions of the software that is known to work and which this book is based on. If you experience problems which you can't solve yourself, then please download the version that -is assumed in this book (in case you downloaded a newer version). -</para> +is assumed in this book (in case you downloaded a newer version).</para> -<para> -If the packages.linuxfromscratch.org server isn't allowing connections +<para>If the packages.linuxfromscratch.org server isn't allowing connections anymore try one of our mirror sites. The addresses of the mirror sites can be found in <ulink url="ch01-version.html">Chapter 1 - Book -Version</ulink> -</para> +Version</ulink></para> -<para> -We have provided a list of official download sites of the packages below +<para>We have provided a list of official download sites of the packages below in <ulink url="appendixc.html">Appendix C - Official download locations </ulink>. The LFS FTP archive only contains the versions of packages that are recommended for use in this book. You can check the official sites in Appendix C to determine whether a newer package is available. If you do download a newer package, we would appreciate hearing whether you were able to install the package using this book's -instructions or not. -</para> +instructions or not.</para> -<para> -Please note that all files downloaded from the LFS FTP archive are files +<para>Please note that all files downloaded from the LFS FTP archive are files compressed with bzip2 instead of gz. If you don't know how to handle bz2 files, check out <ulink url="ch02-install.html">Chapter 2 - How to install the -software</ulink>. -</para> +software</ulink>.</para> </sect1> diff --git a/chapter04/kbd.xml b/chapter04/kbd.xml index 30ed9cbfd..2784baa0b 100644 --- a/chapter04/kbd.xml +++ b/chapter04/kbd.xml @@ -1,6 +1,4 @@ Kbd (&kbd-version;) - &kbd-size;: -<ulink url="&ftp;/kbd-&kbd-version;.tar.bz2"> -&ftp;/kbd-&kbd-version;.tar.bz2</ulink> -<ulink url="&http;/kbd-&kbd-version;.tar.bz2"> -&http;/kbd-&kbd-version;.tar.bz2</ulink> +<ulink url="&ftp;/kbd-&kbd-version;.tar.bz2">&ftp;/kbd-&kbd-version;.tar.bz2</ulink> +<ulink url="&http;/kbd-&kbd-version;.tar.bz2">&http;/kbd-&kbd-version;.tar.bz2</ulink> diff --git a/chapter04/kernel.xml b/chapter04/kernel.xml index b7baa71bc..5b80427eb 100644 --- a/chapter04/kernel.xml +++ b/chapter04/kernel.xml @@ -1,6 +1,4 @@ Linux Kernel (&kernel-version;) - &kernel-size;: -<ulink url="&ftp;/linux-&kernel-version;.tar.bz2"> -&ftp;/linux-&kernel-version;.tar.bz2</ulink> -<ulink url="&http;/linux-&kernel-version;.tar.bz2"> -&http;/linux-&kernel-version;.tar.bz2</ulink> +<ulink url="&ftp;/linux-&kernel-version;.tar.bz2">&ftp;/linux-&kernel-version;.tar.bz2</ulink> +<ulink url="&http;/linux-&kernel-version;.tar.bz2">&http;/linux-&kernel-version;.tar.bz2</ulink> diff --git a/chapter04/less.xml b/chapter04/less.xml index 834b11af2..0d923f4cf 100644 --- a/chapter04/less.xml +++ b/chapter04/less.xml @@ -1,6 +1,4 @@ Less (&less-version;) - &less-size;: -<ulink url="&ftp;/less-&less-version;.tar.bz2"> -&ftp;/less-&less-version;.tar.bz2</ulink> -<ulink url="&http;/less-&less-version;.tar.bz2"> -&http;/less-&less-version;.tar.bz2</ulink> +<ulink url="&ftp;/less-&less-version;.tar.bz2">&ftp;/less-&less-version;.tar.bz2</ulink> +<ulink url="&http;/less-&less-version;.tar.bz2">&http;/less-&less-version;.tar.bz2</ulink> diff --git a/chapter04/libtool.xml b/chapter04/libtool.xml index dc6f40da4..c6cce7251 100644 --- a/chapter04/libtool.xml +++ b/chapter04/libtool.xml @@ -1,6 +1,4 @@ Libtool (&libtool-version;) - &libtool-size;: -<ulink url="&ftp;/libtool-&libtool-version;.tar.bz2"> -&ftp;/libtool-&libtool-version;.tar.bz2</ulink> -<ulink url="&http;/libtool-&libtool-version;.tar.bz2"> -&http;/libtool-&libtool-version;.tar.bz2</ulink> +<ulink url="&ftp;/libtool-&libtool-version;.tar.bz2">&ftp;/libtool-&libtool-version;.tar.bz2</ulink> +<ulink url="&http;/libtool-&libtool-version;.tar.bz2">&http;/libtool-&libtool-version;.tar.bz2</ulink> diff --git a/chapter04/lilo.xml b/chapter04/lilo.xml index 2c05b48c3..a8a0be3ec 100644 --- a/chapter04/lilo.xml +++ b/chapter04/lilo.xml @@ -1,6 +1,4 @@ Lilo (&lilo-version;) - &lilo-size;: -<ulink url="&ftp;/lilo-&lilo-version;.tar.bz2"> -&ftp;/lilo-&lilo-version;.tar.bz2</ulink> -<ulink url="&http;/lilo-&lilo-version;.tar.bz2"> -&http;/lilo-&lilo-version;.tar.bz2</ulink> +<ulink url="&ftp;/lilo-&lilo-version;.tar.bz2">&ftp;/lilo-&lilo-version;.tar.bz2</ulink> +<ulink url="&http;/lilo-&lilo-version;.tar.bz2">&http;/lilo-&lilo-version;.tar.bz2</ulink> diff --git a/chapter04/m4.xml b/chapter04/m4.xml index 8ee58b48c..53ffdebb0 100644 --- a/chapter04/m4.xml +++ b/chapter04/m4.xml @@ -1,6 +1,4 @@ M4 (&m4-version;) - &m4-size;: -<ulink url="&ftp;/m4-&m4-version;.tar.bz2"> -&ftp;/m4-&m4-version;.tar.bz2</ulink> -<ulink url="&http;/m4-&m4-version;.tar.bz2"> -&http;/m4-&m4-version;.tar.bz2</ulink> +<ulink url="&ftp;/m4-&m4-version;.tar.bz2">&ftp;/m4-&m4-version;.tar.bz2</ulink> +<ulink url="&http;/m4-&m4-version;.tar.bz2">&http;/m4-&m4-version;.tar.bz2</ulink> diff --git a/chapter04/make.xml b/chapter04/make.xml index 68d18e134..99c2d0a4a 100644 --- a/chapter04/make.xml +++ b/chapter04/make.xml @@ -1,6 +1,4 @@ Make (&make-version;) - &make-size;: -<ulink url="&ftp;/make-&make-version;.tar.bz2"> -&ftp;/make-&make-version;.tar.bz2</ulink> -<ulink url="&http;/make-&make-version;.tar.bz2"> -&http;/make-&make-version;.tar.bz2</ulink> +<ulink url="&ftp;/make-&make-version;.tar.bz2">&ftp;/make-&make-version;.tar.bz2</ulink> +<ulink url="&http;/make-&make-version;.tar.bz2">&http;/make-&make-version;.tar.bz2</ulink> diff --git a/chapter04/makedev.xml b/chapter04/makedev.xml index 9931e4fd5..00daa67a3 100644 --- a/chapter04/makedev.xml +++ b/chapter04/makedev.xml @@ -1,6 +1,4 @@ MAKEDEV (&makedev-version;) - &makedev-size;: -<ulink url="&ftp;/MAKEDEV-&makedev-version;.bz2"> -&ftp;/MAKEDEV-&makedev-version;.bz2</ulink> -<ulink url="&http;/MAKEDEV-$makedev-version;.bz2"> -&http;/MAKEDEV-&makedev-version;.bz2</ulink> +<ulink url="&ftp;/MAKEDEV-&makedev-version;.bz2">&ftp;/MAKEDEV-&makedev-version;.bz2</ulink> +<ulink url="&http;/MAKEDEV-$makedev-version;.bz2">&http;/MAKEDEV-&makedev-version;.bz2</ulink> diff --git a/chapter04/man-patch.xml b/chapter04/man-patch.xml index e1e4be735..3b191c374 100644 --- a/chapter04/man-patch.xml +++ b/chapter04/man-patch.xml @@ -1,6 +1,4 @@ Man Patch (&man-version;) - &man-patch-size;: -<ulink url="&ftp;/man-&man-version;.patch.bz2"> -&ftp;/man-&man-version;.patch.bz2</ulink> -<ulink url="&http;/man-&man-version;.patch.bz2"> -&http;/man-&man-version;.patch.bz2</ulink> +<ulink url="&ftp;/man-&man-version;.patch.bz2">&ftp;/man-&man-version;.patch.bz2</ulink> +<ulink url="&http;/man-&man-version;.patch.bz2">&http;/man-&man-version;.patch.bz2</ulink> diff --git a/chapter04/man.xml b/chapter04/man.xml index 97ff25789..a719276d0 100644 --- a/chapter04/man.xml +++ b/chapter04/man.xml @@ -1,6 +1,4 @@ Man (&man-version;) - &man-size;: -<ulink url="&ftp;/man-&man-version;.tar.bz2"> -&ftp;/man-&man-version;.tar.bz2</ulink> -<ulink url="&http;/man-&man-version;.tar.bz2"> -&http;/man-&man-version;.tar.bz2</ulink> +<ulink url="&ftp;/man-&man-version;.tar.bz2">&ftp;/man-&man-version;.tar.bz2</ulink> +<ulink url="&http;/man-&man-version;.tar.bz2">&http;/man-&man-version;.tar.bz2</ulink> diff --git a/chapter04/manpages-patch.xml b/chapter04/manpages-patch.xml index 52bad5c67..d82920b08 100644 --- a/chapter04/manpages-patch.xml +++ b/chapter04/manpages-patch.xml @@ -1,6 +1,4 @@ Man-pages Patch (&man-pages-version;) - &man-pages-patch-size;: -<ulink url="&ftp;/man-pages-&man-pages-version;.patch.bz2"> - &ftp;/man-pages-&man-pages-version;.patch.bz2</ulink> -<ulink url="&http;/man-pages-&man-pages-version;.patch.bz2"> - &http;/man-pages-&man-pages-version;.patch.bz2</ulink> +<ulink url="&ftp;/man-pages-&man-pages-version;.patch.bz2">&ftp;/man-pages-&man-pages-version;.patch.bz2</ulink> +<ulink url="&http;/man-pages-&man-pages-version;.patch.bz2">&http;/man-pages-&man-pages-version;.patch.bz2</ulink> diff --git a/chapter04/manpages.xml b/chapter04/manpages.xml index 81dfd736d..31d33ed3b 100644 --- a/chapter04/manpages.xml +++ b/chapter04/manpages.xml @@ -1,6 +1,4 @@ Man-pages (&man-pages-version;) - &man-pages-size;: -<ulink url="&ftp;/man-pages-&man-pages-version;.tar.bz2"> -&ftp;/man-pages-&man-pages-version;.tar.bz2</ulink> -<ulink url="&http;/man-pages-&man-pages-version;.tar.bz2"> -&http;/man-pages-&man-pages-version;.tar.bz2</ulink> +<ulink url="&ftp;/man-pages-&man-pages-version;.tar.bz2">&ftp;/man-pages-&man-pages-version;.tar.bz2</ulink> +<ulink url="&http;/man-pages-&man-pages-version;.tar.bz2">&http;/man-pages-&man-pages-version;.tar.bz2</ulink> diff --git a/chapter04/mawk.xml b/chapter04/mawk.xml index 7da3e1287..b54ea11e4 100644 --- a/chapter04/mawk.xml +++ b/chapter04/mawk.xml @@ -1,6 +1,4 @@ Mawk (&mawk-version;) - &mawk-size;: -<ulink url="&ftp;/mawk&mawk-version;.tar.bz2"> -&ftp;/mawk&mawk-version;.tar.bz2</ulink> -<ulink url="&http;/mawk&mawk-version;.tar.bz2"> -&http;/mawk&mawk-version;.tar.bz2</ulink> +<ulink url="&ftp;/mawk&mawk-version;.tar.bz2">&ftp;/mawk&mawk-version;.tar.bz2</ulink> +<ulink url="&http;/mawk&mawk-version;.tar.bz2">&http;/mawk&mawk-version;.tar.bz2</ulink> diff --git a/chapter04/modutils.xml b/chapter04/modutils.xml index 69c23dc10..8e17a38c8 100644 --- a/chapter04/modutils.xml +++ b/chapter04/modutils.xml @@ -1,6 +1,4 @@ Modutils (&modutils-version;) - &modutils-size;: -<ulink url="&ftp;/modutils-&modutils-version;.tar.bz2"> -&ftp;/modutils-&modutils-version;.tar.bz2</ulink> -<ulink url="&http;/modutils-&modutils-version;.tar.bz2"> -&http;/modutils-&modutils-version;.tar.bz2</ulink> +<ulink url="&ftp;/modutils-&modutils-version;.tar.bz2">&ftp;/modutils-&modutils-version;.tar.bz2</ulink> +<ulink url="&http;/modutils-&modutils-version;.tar.bz2">&http;/modutils-&modutils-version;.tar.bz2</ulink> diff --git a/chapter04/ncurses-patch.xml b/chapter04/ncurses-patch.xml index 8f4226b25..80646f189 100644 --- a/chapter04/ncurses-patch.xml +++ b/chapter04/ncurses-patch.xml @@ -1,6 +1,4 @@ Ncurses Patch (&ncurses-version;) - &ncurses-patch-size;: -<ulink url="&ftp;/ncurses-&ncurses-version;.patch.bz2"> -&ftp;/ncurses-&ncurses-version;.patch.bz2</ulink> -<ulink url="&http;/ncurses-&ncurses-version;.patch.bz2"> -&http;/ncurses-&ncurses-version;.patch.bz2</ulink> +<ulink url="&ftp;/ncurses-&ncurses-version;.patch.bz2">&ftp;/ncurses-&ncurses-version;.patch.bz2</ulink> +<ulink url="&http;/ncurses-&ncurses-version;.patch.bz2">&http;/ncurses-&ncurses-version;.patch.bz2</ulink> diff --git a/chapter04/ncurses.xml b/chapter04/ncurses.xml index 225ac62cc..e1d2cf382 100644 --- a/chapter04/ncurses.xml +++ b/chapter04/ncurses.xml @@ -1,6 +1,4 @@ Ncurses (&ncurses-version;) - &ncurses-size;: -<ulink url="&ftp;/ncurses-&ncurses-version;.tar.bz2"> -&ftp;/ncurses-&ncurses-version;.tar.bz2</ulink> -<ulink url="&http;/ncurses-&ncurses-version;.tar.bz2"> -&http;/ncurses-&ncurses-version;.tar.bz2</ulink> +<ulink url="&ftp;/ncurses-&ncurses-version;.tar.bz2">&ftp;/ncurses-&ncurses-version;.tar.bz2</ulink> +<ulink url="&http;/ncurses-&ncurses-version;.tar.bz2">&http;/ncurses-&ncurses-version;.tar.bz2</ulink> diff --git a/chapter04/netkitbase.xml b/chapter04/netkitbase.xml index 5857393a0..01cbf64d8 100644 --- a/chapter04/netkitbase.xml +++ b/chapter04/netkitbase.xml @@ -1,6 +1,4 @@ Netkit-base (&netkit-base-version;) - &netkit-base-size;: -<ulink url="&ftp;/netkit-base-&netkit-base-version;.tar.bz2"> -&ftp;/netkit-base-&netkit-base-version;.tar.bz2</ulink> -<ulink url="&http;/netkit-base-&netkit-base-version;.tar.bz2"> -&http;/netkit-base-&netkit-base-version;.tar.bz2</ulink> +<ulink url="&ftp;/netkit-base-&netkit-base-version;.tar.bz2">&ftp;/netkit-base-&netkit-base-version;.tar.bz2</ulink> +<ulink url="&http;/netkit-base-&netkit-base-version;.tar.bz2">&http;/netkit-base-&netkit-base-version;.tar.bz2</ulink> diff --git a/chapter04/nettools.xml b/chapter04/nettools.xml index ca4299480..9adda8efd 100644 --- a/chapter04/nettools.xml +++ b/chapter04/nettools.xml @@ -1,6 +1,4 @@ Net-tools (&net-tools-version;) - &net-tools-size;: -<ulink url="&ftp;/net-tools-&net-tools-version;.tar.bz2"> -&ftp;/net-tools-&net-tools-version;.tar.bz2</ulink> -<ulink url="&http;/net-tools-&net-tools-version;.tar.bz2"> -&http;/net-tools-&net-tools-version;.tar.bz2</ulink> +<ulink url="&ftp;/net-tools-&net-tools-version;.tar.bz2">&ftp;/net-tools-&net-tools-version;.tar.bz2</ulink> +<ulink url="&http;/net-tools-&net-tools-version;.tar.bz2">&http;/net-tools-&net-tools-version;.tar.bz2</ulink> diff --git a/chapter04/patch.xml b/chapter04/patch.xml index 5328766ca..6c4611b55 100644 --- a/chapter04/patch.xml +++ b/chapter04/patch.xml @@ -1,6 +1,4 @@ Patch (&patch-version;) - &patch-size;: -<ulink url="&ftp;/patch-&patch-version;.tar.bz2"> -&ftp;/patch-&patch-version;.tar.bz2</ulink> -<ulink url="&http;/patch-&patch-version;.tar.bz2"> -&http;/patch-&patch-version;.tar.bz2</ulink> +<ulink url="&ftp;/patch-&patch-version;.tar.bz2">&ftp;/patch-&patch-version;.tar.bz2</ulink> +<ulink url="&http;/patch-&patch-version;.tar.bz2">&http;/patch-&patch-version;.tar.bz2</ulink> diff --git a/chapter04/perl.xml b/chapter04/perl.xml index 0619a6ba8..47569e100 100644 --- a/chapter04/perl.xml +++ b/chapter04/perl.xml @@ -1,6 +1,4 @@ Perl (&perl-version;) - &perl-size;: -<ulink url="&ftp;/perl-&perl-version;.tar.bz2"> -&ftp;/perl-&perl-version;.tar.bz2</ulink> -<ulink url="&http;/perl-&perl-version;.tar.bz2"> -&http;/perl-&perl-version;.tar.bz2</ulink> +<ulink url="&ftp;/perl-&perl-version;.tar.bz2">&ftp;/perl-&perl-version;.tar.bz2</ulink> +<ulink url="&http;/perl-&perl-version;.tar.bz2">&http;/perl-&perl-version;.tar.bz2</ulink> diff --git a/chapter04/procinfo.xml b/chapter04/procinfo.xml index e20b55318..b7d1e6074 100644 --- a/chapter04/procinfo.xml +++ b/chapter04/procinfo.xml @@ -1,6 +1,4 @@ Procinfo (&procinfo-version;) - &procinfo-size;: -<ulink url="&ftp;/procinfo-&procinfo-version;.tar.bz2"> -&ftp;/procinfo-&procinfo-version;.tar.bz2</ulink> -<ulink url="&http;/procinfo-&procinfo-version;.tar.bz2"> -&http;/procinfo-&procinfo-version;.tar.bz2</ulink> +<ulink url="&ftp;/procinfo-&procinfo-version;.tar.bz2">&ftp;/procinfo-&procinfo-version;.tar.bz2</ulink> +<ulink url="&http;/procinfo-&procinfo-version;.tar.bz2">&http;/procinfo-&procinfo-version;.tar.bz2</ulink> diff --git a/chapter04/procps.xml b/chapter04/procps.xml index bd15fa2e9..bbd22dc57 100644 --- a/chapter04/procps.xml +++ b/chapter04/procps.xml @@ -1,6 +1,4 @@ Procps (&procps-version;) - &procps-size;: -<ulink url="&ftp;/procps-&procps-version;.tar.bz2"> -&ftp;/procps-&procps-version;.tar.bz2</ulink> -<ulink url="&http;/procps-&procps-version;.tar.bz2"> -&http;/procps-&procps-version;.tar.bz2</ulink> +<ulink url="&ftp;/procps-&procps-version;.tar.bz2">&ftp;/procps-&procps-version;.tar.bz2</ulink> +<ulink url="&http;/procps-&procps-version;.tar.bz2">&http;/procps-&procps-version;.tar.bz2</ulink> diff --git a/chapter04/psmisc.xml b/chapter04/psmisc.xml index d7b528674..e1d95f5b1 100644 --- a/chapter04/psmisc.xml +++ b/chapter04/psmisc.xml @@ -1,6 +1,4 @@ Psmisc (&psmisc-version;) - &psmisc-size;: -<ulink url="&ftp;/psmisc-&psmisc-version;.tar.bz2"> -&ftp;/psmisc-&psmisc-version;.tar.bz2</ulink> -<ulink url="&http;/psmisc-&psmisc-version;.tar.bz2"> -&http;/psmisc-&psmisc-version;.tar.bz2</ulink> +<ulink url="&ftp;/psmisc-&psmisc-version;.tar.bz2">&ftp;/psmisc-&psmisc-version;.tar.bz2</ulink> +<ulink url="&http;/psmisc-&psmisc-version;.tar.bz2">&http;/psmisc-&psmisc-version;.tar.bz2</ulink> diff --git a/chapter04/sed.xml b/chapter04/sed.xml index b60cfcc89..49ac970aa 100644 --- a/chapter04/sed.xml +++ b/chapter04/sed.xml @@ -1,6 +1,4 @@ Sed (&sed-version;) - &sed-size;: -<ulink url="&ftp;/sed-&sed-version;.tar.bz2"> -&ftp;/sed-&sed-version;.tar.bz2</ulink> -<ulink url="&http;/sed-&sed-version;.tar.bz2"> -&http;/sed-&sed-version;.tar.bz2</ulink> +<ulink url="&ftp;/sed-&sed-version;.tar.bz2">&ftp;/sed-&sed-version;.tar.bz2</ulink> +<ulink url="&http;/sed-&sed-version;.tar.bz2">&http;/sed-&sed-version;.tar.bz2</ulink> diff --git a/chapter04/shadowpwd-patch.xml b/chapter04/shadowpwd-patch.xml index 7ebace2ba..577d66015 100644 --- a/chapter04/shadowpwd-patch.xml +++ b/chapter04/shadowpwd-patch.xml @@ -1,6 +1,4 @@ Shadow Password Suite Patch (&shadow-version;) - &shadow-patch-size;: -<ulink url="&ftp;/shadow-&shadow-version;.patch.bz2"> -&ftp;/shadow-&shadow-version;.patch.bz2</ulink> -<ulink url="&http;/shadow-&shadow-version;.patch.bz2"> -&http;/shadow-&shadow-version;.patch.bz2</ulink> +<ulink url="&ftp;/shadow-&shadow-version;.patch.bz2">&ftp;/shadow-&shadow-version;.patch.bz2</ulink> +<ulink url="&http;/shadow-&shadow-version;.patch.bz2">&http;/shadow-&shadow-version;.patch.bz2</ulink> diff --git a/chapter04/shadowpwd.xml b/chapter04/shadowpwd.xml index 0c763dcb8..b10cacf35 100644 --- a/chapter04/shadowpwd.xml +++ b/chapter04/shadowpwd.xml @@ -1,6 +1,4 @@ Shadow Password Suite (&shadow-version;) - &shadow-size;: -<ulink url="&ftp;/shadow-&shadow-version;.tar.bz2"> -&ftp;/shadow-&shadow-version;.tar.bz2</ulink> -<ulink url="&http;/shadow-&shadow-version;.tar.bz2"> -&http;/shadow-&shadow-version;.tar.bz2</ulink> +<ulink url="&ftp;/shadow-&shadow-version;.tar.bz2">&ftp;/shadow-&shadow-version;.tar.bz2</ulink> +<ulink url="&http;/shadow-&shadow-version;.tar.bz2">&http;/shadow-&shadow-version;.tar.bz2</ulink> diff --git a/chapter04/shellutils-patch.xml b/chapter04/shellutils-patch.xml index 07b48c256..8e16fdb78 100644 --- a/chapter04/shellutils-patch.xml +++ b/chapter04/shellutils-patch.xml @@ -1,6 +1,4 @@ Sh-utils Patch (&sh-utils-version;) - &sh-utils-patch-size;: -<ulink url="&ftp;/sh-utils-&sh-utils-version;.patch.bz2"> -&ftp;/sh-utils-&sh-utils-version;.patch.bz2</ulink> -<ulink url="&http;/sh-utils-&sh-utils-version;.patch.bz2"> -&http;/sh-utils-&sh-utils-version;.patch.bz2</ulink> +<ulink url="&ftp;/sh-utils-&sh-utils-version;.patch.bz2">&ftp;/sh-utils-&sh-utils-version;.patch.bz2</ulink> +<ulink url="&http;/sh-utils-&sh-utils-version;.patch.bz2">&http;/sh-utils-&sh-utils-version;.patch.bz2</ulink> diff --git a/chapter04/shellutils.xml b/chapter04/shellutils.xml index 4644c5346..bd138cf64 100644 --- a/chapter04/shellutils.xml +++ b/chapter04/shellutils.xml @@ -1,6 +1,4 @@ Sh-utils (&sh-utils-version;) - &sh-utils-size;: -<ulink url="&ftp;/sh-utils-&sh-utils-version;.tar.bz2"> -&ftp;/sh-utils-&sh-utils-version;.tar.bz2</ulink> -<ulink url="&http;/sh-utils-&sh-utils-version;.tar.bz2"> -&http;/sh-utils-&sh-utils-version;.tar.bz2</ulink> +<ulink url="&ftp;/sh-utils-&sh-utils-version;.tar.bz2">&ftp;/sh-utils-&sh-utils-version;.tar.bz2</ulink> +<ulink url="&http;/sh-utils-&sh-utils-version;.tar.bz2">&http;/sh-utils-&sh-utils-version;.tar.bz2</ulink> diff --git a/chapter04/sysklogd.xml b/chapter04/sysklogd.xml index 82d6a0279..9b6847f54 100644 --- a/chapter04/sysklogd.xml +++ b/chapter04/sysklogd.xml @@ -1,6 +1,4 @@ Sysklogd (&sysklogd-version;) - &sysklogd-size;: -<ulink url="&ftp;/sysklogd-&sysklogd-version;.tar.bz2"> -&ftp;/sysklogd-&sysklogd-version;.tar.bz2</ulink> -<ulink url="&http;/sysklogd-&sysklogd-version;.tar.bz2"> -&http;/sysklogd-&sysklogd-version;.tar.bz2</ulink> +<ulink url="&ftp;/sysklogd-&sysklogd-version;.tar.bz2">&ftp;/sysklogd-&sysklogd-version;.tar.bz2</ulink> +<ulink url="&http;/sysklogd-&sysklogd-version;.tar.bz2">&http;/sysklogd-&sysklogd-version;.tar.bz2</ulink> diff --git a/chapter04/sysvinit-patch.xml b/chapter04/sysvinit-patch.xml index 295e33daa..5dc0de82f 100644 --- a/chapter04/sysvinit-patch.xml +++ b/chapter04/sysvinit-patch.xml @@ -1,6 +1,4 @@ Sysvinit Patch (&sysvinit-version;) - &sysvinit-patch-size;: -<ulink url="&ftp;/sysvinit-&sysvinit-version;.patch.bz2"> -&ftp;/sysvinit-&sysvinit-version;.patch.bz2</ulink> -<ulink url="&http;/sysvinit-&sysvinit-version;.patch.bz2"> -&http;/sysvinit-&sysvinit-version;.patch.bz2</ulink> +<ulink url="&ftp;/sysvinit-&sysvinit-version;.patch.bz2">&ftp;/sysvinit-&sysvinit-version;.patch.bz2</ulink> +<ulink url="&http;/sysvinit-&sysvinit-version;.patch.bz2">&http;/sysvinit-&sysvinit-version;.patch.bz2</ulink> diff --git a/chapter04/sysvinit.xml b/chapter04/sysvinit.xml index bdc23cb7a..73d5d99c4 100644 --- a/chapter04/sysvinit.xml +++ b/chapter04/sysvinit.xml @@ -1,6 +1,4 @@ Sysvinit (&sysvinit-version;) - &sysvinit-size;: -<ulink url="&ftp;/sysvinit-&sysvinit-version;.tar.bz2"> -&ftp;/sysvinit-&sysvinit-version;.tar.bz2</ulink> -<ulink url="&http;/sysvinit-&sysvinit-version;.tar.bz2"> -&http;/sysvinit-&sysvinit-version;.tar.bz2</ulink> +<ulink url="&ftp;/sysvinit-&sysvinit-version;.tar.bz2">&ftp;/sysvinit-&sysvinit-version;.tar.bz2</ulink> +<ulink url="&http;/sysvinit-&sysvinit-version;.tar.bz2">&http;/sysvinit-&sysvinit-version;.tar.bz2</ulink> diff --git a/chapter04/tar-patch.xml b/chapter04/tar-patch.xml index 7cfbd5fe3..65a083e4b 100644 --- a/chapter04/tar-patch.xml +++ b/chapter04/tar-patch.xml @@ -1,6 +1,4 @@ Tar Patch (&tar-version;) - &tar-patch-size;: -<ulink url="&ftp;/gnutarpatch.txt.bz2"> -&ftp;/gnutarpatch.txt.bz2</ulink> -<ulink url="&http;/gnutarpatch.txt.bz2"> -&http;/gnutarpatch.txt.bz2</ulink> +<ulink url="&ftp;/gnutarpatch.txt.bz2">&ftp;/gnutarpatch.txt.bz2</ulink> +<ulink url="&http;/gnutarpatch.txt.bz2">&http;/gnutarpatch.txt.bz2</ulink> diff --git a/chapter04/tar.xml b/chapter04/tar.xml index 28288278f..901ba24d9 100644 --- a/chapter04/tar.xml +++ b/chapter04/tar.xml @@ -1,6 +1,4 @@ Tar (&tar-version;) - &tar-size;: -<ulink url="&ftp;/tar-&tar-version;.tar.bz2"> -&ftp;/tar-&tar-version;.tar.bz2</ulink> -<ulink url="&http;/tar-&tar-version;.tar.bz2"> -&http;/tar-&tar-version;.tar.bz2</ulink> +<ulink url="&ftp;/tar-&tar-version;.tar.bz2">&ftp;/tar-&tar-version;.tar.bz2</ulink> +<ulink url="&http;/tar-&tar-version;.tar.bz2">&http;/tar-&tar-version;.tar.bz2</ulink> diff --git a/chapter04/texinfo-patch.xml b/chapter04/texinfo-patch.xml index e9fb81b23..e0d6e8c92 100644 --- a/chapter04/texinfo-patch.xml +++ b/chapter04/texinfo-patch.xml @@ -1,6 +1,4 @@ Texinfo Patch (&texinfo-version;) - &texinfo-patch-size;: -<ulink url="&ftp;/texinfo-&texinfo-version;.patch.bz2"> -&ftp;/texinfo-&texinfo-version;.patch.bz2</ulink> -<ulink url="&http;/texinfo-&texinfo-version;.patch.bz2"> -&http;/texinfo-&texinfo-version;.patch.bz2</ulink> +<ulink url="&ftp;/texinfo-&texinfo-version;.patch.bz2">&ftp;/texinfo-&texinfo-version;.patch.bz2</ulink> +<ulink url="&http;/texinfo-&texinfo-version;.patch.bz2">&http;/texinfo-&texinfo-version;.patch.bz2</ulink> diff --git a/chapter04/texinfo.xml b/chapter04/texinfo.xml index 5b51cc86a..0725c64a3 100644 --- a/chapter04/texinfo.xml +++ b/chapter04/texinfo.xml @@ -1,6 +1,4 @@ Texinfo (&texinfo-version;) - &texinfo-size;: -<ulink url="&ftp;/texinfo-&texinfo-version;.tar.bz2"> -&ftp;/texinfo-&texinfo-version;.tar.bz2</ulink> -<ulink url="&http;/texinfo-&texinfo-version;.tar.bz2"> -&http;/texinfo-&texinfo-version;.tar.bz2</ulink> +<ulink url="&ftp;/texinfo-&texinfo-version;.tar.bz2">&ftp;/texinfo-&texinfo-version;.tar.bz2</ulink> +<ulink url="&http;/texinfo-&texinfo-version;.tar.bz2">&http;/texinfo-&texinfo-version;.tar.bz2</ulink> diff --git a/chapter04/textutils.xml b/chapter04/textutils.xml index b1d7f31fc..319fa06de 100644 --- a/chapter04/textutils.xml +++ b/chapter04/textutils.xml @@ -1,6 +1,4 @@ Text Utils (&textutils-version;) - &textutils-size;: -<ulink url="&ftp;/textutils-&textutils-version;.tar.bz2"> -&ftp;/textutils-&textutils-version;.tar.bz2</ulink> -<ulink url="&http;/textutils-&textutils-version;.tar.bz2"> -&http;/textutils-&textutils-version;.tar.bz2</ulink> +<ulink url="&ftp;/textutils-&textutils-version;.tar.bz2">&ftp;/textutils-&textutils-version;.tar.bz2</ulink> +<ulink url="&http;/textutils-&textutils-version;.tar.bz2">&http;/textutils-&textutils-version;.tar.bz2</ulink> diff --git a/chapter04/toplevel.xml b/chapter04/toplevel.xml index 761955676..ec26bbd8c 100644 --- a/chapter04/toplevel.xml +++ b/chapter04/toplevel.xml @@ -1,8 +1,6 @@ Browse FTP: -<ulink url="&ftp-root;/"> -&ftp-root;/</ulink> +<ulink url="&ftp-root;/">&ftp-root;/</ulink> Browse HTTP: -<ulink url="&http-root;/"> -&http-root;/</ulink> +<ulink url="&http-root;/">&http-root;/</ulink> diff --git a/chapter04/utillinux.xml b/chapter04/utillinux.xml index 76901392c..7fe704892 100644 --- a/chapter04/utillinux.xml +++ b/chapter04/utillinux.xml @@ -1,6 +1,4 @@ Util Linux (&util-linux-version;) - &util-linux-size;: -<ulink url="&ftp;/util-linux-&util-linux-version;.tar.bz2"> -&ftp;/util-linux-&util-linux-version;.tar.bz2</ulink> -<ulink url="&http;/util-linux-&util-linux-version;.tar.bz2"> -&http;/util-linux-&util-linux-version;.tar.bz2</ulink> +<ulink url="&ftp;/util-linux-&util-linux-version;.tar.bz2">&ftp;/util-linux-&util-linux-version;.tar.bz2</ulink> +<ulink url="&http;/util-linux-&util-linux-version;.tar.bz2">&http;/util-linux-&util-linux-version;.tar.bz2</ulink> diff --git a/chapter04/vim.xml b/chapter04/vim.xml index b22021b1c..6237cd2a3 100644 --- a/chapter04/vim.xml +++ b/chapter04/vim.xml @@ -1,12 +1,8 @@ Vim-rt (&vim-version;) - &vim-rt-size;: -<ulink url="&ftp;/vim-&vim-version;-rt.tar.bz2"> -&ftp;/vim-&vim-version;-rt.tar.bz2</ulink> -<ulink url="&http;/vim-&vim-version;-rt.tar.bz2"> -&http;/vim-&vim-version;-rt.tar.bz2</ulink> +<ulink url="&ftp;/vim-&vim-version;-rt.tar.bz2">&ftp;/vim-&vim-version;-rt.tar.bz2</ulink> +<ulink url="&http;/vim-&vim-version;-rt.tar.bz2">&http;/vim-&vim-version;-rt.tar.bz2</ulink> Vim-src (&vim-version;) - &vim-src-size;: -<ulink url="&ftp;/vim-&vim-version;-src.tar.bz2"> -&ftp;/vim-&vim-version;-src.tar.bz2</ulink> -<ulink url="&http;/vim-&vim-version;-src.tar.bz2"> -&http;/vim-&vim-version;-src.tar.bz2</ulink> +<ulink url="&ftp;/vim-&vim-version;-src.tar.bz2">&ftp;/vim-&vim-version;-src.tar.bz2</ulink> +<ulink url="&http;/vim-&vim-version;-src.tar.bz2">&http;/vim-&vim-version;-src.tar.bz2</ulink> diff --git a/chapter05/bash-exp.xml b/chapter05/bash-exp.xml index 1412e20f5..0a6f05751 100644 --- a/chapter05/bash-exp.xml +++ b/chapter05/bash-exp.xml @@ -1,50 +1,38 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>--enable-static-link:</userinput> This configure -option causes Bash to be linked statically -</para> +<para><userinput>--enable-static-link:</userinput> This configure +option causes Bash to be linked statically</para> -<para> -<userinput>--prefix=$LFS/usr:</userinput> This configure option installs +<para><userinput>--prefix=$LFS/usr:</userinput> This configure option installs all of Bash's files under the $LFS/usr directory, which becomes the /usr directory after the user chroot'ed into $LFS or when he rebooted -the system into LFS. -</para> +the system into LFS.</para> -<para> -<userinput>--bindir=$LFS/bin:</userinput> This installs the executable +<para><userinput>--bindir=$LFS/bin:</userinput> This installs the executable files in $LFS/bin. We do this because we want bash to be in /bin, not in /usr/bin. One reason being: the /usr partition might be on a separate partition which has to be mounted at some point. Before that partition is mounted a user needs and will want to have bash available (it will be hard to -execute the boot scripts without a shell for instance). -</para> +execute the boot scripts without a shell for instance).</para> -<para> -<userinput>--with-curses:</userinput> This causes Bash to be linked +<para><userinput>--with-curses:</userinput> This causes Bash to be linked against the curses library instead of the default termcap library which -is becoming obsolete. -</para> +is becoming obsolete.</para> -<para> -<userinput>ln -s bash sh:</userinput> This command creates the sh +<para><userinput>ln -s bash sh:</userinput> This command creates the sh symlink that points to bash. Most scripts run themselves via 'sh' (invoked by the #!/bin/sh as the first line in the scripts) which invokes a special bash mode. Bash will then behave (as closely as -possible) as the original Bourne shell. -</para> +possible) as the original Bourne shell.</para> -<para> -The <userinput>&&</userinput>'s at the end of every line cause +<para>The <userinput>&&</userinput>'s at the end of every line cause the next command to be executed only if the previous command exists with a return value of 0 indicating success. In case all of these commands are copy&pasted on the shell, is is important to be ensured that if ./configure fails, make isn't being executed and, likewise, if make fails, -that make install isn't being executed, and so forth. -</para> +that make install isn't being executed, and so forth.</para> </sect2> diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml index f25dbaf21..5fbf03ec0 100644 --- a/chapter05/bash-inst.xml +++ b/chapter05/bash-inst.xml @@ -1,28 +1,18 @@ <sect2> <title>Installation of Bash</title> -<para> -Install Bash by running the following commands: -</para> +<para>Install Bash by running the following commands:</para> -<para> -<screen> -<userinput>./configure --enable-static-link --prefix=$LFS/usr \</userinput> +<para><screen><userinput>./configure --enable-static-link --prefix=$LFS/usr \</userinput> <userinput> --bindir=$LFS/bin --with-curses &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd $LFS/bin &&</userinput> -<userinput>ln -s bash sh</userinput> -</screen> -</para> +<userinput>ln -s bash sh</userinput></screen></para> -<para> -If the make install phase ends with something along the lines of -</para> +<para>If the make install phase ends with something along the lines of</para> -<blockquote> -<screen> -install-info: unknown option `--dir-file=/mnt/lfs/usr/info/dir' +<blockquote><screen>install-info: unknown option `--dir-file=/mnt/lfs/usr/info/dir' usage: install-info [--version] [--help] [--debug] [--maxwidth=nnn] [--section regexp title] [--infodir=xxx] [--align=nnn] [--calign=nnn] [--quiet] [--menuentry=xxx] @@ -31,19 +21,15 @@ usage: install-info [--version] [--help] [--debug] [--maxwidth=nnn] [--remove] [--] filename make[1]: *** [install] Error 1 make[1]: Leaving directory `/mnt/lfs/usr/src/bash-2.04/doc' -make: [install] Error 2 (ignored) -</screen> -</blockquote> +make: [install] Error 2 (ignored)</screen></blockquote> -<para> -then that means that you are probably using Debian, and that you have an +<para>then that means that you are probably using Debian, and that you have an old version of the texinfo package. This error is not severe by any means: the info pages will be installed when we recompile bash dynamically in chapter 6, so you can ignore it. You do, however, have to run the last two commands manually (the <userinput>cd $LFS/bin</userinput> and <userinput>ln -s bash sh</userinput> commands) because they won't be -executed when the error occurs. -</para> +executed when the error occurs.</para> </sect2> diff --git a/chapter05/bash.xml b/chapter05/bash.xml index 9815a86dc..f5fa1e19c 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-bash"> <title>Installing Bash</title> -<screen> -Estimated build time: &bash-time-static; -Estimated disk space required: &bash-compsize-static; -</screen> +<screen>Estimated build time: &bash-time-static; +Estimated disk space required: &bash-compsize-static;</screen> &c5-bash-inst; &c5-bash-exp; diff --git a/chapter05/binutils-exp.xml b/chapter05/binutils-exp.xml index c0ba51bf4..4ac33410a 100644 --- a/chapter05/binutils-exp.xml +++ b/chapter05/binutils-exp.xml @@ -1,35 +1,27 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>make -e:</userinput> The -e parameter tells make that +<para><userinput>make -e:</userinput> The -e parameter tells make that environment variables take precedence over variables defined in the Makefile file(s). This is needed in order to successfully link binutils -statically. -</para> +statically.</para> -<para> -<userinput>--disable-nls:</userinput> This option disabled +<para><userinput>--disable-nls:</userinput> This option disabled internationalization (also known as i18n). We don't need this for our static programs and nls often causes problems when you're linking -statically. -</para> +statically.</para> -<para> -<userinput>LDFLAGS=-all-static:</userinput> Setting the variable LDFLAGS -to the value -all-static causes binutils to be linked statically. -</para> +<para><userinput>LDFLAGS=-all-static:</userinput> Setting the variable LDFLAGS +to the value -all-static causes binutils to be linked statically.</para> -<para> -<userinput>tooldir=$LFS/usr:</userinput> Normally, the tooldir (the +<para><userinput>tooldir=$LFS/usr:</userinput> Normally, the tooldir (the directory where the executables from binutils end up in) is set to $(exec_prefix)/$(target_alias) which expands into, for example, /usr/i686-pc-linux-gnu. Since we only build for our own system, we don't need this target specific directory in $LFS/usr. That setup would be used if the system was used to cross-compile (for example compiling a package on the Intel machine that generates code that can be -executed on Apple PowerPC machines). -</para> +executed on Apple PowerPC machines).</para> </sect2> diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml index 81b4858ec..982b2da78 100644 --- a/chapter05/binutils-inst.xml +++ b/chapter05/binutils-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Binutils</title> -<para> -Install Binutils by running the following commands: -</para> +<para>Install Binutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make -e LDFLAGS=-all-static tooldir=$LFS/usr &&</userinput> -<userinput>make -e tooldir=$LFS/usr install</userinput> -</screen> -</para> +<userinput>make -e tooldir=$LFS/usr install</userinput></screen></para> </sect2> diff --git a/chapter05/binutils.xml b/chapter05/binutils.xml index af286fe85..733fc70bd 100644 --- a/chapter05/binutils.xml +++ b/chapter05/binutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-binutils"> <title>Installing Binutils</title> -<screen> -Estimated build time: &binutils-time-static; -Estimated disk space required: &binutils-compsize-static; -</screen> +<screen>Estimated build time: &binutils-time-static; +Estimated disk space required: &binutils-compsize-static;</screen> &c5-binutils-inst; &c5-binutils-exp; diff --git a/chapter05/bzip2-exp.xml b/chapter05/bzip2-exp.xml index ca77f5f4d..b53254eab 100644 --- a/chapter05/bzip2-exp.xml +++ b/chapter05/bzip2-exp.xml @@ -1,15 +1,12 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>sed: </userinput> The sed command here searches for the +<para><userinput>sed: </userinput> The sed command here searches for the string "$(CC) $(CFLAGS) -o" and replaces it by "$(CC) $(CFLAGS) $(LDFLAGS) -o" in the Makefile file. We make that modification so it -will be easier to link bzip2 statically. -</para> +will be easier to link bzip2 statically.</para> -<para> -<userinput>...Makefile | make -f -:</userinput> Makefile +<para><userinput>...Makefile | make -f -:</userinput> Makefile is the last parameter of the sed command which indicates the file to search and replace in. Sed normally sends the modified file to stdout (standard output), which will be the console. With the construction we @@ -19,15 +16,12 @@ modified the Makefile file so we don't want make to use it. The "-f -" parameter tells make to read it's input from another file, or from stdin (standard input) which the dash (-) implies. This is one way to do it. Another way would be to have sed write the output to a different file -and tell make with the -f parameter to read that alternate file. -</para> +and tell make with the -f parameter to read that alternate file.</para> -<para> -<userinput>LDFLAGS=-static:</userinput> This is the second way we use to +<para><userinput>LDFLAGS=-static:</userinput> This is the second way we use to link a package statically. This is also the most common way. The -all-static value is only used with the binutils package and won't -be used throughout the rest of this book. -</para> +be used throughout the rest of this book.</para> </sect2> diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 1df7a7a4b..2c2f04dbc 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -1,20 +1,14 @@ <sect2> <title>Installation of Bzip2</title> -<para> -Install Bzip2 by running the following commands: -</para> +<para>Install Bzip2 by running the following commands:</para> -<para> -<screen> -<userinput>sed \</userinput> +<para><screen><userinput>sed \</userinput> <userinput> s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) \$(LDFLAGS) -o"/ \</userinput> <userinput> Makefile | make -f - LDFLAGS=-static &&</userinput> <userinput>make PREFIX=$LFS/usr install &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> -<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput> -</screen> -</para> +<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput></screen></para> </sect2> diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml index 7c7368704..7838559b3 100644 --- a/chapter05/bzip2.xml +++ b/chapter05/bzip2.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-bzip2"> <title>Installing Bzip2</title> -<screen> -Estimated build time: &bzip2-time-static; -Estimated disk space required: &bzip2-compsize-static; -</screen> +<screen>Estimated build time: &bzip2-time-static; +Estimated disk space required: &bzip2-compsize-static;</screen> &c5-bzip2-inst; &c5-bzip2-exp; diff --git a/chapter05/diffutils-exp.xml b/chapter05/diffutils-exp.xml index 181f700da..b930cbe07 100644 --- a/chapter05/diffutils-exp.xml +++ b/chapter05/diffutils-exp.xml @@ -1,16 +1,14 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2:</userinput> The +<para><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2:</userinput> The CPPFLAGS variable is a variable that's read by the cpp program (C PreProcessor). The value of this variable tells the preprocessor to replace every instance of re_max_failures it finds by re_max_failures2 before handing the source file to the compiler itself for compilation. This package has problems linking statically on certain platforms (depending on the Glibc version used on that system) and this construction fixes -that problem. -</para> +that problem.</para> </sect2> diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index e6e962bef..d2ce49a20 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -1,19 +1,13 @@ <sect2> <title>Installation of Diffutils</title> -<para> -Install Diffutils by running the following commands: -</para> +<para>Install Diffutils by running the following commands:</para> -<para> -<screen> -<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> +<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> <userinput>./configure --prefix=$LFS/usr &&</userinput> <userinput>unset CPPFLAGS &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml index 5486412a7..3757ec6a8 100644 --- a/chapter05/diffutils.xml +++ b/chapter05/diffutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-diffutils"> <title>Installing Diffutils</title> -<screen> -Estimated build time: &diffutils-time-static; -Estimated disk space required: &diffutils-compsize-static; -</screen> +<screen>Estimated build time: &diffutils-time-static; +Estimated disk space required: &diffutils-compsize-static;</screen> &c5-diffutils-inst; &c5-diffutils-exp; diff --git a/chapter05/fileutils-exp.xml b/chapter05/fileutils-exp.xml index c4cc59b1a..b5ebb1d7b 100644 --- a/chapter05/fileutils-exp.xml +++ b/chapter05/fileutils-exp.xml @@ -1,12 +1,10 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>--libexecdir=$LFS/bin:</userinput> This configure option will +<para><userinput>--libexecdir=$LFS/bin:</userinput> This configure option will set the program executable directory to $LFS/bin. This is normally set to /usr/libexec, but nothing is placed in it. Changing it just prevents -that directory from being created. -</para> +that directory from being created.</para> </sect2> diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml index 6ef386a53..1fb41f3ca 100644 --- a/chapter05/fileutils-inst.xml +++ b/chapter05/fileutils-inst.xml @@ -1,19 +1,14 @@ <sect2> <title>Installation of Fileutils</title> -<para> -Install Fileutils by running the following commands: -</para> +<para>Install Fileutils by running the following commands:</para> -<para><screen> -<userinput>./configure --disable-nls \</userinput> +<para><screen><userinput>./configure --disable-nls \</userinput> <userinput> --prefix=$LFS/usr --libexecdir=$LFS/bin --bindir=$LFS/bin &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> -<userinput>ln -s ../../bin/install</userinput> -</screen> -</para> +<userinput>ln -s ../../bin/install</userinput></screen></para> </sect2> diff --git a/chapter05/fileutils.xml b/chapter05/fileutils.xml index 49973ab4f..603ba7f4a 100644 --- a/chapter05/fileutils.xml +++ b/chapter05/fileutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-fileutils"> <title>Installing Fileutils</title> -<screen> -Estimated build time: &fileutils-time-static; -Estimated disk space required: &fileutils-compsize-static; -</screen> +<screen>Estimated build time: &fileutils-time-static; +Estimated disk space required: &fileutils-compsize-static;</screen> &c5-fileutils-inst; &c5-fileutils-exp; diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml index be7d64e48..406b42282 100644 --- a/chapter05/gcc-exp.xml +++ b/chapter05/gcc-exp.xml @@ -1,34 +1,26 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -i ../gcc-3.0.patch:</userinput> This patch +<para><userinput>patch -Np1 -i ../gcc-3.0.patch:</userinput> This patch changes all instances of re_max_failures to re_max_failures2. re_max_failures is a variable used within Glibc and with static compiling this variable sometimes clashes between the package's re_max_failures and the same variable in glibc. By renaming re_max_failures in the package to re_max_failures2 we just tell the -package to use the second variable so that glibc won't be in the way. -</para> +package to use the second variable so that glibc won't be in the way.</para> -<para> -<userinput>--enable-languages=c,c++:</userinput> This only builds the C +<para><userinput>--enable-languages=c,c++:</userinput> This only builds the C and C++ compilers and not the other available compilers as they are, on the average, not often used. If those other compilers are needed, -the --enable-languages parameter can be omitted. -</para> +the --enable-languages parameter can be omitted.</para> -<para> -<userinput>ln -s ../usr/bin/cpp:</userinput> This +<para><userinput>ln -s ../usr/bin/cpp:</userinput> This creates the $LFS/lib/cpp symlink. Some packages explicitly try to find -cpp in /lib. -</para> +cpp in /lib.</para> -<para> -<userinput>ln -s ../bin/cpp:</userinput> This +<para><userinput>ln -s ../bin/cpp:</userinput> This creates the $LFS/usr/lib/cpp symlink as there are packages that expect -cpp to be in /usr/lib. -</para> +cpp to be in /usr/lib.</para> </sect2> diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 066f8195f..e4d920a8d 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -1,13 +1,9 @@ <sect2> <title>Installation of GCC</title> -<para> -Install GCC by running the following commands: -</para> +<para>Install GCC by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../gcc-&gcc-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;.patch &&</userinput> <userinput>mkdir ../gcc-build &&</userinput> <userinput>cd ../gcc-build &&</userinput> <userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput> @@ -20,9 +16,7 @@ Install GCC by running the following commands: <userinput>cd $LFS/usr/lib &&</userinput> <userinput>ln -s ../bin/cpp &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> -<userinput>ln -s gcc cc</userinput> -</screen> -</para> +<userinput>ln -s gcc cc</userinput></screen></para> </sect2> diff --git a/chapter05/gcc.xml b/chapter05/gcc.xml index 490f822a7..7f92e0eb4 100644 --- a/chapter05/gcc.xml +++ b/chapter05/gcc.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-gcc"> <title>Installing GCC</title> -<screen> -Estimated build time: &gcc-time-static; -Estimated disk space required: &gcc-compsize-static; -</screen> +<screen>Estimated build time: &gcc-time-static; +Estimated disk space required: &gcc-compsize-static;</screen> &c5-gcc-inst; &c5-gcc-exp; diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index 6b1058547..f6635c56c 100644 --- a/chapter05/grep-inst.xml +++ b/chapter05/grep-inst.xml @@ -1,19 +1,13 @@ <sect2> <title>Installation of Grep</title> -<para> -Install Grep by running the following commands: -</para> +<para>Install Grep by running the following commands:</para> -<para> -<screen> -<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> +<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>unset CPPFLAGS &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter05/grep.xml b/chapter05/grep.xml index f651af762..de0160096 100644 --- a/chapter05/grep.xml +++ b/chapter05/grep.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-grep"> <title>Installing Grep</title> -<screen> -Estimated build time: &grep-time-static; -Estimated disk space required: &grep-compsize-static; -</screen> +<screen>Estimated build time: &grep-time-static; +Estimated disk space required: &grep-compsize-static;</screen> &c5-grep-inst; &aa-grep-desc; diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index f1d5d1ca6..9b578e42d 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -1,20 +1,14 @@ <sect2> <title>Installation of Gzip</title> -<para> -Before Gzip is installed, the gzip patch file needs to be unpacked. -</para> +<para>Before Gzip is installed, the gzip patch file needs to be unpacked.</para> -<para> -<screen> -<userinput>patch -Np1 -i ../gzip-&gzip-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch &&</userinput> <userinput>./configure --prefix=$LFS/usr &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</userinput> <userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &&</userinput> -<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput> -</screen> -</para> +<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput></screen></para> </sect2> diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml index 627752117..72057c5b0 100644 --- a/chapter05/gzip.xml +++ b/chapter05/gzip.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-gzip"> <title>Installing Gzip</title> -<screen> -Estimated build time: &gzip-time-static; -Estimated disk space required: &gzip-compsize-static; -</screen> +<screen>Estimated build time: &gzip-time-static; +Estimated disk space required: &gzip-compsize-static;</screen> &c5-gzip-inst; &aa-gzip-desc; diff --git a/chapter05/installasroot.xml b/chapter05/installasroot.xml index bfb49d62e..27bcd245b 100644 --- a/chapter05/installasroot.xml +++ b/chapter05/installasroot.xml @@ -1,23 +1,19 @@ <sect1 id="ch05-installasroot"> <title>Install all software as user root</title> -<para> -It's best to log in as root or su's to root when installing the +<para>It's best to log in as root or su's to root when installing the packages. That way you are assured that all files are owned by user and group root (and not owned by the userid of the non-root user), and if a package wants to set special permissions, it can do so without problems -due to non-root access. -</para> +due to non-root access.</para> -<para> -The documentation that comes with Glibc, Gcc, and other +<para>The documentation that comes with Glibc, Gcc, and other packages recommend not to compile the packages as user root. We feel it's safe to ignore that recommendation and compile as user root anyway. Hundreds of people using LFS have done so without any problems whatsoever, and we haven't encountered any bugs in the compile processes that cause harm. So it's pretty safe (never can be 100% safe though, so -it's up to you what you end up doing). -</para> +it's up to you what you end up doing).</para> </sect1> diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml index 8729787e2..6c98ee73d 100644 --- a/chapter05/introduction.xml +++ b/chapter05/introduction.xml @@ -1,55 +1,39 @@ <sect1 id="ch05-introduction"> <title>Introduction</title> -<para> -In the following chapters we will install all the software that belongs to -a basic Linux system. After you're done with this and the next chapter, +<para>In the following chapters we will install all the software that belongs +to a basic Linux system. After you're done with this and the next chapter, you'll have a fully working Linux system. The remaining chapters deal with creating the boot scripts, making the LFS system bootable and -setting up basic networking. -</para> +setting up basic networking.</para> -<para> -The software in this chapter will be linked statically. These programs +<para>The software in this chapter will be linked statically. These programs will be reinstalled in the next chapter and linked dynamically. The reason for the static version first is that there is a chance that our normal Linux system and the LFS system aren't using the same C Library versions. If the programs in the first part are linked against an older C library version, those programs might not work well on the -LFS system. -</para> +LFS system.</para> -<para> -The key to learn what makes Linux tick is to know exactly what packages +<para>The key to learn what makes Linux tick is to know exactly what packages are used for and why a user or the system needs them. Descriptions of the package content are provided after the Installation subsection of each -package and in Appendix A as well. -</para> +package and in Appendix A as well.</para> -<para> -During the installation of various packages, you will more than likely see +<para>During the installation of various packages, you will more than likely see all kinds of compiler warnings scrolling by on the screen. These are normal and can be safely ignored. They are just that, warnings (mostly about improper use of the C or C++ syntax, but not illegal use. It's just that, often, C standards changed and packages still use the old standard -which is not a problem). -</para> - -<para> -Before we start, make sure the LFS environment variable is setup -properly if you decided to make use of it. Run the following: -</para> - -<para> -<screen> -<userinput>echo $LFS</userinput> -</screen> -</para> - -<para> -Check to make sure the output contains the correct directory to the LFS -partition's mount point (/mnt/lfs for example). -</para> +which is not a problem).</para> + +<para>Before we start, make sure the LFS environment variable is setup +properly if you decided to make use of it. Run the following:</para> + +<para><screen><userinput>echo $LFS</userinput></screen></para> + +<para>Check to make sure the output contains the correct directory to the LFS +partition's mount point (/mnt/lfs for example).</para> </sect1> diff --git a/chapter05/kernel-exp.xml b/chapter05/kernel-exp.xml index 573ddb1b4..475984ee8 100644 --- a/chapter05/kernel-exp.xml +++ b/chapter05/kernel-exp.xml @@ -1,13 +1,10 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>make mrproper:</userinput> This will ensure that the kernel -tree is absolutely clean. -</para> +<para><userinput>make mrproper:</userinput> This will ensure that the kernel +tree is absolutely clean.</para> -<para> -<userinput>yes "" | make config:</userinput> This runs make config and +<para><userinput>yes "" | make config:</userinput> This runs make config and answers with the default answer to every question the config script asks the user (it does this by simply doing the equivalent of hitting the Enter key, thus accepting the default Y and N answers to the questions). @@ -15,32 +12,25 @@ We're not configuring the real kernel here, we just need to have some sort of configure file created so that we can run make dep next that will create a few files in $LFS/usr/src/linux/include/linux, like version.h, among others, that we will need to compile Glibc and other packages later -in chroot. -</para> +in chroot.</para> -<para> -<userinput>make dep:</userinput> make dep checks dependencies and sets +<para><userinput>make dep:</userinput> make dep checks dependencies and sets up the dependencies file. We don't really care about the dependency checks, but what we do care about is that make dep creates those aforementioned files in $LFS/usr/src/linux/include/linux we will be -needing later on. -</para> +needing later on.</para> -<para> -<userinput>cp -a ../src/linux/include/linux .</userinput> and +<para><userinput>cp -a ../src/linux/include/linux .</userinput> and <userinput>mkdir asm && cp -a ../src/linux/include/asm/* .</userinput>: These commands copy the kernel headers in the -<filename>$LFS/usr/include</filename> directory. -</para> +<filename>$LFS/usr/include</filename> directory.</para> -<para> -<userinput>chown root.root $LFS/usr/include/linux -R </userinput> and +<para><userinput>chown root.root $LFS/usr/include/linux -R </userinput> and <userinput>chown root.root $LFS/usr/include/asm -R </userinput>: These commands change the ownership of the <filename>$LFS/usr/include/linux</filename> and the <filename>$LFS/usr/include/asm</filename> directories, plus all the -files contained therein to the user root and group root. -</para> +files contained therein to the user root and group root.</para> </sect2> diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml index 87c7a9509..5d79a5ba3 100644 --- a/chapter05/kernel-inst.xml +++ b/chapter05/kernel-inst.xml @@ -1,21 +1,16 @@ <sect2> <title>Installation of the Linux Kernel</title> -<para> -We won't be compiling a new kernel image yet. We'll do that after we +<para>We won't be compiling a new kernel image yet. We'll do that after we have finished the installation of the basic system software in this chapter. But because certain software needs the kernel header files, we're going to unpack the kernel archive now and set it up so that we can -compile the packages that need the kernel. -</para> +compile the packages that need the kernel.</para> -<para> -The kernel configuration file is created by running the following command: -</para> +<para>The kernel configuration file is created by running the following +command:</para> -<para> -<screen> -<userinput>make mrproper &&</userinput> +<para><screen><userinput>make mrproper &&</userinput> <userinput>yes "" | make config &&</userinput> <userinput>make dep &&</userinput> <userinput>cd $LFS/usr/include &&</userinput> @@ -23,9 +18,7 @@ The kernel configuration file is created by running the following command: <userinput>chown root.root $LFS/usr/include/linux -R &&</userinput> <userinput>mkdir asm &&</userinput> <userinput>cp -a ../src/linux/include/asm/* asm &&</userinput> -<userinput>chown root.root $LFS/usr/include/asm -R</userinput> -</screen> -</para> +<userinput>chown root.root $LFS/usr/include/asm -R</userinput></screen></para> </sect2> diff --git a/chapter05/kernel.xml b/chapter05/kernel.xml index c2b98ed49..69a3f7c5c 100644 --- a/chapter05/kernel.xml +++ b/chapter05/kernel.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-kernel"> <title>Installing Linux Kernel</title> -<screen> -Estimated build time: &kernel-time-static; -Estimated disk space required: &kernel-compsize-static; -</screen> +<screen>Estimated build time: &kernel-time-static; +Estimated disk space required: &kernel-compsize-static;</screen> &c5-kernel-inst; &c5-kernel-exp; diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml index e07c8205b..1e358f555 100644 --- a/chapter05/make-inst.xml +++ b/chapter05/make-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Make</title> -<para> -Install Make by running the following commands: -</para> +<para>Install Make by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter05/make.xml b/chapter05/make.xml index d517aaed8..a221a7f91 100644 --- a/chapter05/make.xml +++ b/chapter05/make.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-make"> <title>Installing Make</title> -<screen> -Estimated build time: &make-time-static; -Estimated disk space required: &make-compsize-static; -</screen> +<screen>Estimated build time: &make-time-static; +Estimated disk space required: &make-compsize-static;</screen> &c5-make-inst; &aa-make-desc; diff --git a/chapter05/mawk-inst.xml b/chapter05/mawk-inst.xml index e42e77665..a49156287 100644 --- a/chapter05/mawk-inst.xml +++ b/chapter05/mawk-inst.xml @@ -1,20 +1,14 @@ <sect2> <title>Installation of Mawk</title> -<para> -Install Mawk by running the following commands: -</para> +<para>Install Mawk by running the following commands:</para> -<para> -<screen> -<userinput>./configure &&</userinput> +<para><screen><userinput>./configure &&</userinput> <userinput>sed \</userinput> <userinput> s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) \$(LDFLAGS) -o"/ \</userinput> <userinput> Makefile | make -f - LDFLAGS=-static && </userinput> <userinput>make BINDIR=$LFS/usr/bin \</userinput> -<userinput> MANDIR=$LFS/usr/share/man/man1 install</userinput> -</screen> -</para> +<userinput> MANDIR=$LFS/usr/share/man/man1 install</userinput></screen></para> </sect2> diff --git a/chapter05/mawk.xml b/chapter05/mawk.xml index d1df4cb84..6dd7dfc06 100644 --- a/chapter05/mawk.xml +++ b/chapter05/mawk.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-mawk"> <title>Installing Mawk</title> -<screen> -Estimated build time: &mawk-time-static; -Estimated disk space required: &mawk-compsize-static; -</screen> +<screen>Estimated build time: &mawk-time-static; +Estimated disk space required: &mawk-compsize-static;</screen> &c5-mawk-inst; &aa-mawk-desc; diff --git a/chapter05/oldnsslib.xml b/chapter05/oldnsslib.xml index 54d5f8a3f..c7b3c2a17 100644 --- a/chapter05/oldnsslib.xml +++ b/chapter05/oldnsslib.xml @@ -1,31 +1,19 @@ <sect1 id="ch05-oldnsslib"> <title>Copying old NSS library files</title> -<para> -If your normal Linux system runs glibc-2.0, you need to copy the NSS library -files to the LFS partition. Certain statically linked programs still depend -on the NSS library, especially programs that need to lookup usernames,userid's -and groupid's. You can check which C library version your normal Linux system -uses by simply executing the library, like this: -</para> +<para>If your normal Linux system runs glibc-2.0, you need to copy the NSS +library files to the LFS partition. Certain statically linked programs still +depend on the NSS library, especially programs that need to lookup +usernames, userid's and groupid's. You can check which C library version your +normal Linux system uses by simply executing the library, like this:</para> -<para> -<screen> -<userinput>/lib/libc.so.6</userinput> -</screen> -</para> +<para><screen><userinput>/lib/libc.so.6</userinput></screen></para> -<para> -The first line will give you the release version. Following lines contain +<para>The first line will give you the release version. Following lines contain interesting information. If you have Glibc-2.0.x installed on your starting -distribution, copy the NSS library files by running: -</para> +distribution, copy the NSS library files by running:</para> -<para> -<screen> -<userinput>cp -av /lib/libnss* $LFS/lib</userinput> -</screen> -</para> +<para><screen><userinput>cp -av /lib/libnss* $LFS/lib</userinput></screen></para> </sect1> diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml index 3442d860b..7effdd3df 100644 --- a/chapter05/patch-inst.xml +++ b/chapter05/patch-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Patch</title> -<para> -Install Patch by running the following commands: -</para> +<para>Install Patch by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=$LFS/usr &&</userinput> +<para><screen><userinput>./configure --prefix=$LFS/usr &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter05/patch.xml b/chapter05/patch.xml index f0dc91269..257d66fdc 100644 --- a/chapter05/patch.xml +++ b/chapter05/patch.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-patch"> <title>Installing Patch</title> -<screen> -Estimated build time: &patch-time-static; -Estimated disk space required: &patch-compsize-static; -</screen> +<screen>Estimated build time: &patch-time-static; +Estimated disk space required: &patch-compsize-static;</screen> &c5-patch-inst; &aa-patch-desc; diff --git a/chapter05/proc.xml b/chapter05/proc.xml index 3a13f2be3..c68a9d171 100644 --- a/chapter05/proc.xml +++ b/chapter05/proc.xml @@ -1,23 +1,16 @@ <sect1 id="ch05-proc"> <title>Mounting $LFS/proc file system</title> -<para> -In order for certain programs to function properly the proc file system +<para>In order for certain programs to function properly the proc file system must be mounted and available from within the chroot'ed environment as well. It's not a problem to mount the proc file system twice or even more than that, since it's a virtual file system maintained by -the kernel itself. -</para> +the kernel itself.</para> -<para> -The proc file system is mounted under $LFS/proc by running the following command: -</para> +<para>The proc file system is mounted under $LFS/proc by running the following +command:</para> -<para> -<screen> -<userinput>mount proc $LFS/proc -t proc</userinput> -</screen> -</para> +<para><screen><userinput>mount proc $LFS/proc -t proc</userinput></screen></para> </sect1> diff --git a/chapter05/pwdgroup.xml b/chapter05/pwdgroup.xml index 28e17442b..eb5d77f4a 100644 --- a/chapter05/pwdgroup.xml +++ b/chapter05/pwdgroup.xml @@ -1,10 +1,9 @@ <sect1 id="ch05-pwdgroup"> <title>Creating passwd and group files</title> -<para> -In order for the user and group root to be recognized and to be able to login, -there needs to be an entry in the /etc/passwd and /etc/group file. Besides the -group root a couple of other groups are recommended and needed by +<para>In order for the user and group root to be recognized and to be able to +login, there needs to be an entry in the /etc/passwd and /etc/group file. +Besides the group root a couple of other groups are recommended and needed by packages. The groups with their GID's below aren't part of any standard. The LSB only recommends besides a group root a group bin to be present with GID 1. Other group names and GID's can be chosen by the user. Well @@ -13,29 +12,17 @@ name, since it doesn't matter all that much what GID a group has. Since there aren't any standards for groups I won't follow any conventions used by Debian, RedHat and others. The groups added here are the groups the MAKEDEV script (the script that creates the device files in the /dev -directory) mentions. -</para> +directory) mentions.</para> -<para> -Create a new file <filename>$LFS/etc/passwd</filename> by running the -following command: -</para> +<para>Create a new file <filename>$LFS/etc/passwd</filename> by running the +following command:</para> -<para> -<screen> -<userinput>echo "root:x:0:0:root:/root:/bin/bash" > $LFS/etc/passwd -</userinput> -</screen> -</para> +<para><screen><userinput>echo "root:x:0:0:root:/root:/bin/bash" > $LFS/etc/passwd</userinput></screen></para> -<para> -Create a new file <filename>$LFS/etc/group</filename> by running the -following: -</para> +<para>Create a new file <filename>$LFS/etc/group</filename> by running the +following:</para> -<para> -<screen> -<userinput>cat > $LFS/etc/group << "EOF"</userinput> +<para><screen><userinput>cat > $LFS/etc/group << "EOF"</userinput> root:x:0: bin:x:1: sys:x:2: @@ -48,9 +35,7 @@ disk:x:8: lp:x:9: dialout:x:10: audio:x:11: -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index c410c0d88..261fe36b0 100644 --- a/chapter05/sed-inst.xml +++ b/chapter05/sed-inst.xml @@ -1,19 +1,13 @@ <sect2> <title>Installation of Sed</title> -<para> -Install Sed by running the following commands: -</para> +<para>Install Sed by running the following commands:</para> -<para> -<screen> -<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> +<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> <userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &&</userinput> <userinput>unset CPPFLAGS &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter05/sed.xml b/chapter05/sed.xml index d229c98ad..b4e4a0bef 100644 --- a/chapter05/sed.xml +++ b/chapter05/sed.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-sed"> <title>Installing Sed</title> -<screen> -Estimated build time: &sed-time-static; -Estimated disk space required: &sed-compsize-static; -</screen> +<screen>Estimated build time: &sed-time-static; +Estimated disk space required: &sed-compsize-static;</screen> &c5-sed-inst; &aa-sed-desc; diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index 0fa096a4c..6e784c0c0 100644 --- a/chapter05/shellutils-inst.xml +++ b/chapter05/shellutils-inst.xml @@ -1,21 +1,16 @@ <sect2> <title>Installation of Sh-utils</title> -<para> -Before Sh-utils is installed, the sh-utils patch file needs to be unpacked. -</para> +<para>Before Sh-utils is installed, the sh-utils patch file needs +to be unpacked.</para> -<para> -<screen> -<userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch &&</userinput> <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> <userinput>mv date echo false pwd stty $LFS/bin &&</userinput> -<userinput>mv su true uname hostname $LFS/bin</userinput> -</screen> -</para> +<userinput>mv su true uname hostname $LFS/bin</userinput></screen></para> </sect2> diff --git a/chapter05/shellutils.xml b/chapter05/shellutils.xml index 7a50fb11f..b0b64dbb0 100644 --- a/chapter05/shellutils.xml +++ b/chapter05/shellutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-shutils"> <title>Installing Sh-utils</title> -<screen> -Estimated build time: &sh-utils-time-static; -Estimated disk space required: &sh-utils-compsize-static; -</screen> +<screen>Estimated build time: &sh-utils-time-static; +Estimated disk space required: &sh-utils-compsize-static;</screen> &c5-shellutils-inst; &aa-shellutils-desc; diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml index 175cab6e9..98202f7d5 100644 --- a/chapter05/tar-inst.xml +++ b/chapter05/tar-inst.xml @@ -1,36 +1,23 @@ <sect2> <title>Installation of Tar</title> -<para> -To be able to directly use bzip2 files with tar, use the tar +<para>To be able to directly use bzip2 files with tar, use the tar patch available from the LFS FTP site. This patch will add the -y option to tar which works the same as the -z option to tar (which can be used -for gzip files). -</para> +for gzip files).</para> -<para> -Apply the patch by running the following command: -</para> +<para>Apply the patch by running the following command:</para> -<para> -<screen> -<userinput>cd src &&</userinput> +<para><screen><userinput>cd src &&</userinput> <userinput>patch -i ../../gnutarpatch.txt &&</userinput> -<userinput>cd ..</userinput> -</screen> -</para> +<userinput>cd ..</userinput></screen></para> -<para> -Install Tar by running the following commands: -</para> +<para>Install Tar by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=$LFS/usr --disable-nls \</userinput> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls \</userinput> <userinput> --libexecdir=$LFS/usr/bin --bindir=$LFS/bin && </userinput> <userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput> -</screen></para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter05/tar.xml b/chapter05/tar.xml index 80fd0b1e1..241b36e74 100644 --- a/chapter05/tar.xml +++ b/chapter05/tar.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-tar"> <title>Installing Tar</title> -<screen> -Estimated build time: &tar-time-static; -Estimated disk space required: &tar-compsize-static; -</screen> +<screen>Estimated build time: &tar-time-static; +Estimated disk space required: &tar-compsize-static;</screen> &c5-tar-inst; &aa-tar-desc; diff --git a/chapter05/texinfo-exp.xml b/chapter05/texinfo-exp.xml index 4ab1323f6..7dda4a0d4 100644 --- a/chapter05/texinfo-exp.xml +++ b/chapter05/texinfo-exp.xml @@ -1,11 +1,9 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -i ../texinfo-4.0.patch:</userinput> This patch +<para><userinput>patch -Np1 -i ../texinfo-4.0.patch:</userinput> This patch fixes a problem with compiling texinfo on gcc-3.0 systems. More specifically, it moves an #ifdef out of a printf macro in order to be -compatible. -</para> +compatible.</para> </sect2> diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml index 2fed3e3b0..84143096b 100644 --- a/chapter05/texinfo-inst.xml +++ b/chapter05/texinfo-inst.xml @@ -1,18 +1,12 @@ <sect2> <title>Installation of Texinfo</title> -<para> -Install Texinfo by running the following commands: -</para> +<para>Install Texinfo by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &&</userinput> <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml index 5a6448dba..e531ad2b7 100644 --- a/chapter05/texinfo.xml +++ b/chapter05/texinfo.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-texinfo"> <title>Installing Texinfo</title> -<screen> -Estimated build time: &texinfo-time-static; -Estimated disk space required: &texinfo-compsize-static; -</screen> +<screen>Estimated build time: &texinfo-time-static; +Estimated disk space required: &texinfo-compsize-static;</screen> &c5-texinfo-inst; &c5-texinfo-exp; diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml index d0485f4d7..fc56d6f8d 100644 --- a/chapter05/textutils-inst.xml +++ b/chapter05/textutils-inst.xml @@ -1,18 +1,12 @@ <sect2> <title>Installation of Textutils</title> -<para> -Install Textutils by running the following commands: -</para> +<para>Install Textutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</userinput> -<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput> -</screen> -</para> +<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput></screen></para> </sect2> diff --git a/chapter05/textutils.xml b/chapter05/textutils.xml index 908ef48d6..34ea82247 100644 --- a/chapter05/textutils.xml +++ b/chapter05/textutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch05-textutils"> <title>Installing Textutils</title> -<screen> -Estimated build time: &textutils-time-static; -Estimated disk space required: &textutils-compsize-static; -</screen> +<screen>Estimated build time: &textutils-time-static; +Estimated disk space required: &textutils-compsize-static;</screen> &c5-textutils-inst; &aa-textutils-desc; diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml index 094398e2f..b743aa9ab 100644 --- a/chapter06/aboutdebug.xml +++ b/chapter06/aboutdebug.xml @@ -1,70 +1,53 @@ <sect1 id="ch06-aboutdebug"> <title>About debugging symbols</title> -<para> -Most programs and libraries by default are compiled with debugging +<para>Most programs and libraries by default are compiled with debugging symbols (gcc option -g) Let me explain what these debugging symbols -are and why you may not want them. -</para> +are and why you may not want them.</para> -<para> -A program compiled with debugging symbols means a user can run a program or -library through a debugger and the debugger's output will be user +<para>A program compiled with debugging symbols means a user can run a program +or library through a debugger and the debugger's output will be user friendly. These debugging symbols also enlarge the program or library -significantly. -</para> +significantly.</para> -<para> -Before you start wondering whether these debugging symbols really make a +<para>Before you start wondering whether these debugging symbols really make a big difference, here are some statistics. Use them to draw your own -conclusion. -</para> +conclusion.</para> <itemizedlist> -<listitem><para> - A dynamic Bash binary with debugging symbols: 1.2MB -</para></listitem> +<listitem><para>A dynamic Bash binary +with debugging symbols: 1.2MB</para></listitem> -<listitem><para> - A dynamic Bash binary without debugging symbols: 478KB -</para></listitem> +<listitem><para>A dynamic Bash binary +without debugging symbols: 478KB</para></listitem> -<listitem><para> - /lib and /usr/lib (glibc and gcc files) with debugging - symbols: 87MB -</para></listitem> +<listitem><para>/lib and /usr/lib (glibc +and gcc files) with debugging symbols: 87MB</para></listitem> -<listitem><para> - /lib and /usr/lib (glibc and gcc files) without - debugging symbols: 16MB -</para></listitem> +<listitem><para>/lib and /usr/lib (glibc +and gcc files) without debugging symbols: 16MB</para></listitem> </itemizedlist> -<para> -Sizes vary depending on which compiler was used and which C library +<para>Sizes vary depending on which compiler was used and which C library version was used to link dynamic programs against, but results will be similar if you compare programs with and without debugging symbols. After I was done with this chapter and stripped all debugging symbols from all LFS -binaries I regained a little over 102 MB of disk space. Quite the difference. -</para> +binaries I regained a little over 102 MB of disk space. Quite the +difference.</para> -<para> -To remove debugging symbols from a binary (must be an a.out or ELF +<para>To remove debugging symbols from a binary (must be an a.out or ELF binary) run <userinput>strip --strip-debug filename</userinput>. Wild cards can be used to strip debugging symbols from multiple files (use something like <userinput>strip --strip-debug $LFS/usr/bin/*</userinput>). Most people will probably never use a debugger on software, so by -removing those symbols a lot of disk space can be regained. -</para> +removing those symbols a lot of disk space can be regained.</para> -<para> -You might find additional information in the optimization hint which can +<para>You might find additional information in the optimization hint which can be found at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/optimization.txt"> -http://archive.linuxfromscratch.org/lfs-hints/optimization.txt</ulink>. -</para> +url="http://archive.linuxfromscratch.org/lfs-hints/optimization.txt">http://archive.linuxfromscratch.org/lfs-hints/optimization.txt</ulink> +.</para> </sect1> diff --git a/chapter06/autoconf-inst.xml b/chapter06/autoconf-inst.xml index 557f6753d..34bdaad56 100644 --- a/chapter06/autoconf-inst.xml +++ b/chapter06/autoconf-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Autoconf</title> -<para> -Install Autoconf by running the following commands: -</para> +<para>Install Autoconf by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml index 10caa664b..0f8b40b7d 100644 --- a/chapter06/autoconf.xml +++ b/chapter06/autoconf.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-autoconf"> <title>Installing Autoconf</title> -<screen> -Estimated build time: &autoconf-time; -Estimated disk space required: &autoconf-compsize; -</screen> +<screen>Estimated build time: &autoconf-time; +Estimated disk space required: &autoconf-compsize;</screen> &c6-autoconf-inst; &aa-autoconf-desc; diff --git a/chapter06/automake-inst.xml b/chapter06/automake-inst.xml index 09a378452..c3bbd13b3 100644 --- a/chapter06/automake-inst.xml +++ b/chapter06/automake-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Automake</title> -<para> -Install Automake by running the following commands: -</para> +<para>Install Automake by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 0716739ff..95e27a093 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-automake"> <title>Installing Automake</title> -<screen> -Estimated build time: &automake-time; -Estimated disk space required: &automake-compsize; -</screen> +<screen>Estimated build time: &automake-time; +Estimated disk space required: &automake-compsize;</screen> &c6-automake-inst; &aa-automake-desc; diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml index 677a75ece..653d49166 100644 --- a/chapter06/bash-inst.xml +++ b/chapter06/bash-inst.xml @@ -1,30 +1,19 @@ <sect2> <title>Installation of Bash</title> -<para> -Install Bash by running the following commands: -</para> +<para>Install Bash by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --with-curses &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --with-curses &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>logout</userinput> <userinput>mv $LFS/usr/bin/bash $LFS/usr/bin/bashbug $LFS/bin</userinput> -</screen> -</para> +</screen></para> -<para> -The static bash is replaced with the dynamic bash and the chroot'ed -environment is re-entered by running: -</para> +<para>The static bash is replaced with the dynamic bash and the chroot'ed +environment is re-entered by running:</para> -<para> -<screen> -&c6-chrootcmd; -</screen> -</para> +<para><screen>&c6-chrootcmd;</screen></para> </sect2> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 380825a61..43388b039 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-bash"> <title>Installing Bash</title> -<screen> -Estimated build time: &bash-time; -Estimated disk space required: &bash-compsize; -</screen> +<screen>Estimated build time: &bash-time; +Estimated disk space required: &bash-compsize;</screen> &c6-bash-inst; &aa-bash-desc; diff --git a/chapter06/bashprofile.xml b/chapter06/bashprofile.xml index b6543425c..abfed3700 100644 --- a/chapter06/bashprofile.xml +++ b/chapter06/bashprofile.xml @@ -1,22 +1,16 @@ <sect1 id="ch06-bashprofile"> <title>Creating $LFS/root/.bash_profile</title> -<para> -When we have entered the chroot'ed environment in the next section we +<para>When we have entered the chroot'ed environment in the next section we want to export a couple of environment variables in that shell such as PS1, PATH and others variables which are good to have set. For that purpose we'll create the $LFS/root/.bash_profile file which will be read -by bash when we enter the chroot environment. -</para> +by bash when we enter the chroot environment.</para> -<para> -Create a new file <filename>$LFS/root/.bash_profile</filename> -by running the following. -</para> +<para>Create a new file <filename>$LFS/root/.bash_profile</filename> +by running the following.</para> -<para> -<screen> -<userinput>cat > $LFS/root/.bash_profile << "EOF"</userinput> +<para><screen><userinput>cat > $LFS/root/.bash_profile << "EOF"</userinput> # Begin /root/.bash_profile PS1='\u:\w\$ ' @@ -25,16 +19,12 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin export PS1 PATH # End /root/.bash_profile -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -The PS1 variable is an environment variable that controls the appearance of -the command prompt. See the bash man page for details how this variable +<para>The PS1 variable is an environment variable that controls the appearance +of the command prompt. See the bash man page for details how this variable is constructed. Additional environment variables, aliases and so forth that are -needed and/or wanted can be added at your own discretion. -</para> +needed and/or wanted can be added at your own discretion.</para> </sect1> diff --git a/chapter06/bin86-exp.xml b/chapter06/bin86-exp.xml index dd15f0f88..5d0c31040 100644 --- a/chapter06/bin86-exp.xml +++ b/chapter06/bin86-exp.xml @@ -1,13 +1,11 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>make INSTALL_OPTS="-m 755"...</userinput>: The Makefile +<para><userinput>make INSTALL_OPTS="-m 755"...</userinput>: The Makefile declares INSTALL_OPTS="-m 755 -s". The -s parameter causes the install program to invoke the strip program to strip debug symbols from the program. This doesn't work properly because a few files aren't -programs, but shell scripts. The strip program errors on those. -</para> +programs, but shell scripts. The strip program errors on those.</para> </sect2> diff --git a/chapter06/bin86-inst.xml b/chapter06/bin86-inst.xml index cb818beda..34f13b2d1 100644 --- a/chapter06/bin86-inst.xml +++ b/chapter06/bin86-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Bin86</title> -<para> -Install Bin86 by running the following commands: -</para> +<para>Install Bin86 by running the following commands:</para> -<para> -<screen> -<userinput>make &&</userinput> -<userinput>make PREFIX=/usr install</userinput> -</screen> -</para> +<para><screen><userinput>make &&</userinput> +<userinput>make PREFIX=/usr install</userinput></screen></para> </sect2> diff --git a/chapter06/bin86.xml b/chapter06/bin86.xml index 89e1c1a38..c2cf4166c 100644 --- a/chapter06/bin86.xml +++ b/chapter06/bin86.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-bin86"> <title>Installing Bin86</title> -<screen> -Estimated build time: &bin86-time; -Estimated disk space required: &bin86-compsize; -</screen> +<screen>Estimated build time: &bin86-time; +Estimated disk space required: &bin86-compsize;</screen> &c6-bin86-inst; &aa-bin86-desc; diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml index f8ea0860a..1002d09c3 100644 --- a/chapter06/binutils-inst.xml +++ b/chapter06/binutils-inst.xml @@ -1,17 +1,11 @@ <sect2><title>Installation of Binutils</title> -<para> -Install Binutils by running the following commands: -</para> +<para>Install Binutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --enable-shared &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --enable-shared &&</userinput> <userinput>make -e tooldir=/usr &&</userinput> <userinput>make -e tooldir=/usr install &&</userinput> -<userinput>make -e tooldir=/usr install-info</userinput> -</screen> -</para> +<userinput>make -e tooldir=/usr install-info</userinput></screen></para> </sect2> diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index 6747c7a78..58a07f9ab 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-binutils"> <title>Installing Binutils</title> -<screen> -Estimated build time: &binutils-time; -Estimated disk space required: &binutils-compsize; -</screen> +<screen>Estimated build time: &binutils-time; +Estimated disk space required: &binutils-compsize;</screen> &c6-binutils-inst; &aa-binutils-desc; diff --git a/chapter06/bison-exp.xml b/chapter06/bison-exp.xml index 250f345ce..2ba311845 100644 --- a/chapter06/bison-exp.xml +++ b/chapter06/bison-exp.xml @@ -1,10 +1,8 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>--datadir=/usr/share/bison:</userinput> This installs the -bison grammar files in /usr/share/bison rather than /usr/share. -</para> +<para><userinput>--datadir=/usr/share/bison:</userinput> This installs the +bison grammar files in /usr/share/bison rather than /usr/share.</para> </sect2> diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml index 8d83c0bad..d196366f2 100644 --- a/chapter06/bison-inst.xml +++ b/chapter06/bison-inst.xml @@ -1,34 +1,22 @@ <sect2> <title>Installation of Bison</title> -<para> -Install Bison by running the following commands: -</para> +<para>Install Bison by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr \</userinput> +<para><screen><userinput>./configure --prefix=/usr \</userinput> <userinput> --datadir=/usr/share/bison &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -Some programs don't know about bison and try to find the yacc program +<para>Some programs don't know about bison and try to find the yacc program (bison is a (better) alternative for yacc). So to please those few programs out there we'll create a yacc script that calls bison and have -it emulate yacc's output file name conventions). -</para> +it emulate yacc's output file name conventions).</para> -<para> -Create a new file <filename>/usr/bin/yacc</filename> by running the -following: -</para> +<para>Create a new file <filename>/usr/bin/yacc</filename> by running the +following:</para> -<para> -<screen> -<userinput>cat > /usr/bin/yacc << "EOF"</userinput> +<para><screen><userinput>cat > /usr/bin/yacc << "EOF"</userinput> #!/bin/sh # Begin /usr/bin/yacc @@ -36,9 +24,7 @@ following: # End /usr/bin/yacc <userinput>EOF</userinput> -<userinput>chmod 755 /usr/bin/yacc</userinput> -</screen> -</para> +<userinput>chmod 755 /usr/bin/yacc</userinput></screen></para> </sect2> diff --git a/chapter06/bison.xml b/chapter06/bison.xml index 790da35fb..417d18e72 100644 --- a/chapter06/bison.xml +++ b/chapter06/bison.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-bison"> <title>Installing Bison</title> -<screen> -Estimated build time: &bison-time; -Estimated disk space required: &bison-compsize; -</screen> +<screen>Estimated build time: &bison-time; +Estimated disk space required: &bison-compsize;</screen> &c6-bison-inst; &c6-bison-exp; diff --git a/chapter06/bzip2-exp.xml b/chapter06/bzip2-exp.xml index 99eded1d5..327455c97 100644 --- a/chapter06/bzip2-exp.xml +++ b/chapter06/bzip2-exp.xml @@ -1,19 +1,15 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>make -f Makefile-libbz2_so:</userinput> This will cause bzip2 +<para><userinput>make -f Makefile-libbz2_so:</userinput> This will cause bzip2 to be build using a different Makefile file, in this case the Makefile-libbz2_so file which creates a dynamic libbz2.so library and -links the bzip2 utilities against it. -</para> +links the bzip2 utilities against it.</para> -<para> -The reason we don't use <userinput>make install</userinput> is that +<para>The reason we don't use <userinput>make install</userinput> is that bzip2's make install doesn't install the shared libbz2.so, nor the bzip2 binary that's linked against that library. So we have no choice but to -manually install the files. -</para> +manually install the files.</para> </sect2> diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 8a9cc2880..551818ac2 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -1,13 +1,9 @@ <sect2> <title>Installation of Bzip2</title> -<para> -Install Bzip2 by running the following commands: -</para> +<para>Install Bzip2 by running the following commands:</para> -<para> -<screen> -<userinput>make -f Makefile-libbz2_so &&</userinput> +<para><screen><userinput>make -f Makefile-libbz2_so &&</userinput> <userinput>make bzip2recover libbz2.a &&</userinput> <userinput>cp bzip2-shared /bin/bzip2 &&</userinput> <userinput>cp bzip2recover /bin &&</userinput> @@ -21,20 +17,16 @@ Install Bzip2 by running the following commands: <userinput>cd /usr/share/man/man1 &&</userinput> <userinput>ln -s bzip2.1 bunzip2.1 &&</userinput> <userinput>ln -s bzip2.1 bzcat.1 &&</userinput> -<userinput>ln -s bzip2.1 bzip2recover.1</userinput> -</screen> -</para> +<userinput>ln -s bzip2.1 bzip2recover.1</userinput></screen></para> -<para> -Although it's not strictly a part of a basic LFS system it's worth +<para>Although it's not strictly a part of a basic LFS system it's worth mentioning that a patch for Tar can be downloaded which enables the tar program to compress and uncompress using bzip2/bunzip2 easily. With a plain tar a user has to use constructions like bzcat file.tar.bz|tar xv or tar --use-compress-prog=bunzip2 -xvf file.tar.bz2 to use bzip2 and bunzip2 with tar. This patch gives the -y option so a user can unpack a Bzip2 archive with tar xvfy file.tar.bz2. Applying this patch will be -mentioned later on when the Tar package is re-installed. -</para> +mentioned later on when the Tar package is re-installed.</para> </sect2> diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml index dade55e31..7dd130375 100644 --- a/chapter06/bzip2.xml +++ b/chapter06/bzip2.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-bzip2"> <title>Installing Bzip2</title> -<screen> -Estimated build time: &bzip2-time; -Estimated disk space required: &bzip2-compsize; -</screen> +<screen>Estimated build time: &bzip2-time; +Estimated disk space required: &bzip2-compsize;</screen> &c6-bzip2-inst; &c6-bzip2-exp; diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml index c025085dd..59c312f03 100644 --- a/chapter06/chroot.xml +++ b/chapter06/chroot.xml @@ -1,47 +1,33 @@ <sect1 id="ch06-chroot"> <title>Entering the chroot'ed environment</title> -<para> -It's time to enter our chroot'ed environment in order to install the -rest of the software we need. -</para> +<para>It's time to enter our chroot'ed environment in order to install the +rest of the software we need.</para> -<para> -Enter the following commands to enter the chroot'ed environment. From +<para>Enter the following commands to enter the chroot'ed environment. From this point on there's no need to use the $LFS variable anymore, because everything a user does will be restricted to the LFS partition (since / is -actually /mnt/lfs but the shell doesn't know that). -</para> +actually /mnt/lfs but the shell doesn't know that).</para> -<para> -<screen> -&c6-chrootcmd; -</screen> -</para> +<para><screen>&c6-chrootcmd;</screen></para> -<para> -The -i option will clear all environment variables for as long as you +<para>The -i option will clear all environment variables for as long as you are in the chroot'ed environment and only the ROOT and TERM variables are rest. The TERM=$TERM construction will set the $TERM value inside chroot to the same value as outside chroot which is needed for programs like vim and less to operate properly. If you need other variables -present, such as CFLAGS or CXXFLAGS, you need to set them again. -</para> +present, such as CFLAGS or CXXFLAGS, you need to set them again.</para> -<para> -Now that we are inside a chroot'ed environment, we can continue to +<para>Now that we are inside a chroot'ed environment, we can continue to install all the basic system software. You have to make sure all the following commands in this and following chapters are run from within the chroot'ed environment. If you ever leave this environment for any reason (when rebooting for example) please remember to mount $LFS/proc again and re-enter chroot before continuing with the -book. -</para> +book.</para> -<para> -Note that the bash prompt will contain "I have no name!" This is -normal because Glibc hasn't been installed yet. -</para> +<para>Note that the bash prompt will contain "I have no name!" This is +normal because Glibc hasn't been installed yet.</para> </sect1> diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml index f5b9787da..3c5fb97ce 100644 --- a/chapter06/config-glibc.xml +++ b/chapter06/config-glibc.xml @@ -1,20 +1,14 @@ <sect2><title>Configuring Glibc</title> -<para> -We need to create the /etc/nsswitch.conf file. Although glibc should provide -defaults when this file is missing or corrupt, it's defaults don't work +<para>We need to create the /etc/nsswitch.conf file. Although glibc should +provide defaults when this file is missing or corrupt, it's defaults don't work well with networking which will be dealt with in a later chapter. Also, our -timezone needs to be setup. -</para> +timezone needs to be setup.</para> -<para> -Create a new file <filename>/etc/nsswitch.conf</filename> by running the -following: -</para> +<para>Create a new file <filename>/etc/nsswitch.conf</filename> by running the +following:</para> -<para> -<screen> -<userinput>cat > /etc/nsswitch.conf << "EOF"</userinput> +<para><screen><userinput>cat > /etc/nsswitch.conf << "EOF"</userinput> # Begin /etc/nsswitch.conf passwd: files @@ -34,53 +28,29 @@ rpc: db files netgroup: db files # End /etc/nsswitch.conf -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -The <userinput>tzselect</userinput> script has to be run and the questions -regarding your timezone have to be answered. +<para>The <userinput>tzselect</userinput> script has to be run and the +questions regarding your timezone have to be answered. When you're done, the script will give the -location of the needed timezone file. -</para> - -<para> -Create the <filename class="directory">/etc/localtime</filename> symlink -by running: -</para> - -<para> -<screen> -<userinput>cd /etc &&</userinput> -<userinput>ln -sf ../usr/share/zoneinfo/<tzselect's output> localtime</userinput> -</screen> -</para> - -<para> -tzselect's output can be something like <emphasis>EST5EDT</emphasis> or -<emphasis>Canada/Eastern</emphasis>. -</para> - -<para> -The symlink you'd create with that information would be: -</para> - -<para> -<screen> -<userinput>ln -sf ../usr/share/zoneinfo/EST5EDT localtime</userinput> -</screen> -</para> - -<para> -Or: -</para> - -<para> -<screen> -<userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern localtime </userinput> -</screen> -</para> +location of the needed timezone file.</para> + +<para> Create the <filename class="directory">/etc/localtime</filename> symlink +by running:</para> + +<para><screen><userinput>cd /etc &&</userinput> +<userinput>ln -sf ../usr/share/zoneinfo/<tzselect's output> localtime</userinput></screen></para> + +<para>tzselect's output can be something like <emphasis>EST5EDT</emphasis> or +<emphasis>Canada/Eastern</emphasis>.</para> + +<para>The symlink you'd create with that information would be:</para> + +<para><screen><userinput>ln -sf ../usr/share/zoneinfo/EST5EDT localtime</userinput></screen></para> + +<para>Or:</para> + +<para><screen><userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern localtime </userinput></screen></para> </sect2> diff --git a/chapter06/config-ldso.xml b/chapter06/config-ldso.xml index 04fb4960e..7bb4768e8 100644 --- a/chapter06/config-ldso.xml +++ b/chapter06/config-ldso.xml @@ -1,25 +1,19 @@ <sect2> <title>Configuring Dynamic Loader</title> -<para> -By default the dynamic loader searches a few default paths for dynamic +<para>By default the dynamic loader searches a few default paths for dynamic libraries, so there normally isn't a need for the <filename>/etc/ld.so.conf</filename> file unless the system has extra directories in which a user wants the system to search for paths. The <filename class="directory">/usr/local/lib</filename> directory isn't searched through for dynamic libraries by default, so we want to add this path so when you install software you won't be surprised by them not -running for some reason. -</para> +running for some reason.</para> -<para> -Create a new file <filename>/etc/ld.so.conf</filename> by running the -following: -</para> +<para>Create a new file <filename>/etc/ld.so.conf</filename> by running the +following:</para> -<para> -<screen> -<userinput>cat > /etc/ld.so.conf << "EOF"</userinput> +<para><screen><userinput>cat > /etc/ld.so.conf << "EOF"</userinput> # Begin /etc/ld.so.conf /lib @@ -27,17 +21,13 @@ following: /usr/local/lib # End /etc/ld.so.conf -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -Although it's not necessary to add the +<para>Although it's not necessary to add the <filename class="directory">/lib</filename> and <filename class="directory">/usr/lib</filename> directories it doesn't hurt. This way it can be seen right away what's being searched and a you -don't have to remember the default search paths if you don't want to. -</para> +don't have to remember the default search paths if you don't want to.</para> </sect2> diff --git a/chapter06/config-shadowpwd.xml b/chapter06/config-shadowpwd.xml index 8202c12bb..e3b0237c9 100644 --- a/chapter06/config-shadowpwd.xml +++ b/chapter06/config-shadowpwd.xml @@ -1,25 +1,17 @@ <sect2><title>Configuring Shadow Password Suite</title> -<para> -This package contains the utilities to modify user's passwords, add new +<para>This package contains the utilities to modify user's passwords, add new users/groups, delete users/groups and more. We're not going to explain what 'password shadowing' means. All about that can be read in the doc/HOWTO file within the unpacked shadow password suite's source tree. There's one thing you should keep in mind, if you decide to use shadow support, that programs that need to verify passwords (examples are xdm, ftp daemons, pop3 daemons, etc) need to be 'shadow-compliant', eg. they need to -be able to work with shadow'ed passwords. -</para> +be able to work with shadow'ed passwords.</para> -<para> -To enable shadow'ed passwords, run the following command: -</para> +<para>To enable shadow'ed passwords, run the following command:</para> -<para> -<screen> -<userinput>/usr/sbin/pwconv</userinput> -</screen> -</para> +<para><screen><userinput>/usr/sbin/pwconv</userinput></screen></para> </sect2> diff --git a/chapter06/config-sysklogd.xml b/chapter06/config-sysklogd.xml index 3b52725e3..37ca8fbdd 100644 --- a/chapter06/config-sysklogd.xml +++ b/chapter06/config-sysklogd.xml @@ -1,13 +1,9 @@ <sect2><title>Configuring Sysklogd</title> -<para> -Create a new file <filename>/etc/syslog.conf</filename> by running the -following: -</para> +<para>Create a new file <filename>/etc/syslog.conf</filename> by running the +following:</para> -<para> -<screen> -<userinput>cat > /etc/syslog.conf << "EOF"</userinput> +<para><screen><userinput>cat > /etc/syslog.conf << "EOF"</userinput> # Begin /etc/syslog.conf auth,authpriv.* -/var/log/auth.log @@ -19,9 +15,7 @@ user.* -/var/log/user.log *.emerg * # End /etc/syslog.conf -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect2> diff --git a/chapter06/config-sysvinit.xml b/chapter06/config-sysvinit.xml index bbb2ae51a..11f0ffabd 100644 --- a/chapter06/config-sysvinit.xml +++ b/chapter06/config-sysvinit.xml @@ -1,13 +1,9 @@ <sect2><title>Configuring Sysvinit</title> -<para> -Create a new file <filename>/etc/inittab</filename> by running the -following: -</para> - -<para> -<screen> -<userinput>cat > /etc/inittab << "EOF"</userinput> +<para>Create a new file <filename>/etc/inittab</filename> by running the +following:</para> + +<para><screen><userinput>cat > /etc/inittab << "EOF"</userinput> # Begin /etc/inittab id:3:initdefault: @@ -34,9 +30,7 @@ su:S016:respawn:/sbin/sulogin 6:2345:respawn:/sbin/agetty tty6 9600 # End /etc/inittab -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect2> diff --git a/chapter06/config-vim.xml b/chapter06/config-vim.xml index 172d67ffc..ee4124a2f 100644 --- a/chapter06/config-vim.xml +++ b/chapter06/config-vim.xml @@ -1,24 +1,18 @@ <sect2><title>Configuring Vim</title> -<para> -By default Vim runs in vi compatible mode. Some people might like this, +<para>By default Vim runs in vi compatible mode. Some people might like this, but we have a high preference to run vim in vim mode (else we wouldn't have included Vim in this book but the original Vi). Create the -<filename>/root/.vimrc</filename> by running the following: -</para> +<filename>/root/.vimrc</filename> by running the following:</para> -<para> -<screen> -<userinput>cat > /root/.vimrc << "EOF"</userinput> +<para><screen><userinput>cat > /root/.vimrc << "EOF"</userinput> " Begin /root/.vimrc set nocompatible set bs=2 " End /root/.vimrc -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect2> diff --git a/chapter06/configure.xml b/chapter06/configure.xml index 207597b95..2487f3536 100644 --- a/chapter06/configure.xml +++ b/chapter06/configure.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-configure"> <title>Configuring essential software</title> -<para> -Now that all software is installed, all that we need to do to get a few -programs running properly is to create their configuration files. -</para> +<para>Now that all software is installed, all that we need to do to get a few +programs running properly is to create their configuration files.</para> &c6-cf-vim; &c6-cf-glibc; diff --git a/chapter06/create-password.xml b/chapter06/create-password.xml index 7bbde76f9..d8e182d5f 100644 --- a/chapter06/create-password.xml +++ b/chapter06/create-password.xml @@ -1,16 +1,10 @@ <sect2> <title>Creating root password</title> -<para> -Choose a password for user root and create it by running the following -command: -</para> +<para>Choose a password for user root and create it by running the following +command:</para> -<para> -<screen> -<userinput>passwd root</userinput> -</screen> -</para> +<para><screen><userinput>passwd root</userinput></screen></para> </sect2> diff --git a/chapter06/create-utmp.xml b/chapter06/create-utmp.xml index 93a94fb75..3c8dcd756 100644 --- a/chapter06/create-utmp.xml +++ b/chapter06/create-utmp.xml @@ -2,27 +2,19 @@ <title>Creating the /var/run/utmp, /var/log/wtmp and /var/log/btmp files</title> -<para> -Programs like login, shutdown, uptime and others want to read from and write -to the /var/run/utmp /var/log/btmp and /var/log/wtmp. These files contain +<para>Programs like login, shutdown, uptime and others want to read from and +write to the /var/run/utmp /var/log/btmp and /var/log/wtmp. These files contain information about who is currently logged in. It also contains information on when the computer was last booted and shutdown and a record of the -bad login attempts. -</para> +bad login attempts.</para> -<para> -Create these files with their proper permissions by running the -following commands: -</para> +<para>Create these files with their proper permissions by running the +following commands:</para> -<para> -<screen> -<userinput>touch /var/run/utmp /var/log/wtmp \</userinput> +<para><screen><userinput>touch /var/run/utmp /var/log/wtmp \</userinput> <userinput> /var/log/btmp /var/log/lastlog &&</userinput> <userinput>chmod 644 /var/run/utmp /var/log/wtmp \</userinput> -<userinput> /var/log/btmp /var/log/lastlog</userinput> -</screen> -</para> +<userinput> /var/log/btmp /var/log/lastlog</userinput></screen></para> </sect2> diff --git a/chapter06/diffutils-inst.xml b/chapter06/diffutils-inst.xml index 7b3bf5ecd..527866a22 100644 --- a/chapter06/diffutils-inst.xml +++ b/chapter06/diffutils-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Diffutils</title> -<para> -Install Diffutils by running the following commands: -</para> +<para>Install Diffutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index d11ba845e..13e39bb68 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -1,10 +1,8 @@ <sect1 id="diffutils"> <title>Installing Diffutils</title> -<screen> -Estimated build time: &diffutils-time; -Estimated disk space required: &diffutils-compsize; -</screen> +<screen>Estimated build time: &diffutils-time; +Estimated disk space required: &diffutils-compsize;</screen> &c6-diffutils-inst; &aa-diffutils-desc; diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml index 39c263be4..4843a3554 100644 --- a/chapter06/e2fsprogs-inst.xml +++ b/chapter06/e2fsprogs-inst.xml @@ -1,25 +1,17 @@ <sect2> <title>Installation of E2fsprogs</title> -<para> -Install E2fsprogs by running the following commands: -</para> +<para>Install E2fsprogs by running the following commands:</para> -<para> -Please note that the empty --with-root-prefix= option below is supposed -to be like this. We did not forget to supply a value there. -</para> +<para>Please note that the empty --with-root-prefix= option below is supposed +to be like this. We did not forget to supply a value there.</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --with-root-prefix= \</userinput> +<para><screen><userinput>./configure --prefix=/usr --with-root-prefix= \</userinput> <userinput> --enable-elf-shlibs &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>make install-libs &&</userinput> -<userinput>mv /usr/sbin/mklost+found /sbin</userinput> -</screen> -</para> +<userinput>mv /usr/sbin/mklost+found /sbin</userinput></screen></para> </sect2> diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 6c25f63ff..d9921b7ed 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-e2fsprogs"> <title>Installing E2fsprogs</title> -<screen> -Estimated build time: &e2fsprogs-time; -Estimated disk space required: &e2fsprogs-compsize; -</screen> +<screen>Estimated build time: &e2fsprogs-time; +Estimated disk space required: &e2fsprogs-compsize;</screen> &c6-e2fsprogs-inst; &aa-e2fsprogs-desc; diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml index 8c582413f..4e896a9cc 100644 --- a/chapter06/ed-inst.xml +++ b/chapter06/ed-inst.xml @@ -1,18 +1,12 @@ <sect2> <title>Installation of Ed</title> -<para> -Install Ed by running the following commands: -</para> +<para>Install Ed by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput> -</screen> -</para> +<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput></screen></para> </sect2> diff --git a/chapter06/ed.xml b/chapter06/ed.xml index 3ac799728..c43bc1f12 100644 --- a/chapter06/ed.xml +++ b/chapter06/ed.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-ed"> <title>Installing Ed</title> -<screen> -Estimated build time: &ed-time; -Estimated disk space required: &ed-compsize; -</screen> +<screen>Estimated build time: &ed-time; +Estimated disk space required: &ed-compsize;</screen> &c6-ed-inst; &aa-ed-desc; diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml index 0a084a542..f300117e4 100644 --- a/chapter06/file-inst.xml +++ b/chapter06/file-inst.xml @@ -1,22 +1,16 @@ <sect2> <title>Installation of File</title> -<para> -Install File by running the following commands: -</para> +<para>Install File by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --datadir=/usr/share/misc &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --datadir=/usr/share/misc &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -File uses magic numbers to determine a file type. These magic numbers come with -File in a plain text file. File internally compiles this database each time it -is run. This is not the normal type of operation for File since compiling a +<para>File uses magic numbers to determine a file type. These magic numbers +come with File in a plain text file. File internally compiles this database +each time it is run. This is not the normal type of operation for File since +compiling a plain text file each time is not the fastest way to do it. File offers an option "-C" to compile this magic number file. The reason this isn't done automatically is that some people like to work on the magic numbers. On the @@ -24,14 +18,9 @@ other hand many people didn't get it that they should compile the magic numbers, so the author of File added a warning when the plain text magic file is used. As we usually won't work on the plain text magic file, we compile this file, because it's faster, fixes that annoying warning and is how -it was meant to be: -</para> +it was meant to be:</para> -<para> -<screen> -<userinput>file -C</userinput> -</screen> -</para> +<para><screen><userinput>file -C</userinput></screen></para> </sect2> diff --git a/chapter06/file.xml b/chapter06/file.xml index 9125c8f2f..ed2d3a9df 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-file"> <title>Installing File</title> -<screen> -Estimated build time: &file-time; -Estimated disk space required: &file-compsize; -</screen> +<screen>Estimated build time: &file-time; +Estimated disk space required: &file-compsize;</screen> &c6-file-inst; &aa-file-desc; diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml index aa882500c..4374d77b7 100644 --- a/chapter06/fileutils-inst.xml +++ b/chapter06/fileutils-inst.xml @@ -1,18 +1,12 @@ <sect2> <title>Installation of Fileutils</title> -<para> -Install Fileutils by running the following commands: -</para> +<para>Install Fileutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --bindir=/bin \</userinput> +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin \</userinput> <userinput> --libexecdir=/bin &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/fileutils.xml b/chapter06/fileutils.xml index 6929da0eb..a3a2fea84 100644 --- a/chapter06/fileutils.xml +++ b/chapter06/fileutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-fileutils"> <title>Installing Fileutils</title> -<screen> -Estimated build time: &fileutils-time; -Estimated disk space required: &fileutils-compsize; -</screen> +<screen>Estimated build time: &fileutils-time; +Estimated disk space required: &fileutils-compsize;</screen> &c6-fileutils-inst; &aa-fileutils-desc; diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml index 167930c3a..ea032aa63 100644 --- a/chapter06/findutils-inst.xml +++ b/chapter06/findutils-inst.xml @@ -1,22 +1,15 @@ <sect2> <title>Installing Findutils</title> -<para> -Before Findutils is installed the findutils patch file has to be unpacked. -</para> +<para>Before Findutils is installed the findutils patch file has +to be unpacked.</para> -<para> -Install Findutils by running the following commands: -</para> +<para>Install Findutils by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../findutils-4.1.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make libexecdir=/usr/bin install</userinput> -</screen> -</para> +<userinput>make libexecdir=/usr/bin install</userinput></screen></para> </sect2> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index 8e5d11660..2567d3c17 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-findutils"> <title>Installing Findutils</title> -<screen> -Estimated build time: &findutils-time; -Estimated disk space required: &findutils-compsize; -</screen> +<screen>Estimated build time: &findutils-time; +Estimated disk space required: &findutils-compsize;</screen> &c6-findutils-inst; &aa-findutils-desc; diff --git a/chapter06/flex-inst.xml b/chapter06/flex-inst.xml index efe1801bc..fedd2dc5e 100644 --- a/chapter06/flex-inst.xml +++ b/chapter06/flex-inst.xml @@ -1,19 +1,13 @@ <sect2> <title>Installation of Flex</title> -<para> -Install Flex by running the following commands: -</para> +<para>Install Flex by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s flex lex</userinput> -</screen> -</para> +<userinput>ln -s flex lex</userinput></screen></para> </sect2> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 2c8ea0647..07257cf35 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-flex"> <title>Installing Flex</title> -<screen> -Estimated build time: &flex-time; -Estimated disk space required: &flex-compsize; -</screen> +<screen>Estimated build time: &flex-time; +Estimated disk space required: &flex-compsize;</screen> &c6-flex-inst; &aa-flex-desc; diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index c4d77b0af..97e64cc2c 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -1,31 +1,23 @@ <sect2> <title>Installation of GCC</title> -<para> -Install GCC by running the following commands. These commands will build +<para>Install GCC by running the following commands. These commands will build the C and C++ compiler. Other compilers are available within the gcc package. If you want to build all the other availble compilers too, leave out the --enable-languages=c,c++ option in the configure command. See the GCC documentation for more details on which additional compilers -are available. -</para> +are available.</para> -<para> -Note: the build of other compilers is not tested by the people -who actively work on LFS. -</para> +<para>Note: the build of other compilers is not tested by the people +who actively work on LFS.</para> -<para> -<screen> -<userinput>mkdir ../gcc-build &&</userinput> +<para><screen><userinput>mkdir ../gcc-build &&</userinput> <userinput>cd ../gcc-build &&</userinput> <userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput> <userinput> --with-slibdir=/lib --enable-shared \</userinput> <userinput> --enable-languages=c,c++ &&</userinput> <userinput>make bootstrap &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 654292101..0c85e10b3 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-gcc"> <title>Installing GCC</title> -<screen> -Estimated build time: &gcc-time; -Estimated disk space required: &gcc-compsize; -</screen> +<screen>Estimated build time: &gcc-time; +Estimated disk space required: &gcc-compsize;</screen> &c6-gcc-inst; &aa-gcc-desc; diff --git a/chapter06/gettext-inst.xml b/chapter06/gettext-inst.xml index 25f3f58fa..384ced5c5 100644 --- a/chapter06/gettext-inst.xml +++ b/chapter06/gettext-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Gettext</title> -<para> -Install Gettext by running the following commands: -</para> +<para>Install Gettext by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index 5912a9313..96a2f17fe 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-gettext"> <title>Installing Gettext</title> -<screen> -Estimated build time: &gettext-time; -Estimated disk space required: &gettext-compsize; -</screen> +<screen>Estimated build time: &gettext-time; +Estimated disk space required: &gettext-compsize;</screen> &c6-gettext-inst; &aa-gettext-desc; diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml index 05803155a..36eb6864c 100644 --- a/chapter06/glibc-exp.xml +++ b/chapter06/glibc-exp.xml @@ -1,62 +1,48 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>mknod -m 0666 /dev/null c 1 3:</userinput> Glibc needs a +<para><userinput>mknod -m 0666 /dev/null c 1 3:</userinput> Glibc needs a null device to compile properly. All other devices will be created in the -next section. -</para> +next section.</para> -<para> -<userinput>touch /etc/ld.so.conf</userinput> One of the final steps of +<para><userinput>touch /etc/ld.so.conf</userinput> One of the final steps of the Glibc installation is running ldconfig to update the dynamic loader cache. If this file isn't present Glibc will abort with an error that it can't read the file. So we create an empty file for it (the empty file -will have Glibc default to using /lib and /usr/lib which is fine right now). -</para> +will have Glibc default to using /lib and +/usr/lib which is fine right now).</para> -<para> -<userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ +<para><userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ ../glibc-2.2.3/malloc/Makefile > tmp~:</userinput> This sed command searches through <filename>../glibc-2.2.3/malloc/Makefile</filename> and converts all occurances of <filename>$(PERL)</filename> to <filename>/usr/bin/perl</filename>. The output is then written to the file <filename>tmp~</filename>. This is done because Glibc can't autodetect perl since it's not installed yet at the time when we install -Glibc. -</para> +Glibc.</para> -<para> -<userinput>mv tmp~ ../glibc-2.2.3/malloc/Makefile:</userinput> The file +<para><userinput>mv tmp~ ../glibc-2.2.3/malloc/Makefile:</userinput> The file <filename>tmp~</filename> is now moved back to <filename>../glibc-2.2.3/malloc/Makefile</filename>. We do this because when using sed, we can't write straight back to this file so we need to -use a temporary file in between. -</para> +use a temporary file in between.</para> -<para> -<userinput>sed "s/root/0" ../glibc-2.2.3/login/Makefile > +<para><userinput>sed "s/root/0" ../glibc-2.2.3/login/Makefile > tmp~:</userinput> This sed command replaces all occurances of <filename>root</filename> in <filename>../glibc-2.2.3/login/Makefile</filename> with 0. This is because as we don't have glibc on the LFS system yet, usernames can't be resolved to their user id's. Therefore, we replace the username -root with the id 0. -</para> +root with the id 0. </para> -<para> -<userinput>mv tmp~ ../glibc-2.2.3/login/Makefile:</userinput> As above, +<para><userinput>mv tmp~ ../glibc-2.2.3/login/Makefile:</userinput> As above, we are using a temporary file (<filename>tmp~</filename>) to store the -edited Makefile and then copying it back over the original. -</para> +edited Makefile and then copying it back over the original.</para> -<para> -<userinput>--enable-add-ons:</userinput> This enables the add-on that -we install with Glibc: linuxthreads -</para> +<para><userinput>--enable-add-ons:</userinput> This enables the add-on that +we install with Glibc: linuxthreads</para> -<para> -<userinput>sed s/"cross-compiling = yes"/"cross-compiling = no"/ +<para><userinput>sed s/"cross-compiling = yes"/"cross-compiling = no"/ config.make > config.make~:</userinput> This time, we're replacing <filename>cross-compiling = yes</filename> with <filename>cross-compiling = no</filename>. We do this because we are @@ -65,13 +51,10 @@ instance, to build a package for an Apple Power PC on an Intel system. The reason Glibc thinks we're cross-compiling is that it can't compile a test program to determin this, so it automatically default to a cross-compiler. The reason for the failed program is because Glibc -hasn't been installed yet. -</para> +hasn't been installed yet.</para> -<para> -<userinput>mv config.make~ config.make:</userinput> Again, we are moving -the temporary file over the original. -</para> +<para><userinput>mv config.make~ config.make:</userinput> Again, we are moving +the temporary file over the original.</para> </sect2> diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index c83cd5779..a280f91d0 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -1,20 +1,14 @@ <sect2> <title>Installation of Glibc</title> -<para> -Once glibc has been unpacked as usual and you have cd'ed into the +<para>Once glibc has been unpacked as usual and you have cd'ed into the glibc-&glibc-version; directory, unpack glibc-linuxthreads inside the glibc-&glibc-version; directory, not in /usr/src as you normally -would do. -</para> +would do.</para> -<para> -Install Glibc by running the following commands: -</para> +<para>Install Glibc by running the following commands:</para> -<para> -<screen> -<userinput>mknod -m 0666 /dev/null c 1 3 &&</userinput> +<para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &&</userinput> <userinput>touch /etc/ld.so.conf &&</userinput> <userinput>mkdir ../glibc-build &&</userinput> <userinput>cd ../glibc-build &&</userinput> @@ -31,46 +25,30 @@ Install Glibc by running the following commands: <userinput>mv config.make~ config.make &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>make localedata/install-locales</userinput> -</screen> -</para> +<userinput>make localedata/install-locales</userinput></screen></para> -<para> -During the configure stage you will see the following warning: -</para> +<para>During the configure stage you will see the following warning:</para> -<blockquote><screen> -configure: warning: +<blockquote><screen>configure: warning: *** An auxiliary program is missing or too old; *** some features will be disabled. -*** Check the INSTALL file for required versions. -</screen></blockquote> +*** Check the INSTALL file for required versions.</screen></blockquote> -<para> -This warning refers to the missing msgfmt program from the gettext +<para>This warning refers to the missing msgfmt program from the gettext package. But there is nothing to worry about: Glib will still be installed the same way as when msgfmt is present. It can safely be -ignored in our case. -</para> +ignored in our case.</para> -<para> -By exiting the chroot'ed environment and re-entering it, you will be +<para>By exiting the chroot'ed environment and re-entering it, you will be able to get rid of the "I have no name!" message in the command prompt, which is caused by bash's inability to resolve a userid to a username. You don't have to exit and re-enter chroot, but it's highly recommended -to ensure a properly working bash. -</para> +to ensure a properly working bash.</para> -<para> -Run the following commands to accomplish this: -</para> +<para>Run the following commands to accomplish this:</para> -<para> -<screen> -<userinput>logout</userinput> -&c6-chrootcmd; -</screen> -</para> +<para><screen><userinput>logout</userinput> +&c6-chrootcmd;</screen></para> </sect2> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index b6a0152ea..0440191e5 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-glibc"> <title>Installing Glibc</title> -<screen> -Estimated build time: &glibc-time; -Estimated disk space required: &glibc-compsize; -</screen> +<screen>Estimated build time: &glibc-time; +Estimated disk space required: &glibc-compsize;</screen> &c6-glibc-inst; &c6-glibc-exp; diff --git a/chapter06/grep-inst.xml b/chapter06/grep-inst.xml index 477df7476..43dababa1 100644 --- a/chapter06/grep-inst.xml +++ b/chapter06/grep-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Grep</title> -<para> -Install Grep by running the following commands: -</para> +<para>Install Grep by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/grep.xml b/chapter06/grep.xml index 354545858..341fa4cae 100644 --- a/chapter06/grep.xml +++ b/chapter06/grep.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-grep"> <title>Installing Grep</title> -<screen> -Estimated build time: &grep-time; -Estimated disk space required: &grep-compsize; -</screen> +<screen>Estimated build time: &grep-time; +Estimated disk space required: &grep-compsize;</screen> &c6-grep-inst; &aa-grep-desc; diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml index 5a00d4fd8..7f7d16fad 100644 --- a/chapter06/groff-inst.xml +++ b/chapter06/groff-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Groff</title> -<para> -Install Groff by running the following commands: -</para> +<para>Install Groff by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 7228dbbb6..e32cdd7e7 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-groff"> <title>Installing Groff</title> -<screen> -Estimated build time: &groff-time; -Estimated disk space required: &groff-compsize; -</screen> +<screen>Estimated build time: &groff-time; +Estimated disk space required: &groff-compsize;</screen> &c6-groff-inst; &aa-groff-desc; diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml index 08b03a3a7..5c59c88c1 100644 --- a/chapter06/gzip-inst.xml +++ b/chapter06/gzip-inst.xml @@ -1,13 +1,9 @@ <sect2> <title>Installation of Gzip</title> -<para> -Install Gzip by running the following commands: -</para> +<para>Install Gzip by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> @@ -17,9 +13,7 @@ Install Gzip by running the following commands: <userinput>ln -sf gzip gunzip &&</userinput> <userinput>ln -s gzip zcat &&</userinput> <userinput>ln -s gzip compress &&</userinput> -<userinput>ln -s gunzip uncompress</userinput> -</screen> -</para> +<userinput>ln -s gunzip uncompress</userinput></screen></para> </sect2> diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index 9ce0e3ee2..cdf1d7385 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-gzip"> <title>Installing Gzip</title> -<screen> -Estimated build time: &gzip-time; -Estimated disk space required: &gzip-compsize; -</screen> +<screen>Estimated build time: &gzip-time; +Estimated disk space required: &gzip-compsize;</screen> &c6-gzip-inst; &aa-gzip-desc; diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml index 3c3c68ee6..f915875aa 100644 --- a/chapter06/introduction.xml +++ b/chapter06/introduction.xml @@ -1,26 +1,21 @@ <sect1 id="ch06-introduction"> <title>Introduction</title> -<para> -The installation of all the software is pretty straightforward and +<para>The installation of all the software is pretty straightforward and you will probably think it's so much easier and shorter to give the generic installation instructions for each package and only explain how to install something if a certain package requires an alternate installation method. Although I agree on that, I choose to give the full instructions for each and every package. This is simply to avoid any -possible confusion and errors. -</para> +possible confusion and errors.</para> -<para> -Now would be a good time to take a look at the optimization hint at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/optimization.txt"> -http://archive.linuxfromscratch.org/lfs-hints/optimization.txt</ulink> +<para>Now would be a good time to take a look at the optimization hint at <ulink +url="http://archive.linuxfromscratch.org/lfs-hints/optimization.txt">http://archive.linuxfromscratch.org/lfs-hints/optimization.txt</ulink> if you plan on using compiler optimization for the packages installed in the following chapter. Compiler optimization can make a program run faster, but may also cause some compilation problems. If you run into problems after having used optimization, always try it without optimizing to see if you -can reproduce the problem. -</para> +can reproduce the problem.</para> </sect1> diff --git a/chapter06/kbd-exp.xml b/chapter06/kbd-exp.xml index 3fa90eb34..e00d4b751 100644 --- a/chapter06/kbd-exp.xml +++ b/chapter06/kbd-exp.xml @@ -1,23 +1,18 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>--datadir=/usr/share/kbd:</userinput> This puts the kbd data files -(fonts, keymaps, and such) in the /usr/share/kbd directory, as the FHS -suggests. -</para> +<para><userinput>--datadir=/usr/share/kbd:</userinput> This puts the kbd +data files (fonts, keymaps, and such) in the /usr/share/kbd directory, as +the FHS suggests.</para> -<para> -<userinput>rm +<para><userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz:</userinput> We -remove this file because we don't know which keymap you need to use. -</para> +remove this file because we don't know which keymap you +need to use.</para> -<para> -<userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput> +<para><userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput> With this command you set the default keymap that can be loaded using -the <userinput>loadkeys -d</userinput> command. -</para> +the <userinput>loadkeys -d</userinput> command.</para> </sect2> diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml index b6b8e1aec..1733fb310 100644 --- a/chapter06/kbd-inst.xml +++ b/chapter06/kbd-inst.xml @@ -1,38 +1,24 @@ <sect2> <title>Installation of Kbd</title> -<para> -Install Kbd by running the following commands: -</para> +<para>Install Kbd by running the following commands:</para> -<para> -<screen> -<userinput>./configure --datadir=/usr/share/kbd &&</userinput> +<para><screen><userinput>./configure --datadir=/usr/share/kbd &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput> -</screen> -</para> +<userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput></screen></para> -<para> -Now we have to choose a default keymap. Explore the +<para>Now we have to choose a default keymap. Explore the /usr/share/kbd/keymaps directory, and find the keymap that you would like to use -as a default. Then execute this command: -</para> +as a default. Then execute this command:</para> -<para> -<screen> -<userinput>cd /usr/share/kbd/keymaps &&</userinput> -<userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput> -</screen> -</para> +<para><screen><userinput>cd /usr/share/kbd/keymaps &&</userinput> +<userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput></screen></para> -<para> -Replace <userinput><path-to-keymap></userinput> with the path to the +<para>Replace <userinput><path-to-keymap></userinput> with the path to the keymap you have selected, relative to the /usr/share/kbd/keymaps/ directory. For example, if you have chosen the US keymap, you would replace it with -i386/qwerty/us.map.gz. -</para> +i386/qwerty/us.map.gz.</para> </sect2> diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index 5857bd2c2..d4e109959 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-kbd"> <title>Installing Kbd</title> -<screen> -Estimated build time: &kbd-time; -Estimated disk space required: &kbd-compsize; -</screen> +<screen>Estimated build time: &kbd-time; +Estimated disk space required: &kbd-compsize;</screen> &c6-kbd-inst; &c6-kbd-exp; diff --git a/chapter06/less-inst.xml b/chapter06/less-inst.xml index 1750d22ec..0a1edeaa0 100644 --- a/chapter06/less-inst.xml +++ b/chapter06/less-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Less</title> -<para> -Install Less by running the following commands: -</para> +<para>Install Less by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/less.xml b/chapter06/less.xml index b723f9122..40d126121 100644 --- a/chapter06/less.xml +++ b/chapter06/less.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-less"> <title>Installing Less</title> -<screen> -Estimated build time: &less-time; -Estimated disk space required: &less-compsize; -</screen> +<screen>Estimated build time: &less-time; +Estimated disk space required: &less-compsize;</screen> &c6-less-inst; &aa-less-desc; diff --git a/chapter06/libtool-inst.xml b/chapter06/libtool-inst.xml index 8e5333702..c0c861846 100644 --- a/chapter06/libtool-inst.xml +++ b/chapter06/libtool-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Libtool</title> -<para> -Install Libtool by running the following commands: -</para> +<para>Install Libtool by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml index 94135e34d..fc4536b47 100644 --- a/chapter06/libtool.xml +++ b/chapter06/libtool.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-libtool"> <title>Installing Libtool</title> -<screen> -Estimated build time: &libtool-time; -Estimated disk space required: &libtool-compsize; -</screen> +<screen>Estimated build time: &libtool-time; +Estimated disk space required: &libtool-compsize;</screen> &c6-libtool-inst; &aa-libtool-desc; diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml index e4c8a2b13..03c1eb6c1 100644 --- a/chapter06/lilo-inst.xml +++ b/chapter06/lilo-inst.xml @@ -1,45 +1,32 @@ <sect2> <title>Installation of Lilo</title> -<para> -We have chosen Lilo because we feel confortable with it, but you may wish to -take a look elsewhere. Someone has written a hint on GRUB at<ulink -url="http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt"> -http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt</ulink>, - an alternative boot loader. -</para> - -<para> -Install Lilo by running the following commands: -</para> - -<para> -<screen> -<userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> - -<para> -It appears that compilation of this package fails on certain machines +<para>We have chosen Lilo because we feel confortable with it, but you +may wish to take a look elsewhere. Someone has written a hint on +GRUB at<ulink +url="http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt">http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt</ulink>, + an alternative boot loader.</para> + +<para>Install Lilo by running the following commands:</para> + +<para><screen><userinput>make &&</userinput> +<userinput>make install</userinput></screen></para> + +<para>It appears that compilation of this package fails on certain machines when the -g compiler flag is being used. If you can't compile Lilo at all, you should try to remove the -g value from the CFLAGS variable in the -<filename>Makefile</filename> file. -</para> +<filename>Makefile</filename> file.</para> -<para> -At the end of the installation the make install process will print a +<para>At the end of the installation the make install process will print a message stating that /sbin/lilo has to be executed to complete the update. Don't do this as it has no use. The /etc/lilo.conf isn't present -yet. We will complete the installation of lilo in chapter 8. -</para> - -<para> -Maybe you'll be interested to know that someone wrote a hint on how to get a -logo instead the the standard LILO prompt or menu. Take a look at it at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/bootlogo.txt"> -http://archive.linuxfromscratch.org/lfs-hints/bootlogo.txt</ulink>. -</para> +yet. We will complete the installation of lilo in chapter 8.</para> + +<para>Maybe you'll be interested to know that someone wrote a hint on +how to get a logo instead the the standard LILO prompt or menu. Take +a look at it at <ulink +url="http://archive.linuxfromscratch.org/lfs-hints/bootlogo.txt">http://archive.linuxfromscratch.org/lfs-hints/bootlogo.txt</ulink> +.</para> </sect2> diff --git a/chapter06/lilo.xml b/chapter06/lilo.xml index 33325f63d..be10b0b86 100644 --- a/chapter06/lilo.xml +++ b/chapter06/lilo.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-lilo"> <title>Installing Lilo</title> -<screen> -Estimated build time: &lilo-time; -Estimated disk space required: &lilo-compsize; -</screen> +<screen>Estimated build time: &lilo-time; +Estimated disk space required: &lilo-compsize;</screen> &c6-lilo-inst; &aa-lilo-desc; diff --git a/chapter06/m4-inst.xml b/chapter06/m4-inst.xml index 3c20e2a6e..86371eaa5 100644 --- a/chapter06/m4-inst.xml +++ b/chapter06/m4-inst.xml @@ -1,20 +1,13 @@ <sect2> <title>Installation of M4</title> -<para> -Install M4 by running the following commands: -</para> +<para>Install M4 by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -If the base system is running a 2.0 kernel and the Glibc version is +<para>If the base system is running a 2.0 kernel and the Glibc version is 2.1 then you will most likely get problems executing M4 in the chroot'ed environment due to incompatibilities between the M4 program, Glibc-2.1 and the running 2.0 kernel. If you have problems executing the @@ -23,36 +16,23 @@ the autoconf and automake packages) you'll have to exit the chroot'ed environment and compile M4 statically. This way the binary is linked against Glibc 2.0 (if he runs kernel 2.0, Glibc version is 2.0 as well on a decent system. Kernel 2.0 and Glibc-2.1 don't mix very well) -and won't give any problems. -</para> +and won't give any problems.</para> -<para> -To create a statically linked version of M4, execute the following -commands: -</para> +<para>To create a statically linked version of M4, execute the following +commands:</para> -<para> -<screen> -<userinput>logout</userinput> +<para><screen><userinput>logout</userinput> <userinput>cd $LFS/usr/src/m4-1.4</userinput> <userinput>./configure --prefix=/usr</userinput> <userinput>make LDFLAGS=-static</userinput> -<userinput>make prefix=$LFS/usr install</userinput> -</screen> -</para> +<userinput>make prefix=$LFS/usr install</userinput></screen></para> -<para> -Now the chroot'ed environment can be re-entered and the +<para>Now the chroot'ed environment can be re-entered and the next package an be installed. If M4 should be re-compiled dynamically, -this can be done -after having rebooted into the LFS system rather than chrooting into it. -</para> - -<para> -<screen> -&c6-chrootcmd; -</screen> -</para> +this can be done after having rebooted into the LFS system +rather than chrooting into it.</para> + +<para><screen>&c6-chrootcmd;</screen></para> </sect2> diff --git a/chapter06/m4.xml b/chapter06/m4.xml index ab1b8ce8e..ff03d2e44 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-m4"> <title>Installing M4</title> -<screen> -Estimated build time: &m4-time; -Estimated disk space required: &m4-compsize; -</screen> +<screen>Estimated build time: &m4-time; +Estimated disk space required: &m4-compsize;</screen> &c6-m4-inst; &aa-m4-desc; diff --git a/chapter06/make-inst.xml b/chapter06/make-inst.xml index ebf668ae6..bf818f27c 100644 --- a/chapter06/make-inst.xml +++ b/chapter06/make-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Make</title> -<para> -Install Make by running the following commands: -</para> +<para>Install Make by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/make.xml b/chapter06/make.xml index 4d90cf0ea..202fe7dd9 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-make"> <title>Installing Make</title> -<screen> -Estimated build time: &make-time; -Estimated disk space required: &make-compsize; -</screen> +<screen>Estimated build time: &make-time; +Estimated disk space required: &make-compsize;</screen> &c6-make-inst; &aa-make-desc; diff --git a/chapter06/makedev-exp.xml b/chapter06/makedev-exp.xml index 7fd515b6c..12c9287b1 100644 --- a/chapter06/makedev-exp.xml +++ b/chapter06/makedev-exp.xml @@ -1,12 +1,10 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>./MAKEDEV -v generic:</userinput> This creates generic +<para><userinput>./MAKEDEV -v generic:</userinput> This creates generic devices. Normally, these devices are all devices you need. It's possible that you are missing some special devices that are needed for your hardware -configuration. Create them with ./MAKEDEV -v <device>. -</para> +configuration. Create them with ./MAKEDEV -v <device>.</para> </sect2> diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml index f59a1a23b..3ea236280 100644 --- a/chapter06/makedev-inst.xml +++ b/chapter06/makedev-inst.xml @@ -1,29 +1,19 @@ <sect2> <title>Creating devices</title> -<para> -Note: the MAKEDEV.bz2 file you have unpacked is not an archive, so it -won't create a directory for you to cd into. -</para> +<para>Note: the MAKEDEV.bz2 file you have unpacked is not an archive, so it +won't create a directory for you to cd into.</para> -<para> -Create the device files by running the following commands: -</para> +<para>Create the device files by running the following commands:</para> -<para> -<screen> -<userinput>cp MAKEDEV-1.1 /dev/MAKEDEV &&</userinput> +<para><screen><userinput>cp MAKEDEV-1.1 /dev/MAKEDEV &&</userinput> <userinput>cd /dev &&</userinput> <userinput>chmod 755 MAKEDEV &&</userinput> -<userinput>./MAKEDEV -v generic</userinput> -</screen> -</para> +<userinput>./MAKEDEV -v generic</userinput></screen></para> -<para> -MAKEDEV will create hda[1-20] and hdb[1-20] and such but keep in mind +<para>MAKEDEV will create hda[1-20] and hdb[1-20] and such but keep in mind that you may not be able to use all of those devices due to kernel -limitations regarding the max. number of partitions. -</para> +limitations regarding the max. number of partitions.</para> </sect2> diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml index cfb821ccc..02f3f092a 100644 --- a/chapter06/man-exp.xml +++ b/chapter06/man-exp.xml @@ -1,11 +1,9 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -i ../man-1.5i2.patch:</userinput> This patch +<para><userinput>patch -Np1 -i ../man-1.5i2.patch:</userinput> This patch changes man so that it uses awk instead of gawk which is the default. -We use this as LFS uses awk instead of gawk. -</para> +We use this as LFS uses awk instead of gawk.</para> </sect2> diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index 6126fbea0..a92c776c4 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -1,24 +1,15 @@ <sect2> <title>Installation of Man</title> -<para> -Before Man is installed, the man patch file needs to be unpacked. -</para> +<para>Before Man is installed, the man patch file needs to be unpacked.</para> -<para> -<screen> -<userinput>patch -Np1 -i ../man-&man-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../man-&man-version;.patch &&</userinput> <userinput>./configure -default &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -You may want to take a look at the man hint at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/man.txt"> -http://archive.linuxfromscratch.org/lfs-hints/man.txt</ulink> -which deals with formatting and compression issues for man pages. -</para> +<para>You may want to take a look at the man hint at <ulink +url="http://archive.linuxfromscratch.org/lfs-hints/man.txt">http://archive.linuxfromscratch.org/lfs-hints/man.txt</ulink> +which deals with formatting and compression issues for man pages.</para> </sect2> diff --git a/chapter06/man.xml b/chapter06/man.xml index fa0449b4c..009855e0a 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-man"> <title>Installing Man</title> -<screen> -Estimated build time: &man-time; -Estimated disk space required: &man-compsize; -</screen> +<screen>Estimated build time: &man-time; +Estimated disk space required: &man-compsize;</screen> &c6-man-inst; &c6-man-exp; diff --git a/chapter06/manpages-exp.xml b/chapter06/manpages-exp.xml index be1fa6ea8..af5ff0c75 100644 --- a/chapter06/manpages-exp.xml +++ b/chapter06/manpages-exp.xml @@ -1,11 +1,9 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch</userinput>: +<para><userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch</userinput>: We patch the man-pages package to include two important missing pages: -<filename>ldd</filename>'s, and <filename>ld.so</filename>'s. -</para> +<filename>ldd</filename>'s, and <filename>ld.so</filename>'s.</para> </sect2> diff --git a/chapter06/manpages-inst.xml b/chapter06/manpages-inst.xml index 67ce29201..13781a047 100644 --- a/chapter06/manpages-inst.xml +++ b/chapter06/manpages-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Man-pages</title> -<para> -Install Man-pages by running the following command: -</para> +<para>Install Man-pages by running the following command:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/manpages.xml b/chapter06/manpages.xml index 4a77284f4..634902bae 100644 --- a/chapter06/manpages.xml +++ b/chapter06/manpages.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-manpages"> <title>Installing Man-pages</title> -<screen> -Estimated build time: &man-pages-time; -Estimated disk space required: &man-pages-compsize; -</screen> +<screen>Estimated build time: &man-pages-time; +Estimated disk space required: &man-pages-compsize;</screen> &c6-manpages-inst; &c6-manpages-exp; diff --git a/chapter06/mawk-inst.xml b/chapter06/mawk-inst.xml index 631ea0511..87380832b 100644 --- a/chapter06/mawk-inst.xml +++ b/chapter06/mawk-inst.xml @@ -1,20 +1,14 @@ <sect2> <title>Installation of Mawk</title> -<para> -Install Mawk by running the following commands: -</para> +<para>Install Mawk by running the following commands:</para> -<para> -<screen> -<userinput>./configure &&</userinput> +<para><screen><userinput>./configure &&</userinput> <userinput>make &&</userinput> <userinput>make BINDIR=/usr/bin \</userinput> <userinput> MANDIR=/usr/share/man/man1 install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s mawk awk</userinput> -</screen> -</para> +<userinput>ln -s mawk awk</userinput></screen></para> </sect2> diff --git a/chapter06/mawk.xml b/chapter06/mawk.xml index 1e1334ba0..a43eddea6 100644 --- a/chapter06/mawk.xml +++ b/chapter06/mawk.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-mawk"> <title>Installing Mawk</title> -<screen> -Estimated build time: &mawk-time; -Estimated disk space required: &mawk-compsize; -</screen> +<screen>Estimated build time: &mawk-time; +Estimated disk space required: &mawk-compsize;</screen> &c6-mawk-inst; &aa-mawk-desc; diff --git a/chapter06/modutils-inst.xml b/chapter06/modutils-inst.xml index dbe9e8480..1002e2892 100644 --- a/chapter06/modutils-inst.xml +++ b/chapter06/modutils-inst.xml @@ -1,23 +1,15 @@ <sect2> <title>Installation of Modutils</title> -<para> -The 2.4.6 version of modutils does not seem to work properly with the +<para>The 2.4.6 version of modutils does not seem to work properly with the 2.2.x kernels. If you are running a 2.2.x kernel we suggest you -downgrade to modutils 2.4.5 which seems to be working better. -</para> +downgrade to modutils 2.4.5 which seems to be working better.</para> -<para> -Install Modutils by running the following commands: -</para> +<para>Install Modutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure &&</userinput> +<para><screen><userinput>./configure &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/modutils.xml b/chapter06/modutils.xml index b4d25eccd..869d8dd53 100644 --- a/chapter06/modutils.xml +++ b/chapter06/modutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-modutils"> <title>Installing Modutils</title> -<screen> -Estimated build time: &modutils-time; -Estimated disk space required: &modutils-compsize; -</screen> +<screen>Estimated build time: &modutils-time; +Estimated disk space required: &modutils-compsize;</screen> &c6-modutils-inst; &aa-modutils-desc; diff --git a/chapter06/ncurses-exp.xml b/chapter06/ncurses-exp.xml index 78b7a3cde..93eb4ab1b 100644 --- a/chapter06/ncurses-exp.xml +++ b/chapter06/ncurses-exp.xml @@ -1,21 +1,15 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -F10 -i ../ncurses-5.2.patch:</userinput> Regular +<para><userinput>patch -Np1 -F10 -i ../ncurses-5.2.patch:</userinput> Regular updates to the ncurses package are provided as patch files so this is -to make the source tree up to date. -</para> +to make the source tree up to date.</para> -<para> -<userinput>--with-shared:</userinput> This enables the build of the -shared ncurses library files. -</para> +<para><userinput>--with-shared:</userinput> This enables the build of the +shared ncurses library files.</para> -<para> -<userinput>--disable-termcap:</userinput> Disabled the compilation of -termcap fall back support. -</para> +<para><userinput>--disable-termcap:</userinput> Disabled the compilation of +termcap fall back support.</para> </sect2> diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index b5433a0fe..865d90d66 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -1,19 +1,13 @@ <sect2> <title>Installation of Ncurses</title> -<para> -Install Ncurses by running the following commands: -</para> +<para>Install Ncurses by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -F10 -i ../ncurses-&ncurses-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -F10 -i ../ncurses-&ncurses-version;.patch &&</userinput> <userinput>./configure --prefix=/usr --libdir=/lib \</userinput> <userinput> --with-shared --disable-termcap &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index e9f17988e..0e8ddb060 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-ncurses"> <title>Installing Ncurses</title> -<screen> -Estimated build time: &ncurses-time; -Estimated disk space required: &ncurses-compsize; -</screen> +<screen>Estimated build time: &ncurses-time; +Estimated disk space required: &ncurses-compsize;</screen> &c6-ncurses-inst; &c6-ncurses-exp; diff --git a/chapter06/netkitbase-inst.xml b/chapter06/netkitbase-inst.xml index 9860311d1..c4cc5d3ce 100644 --- a/chapter06/netkitbase-inst.xml +++ b/chapter06/netkitbase-inst.xml @@ -1,25 +1,17 @@ <sect2> <title>Installation of Netkit-base</title> -<para> -Install Netkit-base by running the following commands: -</para> +<para>Install Netkit-base by running the following commands:</para> -<para> -<screen> -<userinput>./configure &&</userinput> +<para><screen><userinput>./configure &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd etc.sample &&</userinput> -<userinput>cp services protocols /etc</userinput> -</screen> -</para> +<userinput>cp services protocols /etc</userinput></screen></para> -<para> -There are other files in the <filename +<para>There are other files in the <filename class="directory">etc.sample</filename> directory which might be of -interest to the user. -</para> +interest to the user.</para> </sect2> diff --git a/chapter06/netkitbase.xml b/chapter06/netkitbase.xml index 3d6ef1a81..9980f2548 100644 --- a/chapter06/netkitbase.xml +++ b/chapter06/netkitbase.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-netkitbase"> <title>Installing Netkit-base</title> -<screen> -Estimated build time: &netkit-base-time; -Estimated disk space required: &netkit-base-compsize; -</screen> +<screen>Estimated build time: &netkit-base-time; +Estimated disk space required: &netkit-base-compsize;</screen> &c6-netkitbase-inst; &aa-netkitbase-desc; diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml index 37fd86d0d..efdc164ff 100644 --- a/chapter06/nettools-inst.xml +++ b/chapter06/nettools-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Net-tools</title> -<para> -Install Net-tools by running the following commands: -</para> +<para>Install Net-tools by running the following commands:</para> -<para> -<screen> -<userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>make &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml index 6c74449af..ed218c6c2 100644 --- a/chapter06/nettools.xml +++ b/chapter06/nettools.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-nettools"> <title>Installing Net-tools</title> -<screen> -Estimated build time: &net-tools-time; -Estimated disk space required: &net-tools-compsize; -</screen> +<screen>Estimated build time: &net-tools-time; +Estimated disk space required: &net-tools-compsize;</screen> &c6-nettools-inst; &aa-nettools-desc; diff --git a/chapter06/patch-inst.xml b/chapter06/patch-inst.xml index ff9c2a365..bf921f26f 100644 --- a/chapter06/patch-inst.xml +++ b/chapter06/patch-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Patch</title> -<para> -Install Patch by running the following commands: -</para> +<para>Install Patch by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/patch.xml b/chapter06/patch.xml index 537be5943..e8eb1fc54 100644 --- a/chapter06/patch.xml +++ b/chapter06/patch.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-patch"> <title>Installing Patch</title> -<screen> -Estimated build time: &patch-time; -Estimated disk space required: &patch-compsize; -</screen> +<screen>Estimated build time: &patch-time; +Estimated disk space required: &patch-compsize;</screen> &c6-patch-inst; &aa-patch-desc; diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml index 1e7e28015..3c0133859 100644 --- a/chapter06/perl-inst.xml +++ b/chapter06/perl-inst.xml @@ -1,33 +1,21 @@ <sect2> <title>Installation of Perl</title> -<para> -Install Perl by running the following commands: -</para> +<para>Install Perl by running the following commands:</para> -<para> -<screen> -<userinput>./Configure -Dprefix=/usr &&</userinput> +<para><screen><userinput>./Configure -Dprefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -If you don't want to answer all those questions Perl asks, you can +<para>If you don't want to answer all those questions Perl asks, you can add the -d option to the configure script and Perl will use all the default settings. To avoid the Configure script asking questions after the config.sh file has been created you can pass the -e parameter -to perl as well. The commands with these parameters included will be: -</para> +to perl as well. The commands with these parameters included will be:</para> -<para> -<screen> -<userinput>./Configure -Dprefix=/usr -d -e &&</userinput> +<para><screen><userinput>./Configure -Dprefix=/usr -d -e &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index e6862f2ef..0856b4c99 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-perl"> <title>Installing Perl</title> -<screen> -Estimated build time: &perl-time; -Estimated disk space required: &perl-compsize; -</screen> +<screen>Estimated build time: &perl-time; +Estimated disk space required: &perl-compsize;</screen> &c6-perl-inst; &aa-perl-desc; diff --git a/chapter06/procinfo-exp.xml b/chapter06/procinfo-exp.xml index f9adca8a6..18a53165a 100644 --- a/chapter06/procinfo-exp.xml +++ b/chapter06/procinfo-exp.xml @@ -1,14 +1,12 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f -:</userinput> +<para><userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f -:</userinput> This will replace -ltermcap with -lncurses in the Makefile and pipe the output of sed (the modified Makefile) directly to the make program. This is an alternate and more efficient way to direct the output to a file and tell make to use that alternate file. We do this because libtermcap -is declared obsolete in favor of libncurses. -</para> +is declared obsolete in favor of libncurses.</para> </sect2> diff --git a/chapter06/procinfo-inst.xml b/chapter06/procinfo-inst.xml index dde3916cb..9aa8ba480 100644 --- a/chapter06/procinfo-inst.xml +++ b/chapter06/procinfo-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Procinfo</title> -<para> -Install Procinfo by running the following commands: -</para> +<para>Install Procinfo by running the following commands:</para> -<para> -<screen> -<userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f - &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f - &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/procinfo.xml b/chapter06/procinfo.xml index a65af393d..166e3c064 100644 --- a/chapter06/procinfo.xml +++ b/chapter06/procinfo.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-procinfo"> <title>Installing Procinfo</title> -<screen> -Estimated build time: &procinfo-time; -Estimated disk space required: &procinfo-compsize; -</screen> +<screen>Estimated build time: &procinfo-time; +Estimated disk space required: &procinfo-compsize;</screen> &c6-procinfo-inst; &c6-procinfo-exp; diff --git a/chapter06/procps-exp.xml b/chapter06/procps-exp.xml index 0b5a00c2c..87e7c9a13 100644 --- a/chapter06/procps-exp.xml +++ b/chapter06/procps-exp.xml @@ -1,13 +1,11 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>make XSCPT='' install:</userinput> +<para><userinput>make XSCPT='' install:</userinput> This will set the Makefile variable XSCPT to an empty value so that the XConsole installation is disabled. Otherwise "Make install" tries to copy the file XConsole to /usr/X11R6/bin. -And that directory does not exist, because X is not installed yet. -</para> +And that directory does not exist, because X is not installed yet.</para> </sect2> diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 65b1fd107..f76bafd5a 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Procps</title> -<para> -Install Procps by running the following commands: -</para> +<para>Install Procps by running the following commands:</para> -<para> -<screen> -<userinput>make &&</userinput> +<para><screen><userinput>make &&</userinput> <userinput>make XSCPT='' install &&</userinput> -<userinput>mv /usr/bin/kill /bin</userinput> -</screen> -</para> +<userinput>mv /usr/bin/kill /bin</userinput></screen></para> </sect2> diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 568cb4088..b9466d6c3 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-procps"> <title>Installing Procps</title> -<screen> -Estimated build time: &procps-time; -Estimated disk space required: &procps-compsize; -</screen> +<screen>Estimated build time: &procps-time; +Estimated disk space required: &procps-compsize;</screen> &c6-procps-inst; &c6-procps-exp; diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml index b8194286a..100817235 100644 --- a/chapter06/psmisc-inst.xml +++ b/chapter06/psmisc-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Psmisc</title> -<para> -Install Psmisc by running the following commands: -</para> +<para>Install Psmisc by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index f7e7d4b1b..54d122761 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-psmisc"> <title>Installing Psmisc</title> -<screen> -Estimated build time: &psmisc-time; -Estimated disk space required: &psmisc-compsize; -</screen> +<screen>Estimated build time: &psmisc-time; +Estimated disk space required: &psmisc-compsize;</screen> &c6-psmisc-inst; &aa-psmisc-desc; diff --git a/chapter06/removeoldnss.xml b/chapter06/removeoldnss.xml index dfba1e670..3d2214870 100644 --- a/chapter06/removeoldnss.xml +++ b/chapter06/removeoldnss.xml @@ -1,17 +1,11 @@ <sect1 id="ch06-removeoldnss"> <title>Removing old NSS library files</title> -<para> -If you have copied the NSS Library files from the normal Linux system to the -LFS system (because the normal system runs glibc-2.0) it's time to remove -them now by running: -</para> +<para>If you have copied the NSS Library files from the normal Linux system +to the LFS system (because the normal system runs glibc-2.0) it's time to remove +them now by running:</para> -<para> -<screen> -<userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput> -</screen> -</para> +<para><screen><userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput></screen></para> </sect1> diff --git a/chapter06/sed-inst.xml b/chapter06/sed-inst.xml index 795d72926..bded36b7b 100644 --- a/chapter06/sed-inst.xml +++ b/chapter06/sed-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Sed</title> -<para> -Install Sed by running the following commands: -</para> +<para>Install Sed by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/sed.xml b/chapter06/sed.xml index 54fa042bc..b7cc52ec6 100644 --- a/chapter06/sed.xml +++ b/chapter06/sed.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-sed"> <title>Installing Sed</title> -<screen> -Estimated build time: &sed-time; -Estimated disk space required: &sed-compsize; -</screen> +<screen>Estimated build time: &sed-time; +Estimated disk space required: &sed-compsize;</screen> &c6-sed-inst; &aa-sed-desc; diff --git a/chapter06/shadowpwd-exp.xml b/chapter06/shadowpwd-exp.xml index 7343088a1..fc162e326 100644 --- a/chapter06/shadowpwd-exp.xml +++ b/chapter06/shadowpwd-exp.xml @@ -1,18 +1,14 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>cp limits login.access and others:</userinput> These files +<para><userinput>cp limits login.access and others:</userinput> These files were not installed during the installation of the package so we copy them manually as those files are used to configure authentication -details on the system. -</para> +details on the system.</para> -<para> -<userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > +<para><userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > /etc/login.defs</userinput>: /var/spool/mail is the old location of the -user mailboxes. The location that is used nowadays is /var/mail. -</para> +user mailboxes. The location that is used nowadays is /var/mail.</para> </sect2> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 668d6dca4..517d1adb2 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -1,21 +1,15 @@ <sect2> <title>Installation of Shadow Password Suite</title> -<para> -Install the Shadow Password Suite by running the following commands: -</para> +<para>Install the Shadow Password Suite by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../shadow-20001016.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../shadow-20001016.patch &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd etc &&</userinput> <userinput>cp limits login.access /etc &&</userinput> -<userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > /etc/login.defs</userinput> -</screen> -</para> +<userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > /etc/login.defs</userinput></screen></para> </sect2> diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml index 5eebb9f10..7a2c56c53 100644 --- a/chapter06/shadowpwd.xml +++ b/chapter06/shadowpwd.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-shadow"> <title>Installing Shadowpwd</title> -<screen> -Estimated build time: &shadow-time; -Estimated disk space required: &shadow-compsize; -</screen> +<screen>Estimated build time: &shadow-time; +Estimated disk space required: &shadow-compsize;</screen> &c6-shadowpwd-inst; &c6-shadowpwd-exp; diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml index 4e24c3af6..7b0ac4122 100644 --- a/chapter06/shellutils-inst.xml +++ b/chapter06/shellutils-inst.xml @@ -1,40 +1,28 @@ <sect2> <title>Installation of Sh-utils</title> -<para> -Install Shellutils by running the following commands: -</para> +<para>Install Shellutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> <userinput>mv date echo false pwd stty /bin &&</userinput> -<userinput>mv su true uname hostname /bin</userinput> -</screen> -</para> +<userinput>mv su true uname hostname /bin</userinput></screen></para> </sect2> <sect2> <title>FHS compliance notes</title> -<para> -There is a command installed in this package which is named test. It is often -used in shell scripts to evaluate conditions, but is more often encountered -in the form of <command>[ condition ]</command>. These brackets are built into -the bash interpreter, but the FHS dictates that there should be a +<para>There is a command installed in this package which is named test. It is +often used in shell scripts to evaluate conditions, but is more often +encountered in the form of <command>[ condition ]</command>. These brackets +are built into the bash interpreter, but the FHS dictates that there should be a <filename>[</filename> binary. We create that in this way, while still in the -<filename>/usr/bin</filename> directory: -</para> - -<para> -<screen> -<userinput>ln -s test [</userinput> -</screen> -</para> +<filename>/usr/bin</filename> directory:</para> + +<para><screen><userinput>ln -s test [</userinput></screen></para> </sect2> diff --git a/chapter06/shellutils.xml b/chapter06/shellutils.xml index 0d067b4c1..b726f96a9 100644 --- a/chapter06/shellutils.xml +++ b/chapter06/shellutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-shutils"> <title>Installing Sh-utils</title> -<screen> -Estimated build time: &sh-utils-time; -Estimated disk space required: &sh-utils-compsize; -</screen> +<screen>Estimated build time: &sh-utils-time; +Estimated disk space required: &sh-utils-compsize;</screen> &c6-shellutils-inst; &aa-shellutils-desc; diff --git a/chapter06/sysklogd-inst.xml b/chapter06/sysklogd-inst.xml index 42beb3342..6e01e274c 100644 --- a/chapter06/sysklogd-inst.xml +++ b/chapter06/sysklogd-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Sysklogd</title> -<para> -Install Sysklogd by running the following commands: -</para> +<para>Install Sysklogd by running the following commands:</para> -<para> -<screen> -<userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>make &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index f581cccb7..0d9b63819 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-sysklogd"> <title>Installing Sysklogd</title> -<screen> -Estimated build time: &sysklogd-time; -Estimated disk space required: &sysklogd-compsize; -</screen> +<screen>Estimated build time: &sysklogd-time; +Estimated disk space required: &sysklogd-compsize;</screen> &c6-sysklogd-inst; &aa-sysklogd-desc; diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index 846c28944..d0a58fbb3 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -1,8 +1,7 @@ <sect2> <title>Installation of Sysvinit</title> -<para> -When run levels are changed (for example when going to shutdown +<para>When run levels are changed (for example when going to shutdown the system) the init program is going to send the TERM and KILL signals to all the processes that init started. But init prints a message to the screen saying "sending all processes the TERM signal" and the same for the @@ -10,29 +9,16 @@ KILL signal. This implies that init sends this signal to all the currently running processes, which isn't the case. To avoid this confusion a user can apply the sysvinit patch found on the LFS FTP site to sysvinit that changes the sentence in the shutdown.c file and have it print "sending all -processes started by init the TERM signal". -</para> +processes started by init the TERM signal".</para> -<para> -Apply the patch by running the following command: -</para> +<para>Apply the patch by running the following command:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../sysvinit-2.78.patch</userinput> -</screen> -</para> +<para><screen><userinput>patch -Np1 -i ../sysvinit-2.79.patch</userinput></screen></para> -<para> -Install Sysvinit by running the following commands: -</para> +<para>Install Sysvinit by running the following commands:</para> -<para> -<screen> -<userinput>make -C src &&</userinput> -<userinput>make -C src install</userinput> -</screen> -</para> +<para><screen><userinput>make -C src &&</userinput> +<userinput>make -C src install</userinput></screen></para> </sect2> diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index d0a7c53f0..166a15ceb 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-sysvinit"> <title>Installing Sysvinit</title> -<screen> -Estimated build time: &sysvinit-time; -Estimated disk space required: &sysvinit-compsize; -</screen> +<screen>Estimated build time: &sysvinit-time; +Estimated disk space required: &sysvinit-compsize;</screen> &c6-sysvinit-inst; &aa-sysvinit-desc; diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml index a70a2c553..91cadabd3 100644 --- a/chapter06/tar-inst.xml +++ b/chapter06/tar-inst.xml @@ -1,39 +1,25 @@ <sect2> <title>Installation of Tar</title> -<para> -If you want to be able to directly use bzip2 files with tar, you can +<para>If you want to be able to directly use bzip2 files with tar, you can use the tar patch available from the LFS FTP site. This patch will add the -y option to tar which works the same as the -z option to tar (which can be used -for gzip files). -</para> +for gzip files).</para> -<para> -Apply the patch by running the following command: -</para> +<para>Apply the patch by running the following command:</para> -<para> -<screen> -<userinput>cd src &&</userinput> +<para><screen><userinput>cd src &&</userinput> <userinput>patch -i ../../gnutarpatch.txt &&</userinput> -<userinput>cd ..</userinput> -</screen> -</para> +<userinput>cd ..</userinput></screen></para> -<para> -Install Tar by running the following commands from the toplevel -directory: -</para> +<para>Install Tar by running the following commands from the toplevel +directory:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --libexecdir=/usr/bin \</userinput> +<para><screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin \</userinput> <userinput> --bindir=/bin &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/tar.xml b/chapter06/tar.xml index aeafc69c5..d28b0bf66 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-tar"> <title>Installing Tar</title> -<screen> -Estimated build time: &tar-time; -Estimated disk space required: &tar-compsize; -</screen> +<screen>Estimated build time: &tar-time; +Estimated disk space required: &tar-compsize;</screen> &c6-tar-inst; &aa-tar-desc; diff --git a/chapter06/texinfo-exp.xml b/chapter06/texinfo-exp.xml index 4ab1323f6..7dda4a0d4 100644 --- a/chapter06/texinfo-exp.xml +++ b/chapter06/texinfo-exp.xml @@ -1,11 +1,9 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -i ../texinfo-4.0.patch:</userinput> This patch +<para><userinput>patch -Np1 -i ../texinfo-4.0.patch:</userinput> This patch fixes a problem with compiling texinfo on gcc-3.0 systems. More specifically, it moves an #ifdef out of a printf macro in order to be -compatible. -</para> +compatible.</para> </sect2> diff --git a/chapter06/texinfo-inst.xml b/chapter06/texinfo-inst.xml index 9eadf1ea0..e92fc1058 100644 --- a/chapter06/texinfo-inst.xml +++ b/chapter06/texinfo-inst.xml @@ -1,19 +1,13 @@ <sect2> <title>Installation of Texinfo</title> -<para> -Install Texinfo by running the following commands: -</para> +<para>Install Texinfo by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>make TEXMF=/usr/share/texmf install-tex</userinput> -</screen> -</para> +<userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen></para> </sect2> diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml index 41791478f..f595ccb5e 100644 --- a/chapter06/texinfo.xml +++ b/chapter06/texinfo.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-texinfo"> <title>Installing Texinfo</title> -<screen> -Estimated build time: &texinfo-time; -Estimated disk space required: &texinfo-compsize; -</screen> +<screen>Estimated build time: &texinfo-time; +Estimated disk space required: &texinfo-compsize;</screen> &c6-texinfo-inst; &c6-texinfo-exp; diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml index 0cba4145f..c22802455 100644 --- a/chapter06/textutils-inst.xml +++ b/chapter06/textutils-inst.xml @@ -1,18 +1,12 @@ <sect2> <title>Installation of Textutils</title> -<para> -Install Textutils by running the following commands: -</para> +<para>Install Textutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>mv /usr/bin/cat /bin</userinput> -</screen> -</para> +<userinput>mv /usr/bin/cat /bin</userinput></screen></para> </sect2> diff --git a/chapter06/textutils.xml b/chapter06/textutils.xml index 3d4a83b6f..eef47e50a 100644 --- a/chapter06/textutils.xml +++ b/chapter06/textutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-textutils"> <title>Installing Textutils</title> -<screen> -Estimated build time: &textutils-time; -Estimated disk space required: &textutils-compsize; -</screen> +<screen>Estimated build time: &textutils-time; +Estimated disk space required: &textutils-compsize;</screen> &c6-textutils-inst; &aa-textutils-desc; diff --git a/chapter06/utillinux-exp.xml b/chapter06/utillinux-exp.xml index 93986ef89..6d2b62edd 100644 --- a/chapter06/utillinux-exp.xml +++ b/chapter06/utillinux-exp.xml @@ -1,10 +1,8 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>HAVE_SLN=yes</userinput>: We don't build this program because -it already was installed by Glibc. -</para> +<para><userinput>HAVE_SLN=yes</userinput>: We don't build this program because +it already was installed by Glibc.</para> </sect2> diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml index eaef886fb..77738f2a5 100644 --- a/chapter06/utillinux-inst.xml +++ b/chapter06/utillinux-inst.xml @@ -1,20 +1,14 @@ <sect2> <title>FHS compliance notes</title> -<para> -The FHS recommends that we use /var/lib/hwclock as the location of the adjtime -file, instead of the usual /etc. To make hwclock, which is part of the -util-linux package, FHS-compliant, run the following. -</para> +<para>The FHS recommends that we use /var/lib/hwclock as the location of the +adjtime file, instead of the usual /etc. To make hwclock, which is part of the +util-linux package, FHS-compliant, run the following.</para> -<para> -<screen> -<userinput>sed "s|etc/adjtime\"\$|var/lib/hwclock/adjtime\"|" \</userinput> +<para><screen><userinput>sed "s|etc/adjtime\"\$|var/lib/hwclock/adjtime\"|" \</userinput> <userinput> hwclock/hwclock.c > hwclock~ &&</userinput> <userinput>mv hwclock~ hwclock/hwclock.c &&</userinput> -<userinput>mkdir /var/lib/hwclock</userinput> -</screen> -</para> +<userinput>mkdir /var/lib/hwclock</userinput></screen></para> </sect2> @@ -25,16 +19,12 @@ util-linux package, FHS-compliant, run the following. Install Util-Linux by running the following commands: </para> -<para> -<screen> -<userinput>sed s/HAVE_SLN=no/HAVE_SLN=yes/ \</userinput> +<para><screen><userinput>sed s/HAVE_SLN=no/HAVE_SLN=yes/ \</userinput> <userinput> MCONFIG > MCONFIG~ &&</userinput> <userinput>mv MCONFIG~ MCONFIG &&</userinput> <userinput>./configure &&</userinput> <userinput>make ADD_RAW=yes &&</userinput> -<userinput>make ADD_RAW=yes install</userinput> -</screen> -</para> +<userinput>make ADD_RAW=yes install</userinput></screen></para> </sect2> diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml index a9669dee9..5686d393d 100644 --- a/chapter06/utillinux.xml +++ b/chapter06/utillinux.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-utillinux"> <title>Installing Util-linux</title> -<screen> -Estimated build time: &util-linux-time; -Estimated disk space required: &util-linux-compsize; -</screen> +<screen>Estimated build time: &util-linux-time; +Estimated disk space required: &util-linux-compsize;</screen> &c6-utillinux-inst; &c6-utillinux-exp; diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index 49424450d..fdc15c7be 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -1,63 +1,46 @@ <sect2> <title>Installation of Vim</title> -<para> -If you don't like vim to be installed as an editor on the LFS system, +<para>If you don't like vim to be installed as an editor on the LFS system, you may want to download an alternative and install an editor you prefer. There are a few hints how to install different editors available at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/"> -http://www.archive.linuxfromscratch.org/lfs-hints/</ulink>. The -hints which are currently available are for Emacs, Joe and nano. -</para> +url="http://archive.linuxfromscratch.org/lfs-hints/">http://www.archive.linuxfromscratch.org/lfs-hints/</ulink> +. The hints which are currently available are for Emacs, Joe and nano.</para> -<para> -Both the vim-rt and vim-src packages need to be unpacked to install Vim. +<para>Both the vim-rt and vim-src packages need to be unpacked to install Vim. Both packages will unpack their files into the vim-&vim-version; directory. This won't overwrite any files from the other package. So it doesn't matter -in which order it is done. Install Vim by running the following commands: -</para> +in which order it is done. Install Vim by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s vim vi</userinput> -</screen> -</para> +<userinput>ln -s vim vi</userinput></screen></para> -<para> -If you plan on installing the X Window system on your LFS +<para>If you plan on installing the X Window system on your LFS system, you might want to re-compile Vim after you have installed X. Vim comes with a nice GUI version of the editor which requires X and a few other libraries to be installed. For more information read the Vim -documentation. -</para> +documentation.</para> </sect2> <sect2> <title>FHS compliance notes</title> -<para> -The FHS says that editors like vim should use /var/lib/<editor> for their -temporary state files, like temporary save files for example. If you wish vim to -conform to the FHS, you should use this command set instead of the one presented -above: -</para> +<para>The FHS says that editors like vim should use /var/lib/<editor> +for their temporary state files, like temporary save files for example. +If you wish vim to conform to the FHS, you should use this command set +instead of the one presented above:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> <userinput>ln -s vim vi &&</userinput> -<userinput>mkdir /var/lib/vim</userinput> -</screen> -</para> +<userinput>mkdir /var/lib/vim</userinput></screen></para> </sect2> diff --git a/chapter06/vim.xml b/chapter06/vim.xml index e96d078fb..37cc4c495 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-vim"> <title>Installing Vim</title> -<screen> -Estimated build time: &vim-time; -Estimated disk space required: &vim-compsize; -</screen> +<screen>Estimated build time: &vim-time; +Estimated disk space required: &vim-compsize;</screen> &c6-vim-inst; &aa-vim-desc; diff --git a/chapter07/checkfs.xml b/chapter07/checkfs.xml index 60c6bc27f..2857eeea2 100644 --- a/chapter07/checkfs.xml +++ b/chapter07/checkfs.xml @@ -1,14 +1,10 @@ <sect1 id="ch07-checkfs"> <title>Creating the checkfs script</title> -<para> -Create the <filename>/etc/init.d/checkfs</filename> script by running -the following command: -</para> - -<para> -<screen> -<userinput>cat > checkfs << "EOF"</userinput> +<para>Create the <filename>/etc/init.d/checkfs</filename> script by running +the following command:</para> + +<para><screen><userinput>cat > checkfs << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/checkfs @@ -108,9 +104,7 @@ else fi # End /etc/init.d/checkfs -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/createdirs.xml b/chapter07/createdirs.xml index 90980d264..6a6ee3470 100644 --- a/chapter07/createdirs.xml +++ b/chapter07/createdirs.xml @@ -1,18 +1,12 @@ <sect1 id="ch07-createdirs"> <title>Creating directories</title> -<para> -We need to start by creating a few extra directories that are used by -the boot scripts. These directories are created by running: -</para> +<para>We need to start by creating a few extra directories that are used by +the boot scripts. These directories are created by running:</para> -<para> -<screen> -<userinput>cd /etc &&</userinput> +<para><screen><userinput>cd /etc &&</userinput> <userinput>mkdir rc{0,1,2,3,4,5,6,S}.d init.d sysconfig &&</userinput> -<userinput>cd init.d</userinput> -</screen> -</para> +<userinput>cd init.d</userinput></screen></para> </sect1> diff --git a/chapter07/ethnet.xml b/chapter07/ethnet.xml index f9687161b..d1b593b30 100644 --- a/chapter07/ethnet.xml +++ b/chapter07/ethnet.xml @@ -1,19 +1,13 @@ <sect1 id="ch07-ethnet"> <title>Creating the /etc/init.d/ethnet script</title> -<para> -This section only applies if a user is going to configure a network card. -If not, this section can be skipped. -</para> - -<para> -Create the <filename>/etc/init.d/ethnet</filename> script by running the -following command: -</para> - -<para> -<screen> -<userinput>cat > /etc/init.d/ethnet << "EOF"</userinput> +<para>This section only applies if a user is going to configure a network card. +If not, this section can be skipped.</para> + +<para>Create the <filename>/etc/init.d/ethnet</filename> script by running the +following command:</para> + +<para><screen><userinput>cat > /etc/init.d/ethnet << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/ethnet # @@ -114,82 +108,57 @@ case "$1" in esac # End /etc/init.d/ethnet -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> <sect2> <title>Adding default gateway to /etc/sysconfig/network</title> -<para> -If a default gateway is required to be setup, the following command does that: -</para> +<para>If a default gateway is required to be setup, the +following command does that:</para> -<para> -<screen> -<userinput>cat >> /etc/sysconfig/network << "EOF"</userinput> +<para><screen><userinput>cat >> /etc/sysconfig/network << "EOF"</userinput> GATEWAY=192.168.1.2 GATEWAY_IF=eth0 -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -GATEWAY and GATEWAY_IF need to be changed to match the network setup. +<para>GATEWAY and GATEWAY_IF need to be changed to match the network setup. GATEWAY contains the address of the default gateway, and GATEWAY_IF contains the network interface through which that default gateway can -be reached. -</para> +be reached.</para> </sect2> <sect2> <title>Creating NIC configuration files</title> -<para> -Which interfaces are brought up and down by the ethnet script depends on +<para>Which interfaces are brought up and down by the ethnet script depends on the files in the /etc/sysconfig/nic-config directory. This directory should contain files in the form of ifcfg-x where x is an -identification number (or whatever a user named it). -</para> - -<para> -First the nic-config directory is created by running: -</para> +identification number (or whatever a user named it).</para> -<para> -<screen> -<userinput>mkdir /etc/sysconfig/nic-config</userinput> -</screen> -</para> +<para>First the nic-config directory is created by running:</para> -<para> +<para><screen><userinput>mkdir +/etc/sysconfig/nic-config</userinput></screen></para> -Now, new files are created in that directory containing the following. -The following command creates a sample file ifcfg-eth0: -</para> +<para>Now, new files are created in that directory containing the following. +The following command creates a sample file ifcfg-eth0:</para> -<para> -<screen> -<userinput>cat > /etc/sysconfig/nic-config/ifcfg-eth0 << "EOF"</userinput> +<para><screen><userinput>cat > /etc/sysconfig/nic-config/ifcfg-eth0 << "EOF"</userinput> ONBOOT=yes DEVICE=eth0 IP=192.168.1.1 NETMASK=255.255.255.0 BROADCAST=192.168.1.255 -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -Of course, the values of those four variables have to be changed +<para>Of course, the values of those four variables have to be changed in every file to match the proper setup. Usually NETMASK and BROADCAST will remain the same, just the DEVICE IP variables will change per network interface. If the ONBOOT variable is set to yes, the ethnet script will bring it up during boot up of the system. If set to anything else but yes it will be -ignored by the ethnet script and thus not brought up. -</para> +ignored by the ethnet script and thus not brought up.</para> </sect2> diff --git a/chapter07/functions.xml b/chapter07/functions.xml index fb99da658..d82ff60cd 100644 --- a/chapter07/functions.xml +++ b/chapter07/functions.xml @@ -1,14 +1,10 @@ <sect1 id="ch07-functions"> <title>Creating the functions script</title> -<para> -Create the <filename>/etc/init.d/functions</filename> script by running -the following command: -</para> - -<para> -<screen> -<userinput>cat > functions << "EOF"</userinput> +<para>Create the <filename>/etc/init.d/functions</filename> script by running +the following command:</para> + +<para><screen><userinput>cat > functions << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/functions @@ -503,9 +499,7 @@ statusproc() } # End /etc/init.d/functions -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/halt.xml b/chapter07/halt.xml index 962b0cb78..82eaee109 100644 --- a/chapter07/halt.xml +++ b/chapter07/halt.xml @@ -1,14 +1,10 @@ <sect1 id="ch07-halt"> <title>Creating the halt script</title> -<para> -Create the <filename>/etc/init.d/halt</filename> script by running the -following command: -</para> +<para>Create the <filename>/etc/init.d/halt</filename> script by running the +following command:</para> -<para> -<screen> -<userinput>cat > halt << "EOF"</userinput> +<para><screen><userinput>cat > halt << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/halt @@ -19,9 +15,7 @@ following command: /sbin/halt -d -f -i -p # End /etc/init.d/halt -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/hosts.xml b/chapter07/hosts.xml index e2a1159ea..d3ae0c6b7 100644 --- a/chapter07/hosts.xml +++ b/chapter07/hosts.xml @@ -1,84 +1,55 @@ <sect1 id="ch07-hosts"> <title>Creating the /etc/hosts file</title> -<para> -If a network card is to be configured, a user has to decide on the +<para>If a network card is to be configured, a user has to decide on the IP-address, FQDN and possible aliases for use in the /etc/hosts file. An -example is: -</para> - -<para> -<screen> -<my-IP> myhost.mydomain.org aliases -</screen> -</para> - -<para> -It should made sure that the IP-address is in the private network -IP-address range. Valid ranges are: -</para> - -<para> -<screen> - Class Networks +example is:</para> + +<para><screen><my-IP> myhost.mydomain.org aliases</screen></para> + +<para>It should made sure that the IP-address is in the private network +IP-address range. Valid ranges are:</para> + +<para><screen> Class Networks A 10.0.0.0 B 172.16.0.0 through 172.31.0.0 - C 192.168.0.0 through 192.168.255.0 -</screen> -</para> - -<para> -A valid IP address could be 192.168.1.1. A valid FQDN for this IP could -be www.linuxfromscratch.org -</para> - -<para> -If a user is not going to use a network card, he still needs to come up with a -FQDN. This is necessary for programs like Sendmail to operate correctly (in -fact; Sendmail won't run when it can't determine the FQDN). -</para> - -<para> -If a network card is not going to be configured, a new file -<filename>/etc/hosts</filename> is created by running: -</para> - -<para> -<screen> -<userinput>cat > /etc/hosts << "EOF"</userinput> + C 192.168.0.0 through 192.168.255.0</screen></para> + +<para>A valid IP address could be 192.168.1.1. A valid FQDN for this IP could +be www.linuxfromscratch.org</para> + +<para>If a user is not going to use a network card, he still needs to +come up with a FQDN. This is necessary for programs like Sendmail to operate +correctly (in fact; Sendmail won't run when it can't determine the FQDN).</para> + +<para>If a network card is not going to be configured, a new file +<filename>/etc/hosts</filename> is created by running:</para> + +<para><screen><userinput>cat > /etc/hosts << "EOF"</userinput> # Begin /etc/hosts (no network card version) 127.0.0.1 www.mydomain.com <value of HOSTNAME> localhost # End /etc/hosts (no network card version) -<userinput>EOF</userinput> -</screen> -</para> - -<para> -If a network card is to be configured, a new file -<filename>/etc/hosts</filename> is created by running: -</para> - -<para> -<screen> -<userinput>cat > /etc/hosts << "EOF"</userinput> +<userinput>EOF</userinput></screen></para> + +<para>If a network card is to be configured, a new file +<filename>/etc/hosts</filename> is created by running:</para> + +<para><screen><userinput>cat > /etc/hosts << "EOF"</userinput> # Begin /etc/hosts (network card version) 127.0.0.1 localhost.localdomain localhost 192.168.1.1 www.mydomain.org <value of HOSTNAME> # End /etc/hosts (network card version) -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -Of course, the 192.168.1.1 and www.mydomain.org have to be changed to the +<para>Of course, the 192.168.1.1 and www.mydomain.org have to be changed to the users liking (or requirements if assigned an IP-address by a network/system -administrator and this machine is planned to be connected to that network). -</para> +administrator and this machine is planned to be +connected to that network).</para> </sect1> diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml index 74b49b8f4..f1ccae996 100644 --- a/chapter07/introduction.xml +++ b/chapter07/introduction.xml @@ -1,21 +1,19 @@ <sect1 id="ch07-introduction"> <title>Introduction</title> -<para> -This chapter will create the necessary scripts that are run at boot time. +<para>This chapter will create the necessary scripts that are run at boot time. These scripts perform tasks such as remounting the root file system mounted read-only by the kernel into read-write mode, activating the swap partition(s), running a check on the root file system to make sure it's -intact, setting up networking and starting the daemons that the system uses. -</para> +intact, setting up networking and starting the daemons that the +system uses.</para> -<para> -We will be using SysV style init scripts. We have chosen this style because it -is widely used and we feel confortable with it. If you want to try something -else, someone has written an LFS-Hint on BSD style init scripts at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/bsd-init.txt"> -http://archive.linuxfromscratch.org/lfs-hints/bsd-init.txt</ulink>. -</para> +<para>We will be using SysV style init scripts. We have chosen this style +because it is widely used and we feel confortable with it. If you want to +try something else, someone has written an LFS-Hint on BSD style init scripts +at <ulink +url="http://archive.linuxfromscratch.org/lfs-hints/bsd-init.txt">http://archive.linuxfromscratch.org/lfs-hints/bsd-init.txt</ulink> +.</para> </sect1> diff --git a/chapter07/loadkeys.xml b/chapter07/loadkeys.xml index 74da28e9e..f103583a8 100644 --- a/chapter07/loadkeys.xml +++ b/chapter07/loadkeys.xml @@ -1,16 +1,12 @@ <sect1 id="ch07-loadkeys"> <title>Creating the loadkeys script</title> -<para> -A user only needs to create this script if he don't have a default 101 keys -US keyboard layout. Create the +<para>A user only needs to create this script if he don't have a +default 101 keys US keyboard layout. Create the <filename>/etc/init.d/loadkeys</filename> script by running the -following command: -</para> +following command:</para> -<para> -<screen> -<userinput>cat > loadkeys << "EOF"</userinput> +<para><screen><userinput>cat > loadkeys << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/loadkeys @@ -29,9 +25,7 @@ echo -n "Loading keymap..." evaluate_retval # End /etc/init.d/loadkeys -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/localnet.xml b/chapter07/localnet.xml index 60a5bae68..f7d2fa250 100644 --- a/chapter07/localnet.xml +++ b/chapter07/localnet.xml @@ -1,14 +1,10 @@ <sect1 id="ch07-localnet"> <title>Creating the /etc/init.d/localnet boot script</title> -<para> -Create the <filename>/etc/init.d/localnet</filename> script by running -the following command: -</para> - -<para> -<screen> -<userinput>cat > /etc/init.d/localnet << "EOF"</userinput> +<para>Create the <filename>/etc/init.d/localnet</filename> script by running +the following command:</para> + +<para><screen><userinput>cat > /etc/init.d/localnet << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/localnet @@ -49,9 +45,7 @@ case "$1" in esac # End /etc/init.d/localnet -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/mountfs.xml b/chapter07/mountfs.xml index b6432e022..1ffa16306 100644 --- a/chapter07/mountfs.xml +++ b/chapter07/mountfs.xml @@ -1,14 +1,10 @@ <sect1 id="ch07-mountfs"> <title>Creating the mountfs script</title> -<para> -Create the <filename>/etc/init.d/mountfs</filename> script by running -the following command: -</para> - -<para> -<screen> -<userinput>cat > mountfs << "EOF"</userinput> +<para>Create the <filename>/etc/init.d/mountfs</filename> script by running +the following command:</para> + +<para><screen><userinput>cat > mountfs << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/mountfs @@ -43,7 +39,7 @@ case "$1" in # file which contains a list of currently mounted file systems. # - echo > /etc/mtab + echo > /etc/mtab /bin/mount -f -o remount,rw / # @@ -102,9 +98,7 @@ case "$1" in esac # End /etc/init.d/mountfs -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/network.xml b/chapter07/network.xml index f9cea6f1e..958e6d367 100644 --- a/chapter07/network.xml +++ b/chapter07/network.xml @@ -1,24 +1,16 @@ <sect1 id="ch07-network"> <title>Creating the /etc/sysconfig/network file</title> -<para> -A new file <filename>/etc/sysconfig/network</filename> is created and the -hostname is put in it by running: -</para> +<para>A new file <filename>/etc/sysconfig/network</filename> is created and the +hostname is put in it by running:</para> -<para> -<screen> -<userinput>echo "HOSTNAME=lfs" > /etc/sysconfig/network</userinput> -</screen> -</para> +<para><screen><userinput>echo "HOSTNAME=lfs" > +/etc/sysconfig/network</userinput></screen></para> -<para> -<quote>lfs</quote> needs to be replaced by the name the computer is to be -called. -A user should not enter the FQDN (Fully Qualified Domain +<para><quote>lfs</quote> needs to be replaced by the name the computer is +to be called. A user should not enter the FQDN (Fully Qualified Domain Name) here. That information will be put in the -<filename>/etc/hosts</filename> file later. -</para> +<filename>/etc/hosts</filename> file later.</para> </sect1> diff --git a/chapter07/rc.xml b/chapter07/rc.xml index 94121acb0..321c3cb7f 100644 --- a/chapter07/rc.xml +++ b/chapter07/rc.xml @@ -1,15 +1,11 @@ <sect1 id="ch07-rc"> <title>Creating the rc script</title> -<para> -The first main boot script is the <filename>/etc/init.d/rc</filename> script. -Create the <filename>/etc/init.d/rc</filename> script by running the -following command: -</para> - -<para> -<screen> -<userinput>cat > rc << "EOF"</userinput> +<para>The first main boot script is the <filename>/etc/init.d/rc</filename> +script. Create the <filename>/etc/init.d/rc</filename> script by running the +following command:</para> + +<para><screen><userinput>cat > rc << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/rc # @@ -246,9 +242,7 @@ then fi # End /etc/init.d/rc -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/rcS.xml b/chapter07/rcS.xml index d68a7e40c..0014d77b3 100644 --- a/chapter07/rcS.xml +++ b/chapter07/rcS.xml @@ -1,15 +1,11 @@ <sect1 id="ch07-rcS"> <title>Creating the rcS script</title> -<para> -The second main boot script is the <filename>rcS</filename> script. Create -the <filename>/etc/init.d/rcS</filename> script by running the following -command: -</para> - -<para> -<screen> -<userinput>cat > rcS << "EOF"</userinput> +<para>The second main boot script is the <filename>rcS</filename> script. +Create the <filename>/etc/init.d/rcS</filename> script by running the following +command:</para> + +<para><screen><userinput>cat > rcS << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/rcS @@ -36,9 +32,7 @@ do done # End /etc/init.d/rcS -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/reboot.xml b/chapter07/reboot.xml index b65c1ebc9..3b69e5088 100644 --- a/chapter07/reboot.xml +++ b/chapter07/reboot.xml @@ -1,14 +1,10 @@ <sect1 id="ch07-reboot"> <title>Creating the reboot script</title> -<para> -Create the <filename>/etc/init.d/reboot</filename> script by running the -following command: -</para> - -<para> -<screen> -<userinput>cat > reboot << "EOF"</userinput> +<para>Create the <filename>/etc/init.d/reboot</filename> script by running the +following command:</para> + +<para><screen><userinput>cat > reboot << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/reboot @@ -22,9 +18,7 @@ echo "System reboot in progress..." /sbin/reboot -d -f -i # End /etc/init.d/reboot -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/sendsignals.xml b/chapter07/sendsignals.xml index 28a306ffa..55ba5dbae 100644 --- a/chapter07/sendsignals.xml +++ b/chapter07/sendsignals.xml @@ -1,14 +1,10 @@ <sect1 id="ch07-sendsignals"> <title>Creating the sendsignals script</title> -<para> -Creat the <filename>/etc/init.d/sendsignals</filename> script by running -the following command: -</para> - -<para> -<screen> -<userinput>cat > sendsignals << "EOF"</userinput> +<para>Creat the <filename>/etc/init.d/sendsignals</filename> script by running +the following command:</para> + +<para><screen><userinput>cat > sendsignals << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/sendsignals @@ -36,9 +32,7 @@ echo -n "Sending all processes the KILL signal..." evaluate_retval # End /etc/init.d/sendsignals -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/setclock.xml b/chapter07/setclock.xml index 613c39323..a7ea9f2b6 100644 --- a/chapter07/setclock.xml +++ b/chapter07/setclock.xml @@ -1,8 +1,7 @@ <sect1 id="ch07-setclock"> <title>Creating the setclock script</title> -<para> -The following script is only for real use when the hardware clock (also +<para>The following script is only for real use when the hardware clock (also known as BIOS or CMOS clock) isn't set to GMT time. The recommended setup is setting the hardware clock to GMT and having the time converted to localtime using the /etc/localtime symbolic link. But if an @@ -10,23 +9,16 @@ OS is run that doesn't understand a clock set to GMT (most notable are Microsoft OS'es) a user might want to set the clock to localtime so that the time is properly displayed on those OS'es. This script will reset the kernel time to the hardware clock without converting the time using -the /etc/localtime symlink. -</para> +the /etc/localtime symlink.</para> -<para> -If you want to use this script on your system even if the +<para>If you want to use this script on your system even if the hardware clock is set to GMT, then the UTC variable below has to be -changed to the value of <emphasis>1</emphasis>. -</para> +changed to the value of <emphasis>1</emphasis>.</para> -<para> -Creat the <filename>/etc/init.d/setclock</filename> script by running -the following command: -</para> +<para>Create the <filename>/etc/init.d/setclock</filename> script by running +the following command:</para> -<para> -<screen> -<userinput>cat > setclock << "EOF"</userinput> +<para><screen><userinput>cat > setclock << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/setclock @@ -65,45 +57,31 @@ echo -n "Setting clock..." evaluate_retval # End /etc/init.d/setclock -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> <sect2> <title>Creating the /etc/sysconfig/clock file</title> -<para> -Create a new file <filename>/etc/sysconfig/clock</filename> by running -the following: -</para> +<para>Create a new file <filename>/etc/sysconfig/clock</filename> by running +the following:</para> -<para> -<screen> -<userinput>cat > /etc/sysconfig/clock << "EOF"</userinput> +<para><screen><userinput>cat > /etc/sysconfig/clock << "EOF"</userinput> # Begin /etc/sysconfig/clock UTC=1 # End /etc/sysconfig/clock -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -If the hardware clock (also known as BIOS or CMOS clock) is not set to +<para>If the hardware clock (also known as BIOS or CMOS clock) is not set to GMT time, then the UTC variable in the /etc/sysconfig/clock file needs to be -set to -the value <emphasis>0</emphasis> (zero). -</para> - -<para> -Now, you may want to take a look at a very good hint explaining how we -deal with time on LFS at -<ulink url="http://archive.linuxfromscratch.org/lfs-hints/time.txt"> -http://archive.linuxfromscratch.org/lfs-hints/time.txt</ulink>. -It explains issues such as timezones, UTC, and the TZ -environment variable. -</para> +set to the value <emphasis>0</emphasis> (zero).</para> + +<para>Now, you may want to take a look at a very good hint explaining how we +deal with time on LFS at <ulink +url="http://archive.linuxfromscratch.org/lfs-hints/time.txt">http://archive.linuxfromscratch.org/lfs-hints/time.txt</ulink>. +It explains issues such as timezones, UTC, and the TZ +environment variable.</para> </sect2> diff --git a/chapter07/symperm.xml b/chapter07/symperm.xml index fc8db2e00..32c4a0a1c 100644 --- a/chapter07/symperm.xml +++ b/chapter07/symperm.xml @@ -1,25 +1,19 @@ <sect1 id="ch07-symperm"> <title>Setting up symlinks and permissions</title> -<para> -These files get the proper permissions and the necessary symlinks are created -by running the following commands. If you didn't create the loadkeys -and setclock scripts, make sure not to type them in the commands below. -</para> +<para>These files get the proper permissions and the necessary symlinks +are created by running the following commands. If you didn't create the loadkeys +and setclock scripts, make sure not to type them in the commands below.</para> -<para> -A note of caution: all the symlinks (that start with an S or K) have to +<para>A note of caution: all the symlinks (that start with an S or K) have to be of the form Sxxxname where xxx are three digits donating the order in which the script is executed (the lower the number the sooner it's executed). If you feel a need to use less than three digits, make sure you pad with extra zero's at the beginning. This means, don't use S20mydaemon, but S020mydaemon. And don't use K2otherdaemon, but -K002otherdaemon. -</para> +K002otherdaemon.</para> -<para> -<screen> -<userinput>cd /etc/init.d &&</userinput> +<para><screen><userinput>cd /etc/init.d &&</userinput> <userinput>chmod 754 rc rcS functions checkfs halt loadkeys mountfs reboot &&</userinput> <userinput>chmod 754 sendsignals setclock sysklogd template &&</userinput> <userinput>chmod 754 localnet ethnet &&</userinput> @@ -55,9 +49,7 @@ K002otherdaemon. <userinput>ln -s ../init.d/ethnet S200ethnet &&</userinput> <userinput>cd ../rc5.d &&</userinput> <userinput>ln -s ../init.d/sysklogd S100sysklogd &&</userinput> -<userinput>ln -s ../init.d/ethnet S200ethnet</userinput> -</screen> -</para> +<userinput>ln -s ../init.d/ethnet S200ethnet</userinput></screen></para> </sect1> diff --git a/chapter07/sysklogd.xml b/chapter07/sysklogd.xml index 81feb1e79..6cf8c1d12 100644 --- a/chapter07/sysklogd.xml +++ b/chapter07/sysklogd.xml @@ -1,14 +1,10 @@ <sect1 id="ch07-sysklogd"> <title>Creating the sysklogd script</title> -<para> -Create the <filename>/etc/init.d/sysklogd</filename> script by running -the following command: -</para> - -<para> -<screen> -<userinput>cat > sysklogd << "EOF"</userinput> +<para>Create the <filename>/etc/init.d/sysklogd</filename> script by running +the following command:</para> + +<para><screen><userinput>cat > sysklogd << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/sysklogd @@ -59,9 +55,7 @@ case "$1" in esac # End /etc/init.d/sysklogd -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/template.xml b/chapter07/template.xml index 72a0b93f7..91e65216b 100644 --- a/chapter07/template.xml +++ b/chapter07/template.xml @@ -1,14 +1,10 @@ <sect1 id="ch07-template"> <title>Creating the template script</title> -<para> -Create the <filename>/etc/init.d/template</filename> script by running -the following command: -</para> - -<para> -<screen> -<userinput>cat > template << "EOF"</userinput> +<para>Create the <filename>/etc/init.d/template</filename> script by running +the following command:</para> + +<para><screen><userinput>cat > template << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/ @@ -52,9 +48,7 @@ case "$1" in esac # End /etc/init.d/ -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect1> diff --git a/chapter07/usage.xml b/chapter07/usage.xml index e20e3cb53..1e8c944f1 100644 --- a/chapter07/usage.xml +++ b/chapter07/usage.xml @@ -1,51 +1,40 @@ <sect1 id="ch07-usage"> <title>How does the booting process with these scripts work?</title> -<para> -Linux uses a special booting facility named SysVinit. It's based on a +<para>Linux uses a special booting facility named SysVinit. It's based on a concept of <emphasis>runlevels</emphasis>. It can be widely different from one system to another, so it can not be assumed that because things worked in <insert distro name> they should work like that in LFS too. LFS has it's own way of doing things, but it respects generally -accepted standards. -</para> +accepted standards.</para> -<para> -SysVinit (which we'll call <emphasis>init</emphasis> from now on) works +<para>SysVinit (which we'll call <emphasis>init</emphasis> from now on) works using a runlevels scheme. There are 7 (from 0 to 6) runlevels (actually, there are more runlevels but they are for special cases and generally not used. The init man page describes those details), and each one of those corresponds to the things the computer is supposed to do when it starts up. The default runlevel is 3. Here are the descriptions of the -different runlevels as they are often implemented: -</para> +different runlevels as they are often implemented:</para> -<literallayout> -0: halt the computer +<literallayout>0: halt the computer 1: single-user mode 2: multi-user mode without networking 3: multi-user mode with networking 4: reserved for customization, otherwise does the same as 3 5: same as 4, it is usually used for GUI login (like X's xdm or KDE's kdm) -6: reboot the computer -</literallayout> +6: reboot the computer</literallayout> -<para> -The command used to change runlevels is <userinput>init +<para>The command used to change runlevels is <userinput>init <runlevel></userinput> where <runlevel> is the target runlevel. For example, to reboot the computer, a user would issue the init 6 command. The reboot command is just an alias, as is the halt -command an alias to init 0. -</para> +command an alias to init 0.</para> -<para> -The /etc/init.d/rcS script is run at every startup of the computer, +<para>The /etc/init.d/rcS script is run at every startup of the computer, before any runlevel is executed and runs the scripts listed in -/etc/rcS.d -</para> +/etc/rcS.d</para> -<para> -There are a number of directories under /etc that look like like rc?.d +<para>There are a number of directories under /etc that look like like rc?.d where ? is the number of the runlevel and rcS.d. A user might take a look at one of them (after this chapter is finished, right now there's nothing @@ -55,55 +44,43 @@ the initial letter. The K means to stop (kill) a service, and the S means to start a service. The numbers determine the order in which the scripts are run, from 000 to 999; the lower the number the sooner it gets executed. When init switches to another runlevel, the appropriate -services get killed and others get started. -</para> +services get killed and others get started.</para> -<para> -The real scripts are in /etc/init.d. They do all the work, and the +<para>The real scripts are in /etc/init.d. They do all the work, and the symlinks all point to them. Killing links and starting links point to the same script in /etc/init.d. That's because the scripts can be called with different parameters like start, stop, restart, reload, status. When a K link is encountered, the appropriate script is run with the stop argument. When a S link is encountered, the appropriate script -is run with the start argument. -</para> +is run with the start argument.</para> -<para> -These are descriptions of what the arguments make the scripts do: -</para> +<para>These are descriptions of what the arguments make the +scripts do:</para> <itemizedlist> -<listitem><para> -<emphasis>start</emphasis>: The service is started. -</para></listitem> +<listitem><para><emphasis>start</emphasis>: The service is +started.</para></listitem> -<listitem><para> -<emphasis>stop</emphasis>: The service is stopped. -</para></listitem> +<listitem><para><emphasis>stop</emphasis>: The service is +stopped.</para></listitem> -<listitem><para> -<emphasis>restart</emphasis>: The service is stopped and then started again. -</para></listitem> +<listitem><para><emphasis>restart</emphasis>: The service is +stopped and then started again.</para></listitem> -<listitem><para> -<emphasis>reload</emphasis>: The configuration of the service is updated. +<listitem><para><emphasis>reload</emphasis>: The configuration +of the service is updated. This is used after the configuration file of a service was modified, when -the service doesn't need to be restarted. -</para></listitem> +the service doesn't need to be restarted.</para></listitem> -<listitem><para> -<emphasis>status</emphasis>: Tells if the service is running and with -which PID's. -</para></listitem> +<listitem><para><emphasis>status</emphasis>: Tells if the service +is running and with which PID's.</para></listitem> </itemizedlist> -<para> -Feel free to modify the way the boot process works (after all it's your +<para>Feel free to modify the way the boot process works (after all it's your LFS system, not ours). The files here are just an example of how it can be -done in a nice way (well what we consider nice anyway. You may hate it). -</para> +done in a nice way (well what we consider nice anyway. You may hate it).</para> </sect1> diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml index f12ffae71..3617612f1 100644 --- a/chapter08/fstab.xml +++ b/chapter08/fstab.xml @@ -1,16 +1,12 @@ <sect1 id="ch07-fstab"> <title>Creating the /etc/fstab file</title> -<para> -In order for certain programs to be able to determine where certain +<para>In order for certain programs to be able to determine where certain partitions are supposed to be mounted by default, the /etc/fstab file is used. A new file <filename>/etc/fstab</filename> is created containing the -following: -</para> +following:</para> -<para> -<screen> -<userinput>cat > /etc/fstab << "EOF"</userinput> +<para><screen><userinput>cat > /etc/fstab << "EOF"</userinput> # Begin /etc/fstab /dev/<LFS-partition designation> / <fs-type> defaults 1 1 @@ -18,16 +14,12 @@ following: proc /proc proc defaults 0 0 # End /etc/fstab -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -<LFS-partition designation>, <swap-partition +<para><LFS-partition designation>, <swap-partition designation> and <fs-type> have to be replaced with the appropriate values -(/dev/hda2, /dev/hda5 and reiserfs for example). -</para> +(/dev/hda2, /dev/hda5 and reiserfs for example).</para> </sect1> diff --git a/chapter08/introduction.xml b/chapter08/introduction.xml index 04fe57aec..c1500a429 100644 --- a/chapter08/introduction.xml +++ b/chapter08/introduction.xml @@ -1,12 +1,10 @@ <sect1 id="ch08-introduction"> <title>Introduction</title> -<para> -This chapter will make LFS bootable. This chapter deals with creating a +<para>This chapter will make LFS bootable. This chapter deals with creating a new fstab file, building a new kernel for the new LFS system and adding the proper entries to LILO -so that the LFS system can be selected for booting at the LILO: prompt. -</para> +so that the LFS system can be selected for booting at the LILO: prompt.</para> </sect1> diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index 4fd0bf4a2..55de3e743 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -1,17 +1,13 @@ <sect1 id="ch08-kernel"> <title>Installing a kernel</title> -<para> -Building the kernel involves a few steps: configuring it and compiling +<para>Building the kernel involves a few steps: configuring it and compiling it. There are a few ways to configure the kernel. If you don't like the way this book does it, read the <filename>README</filename> that comes with the kernel source tree, and find out what the options are. The -following commands are run to build the kernel: -</para> +following commands are run to build the kernel:</para> -<para> -<screen> -<userinput>cd /usr/src/linux &&</userinput> +<para><screen><userinput>cd /usr/src/linux &&</userinput> <userinput>make mrproper &&</userinput> <userinput>make menuconfig &&</userinput> <userinput>make dep &&</userinput> @@ -19,13 +15,10 @@ following commands are run to build the kernel: <userinput>make modules &&</userinput> <userinput>make modules_install &&</userinput> <userinput>cp arch/i386/boot/bzImage /boot/lfskernel &&</userinput> -<userinput>cp System.map /boot</userinput> -</screen> -</para> +<userinput>cp System.map /boot</userinput></screen></para> -<para> -Note: the arch/i386/boot/bzImage path may vary on different platforms. -</para> +<para>Note: the arch/i386/boot/bzImage path may vary on +different platforms.</para> </sect1> diff --git a/chapter08/lilo.xml b/chapter08/lilo.xml index 6abec4e89..c6c20b629 100644 --- a/chapter08/lilo.xml +++ b/chapter08/lilo.xml @@ -1,86 +1,54 @@ <sect1 id="ch08-lilo"> <title>Making the LFS system bootable</title> -<para> -In order to being able to boot the LFS system, we need to update our +<para>In order to being able to boot the LFS system, we need to update our bootloader. We're assuming that your host system is using Lilo (since -that's the most commonly used boot loader at the moment). -</para> +that's the most commonly used boot loader at the moment).</para> -<para> -We will not be running the lilo program inside chroot. Running lilo +<para>We will not be running the lilo program inside chroot. Running lilo inside chroot can have fatal side-effects which render your MBR useless and you'd need a boot disk to be able to start any Linux system (either -the host system or the LFS system). -</para> +the host system or the LFS system).</para> -<para> -First we'll exit chroot and copy the lfskernel file to the host system: -</para> +<para>First we'll exit chroot and copy the lfskernel file to the host +system:</para> -<para> -<screen> -<userinput>logout</userinput> -<userinput>cp $LFS/boot/lfskernel /boot</userinput> -</screen> -</para> +<para><screen><userinput>logout</userinput> +<userinput>cp $LFS/boot/lfskernel /boot</userinput></screen></para> -<para> -The next step is adding an entry to /etc/lilo.conf so that we can -choose LFS when booting the computer: -</para> +<para>The next step is adding an entry to /etc/lilo.conf so that we can +choose LFS when booting the computer:</para> -<para> -<screen> -<userinput>cat >> /etc/lilo.conf << "EOF"</userinput> +<para><screen><userinput>cat >> /etc/lilo.conf << "EOF"</userinput> image=/boot/lfskernel label=lfs root=<partition> read-only -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -<partition> must be replaced by the LFS partition's designation. -</para> +<para><partition> must be replaced by the LFS +partition's designation.</para> -<para> -Now the boot loader gets updated by running: -</para> +<para>Now the boot loader gets updated by running:</para> -<para> -<screen> -<userinput>/sbin/lilo</userinput> -</screen> -</para> +<para><screen><userinput>/sbin/lilo</userinput></screen></para> -<para> -The last step is syncing the host system lilo config. files with the -LFS system: -</para> +<para>The last step is syncing the host system lilo config. files with the +LFS system:</para> -<para> -<screen> -<userinput>cp /etc/lilo.conf $LFS/etc &&</userinput> -<userinput>cp <kernel images> $LFS/boot</userinput> -</screen> -</para> +<para><screen><userinput>cp /etc/lilo.conf $LFS/etc &&</userinput> +<userinput>cp <kernel images> $LFS/boot</userinput></screen></para> -<para> -To find out which kernel images files are being used, look at the +<para>To find out which kernel images files are being used, look at the /etc/lilo.conf file and find the lines starting with <emphasis>image=</emphasis>. If your host system has kernel files in other places than the /boot directory, make sure you update the paths in the $LFS/etc/lilo.conf file so that it does look for them in the -/boot directory. -</para> +/boot directory.</para> -<para> -As soon as we have booted into LFS we can run +<para>As soon as we have booted into LFS we can run <userinput>/sbin/lilo</userinput> from the LFS system in order to have -the latest Lilo version in the MBR. -</para> +the latest Lilo version in the MBR.</para> </sect1> diff --git a/chapter08/reboot.xml b/chapter08/reboot.xml index e55145af9..0b1b60de8 100644 --- a/chapter08/reboot.xml +++ b/chapter08/reboot.xml @@ -1,48 +1,30 @@ <sect1 id="ch08-reboot"> <title>Rebooting the system</title> -<para> -Now that all software has been installed, bootscripts have been created, +<para>Now that all software has been installed, bootscripts have been created, it's time to reboot the computer. Before we reboot let's exit the -chroot'ed environment first and unmount the LFS partition by running: -</para> - -<para> -<screen> -<userinput>umount $LFS/proc &&</userinput> -<userinput>umount $LFS</userinput> -</screen> -</para> - -<para> -And you can reboot your system by running something like: -</para> - -<para> -<screen> -<userinput>/sbin/shutdown -r now</userinput> -</screen> -</para> - -<para> -At the LILO: prompt make sure that you tell it to boot +chroot'ed environment first and unmount the LFS partition by running:</para> + +<para><screen><userinput>umount $LFS/proc &&</userinput> +<userinput>umount $LFS</userinput></screen></para> + +<para>And you can reboot your system by running something like:</para> + +<para><screen><userinput>/sbin/shutdown -r now</userinput></screen></para> + +<para>At the LILO: prompt make sure that you tell it to boot <emphasis>lfs</emphasis> and not the default entry which will boot your -host system again. -</para> +host system again.</para> -<para> -During the first boot you will get a few errors from syslogd and klogd. +<para>During the first boot you will get a few errors from syslogd and klogd. These errors occur because we haven't setup networking yet. That will be taken care of in the next chapter. So don't worry about those errors -for now. -</para> +for now.</para> -<para> -As just stated, one thing remains to be done and that's setting up +<para>As just stated, one thing remains to be done and that's setting up networking. After having rebooted and finished the next chapter of this book the LFS system is completely ready for use, and you can start -adding your own software. -</para> +adding your own software.</para> </sect1> diff --git a/chapter09/theend.xml b/chapter09/theend.xml index a4edb750d..a75a86cd6 100644 --- a/chapter09/theend.xml +++ b/chapter09/theend.xml @@ -1,32 +1,25 @@ <sect1 id="ch09-theend"> <title>The End</title> -<para> -Well done! You have finished installing your LFS system. It may have +<para>Well done! You have finished installing your LFS system. It may have been a long process but it was well worth it. We wish you a lot of fun -with your new shiny custom built Linux system. -</para> +with your new shiny custom built Linux system.</para> -<para> -Now would be a good time to strip all debug symbols from +<para>Now would be a good time to strip all debug symbols from the binaries on your LFS system. If you are not a programmer and don't plan on debugging your software, then you will be happy to know that you can reclaim a few tens of megs by removing debug symbols. This process causes no inconvenience other than not being able to debug the software fully anymore, which is not an issue if you don't know how to debug. You can -remove the symbols by executing the following command: -</para> +remove the symbols by executing the following command:</para> -<para> -Disclaimer: 98% of the people who use the command mentioned below don't +<para>Disclaimer: 98% of the people who use the command mentioned below don't experience any problems. But do make a backup of your LFS system before you run this command. There's a slight chance it may backfire on you and render your system unusable (mostly by destroying your kernel modules -and dynamic & shared libraries). -</para> +and dynamic & shared libraries).</para> -<para> -Having that said, the --strip-debug option to strip is quite harmless +<para>Having that said, the --strip-debug option to strip is quite harmless under normal circumstances. It doesn't strip anything vital from the files. It also is quite safe to use --strip-all on regular programs (don't use that on libraries - they will be destroyed) but it's not as @@ -34,72 +27,45 @@ safe and the space you gain is not all that much. But if you're tight on disk space every little bit helps, so decide yourself. Please refer to the strip man page for other strip options you can use. The general idea is to not run strip on libraries (other than --strip-debug) just to be -on the safe side. -</para> +on the safe side.</para> -<para> -<screen> -<userinput>find / -type f -exec strip --strip-debug '{}' ';'</userinput> -</screen> -</para> +<para><screen><userinput>find / -type f -exec strip --strip-debug '{}' ';'</userinput></screen></para> -<para> -If you plan to ever upgrade to a newer LFS version in the future it +<para>If you plan to ever upgrade to a newer LFS version in the future it will be a good idea to create the /etc/lfs-&version; file. By having this file it is very easy for you (and for us if you are going to ask for help with something at some point) to find out which LFS version you have installed on your system. This can just be a null-byte file by -running: -</para> +running:</para> -<para> -<screen> -<userinput>touch /etc/lfs-&version;</userinput> -</screen> -</para> +<para><screen><userinput>touch /etc/lfs-&version;</userinput></screen></para> -<para> -One final thing you may want to do is run lilo now that you are booted +<para>One final thing you may want to do is run lilo now that you are booted into LFS. This way you will put the LFS version of LILO in the MBR rather than the one that's there right now from your host system. Depending on how old your host distribution is, the LFS version may have -more advanced features you need/could use. -</para> +more advanced features you need/could use.</para> -<para> -Either way, run the following to make the lilo version installed on LFS -active: -</para> +<para>Either way, run the following to make the lilo version installed on LFS +active:</para> -<para> -<screen> -<userinput>/sbin/lilo</userinput> -</screen> -</para> +<para><screen><userinput>/sbin/lilo</userinput></screen></para> -<para> -If you are wondering: "Well, where to go now?" you'll be glad to hear that +<para>If you are wondering: "Well, where to go now?" you'll be glad to hear that someone has written an LFS hint on the subject at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/afterlfs.txt"> -http://archive.linuxfromscratch.org/lfs-hints/afterlfs.txt</ulink>. +url="http://archive.linuxfromscratch.org/lfs-hints/afterlfs.txt">http://archive.linuxfromscratch.org/lfs-hints/afterlfs.txt</ulink>. On a same note, if you are not only newbie to LFS, but also newbie to Linux in general, you may find the newbie hint at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/newbie.txt"> -http://archive.linuxfromscratch.org/lfs-hints/newbie.txt</ulink> - very interesting. -</para> +url="http://archive.linuxfromscratch.org/lfs-hints/newbie.txt">http://archive.linuxfromscratch.org/lfs-hints/newbie.txt</ulink> + very interesting.</para> -<para> -Don't forget there are several LFS mailinglists you can subscribe to if +<para>Don't forget there are several LFS mailinglists you can subscribe to if you are in need of help, advice, etc. See <ulink url="ch01-maillists.html">Chapter 1 - Mailinglists</ulink> for -more information. -</para> +more information.</para> -<para> -Again, we thank you for using the LFS Book and hope you found this book -useful and worth your time. -</para> +<para>Again, we thank you for using the LFS Book and hope you found this book +useful and worth your time.</para> </sect1> diff --git a/dedication/dedicated.xml b/dedication/dedicated.xml index 638cdcbfe..3658864d5 100644 --- a/dedication/dedicated.xml +++ b/dedication/dedicated.xml @@ -1,7 +1,3 @@ -<para> - -This book is dedicated to my loving and supportive wife -<emphasis>Beverly Beekmans</emphasis>. - -</para> +<para>This book is dedicated to my loving and supportive wife +<emphasis>Beverly Beekmans</emphasis>.</para> diff --git a/preface/foreword.xml b/preface/foreword.xml index 63f2c2b47..8ca66cbf1 100644 --- a/preface/foreword.xml +++ b/preface/foreword.xml @@ -1,8 +1,7 @@ <sect1 id="pf-foreword"> <title>Foreword</title> -<para> -Having used a number of different Linux distributions, I was never fully +<para>Having used a number of different Linux distributions, I was never fully satisfied with any of those. I didn't like the way the bootscripts were arranged, I didn't like the way certain programs were configured by default, and more of those things. I came to realize that if I wanted to @@ -10,20 +9,15 @@ be fully satisfied with a Linux system, I would have to build my own system from scratch, ideally using only the source code. Not using pre-compiled packages of any kind. No help from some sort of CD-ROM or bootdisk that would install some basic utilities. I would use my current -Linux system and use that one to build my own. -</para> +Linux system and use that one to build my own.</para> -<para> -This, at one time, wild idea seemed very difficult and at times almost +<para>This, at one time, wild idea seemed very difficult and at times almost impossible. After sorting out all kinds of dependency problems, compile problems, etcetera, a custom-built Linux system was created and fully operational. I called this system an LFS system, which stands for Linux -From Scratch. -</para> +From Scratch.</para> -<para> -I hope all of you will have a great time working on LFS! -</para> +<para>I hope all of you will have a great time working on LFS!</para> <literallayout> -- diff --git a/preface/organization.xml b/preface/organization.xml index bba292061..fa250f2a0 100644 --- a/preface/organization.xml +++ b/preface/organization.xml @@ -1,11 +1,9 @@ <sect1 id="pre-organization"> <title>Organization</title> -<para> -This book is divided into the following parts. Although there is a lot +<para>This book is divided into the following parts. Although there is a lot of duplicate information in certain parts, it's the easiest way to read -it. -</para> +it.</para> &pf-oz-organpart1; &pf-oz-organpart2; diff --git a/preface/organpart1.xml b/preface/organpart1.xml index 3e7b3e99c..255fc6cda 100644 --- a/preface/organpart1.xml +++ b/preface/organpart1.xml @@ -1,12 +1,10 @@ <sect2 id="pre-organ1"> <title>Part I - Introduction</title> -<para> -Part One gives general information about this book (versions, where +<para>Part One gives general information about this book (versions, where to get it, changelog, mailing lists, and how to get in touch with us). It also explains a few important aspects you really want and need to -read before starting to build an LFS system. -</para> +read before starting to build an LFS system.</para> </sect2> diff --git a/preface/organpart2.xml b/preface/organpart2.xml index ec2de01c4..71fd90ab6 100644 --- a/preface/organpart2.xml +++ b/preface/organpart2.xml @@ -1,12 +1,10 @@ <sect2 id="pre-organ2"> <title>Part II - Installation of the LFS system</title> -<para> -Part Two guides through the installation of the LFS system which will +<para>Part Two guides through the installation of the LFS system which will be the foundation for the rest of the system. Whatever you choose to do with your brand new LFS system, it will be built on the foundation -that's installed in this part. -</para> +that's installed in this part.</para> </sect2> diff --git a/preface/organpart3.xml b/preface/organpart3.xml index 8f2bdc63a..73fdff926 100644 --- a/preface/organpart3.xml +++ b/preface/organpart3.xml @@ -1,9 +1,7 @@ <sect2 id="pre-organ3"> <title>Part III - Appendixes</title> -<para> -Part Three contains various Appendices. -</para> +<para>Part Three contains various Appendices.</para> </sect2> diff --git a/preface/whonotread.xml b/preface/whonotread.xml index 80d7d08dc..1e2cb88b4 100644 --- a/preface/whonotread.xml +++ b/preface/whonotread.xml @@ -1,31 +1,24 @@ <sect1 id="pre-whonotread"> <title>Who would not want to read this book</title> -<para> -People who don't want to build an entire Linux system from scratch +<para>People who don't want to build an entire Linux system from scratch probably don't want to read this book. If you, however, want to learn more about what happens behind the scenes, in particular what happens between turning on the computer and seeing the command prompt, you may want to read the <quote>From Power Up To Bash Prompt</quote> (P2B) HOWTO. This HOWTO builds a bare system, in way similar to the one this book uses, but it focuses more on just installing a bootable system instead -of a complete system. -</para> +of a complete system.</para> -<para> -To decide whether to read this book or the P2B HOWTO, ask yourself this +<para>To decide whether to read this book or the P2B HOWTO, ask yourself this question: "Is my main objective to get a working Linux system that I'm going to build myself and, along the way, learn what every component of a system is for, or is just the learning part my main objective?" If you want to build and learn, read this book. If you just want to learn -the basics, then the P2B HOWTO is probably better material to read. -</para> +the basics, then the P2B HOWTO is probably better material to read.</para> -<para> -The <quote>From Power Up To Bash Prompt</quote> HOWTO is located at -<ulink url="http://www.netspace.net.au/~gok/power2bash/"> -http://www.netspace.net.au/~gok/power2bash/</ulink> -</para> +<para>The <quote>From Power Up To Bash Prompt</quote> HOWTO is located at +<ulink url="http://www.netspace.net.au/~gok/power2bash/">http://www.netspace.net.au/~gok/power2bash/</ulink></para> </sect1> diff --git a/preface/whoread.xml b/preface/whoread.xml index 553ab98d3..722899cd4 100644 --- a/preface/whoread.xml +++ b/preface/whoread.xml @@ -1,27 +1,23 @@ <sect1 id="pre-whoread"> <title>Who would want to read this book</title> -<para> -This book is intended for Linux users who want to setup their own +<para>This book is intended for Linux users who want to setup their own custom built Linux system. Reasons for wanting to build such a system are diverse. Perhaps you want to get into more detail as to what happens behind the scenes. Perhaps you are fed up with distributions which are often bloated or perhaps you don't want to rely on pre-compiled binaries due to security concerns. There are many other reasons why someone may want a custom built system. If any of these reasons apply to -you, this book is meant for you. -</para> +you, this book is meant for you.</para> -<para> -The fruits of building your own system are plentiful, but the labor may +<para>The fruits of building your own system are plentiful, but the labor may be hard. There is a long way ahead, but in the end you will be able to call yourself the proud owner of your own Linux system, completely tailored after your needs. You will dictate the layout of bootscripts, the file system hierarchy, which programs are installed in which directory, which versions of software to use, and more. Perhaps the most important reason is that you will know exactly what is installed where, -why, and how. -</para> +why, and how.</para> </sect1> |