XML changes

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

5 files changed, 75 insertions, 160 deletions

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" &gt; 
 $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>