Index: general/genutils/rep-gtk/rep-gtk-intro.xml
===================================================================
--- general/genutils/rep-gtk/rep-gtk-intro.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ general/genutils/rep-gtk/rep-gtk-intro.xml	(revision 1cd8db240aacad9091b2821e6cdd53268df3c294)
@@ -23,5 +23,5 @@
 </sect3>
                                                                                 
-<sect3><title><application>template</application> dependencies</title>
+<sect3><title><application>rep-gtk</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="GTK2"/>, <xref linkend="libglade"/> and <xref
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ introduction/welcome/changelog.xml	(revision 1cd8db240aacad9091b2821e6cdd53268df3c294)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>September 13th, 2003 [larry]: general: updated to
+rep-gtk-0.18.</para></listitem>
 
 <listitem><para>September 13th, 2003 [larry]: general: updated to
Index: x/wm/sawfish/sawfish-config.xml
===================================================================
--- x/wm/sawfish/sawfish-config.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ x/wm/sawfish/sawfish-config.xml	(revision 1cd8db240aacad9091b2821e6cdd53268df3c294)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring sawfish</title>
+<title>Configuring <application>sawfish</application></title>
 
 <sect3><title>Configuration Information</title>
@@ -7,7 +7,7 @@
 before proceeding.</para>
 
-<para><screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>
 exec sawfish
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 </sect3>
 
Index: x/wm/sawfish/sawfish-desc.xml
===================================================================
--- x/wm/sawfish/sawfish-desc.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ x/wm/sawfish/sawfish-desc.xml	(revision 1cd8db240aacad9091b2821e6cdd53268df3c294)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The sawfish package contains <userinput>sawfish</userinput>.</para>
+<para>The <application>sawfish</application> package contains <command>
+sawfish</command>.</para>
 
 </sect2>
@@ -9,6 +10,6 @@
 
 <sect3><title>sawfish</title>
-<para>sawfish is the extensible window manager using a Lisp-based
-scripting language.</para></sect3>
+<para><command>sawfish</command> is the extensible window manager using a 
+Lisp-based scripting language.</para></sect3>
 
 </sect2>
Index: x/wm/sawfish/sawfish-exp.xml
===================================================================
--- x/wm/sawfish/sawfish-exp.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ x/wm/sawfish/sawfish-exp.xml	(revision 1cd8db240aacad9091b2821e6cdd53268df3c294)
@@ -2,12 +2,13 @@
 <title>Command explanations</title>
 
-<para><userinput>--with-audiofile</userinput> : This command directs
-sawfish to use libaudiofile for sound manipulation.</para>
+<para><command>--with-audiofile</command> : This command directs
+<application>sawfish</application> to use <filename>libaudiofile</filename> 
+for sound manipulation.</para>
 
-<para><userinput>--with-esd</userinput> : This command directs sawfish
-to use the Enlightened Sound Daemon.</para>
+<para><command>--with-esd</command> : This command directs <application>
+sawfish</application> to use the Enlightened Sound Daemon.</para>
 
-<para><userinput>--with-gnome-prefix=/opt/gnome-2.2</userinput> : This
-command directs sawfish to GNOME's directory.</para> 
+<para><command>--with-gnome-prefix=/opt/gnome-2.2</command> : This
+command directs <application>sawfish</application> to GNOME's directory.</para> 
 
 </sect2>
Index: x/wm/sawfish/sawfish-inst.xml
===================================================================
--- x/wm/sawfish/sawfish-inst.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ x/wm/sawfish/sawfish-inst.xml	(revision 1cd8db240aacad9091b2821e6cdd53268df3c294)
@@ -1,11 +1,12 @@
 <sect2>
-<title>Installation of sawfish</title>
+<title>Installation of <application>sawfish</application></title>
 
-<para>Install sawfish by running the following commands:</para>
+<para>Install <application>sawfish</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --libexec=/usr/sbin --infodir=/usr/share/info \
+<screen><userinput><command>./configure --prefix=/usr --libexec=/usr/sbin --infodir=/usr/share/info \
   --with-gnome-prefix=/opt/gnome-2.2 &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 
Index: x/wm/sawfish/sawfish-intro.xml
===================================================================
--- x/wm/sawfish/sawfish-intro.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ x/wm/sawfish/sawfish-intro.xml	(revision 1cd8db240aacad9091b2821e6cdd53268df3c294)
@@ -1,21 +1,31 @@
 <sect2>
-<title>Introduction to sawfish</title>
+<title>Introduction to <application>sawfish</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&sawfish-download-http;"/>
-Download location (FTP):        <ulink url="&sawfish-download-ftp;"/>
-Version used:                   &sawfish-version;
-Package size:                   &sawfish-size;
-Estimated Disk space required:  &sawfish-buildsize;
-Estimated build time:           &sawfish-time;</screen>
+<para>The <application>sawfish</application> package contains a window manager. 
+This is useful for organizing and displaying windows where all window 
+decorations are configurable and all user-interface policy is controlled 
+through the extension language.</para>
 
-<para>The sawfish package contains a window manager. This is useful for
-organizing and displaying windows where all window decorations are
-configurable and all user-interface policy is controlled through the
-extension language.</para>
-
-<screen>sawfish-&sawfish-version; depends on:
-<xref linkend="xfree86"/>, <xref linkend="librep"/>, <xref linkend="rep-gtk"/>, <xref linkend="esound"/> and <xref linkend="GTK2"/>
-sawfish will utilize:
-<xref linkend="libglade"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&sawfish-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&sawfish-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &sawfish-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&sawfish-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&sawfish-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>sawfish</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="xfree86"/>, <xref linkend="librep"/>, <xref
+linkend="rep-gtk"/>, <xref linkend="esound"/> and <xref linkend="GTK2"/></para>
+</sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="libglade"/></para></sect4>
+</sect3>
 
 
Index: x/wm/sawfish/sawfish.ent
===================================================================
--- x/wm/sawfish/sawfish.ent	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ x/wm/sawfish/sawfish.ent	(revision 1cd8db240aacad9091b2821e6cdd53268df3c294)
@@ -5,8 +5,8 @@
 <!ENTITY sawfish-desc SYSTEM "sawfish-desc.xml">
 <!ENTITY sawfish-config SYSTEM "sawfish-config.xml">
-<!ENTITY sawfish-buildsize "13 MB">
+<!ENTITY sawfish-buildsize "17.5 MB">
 <!ENTITY sawfish-version "1.3">
 <!ENTITY sawfish-download-http "http://telia.dl.sourceforge.net/sawmill/sawfish-1.3.tar.gz">
 <!ENTITY sawfish-download-ftp "">
 <!ENTITY sawfish-size "1.5 MB">
-<!ENTITY sawfish-time "0.80 SBU">
+<!ENTITY sawfish-time "0.26 SBU">
