Index: appendices/old/old.xml
===================================================================
--- appendices/old/old.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ appendices/old/old.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -1,3 +1,3 @@
-<appendix id="appendices-old">
+<appendix role="dsssl" id="appendices-old">
 <?dbhtml filename="old.html" dir="appendices"?>
 <title>Packages which are no longer in the main BLFS Book</title>
Index: appendices/symlinks/symlinks.xml
===================================================================
--- appendices/symlinks/symlinks.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ appendices/symlinks/symlinks.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -1,3 +1,3 @@
-<appendix id="appendices-symlinks">
+<appendix role="dsssl" id="appendices-symlinks">
 <?dbhtml filename="symlinks.html" dir="appendices"?>
 <title>List of rc?.d symlinks used in LFS/BLFS</title>
Index: basicnet/textweb/w3m/w3m-intro.xml
===================================================================
--- basicnet/textweb/w3m/w3m-intro.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ basicnet/textweb/w3m/w3m-intro.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -17,5 +17,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="gpm"/>, <xref linkend="openssl"/>, <xref
-linkend="imlib"/>, <xref linkend="gdk"/> and <xref
+linkend="imlib"/>, <xref linkend="imlib2"/>, <xref linkend="gdk"/> and <xref
 linkend="compface"/></para></sect4>
 </sect3>
Index: book/book.ent
===================================================================
--- book/book.ent	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ book/book.ent	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -23,2 +23,3 @@
 <!ENTITY hints-root "http://hints.linuxfromscratch.org">
 <!ENTITY nbsp " ">
+<!ENTITY publisher "Unknown">
Index: general/general.ent
===================================================================
--- general/general.ent	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ general/general.ent	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -54,4 +54,5 @@
 <!ENTITY % svgalib SYSTEM "graphlib/svgalib/svgalib.ent">
 <!ENTITY % directfb SYSTEM "graphlib/directfb/directfb.ent">
+<!ENTITY % imlib2 SYSTEM "graphlib/imlib2/imlib2.ent">
 %lcms;
 %libjpeg;
@@ -64,4 +65,5 @@
 %svgalib;
 %directfb;
+%imlib2;
 
 <!-- General Utilities -->
Index: general/graphlib/directfb/directfb-inst.xml
===================================================================
--- general/graphlib/directfb/directfb-inst.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ general/graphlib/directfb/directfb-inst.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -2,6 +2,5 @@
 <title>Installation of <application>DirectFB</application></title>
 
-<note><para>
-DirectFB needs a Linux kernel with frame buffer support. Check
+<note><para>DirectFB needs a Linux kernel with frame buffer support. Check
 the documentation in the kernel tree
 (<filename class="directory">/usr/src/linux/Documentation/fb/</filename>)
@@ -16,3 +15,10 @@
 make install</command></userinput></screen>
 
+<para>If you decided to add optional image and video providers then you
+have to install DirectFB-extra package too:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
 </sect2>
Index: general/graphlib/directfb/directfb-intro.xml
===================================================================
--- general/graphlib/directfb/directfb-intro.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ general/graphlib/directfb/directfb-intro.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -15,4 +15,11 @@
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Optional image and video providers: <ulink
+url="http://www.directfb.org/download/DirectFB-extra/DirectFB-extra-0.9.16.tar.gz"/>
+</para></listitem>
+</itemizedlist></sect3>
+
 <sect3><title><application>DirectFB</application> dependencies</title>
 <sect4><title>Required</title>
@@ -21,6 +28,8 @@
 </para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="SDL"/>, <xref linkend="libmpeg3"/> and
-<xref linkend="pkgconfig"/></para></sect4>
+<para><xref linkend="SDL"/>, <xref linkend="libmpeg3"/>
+<xref linkend="pkgconfig"/>, <xref linkend="imlib2"/>, <xref
+linkend="openquicktime"/> and <xref linkend="avifile"/>
+</para></sect4>
 </sect3>
 
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ general/graphlib/graphlib.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -18,4 +18,5 @@
 &SVGAlib;
 &DirectFB;
+&imlib2;
 
 </chapter>
Index: general/graphlib/imlib2.xml
===================================================================
--- general/graphlib/imlib2.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ general/graphlib/imlib2.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,10 @@
+<sect1 id="imlib2" xreflabel="Imlib2-&imlib2-version;">
+<?dbhtml filename="imlib2.html" dir="basicnet"?>
+<title>Imlib2-&imlib2-version;</title>
+
+&imlib2-intro;
+&imlib2-inst;
+&imlib2-config;
+&imlib2-desc;
+
+</sect1>
Index: general/graphlib/imlib2/imlib2-config.xml
===================================================================
--- general/graphlib/imlib2/imlib2-config.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ general/graphlib/imlib2/imlib2-config.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Configuring Imlib2</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
Index: general/graphlib/imlib2/imlib2-desc.xml
===================================================================
--- general/graphlib/imlib2/imlib2-desc.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ general/graphlib/imlib2/imlib2-desc.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Contents</title>
+
+<para>
+This package contains <filename class="libraryfile">libImlib2</filename> library 
+as well as various filters and image loader libraries.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libImlib2</title>
+<para><filename class="libraryfile">libImlib2</filename> 
+provides the functions for programs to deal with various image data formats.
+</para></sect3>
+
+</sect2>
Index: general/graphlib/imlib2/imlib2-inst.xml
===================================================================
--- general/graphlib/imlib2/imlib2-inst.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ general/graphlib/imlib2/imlib2-inst.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>Imlib2</application></title>
+
+<para>Install <application>Imlib2</application> by running the
+following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: general/graphlib/imlib2/imlib2-intro.xml
===================================================================
--- general/graphlib/imlib2/imlib2-intro.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ general/graphlib/imlib2/imlib2-intro.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,27 @@
+<sect2>
+<title>Introduction to <application>Imlib2</application></title>
+
+<para><application>Imlib2</application> is a graphics library for fast file 
+loading, saving, rendering and manipulation.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&imlib2-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&imlib2-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &imlib2-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &imlib2-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &imlib2-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Imlib2</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libjpeg"/>, <xref linkend="libpng"/> and <xref
+linkend="freetype2"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="xfree86"/>, <xref linkend="libtiff"/> and <xref
+linkend="libungif"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: general/graphlib/imlib2/imlib2.ent
===================================================================
--- general/graphlib/imlib2/imlib2.ent	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ general/graphlib/imlib2/imlib2.ent	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,13 @@
+<!ENTITY imlib2 SYSTEM "../imlib2.xml">
+<!ENTITY imlib2-intro SYSTEM "imlib2-intro.xml">
+<!ENTITY imlib2-inst SYSTEM "imlib2-inst.xml">
+<!ENTITY imlib2-exp SYSTEM "imlib2-exp.xml">
+<!ENTITY imlib2-desc SYSTEM "imlib2-desc.xml">
+<!ENTITY imlib2-config SYSTEM "imlib2-config.xml">
+<!ENTITY imlib2-buildsize "20 MB">
+<!ENTITY imlib2-version "1.1.0">
+<!ENTITY imlib2-download-http
+"http://heanet.dl.sourceforge.net/sourceforge/enlightenment/imlib2-&imlib2-version;.tar.gz">
+<!ENTITY imlib2-download-ftp "">
+<!ENTITY imlib2-size "796 KB">
+<!ENTITY imlib2-time "0.53 SBU">
Index: index.xml
===================================================================
--- index.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ index.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030909">
-<!ENTITY releasedate "September 9th, 2003">
+<!ENTITY version "20030911">
+<!ENTITY releasedate "September 11th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ introduction/welcome/changelog.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -10,4 +10,13 @@
 
 <itemizedlist>
+
+<listitem><para>September 11th, 2003 [lary]: added imlib2 and
+openquicktime submitted by Igor.</para></listitem>
+
+<listitem><para>September 11th, 2003 [larry]: edited firewalling to
+conform to the rest of book.  Used 'screen' for kernel settings instead
+of 'table'. Changed from 'orderlist' to 'itemizedlist'. Converted
+footnotes to inline notation, except kernel which was inconsistent with
+the rest of the book.</para></listitem>
 
 <listitem><para>September 9th, 2003 [larry]: update to esp
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ multimedia/libdriv/libdriv.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -20,4 +20,5 @@
 &libmpeg3;
 &libmad;
+&openquicktime;
 
 </chapter>
Index: multimedia/libdriv/openquicktime.xml
===================================================================
--- multimedia/libdriv/openquicktime.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ multimedia/libdriv/openquicktime.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,9 @@
+<sect1 id="openquicktime" xreflabel="OpenQuicktime-&openquicktime-version;">
+<?dbhtml filename="openquicktime.html" dir="basicnet"?>
+<title>OpenQuicktime-&openquicktime-version;</title>
+
+&openquicktime-intro;
+&openquicktime-inst;
+&openquicktime-desc;
+
+</sect1>
Index: multimedia/libdriv/openquicktime/openquicktime-desc.xml
===================================================================
--- multimedia/libdriv/openquicktime/openquicktime-desc.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ multimedia/libdriv/openquicktime/openquicktime-desc.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,37 @@
+<sect2>
+<title>Contents</title>
+
+<para>This package provides <filename class="libraryfile">libopenquicktime</filename> 
+library and utilities that allow you to manipulate Quicktime files.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libopenquicktime</title>
+<para>This is the core library.</para></sect3>
+
+<sect3><title>dechunk</title>
+<para><command>dechunk</command> extracts <acronym>RGB</acronym> frames 
+from a movie and writes them as <acronym>PPM</acronym> images.
+</para></sect3>
+
+<sect3><title>make_streamable</title>
+<para>This program makes the Quicktime file streamable. 
+</para></sect3>
+
+<sect3><title>qtdump</title>
+<para><command>qtdump</command> dumps all tables in movie.
+</para></sect3>
+
+<sect3><title>qtinfo</title>
+<para><command>qtinfo</command> reads all the information about the file.
+</para></sect3>
+
+<sect3><title>recover</title>
+<para>This program recovers <acronym>JPEG</acronym> and
+<acronym>PCM</acronym> audio from a corrupted movie.
+</para></sect3>
+
+</sect2>
Index: multimedia/libdriv/openquicktime/openquicktime-inst.xml
===================================================================
--- multimedia/libdriv/openquicktime/openquicktime-inst.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ multimedia/libdriv/openquicktime/openquicktime-inst.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>OpenQuicktime</application></title>
+
+<para>Install <application>OpenQuicktime</application> by running the
+following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: multimedia/libdriv/openquicktime/openquicktime-intro.xml
===================================================================
--- multimedia/libdriv/openquicktime/openquicktime-intro.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ multimedia/libdriv/openquicktime/openquicktime-intro.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Introduction to <application>OpenQuicktime</application></title>
+
+<para><application>OpenQuicktime</application> is a small library that handles the Quicktime
+file format on most varieties of Unix. Audio and video decoding and
+encoding is provided using a plug-in mechanism.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&openquicktime-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&openquicktime-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &openquicktime-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &openquicktime-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &openquicktime-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Optional codecs: <ulink
+url="http://www.openquicktime.org/codecs.php"/></para></listitem>
+</itemizedlist></sect3>
+
+<sect3><title><application>OpenQuicktime</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="GLib"/> and <xref linkend="libjpeg"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: multimedia/libdriv/openquicktime/openquicktime.ent
===================================================================
--- multimedia/libdriv/openquicktime/openquicktime.ent	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ multimedia/libdriv/openquicktime/openquicktime.ent	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -0,0 +1,13 @@
+<!ENTITY openquicktime SYSTEM "../openquicktime.xml">
+<!ENTITY openquicktime-intro SYSTEM "openquicktime-intro.xml">
+<!ENTITY openquicktime-inst SYSTEM "openquicktime-inst.xml">
+<!ENTITY openquicktime-exp SYSTEM "openquicktime-exp.xml">
+<!ENTITY openquicktime-desc SYSTEM "openquicktime-desc.xml">
+<!ENTITY openquicktime-config SYSTEM "openquicktime-config.xml">
+<!ENTITY openquicktime-buildsize "8.6 MB">
+<!ENTITY openquicktime-version "1.0">
+<!ENTITY openquicktime-download-http
+"http://flow.dl.sourceforge.net/sourceforge/openquicktime/openquicktime-&openquicktime-version;-src.tgz">
+<!ENTITY openquicktime-download-ftp "">
+<!ENTITY openquicktime-size "313 KB">
+<!ENTITY openquicktime-time "0.11 SBU">
Index: multimedia/multimedia.ent
===================================================================
--- multimedia/multimedia.ent	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ multimedia/multimedia.ent	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -14,4 +14,5 @@
 <!ENTITY % libmpeg3 SYSTEM "libdriv/libmpeg3/libmpeg3.ent">
 <!ENTITY % libmad SYSTEM "libdriv/libmad/libmad.ent">
+<!ENTITY % openquicktime SYSTEM "libdriv/openquicktime/openquicktime.ent">
 %alsa;
 <!-- %arts; -->
@@ -24,4 +25,5 @@
 %libmpeg3;
 %libmad;
+%openquicktime;
 
 <!-- Audio utilities -->
Index: postlfs/security/firewalling/busybox.xml
===================================================================
--- postlfs/security/firewalling/busybox.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/busybox.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -22,12 +22,12 @@
 into the script.
 
-<screen>iptables -A INPUT	-i ! ppp+				-j ACCEPT
-iptables -A OUTPUT	-o ! ppp+				-j ACCEPT</screen></para>
+<screen>iptables -A INPUT  -i ! ppp+  -j ACCEPT
+iptables -A OUTPUT -o ! ppp+  -j ACCEPT</screen></para>
 
 <para>If your daemons have to access the web themselves, like squid would need
 to, you could open OUTPUT generally and restrict INPUT.
 
-<screen>iptables -A INPUT	-m state --state ESTABLISHED,RELATED	-j ACCEPT
-iptables -A OUTPUT						-j ACCEPT</screen></para>
+<screen>iptables -A INPUT -m state --state ESTABLISHED,RELATED	-j ACCEPT
+iptables -A OUTPUT                                      -j ACCEPT</screen></para>
 
 <para>However, it is generally not advisable to leave OUTPUT unrestricted: you lose 
@@ -40,24 +40,21 @@
 Which ports you have to open depends on your needs: mostly you will find them 
 by looking for failed accesses in your log-files.</para>
-
-<orderedlist numeration="arabic" spacing="compact">
+<itemizedlist spacing="compact">
+<!-- <orderedlist numeration="arabic" spacing="compact"> -->
 <title>Have a look at the following examples:</title>
 
-<listitem><para>Squid is caching the web:</para>
-<para><screen>iptables -A OUTPUT	-p tcp --dport 80			-j ACCEPT
-iptables -A INPUT	-p tcp --sport 80	-m state --state ESTABLISHED \
-&nbsp;&nbsp;&nbsp;-j ACCEPT</screen></para></listitem>
+<listitem><para>Squid is caching the web:
+<screen>iptables -A OUTPUT -p tcp --dport 80                              -j ACCEPT
+iptables -A INPUT  -p tcp --sport 80 -m state --state ESTABLISHED -j ACCEPT</screen></para></listitem>
 
 <listitem><para>Your caching name server (e.g., dnscache) does its
-lookups via udp:</para>
-<para><screen>iptables -A OUTPUT	-p udp --dport 53			-j ACCEPT
-iptables -A INPUT	-p udp --sport 53	-m state --state ESTABLISHED \
-&nbsp;&nbsp;&nbsp;-j ACCEPT</screen></para></listitem>
+lookups via udp:
+<screen>iptables -A OUTPUT -p udp --dport 53                              -j ACCEPT
+iptables -A INPUT  -p udp --sport 53 -m state --state ESTABLISHED -j ACCEPT</screen></para></listitem>
 
 <listitem><para>Alternatively, if you want to be able to ping your box to ensure
-it's still alive:</para>
-<para><screen>iptables -A INPUT	-p icmp	-m icmp --icmp-type echo-request	\
-&nbsp;&nbsp;&nbsp;-j ACCEPT
-iptables -A OUTPUT	-p icmp	-m icmp --icmp-type echo-reply	-j ACCEPT</screen></para></listitem>
+it's still alive:
+<screen>iptables -A INPUT  -p icmp -m icmp --icmp-type echo-request -j ACCEPT
+iptables -A OUTPUT -p icmp -m icmp --icmp-type echo-reply   -j ACCEPT</screen></para></listitem>
 
 <listitem><para><anchor id='postlfs-security-fw-BB-4' xreflabel="example no. 4"/>If you are 
@@ -69,24 +66,23 @@
 
 <para>To avoid these delays you could reject the requests 
-with a 'tcp-reset':</para>
+with a 'tcp-reset':
 
-<para><screen>iptables -A INPUT	-p tcp --dport 113			-j REJECT \
-&nbsp;&nbsp;&nbsp;--reject-with tcp-reset
-iptables -A OUTPUT	-p tcp --sport 113	-m state --state RELATED \
-&nbsp;&nbsp;&nbsp;-j ACCEPT</screen></para></listitem>
+<screen>iptables -A INPUT  -p tcp --dport 113 -j REJECT --reject-with tcp-reset
+iptables -A OUTPUT -p tcp --sport 113 -m state --state RELATED -j ACCEPT</screen></para></listitem>
 
 <listitem><para>To log and drop invalid packets, mostly harmless packets
-that came in after netfilter's timeout, sometimes scans:</para>
+that came in after netfilter's timeout, sometimes scans:
 
-<para><screen>iptables -I INPUT 1	-p tcp	-m state --state INVALID	-j LOG \ 
-&nbsp;&nbsp;&nbsp;--log-prefix "FIREWALL:INVALID"
-iptables -I INPUT 2	-p tcp	-m state --state INVALID	-j DROP</screen></para></listitem>
+<screen>iptables -I INPUT 1 -p tcp -m state --state INVALID -j LOG --log-prefix \ 
+"FIREWALL:INVALID"
+iptables -I INPUT 2 -p tcp -m state --state INVALID -j DROP</screen></para></listitem>
 
 <listitem><para>Anything coming from the outside should not have a
-private address, this is a common attack called IP-spoofing:</para>
+private address, this is a common attack called IP-spoofing:
 
-<para><screen>iptables -t nat -A PREROUTING	-i ppp+	-s 10.0.0.0/8		-j DROP
-iptables -t nat -A PREROUTING	-i ppp+	-s 172.16.0.0/12	-j DROP
-iptables -t nat -A PREROUTING	-i ppp+	-s 192.168.0.0/16	-j DROP</screen></para></listitem>
+<screen>iptables -t nat -A PREROUTING -i ppp+ -s 10.0.0.0/8     -j DROP
+iptables -t nat -A PREROUTING -i ppp+ -s 172.16.0.0/12	-j DROP
+iptables -t nat -A PREROUTING -i ppp+ -s 192.168.0.0/16	-j
+DROP</screen></para></listitem>
 
 <listitem><para>To simplify debugging and be fair to anyone who'd like to 
@@ -95,10 +91,10 @@
 
 <para>Obviously this must be done directly after logging as the very
-last lines before the packets are dropped by policy:</para>
+last lines before the packets are dropped by policy:
 
-<para><screen>iptables -A INPUT						-j REJECT
-iptables -A OUTPUT		-p icmp --icmp-type 3		-j ACCEPT</screen></para></listitem>
-
-</orderedlist>
+<screen>iptables -A INPUT                        -j REJECT
+iptables -A OUTPUT -p icmp --icmp-type 3 -j ACCEPT</screen></para></listitem>
+</itemizedlist>
+<!--</orderedlist>-->
 
 <para>These are only examples to show you some of the capabilities of the new 
@@ -106,6 +102,6 @@
 iptables.
 There you will find more of them. The port-numbers you'll need for this
-can be found in /etc/services, in case you didn't find them via "try'n'error" 
-in your logfile.</para>
+can be found in <filename>/etc/services</filename>, in case you didn't
+find them by trial and error in your logfile.</para>
 
 <para>If you add any of your offered or accessed services such as the above,
Index: postlfs/security/firewalling/disclaimer.xml
===================================================================
--- postlfs/security/firewalling/disclaimer.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/disclaimer.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -2,7 +2,7 @@
 <title>Disclaimer</title>
 
-<para><emphasis>NEITHER THE AUTHOR NOR ANY OF THE LINUXFROMSCRATCH TEAM 
+<!-- <para><emphasis>NEITHER THE AUTHOR NOR ANY OF THE LINUXFROMSCRATCH TEAM 
 ARE RESPONSIBLE FOR ANY DAMAGES INCURRED DUE TO ACTIONS TAKEN BASED ON THIS 
-DOCUMENT.</emphasis></para>
+DOCUMENT.</emphasis></para> -->
 
 <para>This document is meant as an introduction to how to setup a
Index: postlfs/security/firewalling/finale.xml
===================================================================
--- postlfs/security/firewalling/finale.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/finale.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -1,4 +1,4 @@
 <sect2 id="postlfs-security-fw-finale" xreflabel="Conclusion">
-<title>Editor's Note</title>
+<title>Conclusion</title>
 
 <para>Finally, I'd like to remind you of one fact we must not forget:
@@ -9,5 +9,5 @@
 need of this hint!</para>
 
-<para><literallayout>Be cautious!
+<!-- <para><literallayout>Be cautious!
 
     Henning Rohde
@@ -19,5 +19,5 @@
 
 <para>PPS: If any of these scripts fail, please tell me. I will try to trace 
-any faults.</para>
+any faults.</para> -->
 
 </sect2>
Index: postlfs/security/firewalling/intro.xml
===================================================================
--- postlfs/security/firewalling/intro.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/intro.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -50,8 +50,8 @@
 should generally have only one role, that of protecting the intranet.
 Although not completely riskless, the tasks of doing the routing 
-and eventually IP masquerading<footnote><para>rewriting IP-headers 
+and eventually IP masquerading (rewriting IP-headers 
 of the packets it routes from clients with private IP-addresses onto 
 the internet so that they seem to come from the firewall 
-itself</para></footnote> are commonly considered harmless.</para></sect3>
+itself) are commonly considered harmless.</para></sect3>
 
 <sect3><title><xref linkend="postlfs-security-fw-busybox"/></title>
Index: postlfs/security/firewalling/kernel.xml
===================================================================
--- postlfs/security/firewalling/kernel.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/kernel.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -4,5 +4,5 @@
 <para>If you want your Linux-Box to do firewalling you must first ensure 
 that your kernel has been compiled with the relevant options turned on
-<footnote><para>If you needed assistance howto configure, compile and install 
+<!-- <footnote><para>If you needed assistance howto configure, compile and install 
 a new kernel, refer back to chapter VIII of the LinuxFromScratch book, 
 <ulink url="http://www.linuxfromscratch.org/view/3.1/chapter08/kernel.html">Installing a kernel</ulink>
@@ -10,5 +10,5 @@
 <ulink url="http://www.linuxfromscratch.org/view/3.1/chapter08/lilo.html">Making the LFS system bootable</ulink>
 ; note, that you'll need to reboot 
-to actually run your new kernel.</para></footnote>.</para>
+to actually run your new kernel.</para></footnote>-->.</para>
 
 <para>How to configure your kernel, with enabling the options to be 
@@ -17,4 +17,19 @@
 that the modules need to be loaded at first.</para>
 
+<screen>Network options menu
+  Network paket filtering:                          Y
+  Unix domain sockets:                         Y or M
+  TCP/IP networking:                                Y
+  IP: advanced router:                              Y
+  IP: verbose route monitoring:                     Y
+  IP: TCP Explicit Congestion Notification support: Y
+  IP: TCP syncookie support:                        Y
+  IP: Netfilter Configuration menu
+    Every option except:
+      ipchains (2.2-style) support
+      ipfwadm (2.0-style) support              Y or M
+  Fast switching:                                   N</screen>
+
+<!--
 <table frame='none'>
 <title>Essential config-options for a firewalling-enabled Kernel</title>
@@ -116,5 +131,5 @@
 </tgroup>
 
-</table>
+</table> -->
 
 </sect2>
Index: postlfs/security/firewalling/library.xml
===================================================================
--- postlfs/security/firewalling/library.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/library.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -6,5 +6,5 @@
 <ulink url="http://www.netfilter.org/documentation/FAQ/netfilter-faq.html">FAQ</ulink>
 <ulink url="http://www.netfilter.org/documentation/index.html#HOWTO">List of Netfilter-related HOWTO's</ulink>
-<ulink url="http://www.linuxdoc.org/LDP/nag2/x-087-2-firewall.html"></ulink>
+<ulink url="http://www.linuxdoc.org/LDP/nag2/x-087-2-firewall.html"/>
 <ulink url="http://www.linuxdoc.org/HOWTO/Security-HOWTO.html"></ulink>
 <ulink url="http://www.linuxdoc.org/HOWTO/Firewall-HOWTO.html"></ulink>
Index: postlfs/security/firewalling/masqrouter.xml
===================================================================
--- postlfs/security/firewalling/masqrouter.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/masqrouter.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -7,9 +7,9 @@
 make sure that there are no servers running on it, especially not X11 et
 al.  And, as a general principle, the box itself should not access any untrusted
-service<footnote><para>Think of a name server giving answers that make your
+service (Think of a name server giving answers that make your
 bind crash, or, even worse, that implement a worm via a 
-buffer-overflow.</para></footnote>.</para>
+buffer-overflow).</para>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/firewall &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/firewall &lt;&lt; "EOF"</command>
 #!/bin/sh
 
@@ -78,5 +78,5 @@
 # activate IP-Forwarding 
 echo 1 &gt; /proc/sys/net/ipv4/ip_forward
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 <para>With this script your intranet should be sufficiently 
Index: postlfs/security/firewalling/persfw.xml
===================================================================
--- postlfs/security/firewalling/persfw.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/persfw.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -10,5 +10,5 @@
 2.4 Packet Filtering HOWTO</ulink>:</para>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/firewall &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/firewall &lt;&lt; "EOF"</command>
 #!/bin/sh
 
@@ -47,5 +47,5 @@
 
 # End $rc_base/init.d/firewall
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 <para>His script is quite simple, it drops all traffic coming in into your 
Index: postlfs/security/firewalling/status.xml
===================================================================
--- postlfs/security/firewalling/status.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/status.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -5,5 +5,5 @@
 the order in which the rules take effect:</para>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/firewall.status &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/firewall.status &lt;&lt; "EOF"</command>
 #!/bin/sh
 
@@ -20,4 +20,4 @@
 echo "iptables.filter:"
 iptables	    -v -L -n --line-numbers
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 </sect3>
Index: postlfs/security/firewalling/stop.xml
===================================================================
--- postlfs/security/firewalling/stop.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ postlfs/security/firewalling/stop.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -4,5 +4,5 @@
 <para>If you need to turn firewalling off, this script will do it:</para>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/firewall.stop &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/firewall.stop &lt;&lt; "EOF"</command>
 #!/bin/sh
 
@@ -23,5 +23,5 @@
 iptables -P FORWARD     ACCEPT
 iptables -P OUTPUT      ACCEPT
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 </sect3>
Index: pst/printing/espgs.xml
===================================================================
--- pst/printing/espgs.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ pst/printing/espgs.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -1,3 +1,3 @@
-<sect1 id="espgs" xreflabel="GhostScript-&espgs-version;">
+<sect1 id="espgs" xreflabel="ESP GhostScript-&espgs-version;">
 <?dbhtml filename="espgs.html" dir="pst"?>
 <title>ESP Ghostscript-&espgs-version;</title>
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision 945f9447b9b702854aed73edab83ef76295ebca7)
+++ pst/printing/gs.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
@@ -1,3 +1,3 @@
-<sect1 id="gs" xreflabel="GhostScript-&gs-version;">
+<sect1 id="gs" xreflabel="AFPL GhostScript-&gs-version;">
 <?dbhtml filename="gs.html" dir="pst"?>
 <title>AFPL Ghostscript-&gs-version;</title>
