Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 15e7f44f73056a8a4db6510c60c84547ce62beb6)
+++ postlfs/editors/emacs.xml	(revision ed59474e914b771a83ec549c8f6fdaeabeee16c1)
@@ -14,149 +14,178 @@
 
 <sect1 id="emacs" xreflabel="Emacs-&emacs-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="emacs.html"?>
-<title>Emacs-&emacs-version;</title>
-<indexterm zone="emacs"><primary
-sortas="a-Emacs">Emacs</primary></indexterm>
-
-<sect2>
-<title>Introduction to <application>Emacs</application></title>
-
-<para>The <application>Emacs</application> package contains the extensible, 
-customizable, self-documenting real-time display editor.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&emacs-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&emacs-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &emacs-md5sum;</para></listitem>
-<listitem><para>Download size: &emacs-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&emacs-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&emacs-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>Emacs</application> dependencies</title>
-<sect4><title>Optional</title>
-<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
-<xref linkend="libjpeg"/>, 
-<xref linkend="libpng"/>, 
-<xref linkend="libtiff"/> and 
-<xref linkend="libungif"/> or <xref linkend="giflib"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Emacs</application></title>
-
-<para>Install <application>Emacs</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr \
+  <?dbhtml filename="emacs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Emacs-&emacs-version;</title>
+
+  <indexterm zone="emacs">
+    <primary sortas="a-Emacs">Emacs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Emacs</title>
+
+    <para>The <application>Emacs</application> package contains the extensible, 
+    customizable, self-documenting real-time display editor.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&emacs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&emacs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &emacs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &emacs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &emacs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &emacs-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
+    <xref linkend="libjpeg"/>, 
+    <xref linkend="libpng"/>, 
+    <xref linkend="libtiff"/> and 
+    <xref linkend="libungif"/> or <xref linkend="giflib"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Emacs</title>
+
+    <para>Install <application>Emacs</application> by running the following 
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
    --libexecdir=/usr/sbin &amp;&amp;
-make bootstrap</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-<seglistitem>
-<seg>b2m, ctags, ebrowse, emacs, emacsclient, etags, grep-changelog and rcs-checkin</seg>
-<seg>None</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>
+make bootstrap</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>b2m, ctags, ebrowse, emacs, emacsclient, etags, grep-changelog,
+        and rcs-checkin</seg>
+        <seg>None</seg>
+        <seg>/usr/sbin/emacs and /usr/share/emacs</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="b2m">
+        <term><command>b2m</command></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><command>b2m</command></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><command>ebrowse</command></term>
+        <listitem>
+          <para>permits browsing of C++ class hierarchies from
+          within <command>emacs</command>.</para>
+          <indexterm zone="emacs ebrowse">
+            <primary sortas="b-ebrowse">ebrowse</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="emacs-prog">
+        <term><command>emacs</command></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><command>emacsclient</command></term>
+        <listitem>
+          <para>attaches an emacs <command>session</command> to an already
+          running <command>emacsserver</command> instance.</para>
+          <indexterm zone="emacs emacsclient">
+            <primary sortas="b-emacsclient">emacsclient</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="etags">
+        <term><command>etags</command></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><command>grep-changelog</command></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><command>rcs-checkin</command></term>
+        <listitem>
+          <para>is a shell script used to check files into RCS.</para>
+          <indexterm zone="emacs rcs-checkin">
+            <primary sortas="b-rcs-checkin">rcs-checkin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
 <!-- 
@@ -183,5 +212,5 @@
 <sect3><title>movemail</title>
 <para><command>movemail</command> provides access to
-<acronym>POP</acronym>3 mailboxes.</para></sect3>
+POP3 mailboxes.</para></sect3>
 
 <sect3><title>profile</title>
@@ -191,5 +220,5 @@
 <sect3><title>rcs2log</title>
 <para><command>rcs2log</command> generates change log prefixes from
-<acronym>RCS</acronym> files.</para></sect3>
+RCS files.</para></sect3>
 
 <sect3><title>sorted-doc</title>
@@ -198,5 +227,5 @@
 
 <sect3><title>vcdiff</title>
-<para><command>vcdiff</command> compares <acronym>SCCS</acronym> 
+<para><command>vcdiff</command> compares SCCS 
 files.</para></sect3>
 
@@ -204,7 +233,7 @@
 <para><command>yow</command> prints a quotation from Zippy the 
 Pinhead.</para></sect3>  -->
-</variablelist>
-
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
