Internal markup reworking to fix the extraneous whitespace problem in the "tidy generated" web site pages. Essentially replace all ocurrences of <para><screen> with <screen> (and of course the matching closing tags).

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

3 files changed, 23 insertions, 23 deletions

diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml
index b89afd0c2..c52daee44 100644
--- a/chapter08/fstab.xml
+++ b/chapter08/fstab.xml
@@ -7,7 +7,7 @@ determine where partitions are to be mounted by default, which file systems
 must be checked and in which order. Create a new file systems table like
 this:</para>
 
-<para><screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"</userinput>
 # Begin /etc/fstab
 
 # filesystem  mount-point  fs-type  options         dump  fsck-order
@@ -19,7 +19,7 @@ devpts        /dev/pts     devpts   gid=4,mode=620  0     0
 shm           /dev/shm     tmpfs    defaults        0     0
 
 # End /etc/fstab
-<userinput>EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen>
 
 <para>Of course, replace <filename>xxx</filename>, <filename>yyy</filename>
 and <filename>fff</filename> with the values appropriate for your system --
@@ -43,7 +43,7 @@ kernel source tree.</para>
 <filename>fstab</filename> file. One example is a line to use if you intend to
 use USB devices:</para>
 
-<para><screen>usbfs       /proc/bus/usb  usbfs    defaults    0     0</screen></para>
+<screen>usbfs       /proc/bus/usb  usbfs    defaults    0     0</screen>
 
 <para>This option will of course only work if you have the relevant support
 compiled into your kernel.</para>
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 426457deb..af69909b6 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -6,7 +6,7 @@
 we need to ensure we can boot it.  To do this, we will run the
 <userinput>grub</userinput> program.</para>
 
-<para><screen><userinput>grub</userinput></screen></para>
+<screen><userinput>grub</userinput></screen>
 
 <para>Grub uses its own naming structure for drives and partitions, in the form
 of (hdn,m), where <emphasis>n</emphasis> is the hard drive number, and
@@ -24,22 +24,22 @@ partition is <filename>hda4</filename>.</para>
 <para>First, tell Grub where to search for its <filename>stage{1,2}</filename>
 files -- you can use Tab everywhere to make Grub show the alternatives:</para>
 
-<para><screen><userinput>root (hd0,3)</userinput></screen></para>
+<screen><userinput>root (hd0,3)</userinput></screen>
 
 <para>Then tell it to install itself into the MBR (Master Boot Record) of
 <filename>hda</filename>:</para>
 
-<para><screen><userinput>setup (hd0)</userinput></screen></para>
+<screen><userinput>setup (hd0)</userinput></screen>
 
 <para>If all is well, Grub will have reported finding its files in
 <filename>/boot/grub</filename>. That's all there was to it:</para>
 
-<para><screen><userinput>quit</userinput></screen></para>
+<screen><userinput>quit</userinput></screen>
 
 <para>Now we need to create the <filename>menu.lst</filename> file, which
 defines Grub's boot menu:</para>
 
-<para><screen><userinput>cat &gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
 # Begin /boot/grub/menu.lst
 
 # By default boot the first menu entry.
@@ -55,26 +55,26 @@ color green/black light-green/black
 title LFS 5.0
 root (hd0,3)
 kernel /boot/lfskernel root=/dev/hda4 ro
-<userinput>EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen>
 
 <para>You may want to add an entry for your host distribution.  It might look
 like this:</para>
 
-<para><screen><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
 title Red Hat
 root (hd0,2)
 kernel /boot/kernel-2.4.20 root=/dev/hda3 ro
 initrd /boot/initrd-2.4.20
-<userinput>EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen>
 
 <para>Also, if you happen to dual-boot Windows, the following entry should
 allow booting it:</para>
 
-<para><screen><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
 title Windows
 rootnoverify (hd0,0)
 chainloader +1
-<userinput>EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen>
 
 <para>If <userinput>info grub</userinput> doesn't tell you all you want to
 know, you can find more information regarding Grub on its website, located at:
diff --git a/chapter08/kernel-inst.xml b/chapter08/kernel-inst.xml
index 5ef8dc406..5868d39d2 100644
--- a/chapter08/kernel-inst.xml
+++ b/chapter08/kernel-inst.xml
@@ -10,7 +10,7 @@ file in the kernel source tree for alternative methods.</para>
 
 <para>Prepare for compilation by running the following command:</para>
 
-<para><screen><userinput>make mrproper</userinput></screen></para>
+<screen><userinput>make mrproper</userinput></screen>
 
 <para>This ensures that the kernel tree is absolutely clean. The kernel
 team recommends that this command be issued prior to
@@ -19,7 +19,7 @@ on the source tree being clean after untarring.</para>
 
 <para>Configure the kernel via a menu-driven interface:</para>
 
-<para><screen><userinput>make menuconfig</userinput></screen></para>
+<screen><userinput>make menuconfig</userinput></screen>
 
 <para><userinput>make oldconfig</userinput> may be more appropriate
 in some situations. See the <filename>README</filename> file for
@@ -39,15 +39,15 @@ systems" menu and is normally enabled by default.</para>
 
 <para>Verify dependencies and create dependency information files:</para>
 
-<para><screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc dep</userinput></screen></para>
+<screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc dep</userinput></screen>
 
 <para>Compile the kernel image:</para>
 
-<para><screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc bzImage</userinput></screen></para>
+<screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc bzImage</userinput></screen>
 
 <para>Compile the drivers which have been configured as modules:</para>
 
-<para><screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc modules</userinput></screen></para>
+<screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc modules</userinput></screen>
 
 <para>If you intend to use kernel modules, you will need an
 <filename>/etc/modules.conf</filename> file. Information pertaining
@@ -60,16 +60,16 @@ interest to you.</para>
 
 <para>Install the modules:</para>
 
-<para><screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc modules_install</userinput></screen></para>
+<screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc modules_install</userinput></screen>
 
 <para>As nothing is complete without documentation, build the manual pages
 that come with the kernel:</para>
 
-<para><screen><userinput>make mandocs</userinput></screen></para>
+<screen><userinput>make mandocs</userinput></screen>
 
 <para>And install these pages:</para>
 
-<para><screen><userinput>cp -a Documentation/man /usr/share/man/man9</userinput></screen></para>
+<screen><userinput>cp -a Documentation/man /usr/share/man/man9</userinput></screen>
 
 <para>Kernel compilation has finished, but some of the files created
 still reside in the source tree. To complete the installation, two
@@ -79,13 +79,13 @@ directory.</para>
 <para>The path to the kernel file may vary depending on the platform
 you're using. Issue the following command to install the kernel:</para>
 
-<para><screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel</userinput></screen></para>
+<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel</userinput></screen>
 
 <para><filename>System.map</filename> is a symbol file for the kernel.
 It maps the function entrypoints of every function in the kernel API,
 as well as the addresses of the kernel data structures for the running
 kernel. Issue the following command to install the map file:</para>
 
-<para><screen><userinput>cp System.map /boot</userinput></screen></para>
+<screen><userinput>cp System.map /boot</userinput></screen>
 
 </sect2>