XML changes

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

5 files changed, 54 insertions, 121 deletions

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 &gt; /etc/fstab &lt;&lt; "EOF"</userinput>
+<para><screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"</userinput>
 # Begin /etc/fstab
 
 /dev/&lt;LFS-partition designation&gt; / &lt;fs-type&gt; 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>
-&lt;LFS-partition designation&gt;, &lt;swap-partition
+<para>&lt;LFS-partition designation&gt;, &lt;swap-partition
 designation&gt; and &lt;fs-type&gt; 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 &amp;&amp;</userinput>
+<para><screen><userinput>cd /usr/src/linux &amp;&amp;</userinput>
 <userinput>make mrproper &amp;&amp;</userinput>
 <userinput>make menuconfig &amp;&amp;</userinput>
 <userinput>make dep &amp;&amp;</userinput>
@@ -19,13 +15,10 @@ following commands are run to build the kernel:
 <userinput>make modules &amp;&amp;</userinput>
 <userinput>make modules_install &amp;&amp;</userinput>
 <userinput>cp arch/i386/boot/bzImage /boot/lfskernel &amp;&amp;</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 &gt;&gt; /etc/lilo.conf &lt;&lt; "EOF"</userinput>
+<para><screen><userinput>cat &gt;&gt; /etc/lilo.conf &lt;&lt; "EOF"</userinput>
 image=/boot/lfskernel
         label=lfs
         root=&lt;partition&gt;
         read-only
-<userinput>EOF</userinput>
-</screen>
-</para>
+<userinput>EOF</userinput></screen></para>
 
-<para>
-&lt;partition&gt; must be replaced by the LFS partition's designation.
-</para>
+<para>&lt;partition&gt; 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 &amp;&amp;</userinput>
-<userinput>cp &lt;kernel images&gt; $LFS/boot</userinput>
-</screen>
-</para>
+<para><screen><userinput>cp /etc/lilo.conf $LFS/etc &amp;&amp;</userinput>
+<userinput>cp &lt;kernel images&gt; $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 &amp;&amp;</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 &amp;&amp;</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>