Index: appendices/symlinks/symlinks.xml
===================================================================
--- appendices/symlinks/symlinks.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ appendices/symlinks/symlinks.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -13,6 +13,6 @@
 <para>It should go without saying that this is <emphasis>not</emphasis>
 the only (or some would argue even optimal) setup for the symlinks.  In
-the LFS tradition, you should find what suits <emphasis>you</emphasis>
-and use that; our recommendations are only a template.</para>
+the <acronym>LFS</acronym> tradition, you should find what suits <emphasis>you
+</emphasis> and use that; our recommendations are only a template.</para>
 
 &appendices-symlinks-rc0;
Index: general/sysutils/which.xml
===================================================================
--- general/sysutils/which.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ general/sysutils/which.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -9,5 +9,5 @@
 the options for equipping your system with "which".</para>
 
-<para>The first option is to install the actual GNU program
+<para>The first option is to install the actual <acronym>GNU</acronym> program
 <emphasis>which</emphasis>.</para>
 
Index: x/lib/lesstif.xml
===================================================================
--- x/lib/lesstif.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ x/lib/lesstif.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -1,5 +1,5 @@
-<sect1 id="lesstif" xreflabel="lesstif-&lesstif-version;">
+<sect1 id="lesstif" xreflabel="LessTif-&lesstif-version;">
 <?dbhtml filename="lesstif.html" dir="x"?>
-<title>lesstif-&lesstif-version;</title>
+<title>LessTif-&lesstif-version;</title>
 
 &lesstif-intro;
Index: x/lib/lesstif/lesstif-config.xml
===================================================================
--- x/lib/lesstif/lesstif-config.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ x/lib/lesstif/lesstif-config.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>lesstif</application></title>
+<title>Configuring <application>LessTif</application></title>
 
 <sect3><title>Configuration Information</title>
@@ -10,7 +10,7 @@
 </sect2>
 
-<sect2><title>Testing <application>lesstif</application></title>
+<sect2><title>Testing <application>LessTif</application></title>
 <para>It is advisable to test the installation of
-<application>lesstif</application> with the
+<application>LessTif</application> with the
 test suite located in
 <filename>lesstif-&lesstif-version;/test</filename>.  It is not
Index: x/lib/lesstif/lesstif-desc.xml
===================================================================
--- x/lib/lesstif/lesstif-desc.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ x/lib/lesstif/lesstif-desc.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>lesstif</application> package contains <filename>lesstif</filename> libraries.</para>
+<para>The <application>LessTif</application> package contains <filename>lesstif</filename> libraries.</para>
 
 </sect2>
Index: x/lib/lesstif/lesstif-exp.xml
===================================================================
--- x/lib/lesstif/lesstif-exp.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ x/lib/lesstif/lesstif-exp.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -4,5 +4,5 @@
 <para><command>--enable-build-20</command> : Build the
 <application>Motif</application> 2.0 compatible version of the
-<application>lesstif</application> libraries.</para> 
+<application>LessTif</application> libraries.</para> 
 
 <para>
@@ -13,8 +13,9 @@
 
 <para><command>--enable-production</command> : Build the release version
-of the <application>lesstif</application> libraries.</para> 
+of the <application>LessTif</application> libraries.</para> 
 
 <para><command>--disable-build-tests</command> : Do not build the
-<filename class="directory">test/</filename> tree (see Testing lesstif).</para> 
+<filename class="directory">test/</filename> tree (see Testing
+<application>LessTif</application>).</para> 
 
 <para><command>--with-xdnd</command> : Enable <acronym>XDND</acronym>
Index: x/lib/lesstif/lesstif-inst.xml
===================================================================
--- x/lib/lesstif/lesstif-inst.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ x/lib/lesstif/lesstif-inst.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>lesstif</application></title>
+<title>Installation of <application>LessTif</application></title>
 
-<para>Install <application>lesstif</application> by running the following commands:</para>
+<para>Install <application>LessTif</application> by running the following commands:</para>
 
 <para><screen><userinput><command>./configure --prefix=/usr \
Index: x/lib/lesstif/lesstif-intro.xml
===================================================================
--- x/lib/lesstif/lesstif-intro.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ x/lib/lesstif/lesstif-intro.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>lesstif</application></title>
+<title>Introduction to <application>LessTif</application></title>
 
-<para>The <application>lesstif</application> package contains an Open
+<para>The <application>LessTif</application> package contains an Open
 Source version of <application>OSF/Motif(R)</application>.</para>
 
@@ -14,5 +14,5 @@
 </sect3>
 
-<sect3><title><application>lesstif</application> dependencies</title>
+<sect3><title><application>LessTif</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="xfree86"/></para></sect4>
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ x/lib/qt.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -1,5 +1,5 @@
-<sect1 id="qt" xreflabel="qt-&qt-version;">
+<sect1 id="qt" xreflabel="Qt-&qt-version;">
 <?dbhtml filename="qt.html" dir="x"?>
-<title>qt-&qt-version;</title>
+<title>Qt-&qt-version;</title>
 
 &qt-intro;
Index: xsoft/graphweb/mozilla/mozilla-inst.xml
===================================================================
--- xsoft/graphweb/mozilla/mozilla-inst.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ xsoft/graphweb/mozilla/mozilla-inst.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -21,5 +21,5 @@
 browser insecure. You have been warned. Many sites use an MS-IE specific tag 
 (autocomplete=off) to prevent autocomplete from working in some forms. This 
-tag is now supported in Mozilla to appease the financial institutions. As per 
+tag is now supported in <application>Mozilla</application> to appease the financial institutions. As per 
 the requirements of the financial institutions, they will not even accept a 
 solution where this a preference option. However our opinion is that it should 
@@ -28,5 +28,5 @@
 
 <para>Open the file <filename>extensions/wallet/src/wallet.cpp</filename> in
-the Mozilla source tree and search for the line:
+the <application>Mozilla</application> source tree and search for the line:
 <screen>#define WALLET_DONT_CACHE_ALL_PASSWORDS</screen>
 Then delete or comment out the line.  Now, if anyone tells you MS-IE is user
Index: xsoft/graphweb/mozilla/mozilla-intro.xml
===================================================================
--- xsoft/graphweb/mozilla/mozilla-intro.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ xsoft/graphweb/mozilla/mozilla-intro.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -2,9 +2,9 @@
 <title>Introduction to <application>Mozilla</application></title>
 
-<para><application>Mozilla</application> is a browser suite, the opensource 
+<para><application>Mozilla</application> is a browser suite, the Open Source 
 sibling of <application>Netscape</application>. It includes the browser, 
 composer, mail client and an <acronym>IRC</acronym> client. A
 calendar component is also being built but it is not yet integrated into the
-stable Mozilla releases.</para>
+stable <application>Mozilla</application> releases.</para>
 
 <sect3><title>Package information</title>
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ xsoft/suites/koffice.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -1,16 +1,34 @@
 <sect1 id="koffice">
 <?dbhtml filename="koffice.html" dir="xsoft"?>
-<title>koffice-&koffice-version;</title>
+<title>KOffice-&koffice-version;</title>
 
-<para><screen>Download location (FTP):        <ulink url="&koffice-download;"/>
-Version used:                   &koffice-version;
-Package size:                   &koffice-size;
-Estimated Disk space required:  133 MB
-Estimated Install size:         35 MB</screen></para>
+<sect2><title>Introduction to <application>KOffice</application></title>
 
-<para>KOffice is the integrated office suite for KDE.</para>
+<para><application>KOffice</application> is the integrated office suite for KDE.</para>
 
-<screen>KOffice depends on:
-<xref linkend="kde-base"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&koffice-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&koffice-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &koffice-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&koffice-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&koffice-time;</para></listitem>
+<listitem><para>Estimated Install size:
+&koffice-installsize;</para></listitem>
+
+</itemizedlist>
+</sect3>
+
+<sect3><title><application>KOffice</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kde-base"/></para></sect4>
+</sect3>
+</sect2>
+
+<sect2><title>Additional downloads</title>
 
 <para>KOffice also has many internationalization packages in the form of:
@@ -18,17 +36,23 @@
 where the xx is a two to five letter code for the country covered. The sizes of these
 files range from about 289 KB to 408 KB.</para>
+</sect2>
 
 
-<para>Install koffice with:
+<sect2><title>Installation of <application>KOffice</application></title>
+<para>Install <application>KOffice</application> with the following
+commands:</para>
 <screen><userinput>./configure --prefix=&kde-dir; --disable-debug &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</userinput></screen>
+</sect2>
      
-<sect2><title>koffice Installation Command explanations</title>
-<para>The options are the same as for kde-base and are not repeated here.</para>
+<sect2><title>Command explanations</title>
+<para>The options are the same as for <xref linkend="kde-base"/> and are not 
+repeated here.</para>
 </sect2>
       
-<sect2><title>Configuring koffice</title>
-<para>There is no explicit configuration for the koffice package.
+<sect2><title>Configuring <application>KOffice</application></title>
+<para>There is no explicit configuration for the <application>KOffice
+</application> package.
 </para>
 </sect2>
@@ -36,5 +60,5 @@
 <sect2>
 <title>Contents</title>
-<para>The KOffice package provides:</para>
+<para>The <application>KOffice</application> package provides:</para>
 <itemizedlist>
 <listitem><para>KWord - Framemaker-like word processing and desktop publishing program</para></listitem>
Index: xsoft/suites/koffice/koffice.ent
===================================================================
--- xsoft/suites/koffice/koffice.ent	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ xsoft/suites/koffice/koffice.ent	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -1,5 +1,8 @@
 <!ENTITY koffice SYSTEM "../koffice.xml">
 <!ENTITY koffice-version "1.2.1">
-<!ENTITY koffice-download "ftp://ftp.kde.org/pub/kde/stable/koffice-1.2.1/src/koffice-1.2.1.tar.bz2">
+<!ENTITY koffice-download-http "">
+<!ENTITY koffice-download-ftp "ftp://ftp.kde.org/pub/kde/stable/koffice-1.2.1/src/koffice-1.2.1.tar.bz2">
 <!ENTITY koffice-size "8.9 MB">
-<!ENTITY koffice-buildsize "143 MB">
+<!ENTITY koffice-buildsize "133 MB">
+<!ENTITY koffice-installsize "35 MB">
+<!ENTITY koffice-time "">
Index: xsoft/suites/openoffice/openoffice-intro.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-intro.xml	(revision 53429135b7ec1aad6f803375276d64481d896d09)
+++ xsoft/suites/openoffice/openoffice-intro.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
@@ -3,5 +3,5 @@
 
 <para>The <application>OpenOffice</application> is a office suite, the 
-opensource sibling of <application>StarOffice</application>.</para>
+Open Source sibling of <application>StarOffice</application>.</para>
 
 <sect3><title>Package information</title>
@@ -39,6 +39,7 @@
 The <filename>openoffice-&openoffice-version;-no-pam.patch</filename> is needed only if
 Linux PAM is not installed. The <filename>openoffice-&openoffice-version;-no-mozab.patch</filename>
-disables building of Mozilla Addressbook which causes build problems since OpenOffice
-includes precompiled Mozilla libraries that are incompatible with LFS. The
+disables building of <application>Mozilla</application> Addressbook which causes build problems since OpenOffice
+includes precompiled <application>Mozilla</application> libraries that
+are incompatible with <acronym>LFS</acronym>. The
 <filename>openoffice-&openoffice-version;-test-bin-loc.patch</filename> corrects the location where
 the installation scripts look for the <command>test</command> executable.</para>
