Index: general/genlib/glib/glib.ent
===================================================================
--- general/genlib/glib/glib.ent	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ general/genlib/glib/glib.ent	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -9,5 +9,5 @@
 <!ENTITY GLib-download-ftp "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz">
 <!ENTITY GLib-size "412 KB">
-<!ENTITY GLib-time "0.52 SBU">
+<!ENTITY GLib-time "0.26 SBU">
 
 <!ENTITY GLib2 SYSTEM "../glib2.xml">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ introduction/welcome/changelog.xml	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -11,4 +11,11 @@
 <itemizedlist>
 
+<listitem><para>August 24th, 2003 [larry]: updated intro for vim,
+docbook and docbook-dsssl. Removed placeholder for
+alsa-oss.</para></listitem>
+
+<listitem><para>August 24th, 2003 [larry]:; SBU updates for
+glib-1, gtk-1, </para></listitem>
+
 <listitem><para>August 24th, 2003 [larry]: Tag edits on Bill's
 submission.</para></listitem>
Index: multimedia/libdriv/alsa/alsa-oss.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-oss.xml	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ multimedia/libdriv/alsa/alsa-oss.xml	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -2,7 +2,4 @@
 <?dbhtml filename="alsa-oss.html" dir="multimedia"?>
 <title>alsa-oss-&alsa-oss-version;</title>
-
-<para>This section is a placeholder for future releases of alsa in which the
-oss-compatibility libraries will be used.</para>
 
 &alsa-oss-intro;
Index: multimedia/libdriv/alsa/alsa.ent
===================================================================
--- multimedia/libdriv/alsa/alsa.ent	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ multimedia/libdriv/alsa/alsa.ent	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -1,4 +1,4 @@
 <!ENTITY alsa SYSTEM "../alsa.xml">
-<!ENTITY alsa-version "0.9.4">
+<!ENTITY alsa-version "0.9.6">
 
 <!ENTITY % alsa-driver SYSTEM "driver/alsa-driver.ent">
Index: postlfs/editors/vim/vim-desc.xml
===================================================================
--- postlfs/editors/vim/vim-desc.xml	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ postlfs/editors/vim/vim-desc.xml	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -2,5 +2,17 @@
 <title>Contents</title>
 
-<para>The vim package contains <userinput>eview</userinput>, <userinput>evim</userinput>, <userinput>ex</userinput>, <userinput>gview</userinput>, <userinput>gvim</userinput>, <userinput>gvimdiff</userinput>, <userinput>rgview</userinput>, <userinput>rgvim</userinput>, <userinput>rview</userinput>, <userinput>rvim</userinput>, <userinput>view</userinput>, <userinput>vim</userinput>, <userinput>vimdiff</userinput>, <userinput>vimtutor</userinput> and <userinput>xxd</userinput>. Except for <userinput>vimtutor</userinput> and  <userinput>xxd</userinput>, all the other commands are symlinks to vim and  start vim with different options. <userinput>vimtutor</userinput> is a tool to  learn the various vim commands and <userinput>xxd</userinput> is a command used to create hex dumps.</para>
+<para>The <application>vim</application> package contains
+<command>eview</command>, <command>evim</command>,
+<command>ex</command>, <command>gview</command>,
+<command>gvim</command>, <command>gvimdiff</command>,
+<command>rgview</command>, <command>rgvim</command>,
+<command>rview</command>, <command>rvim</command>,
+<command>view</command>, <command>vim</command>,
+<command>vimdiff</command>, <command>vimtutor</command> and
+<command>xxd</command>. Except for <command>vimtutor</command> and
+<command>xxd</command>, all the other commands are symlinks to
+<command>vim</command> and  start <command>vim</command> with different
+options. <command>vimtutor</command> is a tool to  learn the various
+<command>vim</command> commands and <command>xxd</command> is a command used to create hex dumps.</para>
 
 </sect2>
Index: postlfs/editors/vim/vim-exp.xml
===================================================================
--- postlfs/editors/vim/vim-exp.xml	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ postlfs/editors/vim/vim-exp.xml	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -1,8 +1,4 @@
 <sect2>
 <title>Command explanations</title>
-
-<para><userinput>patch -Np1 -i ../vim-&vim-version;-fhs-compliant-vimrc...</userinput> : Changes the location of <userinput>vimrc</userinput> and
-<userinput>gvimrc</userinput> from <filename>/usr/share</filename> to the more
-appropriate <filename>/etc</filename>.</para>
 
 <para><userinput>--with-features=huge</userinput> : Enables all the additional
Index: postlfs/editors/vim/vim-inst.xml
===================================================================
--- postlfs/editors/vim/vim-inst.xml	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ postlfs/editors/vim/vim-inst.xml	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -1,11 +1,11 @@
 <sect2>
-<title>Installation of vim</title>
+<title>Installation of <application>vim</application></title>
 
-<para>Install vim by running the following commands:</para>
+<para>Install <application>vim</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr \
+<para><screen><userinput><command>./configure --prefix=/usr \
    --with-features=huge &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen></para>
 
 </sect2>
Index: postlfs/editors/vim/vim-intro.xml
===================================================================
--- postlfs/editors/vim/vim-intro.xml	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ postlfs/editors/vim/vim-intro.xml	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -1,25 +1,34 @@
 <sect2>
-<title>Introduction to Vim</title>
+<title>Introduction to <application>Vim</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&vim-download-http;"/>
-Download location (FTP):        <ulink url="&vim-download-ftp;"/>
-Version used:                   &vim-version;
-Package size:                   &vim-size;
-Estimated Disk space required:  &vim-buildsize;
-Estimated build time:           &vim-time;</screen>
+<para>The <application>vim</application> package, which is an
+abbreviation for VI IMproved, contains a <command>vi</command>
+clone with extra features as compared to the original
+<command>vi</command>.</para>
 
-<para>The vim package, which is an abbreviation for VI IMproved, contains a vi
-clone with extra features as compared to the original vi.</para>
+<para>The default <acronym>LFS</acronym> instructions install
+<acronym>LFS</acronym> as a part of the base system, but
+owing to the lack of <application>X</application> libraries during the
+base install, <application>vim</application> needs to be
+recompiled once <application>X</application> is installed to enable the
+<acronym>GUI</acronym> mode. There is no need for
+special instructions since <application>X</application> support is automatically detected.</para>
 
-<screen>vim depends on:
-<xref linkend="xfree86"/></screen>
 
-<screen>vim will utilize:
-<xref linkend="GLib"/>, <xref linkend="GTK"/>, <xref linkend="GTK2"/> and <xref linkend="lesstif"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&vim-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&vim-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &vim-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &vim-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &vim-time;</para></listitem></itemizedlist>
+</sect3>
 
-<para>The default LFS instructions install LFS as a part of the base system, but
-owing to the lack of X libraries during the base install, vim needs to be
-recompiled once X is installed to enable the GUI mode. There is no need for
-special instructions since X support is automatically detected.</para>
+<sect3><title><application>vim</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="xfree86"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="GLib"/>, <xref linkend="GTK"/>, <xref linkend="GTK2"/> and <xref linkend="lesstif"/></para></sect4>
+</sect3>
 
 
Index: postlfs/editors/vim/vim.ent
===================================================================
--- postlfs/editors/vim/vim.ent	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ postlfs/editors/vim/vim.ent	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -4,9 +4,8 @@
 <!ENTITY vim-desc SYSTEM "vim-desc.xml">
 <!ENTITY vim-exp SYSTEM "vim-exp.xml">
-<!ENTITY vim-buildsize "27 MB">
-<!ENTITY vim-installsize "11 MB">
+<!ENTITY vim-buildsize "46 MB">
 <!ENTITY vim-version "6.2">
 <!ENTITY vim-download-http "">
 <!ENTITY vim-download-ftp "ftp://ftp.nluug.nl/pub/editors/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-size "2.8 MB">
+<!ENTITY vim-size "3.2 MB">
 <!ENTITY vim-time "0.59 SBU">
Index: x/lib/gtk/gtk.ent
===================================================================
--- x/lib/gtk/gtk.ent	(revision 9ed94cb414c0c95373200f6cf3048bb445dc2c4b)
+++ x/lib/gtk/gtk.ent	(revision 36c9064c6834eef4ef687e6cb3bcac6617b57726)
@@ -10,5 +10,5 @@
 <!ENTITY GTK-download-ftp "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz">
 <!ENTITY GTK-size "2.7 MB">
-<!ENTITY GTK-time "7.04 SBU">
+<!ENTITY GTK-time "1.96 SBU">
 
 <!ENTITY GTK2 SYSTEM "../gtk+2.xml">
