Index: general.ent
===================================================================
--- general.ent	(revision 781202333b3a6d415d4c731dbaf166cbb4c45cbf)
+++ general.ent	(revision 60d0f22e8f7325dc212b16d5e7472c23a8f42f3c)
@@ -1,3 +1,3 @@
-<!ENTITY day          "13">
+<!ENTITY day          "14">
 <!ENTITY month        "12">
 <!ENTITY year         "2005">
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision 781202333b3a6d415d4c731dbaf166cbb4c45cbf)
+++ xsoft/office/abiword.xml	(revision 60d0f22e8f7325dc212b16d5e7472c23a8f42f3c)
@@ -114,4 +114,13 @@
 make install</userinput></screen>
 
+    <para>If you have a <application>GNOME-2</application> installation, issue
+    the following command as the <systemitem class="username">root</systemitem>
+    user to install the <application>AbiWord</application> Bonobo component
+    description file:</para>
+
+<screen role="root"><userinput>cd .. &amp;&amp;
+install -v -m644 abidistfiles/GNOME_AbiWord_Control_2_4.server \
+    $GNOME_PREFIX/lib/bonobo/servers</userinput></screen>
+
   </sect2>
 
@@ -122,5 +131,5 @@
     unprivileged user:</para>
 
-<screen><userinput>cd ../abiword-docs &amp;&amp;
+<screen><userinput>cd abiword-docs &amp;&amp;
 sed -i 's@AbiWord-2.0@abiword@' make-gnome-html.sh &amp;&amp;
 ./make-gnome-html.sh &amp;&amp;
@@ -137,14 +146,4 @@
     -type d -exec chmod -v 755 {} \;</userinput></screen>
 
-<!-- I commented this out because I don't know what it does. Andy
-    <para>If you have a <application>GNOME-2</application> installation, issue
-    the following command as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>cd .. &amp;&amp;
-install -v -m644 abidistfiles/GNOME_AbiWord_Control_2_4.server \
-    $GNOME_PREFIX/lib/bonobo/servers</userinput></screen>
--->
-
   </sect2>
 
@@ -154,15 +153,15 @@
     <para><parameter>--without-inter7eps</parameter>: Some of the headers from
     the <application>EPS</application> package are not compatible with
-    <application>GCC</application>-4.0.x. This parameter prevents linking to
-    the package and incurring a build failure.</para>
+    <application>GCC</application>-&gcc-version;. This parameter prevents
+    linking to the package and incurring a build failure.</para>
 
     <para><command>sed -i 's@AbiWord-2.0@abiword@' make-gnome-html.sh</command>:
-    This command alters the make-gnome-html.sh script to look for the current
-    version of <command>abiword</command>.</para>
+    This command alters the <command>make-gnome-html.sh</command> script to
+    look for the current version of <command>abiword</command>.</para>
 
   </sect2>
 
   <sect2 role="configuration">
-    <title>Configuring Abiword</title>
+    <title>Configuring AbiWord</title>
 
     <sect3 id="abiword-config">
@@ -171,4 +170,8 @@
       <para><filename>~/.AbiSuite/templates/normal.awt</filename></para>
 
+      <indexterm zone="abiword abiword-config">
+        <primary sortas="e-AA.AbiSuite-templates-normal">~/.AbiSuite/templates/normal.awt</primary>
+      </indexterm>
+
     </sect3>
 
@@ -176,5 +179,6 @@
       <title>Configuration Information</title>
 
-      <para>Choose the right template for your language and locale:</para>
+      <para>Choose the right template for your language and locale from the
+      list produced by the following command:</para>
 
 <screen><userinput>ls /usr/share/AbiSuite-2.4/templates</userinput></screen>
@@ -185,21 +189,21 @@
 
 <screen><userinput>mkdir -p -v ~/.AbiSuite/templates &amp;&amp;
-cp -v /usr/share/AbiSuite-2.4/templates/normal.awt-[lang] \
+cp -v /usr/share/AbiSuite-2.4/templates/normal.awt-<replaceable>[lang]</replaceable> \
       ~/.AbiSuite/templates/normal.awt</userinput></screen>
 
-      <para>Obviously, change <emphasis role="strong">[lang]</emphasis> in that
-      command to fit the name of the file you want</para>
-
-      <para><application>Abiword</application> uses Times New Roman as its default
+      <para>Obviously, change <replaceable>[lang]</replaceable> in the above
+      command to fit the name of the file you want.</para>
+
+      <para><application>AbiWord</application> uses Times New Roman as its default
       font. If you'd like it to default to a different font, edit
       <filename>~/.AbiSuite/templates/normal.awt</filename> and change the font to
-      the one you want. Open <application>Abiword</application>, choose the font,
+      the one you want. Open <application>AbiWord</application>, choose the font,
       type one letter then save the document in your home folder as
       <filename>test.abw</filename>. Find out what name
-      <application>Abiword</application> uses for the font:</para>
+      <application>AbiWord</application> uses for the font:</para>
 
 <screen><userinput>grep -m 1 '"font-family' ~/test.abw</userinput></screen>
 
-      <para>Now put it into your <application>Abiword</application> template. For
+      <para>Now put it into your <application>AbiWord</application> template. For
       example, if you want to use Bitstream Vera Sans:</para>
 
