Index: general/graphlib/libpng/libpng.ent
===================================================================
--- general/graphlib/libpng/libpng.ent	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ general/graphlib/libpng/libpng.ent	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -7,5 +7,5 @@
 <!ENTITY libpng-buildsize "3.9 MB">
 <!ENTITY libpng-version "1.2.4">
-<!ENTITY libpng-download-http "http://www.libpng.org/pub/png/src/libpng-1.2.4.tar.gz">
+<!ENTITY libpng-download-http "http://www.libpng.org/pub/png/src/libpng-1.2.4.tar.bz2">
 <!ENTITY libpng-download-ftp "ftp://swrinde.nde.swri.edu/pub/png/src/libpng-1.2.4.tar.gz">
 <!ENTITY libpng-size "508 KB">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ introduction/welcome/changelog.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>September 24th, 2002 [larry]: Xsoft: Added
+AbiWord-1.0.3. Minor edits and more bz2.</para></listitem>
 
 <listitem><para>September 23rd, 2002 [larry]: Xsoft: updated mozilla per
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ introduction/welcome/credits.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -76,5 +76,5 @@
 <listitem><para>Alsa: <emphasis>Alex Kloss</emphasis></para></listitem>
 
-<listitem><para>at-spi, ATK, audiofile, bc, bonobo-activation, bug-buddy,
+<listitem><para>AbiWord, at-spi, ATK, audiofile, bc, bonobo-activation, bug-buddy,
 cdrdao, cdrtools, cpio, curl, dhcp, DocBook, enlightenment, eog, esound,
 fcron, fluxbox, FNLIB, gail, galeon, gcc, gconf-editor, gdbm, gedit, GLib2, gmp, gnat, gnome-applets, gnome-common, gnome-desktop, gnome-games, gnome-libs,
Index: multimedia/libdriv/esound/esound.ent
===================================================================
--- multimedia/libdriv/esound/esound.ent	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ multimedia/libdriv/esound/esound.ent	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -7,5 +7,5 @@
 <!ENTITY esound-buildsize "2.3 MB">
 <!ENTITY esound-version "0.2.29">
-<!ENTITY esound-download-http "http://ftp.gnome.org/pub/GNOME/2.0.1/sources/esound/esound-0.2.29.tar.gz">
-<!ENTITY esound-download-ftp "ftp://ftp.gnome.org/pub/GNOME/2.0.1/sources/esound/esound-0.2.29.tar.gz">
+<!ENTITY esound-download-http "http://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.29.tar.bz2">
+<!ENTITY esound-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.29.tar.bz2">
 <!ENTITY esound-size "348 KB">
Index: pst/typesetting/tex/tex-inst.xml
===================================================================
--- pst/typesetting/tex/tex-inst.xml	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ pst/typesetting/tex/tex-inst.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -9,16 +9,16 @@
 
 <para><screen><userinput>
-mkdir -p /usr/share/texmf
+mkdir -p /usr/share/texmf &amp;&amp;
 tar zxvf teTeX-src-&tex-version;.tar.gz &amp;&amp;
 cd teTeX-&tex-version; &amp;&amp;
 gzip -dc ../teTeX-texmf-&tex-version;.tar.gz \
-      | (umask 0; cd /usr/share/texmf; tar xvf -) &amp;&amp;
+      | (umask 0; cd /usr/share/texmf; tar xvf -)
 </userinput></screen></para>
 
 <para>If the optional texmf source code tar ball was downloaded, untar
-it now:
-<screen><userinput>      
+it now:</para>
+<para><screen><userinput>      
 gzip -dc ../teTeX-texmfsrc-&tex-version;.tar.gz \
-      | (umask 0; cd /usr/share/texmf; tar xvf -) &amp;&amp;
+      | (umask 0; cd /usr/share/texmf; tar xvf -)
 </userinput></screen></para>
 
Index: x/lib/atk/atk.ent
===================================================================
--- x/lib/atk/atk.ent	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ x/lib/atk/atk.ent	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -7,4 +7,4 @@
 <!ENTITY ATK-version "1.0.3">
 <!ENTITY ATK-download-http "">
-<!ENTITY ATK-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.0/atk-1.0.3.tar.gz">
+<!ENTITY ATK-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.0/atk-1.0.3.tar.bz2">
 <!ENTITY ATK-size "344 KB">
Index: x/lib/gtk/gtk.ent
===================================================================
--- x/lib/gtk/gtk.ent	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ x/lib/gtk/gtk.ent	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -20,4 +20,4 @@
 <!ENTITY GTK2-version "2.0.6">
 <!ENTITY GTK2-download-http "">
-<!ENTITY GTK2-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.0/gtk+-2.0.6.tar.gz">
+<!ENTITY GTK2-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.0/gtk+-2.0.6.tar.bz2">
 <!ENTITY GTK2-size "8.2 MB">
Index: x/lib/qt/qt.ent
===================================================================
--- x/lib/qt/qt.ent	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ x/lib/qt/qt.ent	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -10,4 +10,4 @@
 <!ENTITY qt-version "3.0.5">
 <!ENTITY qt-download-http "">
-<!ENTITY qt-download-ftp "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.0.5.tar.gz">
+<!ENTITY qt-download-ftp "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.0.5.tar.bz2">
 <!ENTITY qt-size "15.7 MB">
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ xsoft/office/abiword.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -1,7 +1,10 @@
-<sect1 id="abiword" xreflabel="abiword">
-<?dbhtml filename="abiword.html" dir="xsoft"?>
-<title>abiword</title>
+<sect1 id="AbiWord" xreflabel="AbiWord-&AbiWord-version;">
+<?dbhtml filename="AbiWord.html" dir="xsoft"?>
+<title>AbiWord-&AbiWord-version;</title>
 
-<para>TO BE DONE</para>
+&AbiWord-intro;
+&AbiWord-inst;
+&AbiWord-exp;
+&AbiWord-desc;
 
 </sect1>
Index: xsoft/office/abiword/abiword-desc.xml
===================================================================
--- xsoft/office/abiword/abiword-desc.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
+++ xsoft/office/abiword/abiword-desc.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The AbiWord package contains <userinput>AbiWord</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>AbiWord</title>
+<para>AbiWord or abiword are wrapper scripts for the AbiWord executible.</para></sect3>
+
+
+</sect2>
+
Index: xsoft/office/abiword/abiword-exp.xml
===================================================================
--- xsoft/office/abiword/abiword-exp.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
+++ xsoft/office/abiword/abiword-exp.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--enable-gnome :</userinput> This command instructs
+AbiWord to utilize GNOME libraries.</para>
+
+</sect2>
+
Index: xsoft/office/abiword/abiword-inst.xml
===================================================================
--- xsoft/office/abiword/abiword-inst.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
+++ xsoft/office/abiword/abiword-inst.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of AbiWord</title>
+
+<para>Install AbiWord by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/opt/gnome --enable-gnome &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: xsoft/office/abiword/abiword-intro.xml
===================================================================
--- xsoft/office/abiword/abiword-intro.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
+++ xsoft/office/abiword/abiword-intro.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Introduction to AbiWord</title>
+
+<screen>Download location (HTTP):       <ulink url="&AbiWord-download-http;"/>
+Download location (FTP):        <ulink url="&AbiWord-download-ftp;"/>
+Version used:                   &AbiWord-version;
+Package size:                   &AbiWord-size;
+Estimated Disk space required:  &AbiWord-buildsize;</screen>
+
+<para>The AbiWord package contains a word processing application. This
+is useful for writing reports, letters and other formatted documents.</para>
+
+<screen>AbiWord depends on:
+<xref linkend="gnome-libs"/>, <xref linkend="gnome-vfs1"/>, <xref
+linkend="gdk"/>, gal-0.20, bonobo-1.0.20 and gnome-print-0.29
+AbiWord will utilize:
+expat and ispell</screen>
+
+</sect2>
Index: xsoft/office/abiword/abiword.ent
===================================================================
--- xsoft/office/abiword/abiword.ent	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ xsoft/office/abiword/abiword.ent	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -1,1 +1,11 @@
-<!ENTITY abiword SYSTEM "../abiword.xml">
+<!ENTITY AbiWord SYSTEM "../abiword.xml">
+<!ENTITY AbiWord-intro SYSTEM "abiword-intro.xml">
+<!ENTITY AbiWord-inst SYSTEM "abiword-inst.xml">
+<!ENTITY AbiWord-exp SYSTEM "abiword-exp.xml">
+<!ENTITY AbiWord-desc SYSTEM "abiword-desc.xml">
+<!ENTITY AbiWord-config SYSTEM "abiword-config.xml">
+<!ENTITY AbiWord-buildsize "100.7 MB">
+<!ENTITY AbiWord-version "1.0.3">
+<!ENTITY AbiWord-download-http "http://telia.dl.sourceforge.net/sourceforge/abiword/abiword-1.0.3.tar.gz">
+<!ENTITY AbiWord-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/abiword/1.0/abiword-1.0.3.tar.gz">
+<!ENTITY AbiWord-size "19 MB">
Index: xsoft/office/office.xml
===================================================================
--- xsoft/office/office.xml	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ xsoft/office/office.xml	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -3,5 +3,5 @@
 <title>Individual Office Programs</title>
 
-&abiword;
+&AbiWord;
 &gnumeric;
 &gnucash;
Index: xsoft/xsoft.ent
===================================================================
--- xsoft/xsoft.ent	(revision 20d6dc16aa49fb891b4347859a253c9e588d3f9c)
+++ xsoft/xsoft.ent	(revision 5ff5d16e9ee1f99662a634f9f02a4af4ee2b405c)
@@ -3,10 +3,10 @@
 <!-- Individual Office Programs -->
 <!ENTITY xsoft-office SYSTEM "office/office.xml">
-<!ENTITY % abiword SYSTEM "office/abiword/abiword.ent">
+<!ENTITY % AbiWord SYSTEM "office/abiword/abiword.ent">
 <!ENTITY % gnumeric SYSTEM "office/gnumeric/gnumeric.ent">
 <!ENTITY % gnucash SYSTEM "office/gnucash/gnucash.ent">
 <!ENTITY % magicpoint SYSTEM "office/magicpoint/magicpoint.ent">
 <!ENTITY % gimp SYSTEM "office/gimp/gimp.ent">
-%abiword;
+%AbiWord;
 %gnumeric;
 %gnucash;
