Index: general/general.ent
===================================================================
--- general/general.ent	(revision bcf4beb44b67855514997af5d433cf3b167f7b65)
+++ general/general.ent	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -22,4 +22,5 @@
 <!ENTITY % STLport SYSTEM "genlib/stlport/stlport.ent">
 <!ENTITY % LZO SYSTEM "genlib/lzo/lzo.ent">
+<!ENTITY % libsoup SYSTEM "genlib/libsoup/libsoup.ent">
 %openssl;
 %pcre;
@@ -41,4 +42,5 @@
 %STLport;
 %LZO;
+%libsoup;
 
 <!-- Graphics Libraries -->
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision bcf4beb44b67855514997af5d433cf3b167f7b65)
+++ general/genlib/genlib.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -50,4 +50,5 @@
 &slib;
 &gwrap;
+&libsoup;
 &STLport;
 &LZO;
Index: general/genlib/libsoup.xml
===================================================================
--- general/genlib/libsoup.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
+++ general/genlib/libsoup.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -0,0 +1,10 @@
+<sect1 id="libsoup" xreflabel="libsoup-&libsoup-version;">
+<?dbhtml filename="libsoup.html" dir="general"?>
+<title>libsoup-&libsoup-version;</title>
+
+&libsoup-intro;
+&libsoup-inst;
+&libsoup-desc;
+
+</sect1>
+
Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision bcf4beb44b67855514997af5d433cf3b167f7b65)
+++ gnome/gnome.ent	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -45,4 +45,5 @@
 <!ENTITY % gtk-thinice-engine SYSTEM "lib/themes/gtk-thinice-engine.ent">
 <!ENTITY % gal2 SYSTEM "lib/gal/gal2.ent">
+<!ENTITY % gtkhtml2 SYSTEM "lib/gtkhtml/gtkhtml2.ent">
 %libglade;
 %intltool;
@@ -84,4 +85,5 @@
 %vte;
 %gal2;
+%gtkhtml2;
 
 <!-- Gnome Core -->
Index: gnome/lib/gtkhtml/gtkhtml2-config.xml
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2-config.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
+++ gnome/lib/gtkhtml/gtkhtml2-config.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Configuring <application>gtkhtml2</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>List of config files</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
+</para>
+</sect3>
+
+</sect2>
+
Index: gnome/lib/gtkhtml/gtkhtml2-desc.xml
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2-desc.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
+++ gnome/lib/gtkhtml/gtkhtml2-desc.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>gtkhtml</application> package contains <filename>
+libgtkhtml</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgtkhtml libraries</title>
+<para><filename>libgtkhtml</filename> libraries provide the functions to
+render <acronym>HTML</acronym> within applications.</para></sect3>
+
+
+</sect2>
+
Index: gnome/lib/gtkhtml/gtkhtml2-exp.xml
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2-exp.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
+++ gnome/lib/gtkhtml/gtkhtml2-exp.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -0,0 +1,7 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>COMMAND</command> : This command does something.</para>
+
+</sect2>
+
Index: gnome/lib/gtkhtml/gtkhtml2-inst.xml
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2-inst.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
+++ gnome/lib/gtkhtml/gtkhtml2-inst.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>gtkhtml</application></title>
+
+<para>Install <application>gtkhtml</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/lib/gtkhtml/gtkhtml2-intro.xml
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2-intro.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
+++ gnome/lib/gtkhtml/gtkhtml2-intro.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Introduction to <application>gtkhtml</application></title>
+
+<para>The <application>gtkhtml</application> package contains a
+lightweight <acronym>HTML</acronym> rendering/printing/editing engine.
+This is an <application>evolution</application> specific application at
+this time.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&gtkhtml2-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&gtkhtml2-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gtkhtml2-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &gtkhtml2-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &gtkhtml2-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>gtkhtml</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnomeprintui"/> and <xref linkend="gal2"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="libsoup"/></para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/lib/gtkhtml/gtkhtml2.ent
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2.ent	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
+++ gnome/lib/gtkhtml/gtkhtml2.ent	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -0,0 +1,12 @@
+<!ENTITY gtkhtml2 SYSTEM "../gtkhtml2.xml">
+<!ENTITY gtkhtml2-intro SYSTEM "gtkhtml2-intro.xml">
+<!ENTITY gtkhtml2-inst SYSTEM "gtkhtml2-inst.xml">
+<!ENTITY gtkhtml2-exp SYSTEM "gtkhtml2-exp.xml">
+<!ENTITY gtkhtml2-desc SYSTEM "gtkhtml2-desc.xml">
+<!ENTITY gtkhtml2-config SYSTEM "gtkhtml2-config.xml">
+<!ENTITY gtkhtml2-buildsize "141.2 MB">
+<!ENTITY gtkhtml2-version "3.0.8">
+<!ENTITY gtkhtml2-download-http "http://ftp.gnome.org/pub/sources/gtkhtml/3.0/gtkhtml-&gtkhtml2-version;.tar.bz2">
+<!ENTITY gtkhtml2-download-ftp "ftp://ftp.gnome.org/pub/sources/gtkhtml/3.0/gtkhtml-&gtkhtml2-version;.tar.bz2">
+<!ENTITY gtkhtml2-size "1.0 MB">
+<!ENTITY gtkhtml2-time "1.84 SBU">
Index: gnome/lib/gtkhtml2.xml
===================================================================
--- gnome/lib/gtkhtml2.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
+++ gnome/lib/gtkhtml2.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -0,0 +1,12 @@
+<sect1 id="gtkhtml2" xreflabel="gtkhtml-&gtkhtml2-version;">
+<?dbhtml filename="gtkhtml2.html" dir="gnome"?>
+<title>gtkhtml-&gtkhtml2-version;</title>
+
+&gtkhtml2-intro;
+&gtkhtml2-inst;
+&gtkhtml2-exp;
+&gtkhtml2-config;
+&gtkhtml2-desc;
+
+</sect1>
+
Index: gnome/lib/lib.xml
===================================================================
--- gnome/lib/lib.xml	(revision bcf4beb44b67855514997af5d433cf3b167f7b65)
+++ gnome/lib/lib.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -38,3 +38,4 @@
 &libgnomeprint;
 &libgnomeprintui;
+&gtkhtml2;
 </chapter>
Index: index.xml
===================================================================
--- index.xml	(revision bcf4beb44b67855514997af5d433cf3b167f7b65)
+++ index.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030915">
-<!ENTITY releasedate "September 15th, 2003">
+<!ENTITY version "20030916">
+<!ENTITY releasedate "September 16th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision bcf4beb44b67855514997af5d433cf3b167f7b65)
+++ introduction/welcome/changelog.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -10,4 +10,8 @@
 
 <itemizedlist>
+
+<listitem><para>September 16th, 2003 [larry]: update to OpenSSH--3.7p1,
+gtkhtml-3.0.8, libsoup-1.99.23 and evolution-1.4.4.</para>
+</listitem>
 
 <listitem><para>September 15th, 2003 [larry]: update to
Index: server/other/openssh/openssh.ent
===================================================================
--- server/other/openssh/openssh.ent	(revision bcf4beb44b67855514997af5d433cf3b167f7b65)
+++ server/other/openssh/openssh.ent	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -5,8 +5,8 @@
 <!ENTITY openssh-desc SYSTEM "openssh-desc.xml">
 <!ENTITY openssh-config SYSTEM "openssh-config.xml">
-<!ENTITY openssh-buildsize "27.6 MB">
-<!ENTITY openssh-version "3.6.1p2">
-<!ENTITY openssh-download-http "http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/openssh-3.6.1p2.tar.gz">
-<!ENTITY openssh-download-ftp "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.6.1p2.tar.gz">
-<!ENTITY openssh-size "864 KB">
-<!ENTITY openssh-time "0.71">
+<!ENTITY openssh-buildsize "28.6 MB">
+<!ENTITY openssh-version "3.7p1">
+<!ENTITY openssh-download-http "http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
+<!ENTITY openssh-download-ftp "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
+<!ENTITY openssh-size "780 KB">
+<!ENTITY openssh-time "0.32 SBU">
Index: xsoft/office/evolution/evolution-intro.xml
===================================================================
--- xsoft/office/evolution/evolution-intro.xml	(revision bcf4beb44b67855514997af5d433cf3b167f7b65)
+++ xsoft/office/evolution/evolution-intro.xml	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -1,18 +1,26 @@
 <sect2>
-<title>Introduction to Evolution</title>
+<title>Introduction to <application>Evolution</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&evolution-download-http;"/>
-Download location (FTP):        <ulink url="&evolution-download-ftp;"/>
-Version used:                   &evolution-version;
-Package size:                   &evolution-size;
-Estimated Disk space required:  &evolution-buildsize;</screen>
+<para>The <application>Evolution</application> package contains an integrated 
+mail, calendar and address book suite.</para>
 
-<para>The Evolution package contains an integrated mail, calendar and
-address book suite.</para> 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&evolution-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&evolution-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &evolution-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&evolution-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&evolution-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>evolution depends on:
-<xref linkend="bonobo14"></xref>, <xref linkend="bonobo-conf"></xref>,
-<xref linkend="gal"></xref>, <xref linkend="libcapplet"></xref>, <xref linkend="gtkhtml"></xref> and 
-<xref linkend="soup"></xref></screen>
+<sect3><title><application>Evolution</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnomeprintui"/> and  <xref linkend="gtkhtml2"/></para></sect4>
+</sect3>
+
 
 </sect2>
Index: xsoft/office/evolution/evolution.ent
===================================================================
--- xsoft/office/evolution/evolution.ent	(revision bcf4beb44b67855514997af5d433cf3b167f7b65)
+++ xsoft/office/evolution/evolution.ent	(revision b342c991ae3c044e8ea954e1cd2b9d17b632df21)
@@ -6,15 +6,17 @@
 <!ENTITY evolution-config SYSTEM "evolution-config.xml">
 <!ENTITY evolution-buildsize "387 MB">
-<!ENTITY evolution-version "1.2.1">
-<!ENTITY evolution-download-http "http://ftp.gnome.org/pub/GNOME/sources/evolution/1.2/evolution-&evolution-version;.tar.bz2">
-<!ENTITY evolution-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/evolution/1.2/evolution-&evolution-version;.tar.bz2">
+<!ENTITY evolution-version "1.4.4">
+<!ENTITY evolution-download-http "http://ftp.gnome.org/pub/GNOME/sources/evolution/1.4/evolution-&evolution-version;.tar.bz2">
+<!ENTITY evolution-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/evolution/1.4/evolution-&evolution-version;.tar.bz2">
 <!ENTITY evolution-size "12 MB">
+<!ENTITY evolution-time "">
 <!ENTITY db-3.1 SYSTEM "../db-3.1.xml">
 <!ENTITY db-3.1-intro SYSTEM "db-3.1-intro.xml">
 <!ENTITY db-3.1-inst SYSTEM "db-3.1-inst.xml">
 <!ENTITY db-3.1-exp SYSTEM "db-3.1-exp.xml">
-<!ENTITY db-3.1-buildsize "18 MB">
+<!ENTITY db-3.1-buildsize "19.0 MB">
 <!ENTITY db-3.1-version "3.1.17">
 <!ENTITY db-3.1-download-http "http://www.sleepycat.com/update/snapshot/db-3.1.17.tar.gz">
 <!ENTITY db-3.1-download-ftp "">
-<!ENTITY db-3.1-size "2 MB">
+<!ENTITY db-3.1-size "1.9 MB">
+<!ENTITY db-3.1-time "0.26 SBU">
