Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision cc93d48f1a11b2ea75980e8f1c382562ff1408ac)
+++ introduction/welcome/changelog.xml	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>August 7th, 2002 [markh]: Post-LFS: Added emacs-21.2 from
+Billy O'Connor.<para></listitem>
 
 <listitem><para>August 6th, 2002 [larry]: X: Updated to GLib-2.0.6,
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision cc93d48f1a11b2ea75980e8f1c382562ff1408ac)
+++ introduction/welcome/credits.xml	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
@@ -92,4 +92,6 @@
 Hymers</emphasis></para></listitem>
 
+<listitem><para>emacs: <emphasis>Billy O'Connor</emphasis></para></listitem>
+
 <listitem><para>fetchmail and wvdial: <emphasis>Paul
 Campbell</emphasis></para></listitem>
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision cc93d48f1a11b2ea75980e8f1c382562ff1408ac)
+++ postlfs/editors/emacs.xml	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
@@ -1,7 +1,9 @@
 <sect1 id="postlfs-editors-emacs">
 <?dbhtml filename="emacs.html" dir="postlfs"?>
-<title>emacs</title>
+<title>emacs-&emacs-version;</title>
 
-<para>TO BE DONE</para>
+&emacs-intro;
+&emacs-inst;
+&emacs-desc;
 
 </sect1>
Index: postlfs/editors/emacs/emacs-desc.xml
===================================================================
--- postlfs/editors/emacs/emacs-desc.xml	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
+++ postlfs/editors/emacs/emacs-desc.xml	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
@@ -0,0 +1,81 @@
+<sect2>
+<title>Contents</title>
+
+<para>The emacs package contains <userinput>emacs, b2m, ctags, ebrowse,
+emacsclient, etags, grep-changelog, rcs-checkin, cvt-mail,
+digest-doc, emacsserver, fakemail, hexl, movemail, profile, rcs2log,
+sorted-doc, vcdiff, yow</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>emacs</title>
+<para>The editor proper.</para></sect3>
+
+<sect3><title>b2m</title>
+<para>b2m is a program to convert mail files from RMAIL format to Unix
+`mbox' format.</para></sect3>
+
+<sect3><title>ctags</title>
+<para>ctags creates cross reference tagfile database files for source
+code.</para></sect3>
+
+<sect3><title>ebrowse</title>
+<para>ebrowse permits browsing of C++ class hierarchies from with
+emacs.</para></sect3>
+
+<sect3><title>emacsclient</title>
+<para>emacsclient attaches an emacs session to an already running
+emacsserver instance.</para></sect3>
+
+<sect3><title>etags</title>
+<para>etags is another program to generate source code cross reference
+tagfiles</para></sect3>
+
+<sect3><title>grep-changelog</title>
+<para>grep-changelog prints entries in ChangeLogs matching various
+criteria.</para></sect3>
+
+<sect3><title>rcs-checkin</title>
+<para>rcs-checkin is a shell script used to check files into RCS</para></sect3>
+
+<sect3><title>cvt-mail</title>
+<para>cvt-mail converts old style goslings emacs mail directories into
+gnu-rmail format.</para></sect3>
+
+<sect3><title>digest-doc</title>
+<para>digest-doc is a filter to create nroff output for man pages.</para></sect3>
+
+<sect3><title>emacsserver</title>
+<para>emacserver allows other applications/shells to access an already
+running emacs instance and share buffers with it.</para></sect3>
+
+<sect3><title>fakemail</title>
+<para>fakemail is a sendmail-like interface to /bin/mail.</para></sect3>
+
+<sect3><title>hexl</title>
+<para>hexl converts files for editing with emacs hexl-mode binary file
+editing mode.</para></sect3>
+
+<sect3><title>movemail</title>
+<para>movemail provide access to POP3 mailboxes.</para></sect3>
+
+<sect3><title>profile</title>
+<para>profile generates periodic events for profiling of Emacs
+Lisp code.</para></sect3>
+
+<sect3><title>rcs2log</title>
+<para>rcs2log enerates change log prefixex from RCS files.</para></sect3>
+
+<sect3><title>sorted-doc</title>
+<para>sorted-doc is a filter to generate texinfo files.</para></sect3>
+
+<sect3><title>vcdiff</title>
+<para>vcdiff compares SCCS files.</para></sect3>
+
+<sect3><title>yow</title>
+<para>yow prints a quotation from Zippy the Pinhead.</para></sect3>
+
+</sect2>
+
Index: postlfs/editors/emacs/emacs-inst.xml
===================================================================
--- postlfs/editors/emacs/emacs-inst.xml	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
+++ postlfs/editors/emacs/emacs-inst.xml	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of emacs</title>
+
+<para>Install emacs by running the following commands:</para>
+
+<para><screen><userinput>./configure  &amp;&amp;
+make bootstrap &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: postlfs/editors/emacs/emacs-intro.xml
===================================================================
--- postlfs/editors/emacs/emacs-intro.xml	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
+++ postlfs/editors/emacs/emacs-intro.xml	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to emacs</title>
+
+<screen>Download location (HTTP):   <ulink url="&emacs-download-http;"/>
+Download location (FTP):    <ulink url="&emacs-download-ftp;"/>
+Version used:                   &emacs-version;
+Package size:                   &emacs-size;
+Estimated Disk space required:  &emacs-buildsize;</screen>
+
+<para>The emacs package contains emacs, the extensible, customizable,
+self-documenting real-time display editor.</para>
+
+</sect2>
Index: postlfs/editors/emacs/emacs.ent
===================================================================
--- postlfs/editors/emacs/emacs.ent	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
+++ postlfs/editors/emacs/emacs.ent	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
@@ -0,0 +1,9 @@
+<!ENTITY emacs SYSTEM "../emacs.xml">
+<!ENTITY emacs-intro SYSTEM "emacs-intro.xml">
+<!ENTITY emacs-inst SYSTEM "emacs-inst.xml">
+<!ENTITY emacs-desc SYSTEM "emacs-desc.xml">
+<!ENTITY emacs-buildsize "65 MB">
+<!ENTITY emacs-version "21.2">
+<!ENTITY emacs-download-http "http://ftp.gnu.org/pub/gnu/emacs/emacs-21.2.tar.gz">
+<!ENTITY emacs-download-ftp "ftp://ftp.gnu.org/pub/gnu/emacs/emacs-21.2.tar.gz">
+<!ENTITY emacs-size "20 MB">
Index: postlfs/postlfs.ent
===================================================================
--- postlfs/postlfs.ent	(revision cc93d48f1a11b2ea75980e8f1c382562ff1408ac)
+++ postlfs/postlfs.ent	(revision 4d07d5d50dc00e75f8bfe1b2c4cc4e680ba05771)
@@ -34,4 +34,6 @@
 <!ENTITY postlfs-editors-vim SYSTEM "editors/vim.xml">
 <!ENTITY postlfs-editors-emacs SYSTEM "editors/emacs.xml">
+<!ENTITY % emacs SYSTEM "editors/emacs/emacs.ent">
+%emacs;
 <!ENTITY postlfs-editors-nano SYSTEM "editors/nano.xml">
 <!ENTITY % nano SYSTEM "editors/nano/nano.ent">
