Index: general.ent
===================================================================
--- general.ent	(revision f808261ab043f9efd691856409a5b5904d48c2e8)
+++ general.ent	(revision a7a755a2fd070f4c6137206384ac0b2d57cd8d37)
@@ -47,5 +47,5 @@
 <!-- Chapter 6 -->                
 <!ENTITY vim-version                  "6.3">  
-<!ENTITY emacs-version                "21.3">  
+<!ENTITY emacs-version                "21.4">  
 <!ENTITY nano-version                 "1.2.4">  
 <!ENTITY joe-version                  "3.1"> 
@@ -289,5 +289,5 @@
 <!-- Chapter 27 -->
 <!ENTITY sawfish-version              "1.3">  
-<!ENTITY fluxbox-version              "0.9.11"> 
+<!ENTITY fluxbox-version              "0.9.12"> 
 <!ENTITY metacity-version             "2.8.6">  
 <!ENTITY xfce-version                 "4.0.4">  
Index: general/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision f808261ab043f9efd691856409a5b5904d48c2e8)
+++ general/genutils/desktop-file-utils.xml	(revision a7a755a2fd070f4c6137206384ac0b2d57cd8d37)
@@ -56,5 +56,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="postlfs-editors-emacs"/></para>
+<para><xref linkend="emacs"/></para>
 </sect4>
 </sect3>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f808261ab043f9efd691856409a5b5904d48c2e8)
+++ introduction/welcome/changelog.xml	(revision a7a755a2fd070f4c6137206384ac0b2d57cd8d37)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+<listitem><para>February 10th, 2005 [larry]: Updated to emacs-21.4 and
+fluxbox-0.9.12.</para></listitem>
+
 <listitem><para>February 10th, 2005 [larry]: Added more descriptions to
 MIT Kerberos and added db to PAM's dependancies.</para></listitem>
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision f808261ab043f9efd691856409a5b5904d48c2e8)
+++ postlfs/editors/emacs.xml	(revision a7a755a2fd070f4c6137206384ac0b2d57cd8d37)
@@ -7,11 +7,11 @@
   <!ENTITY emacs-download-http "http://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.gz">
   <!ENTITY emacs-download-ftp "ftp://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.gz">
-  <!ENTITY emacs-md5sum    "a0bab457cbf5b4f8eb99d1d0a3ada420">
+  <!ENTITY emacs-md5sum    "0a68ea5b29bb2f081ba8dd85d37bb9bc">
   <!ENTITY emacs-size      "20 MB">
-  <!ENTITY emacs-buildsize "92.5 MB">
+  <!ENTITY emacs-buildsize "96.8 MB">
   <!ENTITY emacs-time      "4.20 SBU">
 ]>
 
-<sect1 id="postlfs-editors-emacs" xreflabel="Emacs-&emacs-version;">
+<sect1 id="emacs" xreflabel="Emacs-&emacs-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -61,6 +61,9 @@
 <screen><userinput><command>./configure --prefix=/usr \
    --libexecdir=/usr/sbin &amp;&amp;
-make bootstrap &amp;&amp;
-make install</command></userinput></screen>
+make bootstrap</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -69,50 +72,89 @@
 <title>Contents</title>
 
-<para>The <application>Emacs</application> package contains <command>emacs</command>,
-<command>b2m</command>, <command>ctags</command>,
-<command>ebrowse</command>, <command>emacsclient</command>,
-<command>etags</command>, <command>grep-changelog</command>,
-<command>rcs-checkin</command>, <command>cvt-mail</command>,
-<command>digest-doc</command>, <command>emacsserver</command>,
-<command>fakemail</command>, <command>hexl</command>,
-<command>movemail</command>, <command>profile</command>,
-<command>rcs2log</command>, <command>sorted-doc</command>,
-<command>vcdiff</command> and <command>yow</command>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>emacs</title>
-<para>The editor proper.</para></sect3>
-
-<sect3><title>b2m</title>
-<para><command>b2m</command> is a program to convert mail files from RMAIL 
-format to Unix <quote>mbox</quote> format.</para></sect3>
-
-<sect3><title>ctags</title>
-<para><command>ctags</command> creates cross-reference tagfile database files 
-for source code.</para></sect3>
-
-<sect3><title>ebrowse</title>
-<para><command>ebrowse</command> permits browsing of C++ class hierarchies from
-within emacs.</para></sect3>
-
-<sect3><title>emacsclient</title>
-<para><command>emacsclient</command> attaches an emacs session to an already 
-running emacsserver instance.</para></sect3>
-
-<sect3><title>etags</title>
-<para><command>etags</command> is another program to generate source code 
-cross-reference tagfiles.</para></sect3>
-
-<sect3><title>grep-changelog</title>
-<para><command>grep-changelog</command> prints entries in Change Logs matching 
-various criteria.</para></sect3>
-
-<sect3><title>rcs-checkin</title>
-<para><command>rcs-checkin</command> is a shell script used to check
-files into <acronym>RCS</acronym>.</para></sect3>
-
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>b2m, ctags, ebrowse, emacs, emacsclient, etags, grep-changelog and rcs-checkin</seg>
+<seg>/usr/sbin/emacs and /usr/share/emacs</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="b2m">
+<term><filename>b2m</filename></term>
+<listitem><para>is a program to convert mail files from RMAIL
+format to Unix <quote>mbox</quote> format.</para>
+<indexterm zone="emacs b2m">
+<primary sortas="b-b2m">b2m</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="ctags">
+<term><filename>b2m</filename></term>
+<listitem><para>creates cross-reference tagfile database files
+for source code.</para>
+<indexterm zone="emacs ctags">
+<primary sortas="b-ctags">ctags</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="ebrowse">
+<term><filename>ebrowse</filename></term>
+<listitem><para>permits browsing of C++ class hierarchies from
+within emacs.</para>
+<indexterm zone="emacs ebrowse">
+<primary sortas="b-ebrowse">ebrowse</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="emacs-prog">
+<term><filename>emacs</filename></term>
+<listitem><para>is an editor.</para>
+<indexterm zone="emacs emacs-prog">
+<primary sortas="b-emacs">emacs</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="emacsclient">
+<term><filename>emacsclient</filename></term>
+<listitem><para>attaches an emacs session to an already
+running emacsserver instance.</para>
+<indexterm zone="emacs emacsclient">
+<primary sortas="b-emacsclient">emacsclient</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="etags">
+<term><filename>etags</filename></term>
+<listitem><para>is another program to generate source code
+cross-reference tagfiles.</para>
+<indexterm zone="emacs etags">
+<primary sortas="b-etags">etags</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="grep-changelog">
+<term><filename>grep-changelog</filename></term>
+<listitem><para>prints entries in Change Logs matching
+various criteria.</para>
+<indexterm zone="emacs grep-changelog">
+<primary sortas="b-grep-changelog">grep-changelog</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="rcs-checkin">
+<term><filename>rcs-checkin</filename></term>
+<listitem><para>is a shell script used to check
+files into <acronym>RCS</acronym>.</para>
+<indexterm zone="emacs rcs-checkin">
+<primary sortas="b-rcs-checkin">rcs-checkin</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<!-- 
 <sect3><title>cvt-mail</title>
 <para><command>cvt-mail</command> converts old style goslings emacs mail 
@@ -157,5 +199,6 @@
 <sect3><title>yow</title>
 <para><command>yow</command> prints a quotation from Zippy the 
-Pinhead.</para></sect3>
+Pinhead.</para></sect3>  -->
+</variablelist>
 
 </sect2>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision f808261ab043f9efd691856409a5b5904d48c2e8)
+++ x/wm/fluxbox.xml	(revision a7a755a2fd070f4c6137206384ac0b2d57cd8d37)
@@ -7,6 +7,6 @@
   <!ENTITY fluxbox-download-http "http://prdownloads.sourceforge.net/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
   <!ENTITY fluxbox-download-ftp  " ">
-  <!ENTITY fluxbox-size          "625 KB">
-  <!ENTITY fluxbox-buildsize     "33.9 MB">
+  <!ENTITY fluxbox-size          "637 KB">
+  <!ENTITY fluxbox-buildsize     "36.7 MB">
   <!ENTITY fluxbox-time          "1.28 SBU">
 ]>
