Index: general.ent
===================================================================
--- general.ent	(revision 77632493fdcab5850b650f7908377ca136907bf4)
+++ general.ent	(revision b56f06c3fefb3e09f96ce09721e7cbe8ca39d96a)
@@ -1,3 +1,3 @@
-<!ENTITY day          "29">                   <!-- Always 2 digits -->
+<!ENTITY day          "30">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
Index: gnome/add/at-spi.xml
===================================================================
--- gnome/add/at-spi.xml	(revision 77632493fdcab5850b650f7908377ca136907bf4)
+++ gnome/add/at-spi.xml	(revision b56f06c3fefb3e09f96ce09721e7cbe8ca39d96a)
@@ -5,22 +5,10 @@
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
   <!ENTITY at-spi-download-http "&gnome-download-http;/at-spi/1.7/at-spi-&at-spi-version;.tar.bz2">
   <!ENTITY at-spi-download-ftp  "&gnome-download-ftp;/at-spi/1.7/at-spi-&at-spi-version;.tar.bz2">
-  <!ENTITY at-spi-md5sum        "9669ee9e3633ffb43a70795edd748e4d">
-  <!ENTITY at-spi-size          "541 KB">
-  <!ENTITY at-spi-buildsize     "14.2 MB">
-  <!ENTITY at-spi-time          "0.5 SBU">
+  <!ENTITY at-spi-md5sum        "2988cd21d9f292fd404a8c532fe2723d">
+  <!ENTITY at-spi-size          "696 KB">
+  <!ENTITY at-spi-buildsize     "19.7 MB">
+  <!ENTITY at-spi-time          "0.6 SBU">
 ]>
 
@@ -31,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">at-spi-&at-spi-version;.tar</keyword>
-      <keyword role="ftpdir">at-spi</keyword>
-    </keywordset>
   </sect1info>
 
@@ -80,5 +64,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="intltool"/> and
+    <xref linkend="gtk-doc"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -93,7 +78,7 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/at-spi &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --libexecdir=$(pkg-config \
+            --variable=prefix ORBit-2.0)/lib/at-spi &amp;&amp;
 make</userinput></screen>
 
@@ -111,6 +96,10 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/at-spi</parameter>: This switch puts libexec files in
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/at-spi</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/at-spi</filename> instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
@@ -122,14 +111,14 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>at-spi-registryd</seg>
+        <seg>None</seg>
         <seg>libspi.{so,a}, libcspi.{so,a}, libloginhelper.{so,a}, the
         libatk-bridge.so <application>GTK+</application> module, and
         <application>ORBit</application>-2.0 Accessibility modules</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/at-spi-1.0,
         lib/at-spi,
Index: gnome/add/gnome-mag.xml
===================================================================
--- gnome/add/gnome-mag.xml	(revision 77632493fdcab5850b650f7908377ca136907bf4)
+++ gnome/add/gnome-mag.xml	(revision b56f06c3fefb3e09f96ce09721e7cbe8ca39d96a)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-mag-download-http "&gnome-download-http;/gnome-mag/0.12/gnome-mag-&gnome-mag-version;.tar.bz2">
   <!ENTITY gnome-mag-download-ftp  "&gnome-download-ftp;/gnome-mag/0.12/gnome-mag-&gnome-mag-version;.tar.bz2">
-  <!ENTITY gnome-mag-md5sum        "f04ccfa081a9433538300ca07e8be1a2">
-  <!ENTITY gnome-mag-size          "456 KB">
-  <!ENTITY gnome-mag-buildsize     "11.9 MB">
+  <!ENTITY gnome-mag-md5sum        "5872f8f5f985cc476f1ea8adf0e4518d">
+  <!ENTITY gnome-mag-size          "591 KB">
+  <!ENTITY gnome-mag-buildsize     "16.2 MB">
   <!ENTITY gnome-mag-time          "0.2 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-mag-&gnome-mag-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-mag</keyword>
-    </keywordset>
   </sect1info>
 
@@ -66,4 +62,7 @@
     <para role="required"><xref linkend="at-spi"/></para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="intltool"/></para>
+
     <bridgehead renderas="sect4">Optional (For
     <application>XFree86</application> Only)</bridgehead>
@@ -93,5 +92,5 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
 make</userinput></screen>
 
@@ -101,4 +100,12 @@
 
 <screen role='root'><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
 
   </sect2>
@@ -115,5 +122,5 @@
         <seg>magnifier</seg>
         <seg>libgnome-mag.so</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/gnome-mag-1.0,
         share/{doc/gnome-mag-0.12.3,gnome-mag,idl/gnome-mag-1.0}</seg>
Index: gnome/add/gnome-speech.xml
===================================================================
--- gnome/add/gnome-speech.xml	(revision 77632493fdcab5850b650f7908377ca136907bf4)
+++ gnome/add/gnome-speech.xml	(revision b56f06c3fefb3e09f96ce09721e7cbe8ca39d96a)
@@ -7,8 +7,8 @@
   <!ENTITY gnome-speech-download-http "&gnome-download-http;/gnome-speech/0.4/gnome-speech-&gnome-speech-version;.tar.bz2">
   <!ENTITY gnome-speech-download-ftp  "&gnome-download-ftp;/gnome-speech/0.4/gnome-speech-&gnome-speech-version;.tar.bz2">
-  <!ENTITY gnome-speech-md5sum        "b477d4e0e01b79374f60ceee597c2c3d">
-  <!ENTITY gnome-speech-size          "286 KB">
-  <!ENTITY gnome-speech-buildsize     "4.8 MB">
-  <!ENTITY gnome-speech-time          "0.1 SBU">
+  <!ENTITY gnome-speech-md5sum        "c27f3eb262b8a66a756872d25c716517">
+  <!ENTITY gnome-speech-size          "307 KB">
+  <!ENTITY gnome-speech-buildsize     "3.0 MB">
+  <!ENTITY gnome-speech-time          "0.2 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-speech-&gnome-speech-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-speech</keyword>
-    </keywordset>
   </sect1info>
 
@@ -98,7 +94,7 @@
       <para>You must install at least one of the backend drivers for
       <application>GNOME Speech</application> to render speech through the
-      audio hardware. Testing the installation of the backend driver to
+      audio hardware. You should test the installation of the backend driver and
       ensure it produces desired results before installing
-      <application>GNOME Speech</application> is recommended.</para>
+      <application>GNOME Speech</application>.</para>
     </note>
 
@@ -106,5 +102,5 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
 make</userinput></screen>
 
@@ -115,6 +111,6 @@
 <screen role='root'><userinput>make install &amp;&amp;
 install -v -m644 -D doc/gnome-speech.html \
-    `pkg-config --variable=prefix \
-    ORBit-2.0`/share/doc/gnome-speech-&gnome-speech-version;/gnome-speech.html</userinput></screen>
+    $(pkg-config --variable=prefix \
+    ORBit-2.0)/share/doc/gnome-speech-&gnome-speech-version;/gnome-speech.html</userinput></screen>
 
   </sect2>
@@ -123,6 +119,9 @@
     <title>Command Explanations</title>
 
-    <para><option>--with-jab-dir=`pkg-config
-    --variable=prefix ORBit-2.0`/share/jar</option>: Use this option if you
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <para><option>--with-jab-dir=$(pkg-config
+    --variable=prefix ORBit-2.0)/share/jar</option>: Use this option if you
     have installed the <application>Java Access Bridge</application> package
     and wish to have <application>GNOME Speech</application> build
@@ -151,5 +150,5 @@
     <command>freetts-synthesis-driver</command> script:</para>
 
-<screen role='root'><userinput>sed -i "s/clip/streaming/" $GNOME_PREFIX/bin/freetts-synthesis-driver</userinput></screen>
+<screen role='root'><userinput>sed -i "s/clip/streaming/" <envar>$GNOME_PREFIX</envar>/bin/freetts-synthesis-driver</userinput></screen>
 
   </sect2>
@@ -164,9 +163,9 @@
 
       <seglistitem>
-        <seg>festival-synthesis-driver, freetts-synthesis-driver and
-        test-speech</seg>
+        <seg>festival-synthesis-driver, freetts-synthesis-driver,
+        speechd-synthesis-driver and test-speech</seg>
         <seg>libgnomespeech.{so,a}. Other drivers and libraries are also
         installed if you have enabled additional backends.</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/gnome-speech-1.0,
         share/{doc/gnome-speech-&gnome-speech-version;,
Index: gnome/add/gnopernicus.xml
===================================================================
--- gnome/add/gnopernicus.xml	(revision 77632493fdcab5850b650f7908377ca136907bf4)
+++ gnome/add/gnopernicus.xml	(revision b56f06c3fefb3e09f96ce09721e7cbe8ca39d96a)
@@ -7,8 +7,8 @@
   <!ENTITY gnopernicus-download-http "&gnome-download-http;/gnopernicus/1.1/gnopernicus-&gnopernicus-version;.tar.bz2">
   <!ENTITY gnopernicus-download-ftp  "&gnome-download-ftp;/gnopernicus/1.1/gnopernicus-&gnopernicus-version;.tar.bz2">
-  <!ENTITY gnopernicus-md5sum        "d2042f0d7fde12a90cc23b98420dbeda">
-  <!ENTITY gnopernicus-size          "2.1 MB">
-  <!ENTITY gnopernicus-buildsize     "40.5 MB">
-  <!ENTITY gnopernicus-time          "0.6 SBU">
+  <!ENTITY gnopernicus-md5sum        "b55b345f765673205a87e251874afba3">
+  <!ENTITY gnopernicus-size          "1.4 MB">
+  <!ENTITY gnopernicus-buildsize     "41.7 MB">
+  <!ENTITY gnopernicus-time          "0.7 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnopernicus-&gnopernicus-version;.tar</keyword>
-      <keyword role="ftpdir">gnopernicus</keyword>
-    </keywordset>
   </sect1info>
 
@@ -69,5 +65,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
+    <para role="optional"><xref linkend="intltool"/>,
+    <xref linkend="gtk-doc"/>, and
     <ulink url="http://www.mielke.cc/brltty/">BRLTTY</ulink></para>
 
@@ -83,9 +80,9 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/gnopernicus-1.0 \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
+            --localstatedir=/var/lib \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnopernicus-1.0 &amp;&amp;
 make</userinput></screen>
 
@@ -101,18 +98,19 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/gnopernicus-1.0</parameter>: This switch puts libexec files
-    in <filename class="directory">$GNOME_PREFIX/lib/gnopernicus-1.0</filename>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/gnopernicus-1.0</parameter>: This parameter causes the
+    libexec files to be installed in the preferred location of
+    <filename class="directory">$GNOME_PREFIX/lib/gnopernicus-1.0</filename>
     instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
     <!-- Commented out as the default X font dir is now /usr/share/fonts
@@ -136,7 +134,6 @@
         <seg>gnopernicus, gnopernicus-mag-config and srcore</seg>
         <seg><application>Gnopernicus</application> support libraries</seg>
-        <seg>&gnome-etc-dir;/{gconf/gconf.xml.defaults/{,schemas/}apps/gnopernicus,
-        gnopernicus-1.0}, and the following subdirectories of
-        $GNOME_PREFIX/:
+        <seg>&gnome-etc-dir;/gnopernicus-1.0},
+        and the following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/gnopernicus-1.0,
         lib/gnopernicus-1.0,
Index: gnome/add/gok.xml
===================================================================
--- gnome/add/gok.xml	(revision 77632493fdcab5850b650f7908377ca136907bf4)
+++ gnome/add/gok.xml	(revision b56f06c3fefb3e09f96ce09721e7cbe8ca39d96a)
@@ -7,8 +7,8 @@
   <!ENTITY gok-download-http "&gnome-download-http;/gok/1.0/gok-&gok-version;.tar.bz2">
   <!ENTITY gok-download-ftp  "&gnome-download-ftp;/gok/1.0/gok-&gok-version;.tar.bz2">
-  <!ENTITY gok-md5sum        "a9334a0e1dc11bbba817c128503260b0">
-  <!ENTITY gok-size          "1.3 MB">
-  <!ENTITY gok-buildsize     "40.3 MB">
-  <!ENTITY gok-time          "0.7 SBU">
+  <!ENTITY gok-md5sum        "de6cceaca780e7ad0702c4b3c0fd8d1f">
+  <!ENTITY gok-size          "1.1 MB">
+  <!ENTITY gok-buildsize     "45.0 MB">
+  <!ENTITY gok-time          "0.6 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gok-&gok-version;.tar</keyword>
-      <keyword role="ftpdir">gok</keyword>
-    </keywordset>
   </sect1info>
 
@@ -63,5 +59,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="esound"/>,
+    <xref linkend="libgnomeui"/>,
     <xref linkend="scrollkeeper"/>,
     <xref linkend="libwnck"/>,
@@ -70,5 +67,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="intltool"/> and
+    <xref linkend="gtk-doc"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -83,5 +81,5 @@
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib &amp;&amp;
@@ -93,6 +91,6 @@
 
 <screen role='root'><userinput>make install &amp;&amp;
-chmod -v 644 `pkg-config --variable=prefix
-      ORBit-2.0`/share/gnome/help/gok/C/legal.xml</userinput></screen>
+chmod -v 644 $(pkg-config --variable=prefix
+      ORBit-2.0)/share/gnome/help/gok/C/{gok,legal}.xml</userinput></screen>
 
   </sect2>
@@ -101,16 +99,15 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
 
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
-
-    <para><option>--enable-gtk-doc</option>: Use this parameter to build and
-    install the API documentation as the source tarball doesn't contain
-    pre-built docs.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+  
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" 
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -144,7 +141,6 @@
         <seg>gok and create-branching-keyboard</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gok,
-        and the following subdirectories of $GNOME_PREFIX/:
-        share/{,gnome/help/, gtk-doc/html, omf}gok</seg>
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
+        share/{,gnome/help/ ,gtk-doc/html ,omf}gok</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/add/java-access-bridge.xml
===================================================================
--- gnome/add/java-access-bridge.xml	(revision 77632493fdcab5850b650f7908377ca136907bf4)
+++ gnome/add/java-access-bridge.xml	(revision b56f06c3fefb3e09f96ce09721e7cbe8ca39d96a)
@@ -7,8 +7,8 @@
   <!ENTITY java-access-bridge-download-http "&gnome-download-http;/java-access-bridge/1.5/java-access-bridge-&java-access-bridge-version;.tar.bz2">
   <!ENTITY java-access-bridge-download-ftp  "&gnome-download-ftp;/java-access-bridge/1.5/java-access-bridge-&java-access-bridge-version;.tar.bz2">
-  <!ENTITY java-access-bridge-md5sum        "7cba0788dd0f1dbb81dc73c470059cf5">
-  <!ENTITY java-access-bridge-size          "120 KB">
-  <!ENTITY java-access-bridge-buildsize     "5.5 MB">
-  <!ENTITY java-access-bridge-time          "1.0 SBU">
+  <!ENTITY java-access-bridge-md5sum        "5099b2c8634d190df15e32f5fcb2a588">
+  <!ENTITY java-access-bridge-size          "121 KB">
+  <!ENTITY java-access-bridge-buildsize     "6.6 MB">
+  <!ENTITY java-access-bridge-time          "1.1 SBU">
 ]>
 
@@ -20,8 +20,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">java-access-bridge-&java-access-bridge-version;.tar</keyword>
-      <keyword role="ftpdir">java-access-bridge</keyword>
-    </keywordset>
   </sect1info>
 
@@ -80,5 +76,5 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
 make</userinput></screen>
 
@@ -88,9 +84,12 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-cat `pkg-config --variable=prefix \
-    ORBit-2.0`/share/jar/accessibility.properties \
+
+cat $(pkg-config --variable=prefix \
+    ORBit-2.0)/share/jar/accessibility.properties \
     &gt;&gt; $JAVA_HOME/jre/lib/accessibility.properties &amp;&amp;
-ln -v -sf `pkg-config --variable=prefix \
-    ORBit-2.0`/share/jar/gnome-java-bridge.jar \
+chmod -v 644 $JAVA_HOME/jre/lib/accessibility.properties &amp;&amp;
+
+ln -v -sf $(pkg-config --variable=prefix \
+    ORBit-2.0)/share/jar/gnome-java-bridge.jar \
     $JAVA_HOME/jre/lib/ext</userinput></screen>
 
@@ -100,9 +99,12 @@
     <title>Command Explanations</title>
 
-    <para><command>cat `pkg-config ...</command>: This command appends to (or
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <para><command>cat $(pkg-config ...</command>: This command appends to (or
     creates) the Java runtime <filename>accessibility.properties</filename>
     file required for <application>Java Access Bridge</application>.</para>
 
-    <para><command>ln -v -sf `pkg-config ...</command>: This command creates
+    <para><command>ln -v -sf $(pkg-config ...</command>: This command creates
     a link from the Access Bridge <filename>jar</filename> file to the Java
     runtime library extensions directory.</para>
@@ -154,5 +156,5 @@
         <seg>None</seg>
         <seg>gnome-java-bridge.jar and JNav.jar</seg>
-        <seg>$GNOME_PREFIX/share/jar</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/jar</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/add/libgail-gnome.xml
===================================================================
--- gnome/add/libgail-gnome.xml	(revision 77632493fdcab5850b650f7908377ca136907bf4)
+++ gnome/add/libgail-gnome.xml	(revision b56f06c3fefb3e09f96ce09721e7cbe8ca39d96a)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">libgail-gnome-&libgail-gnome-version;.tar</keyword>
-      <keyword role="ftpdir">libgail-gnome</keyword>
-    </keywordset>
   </sect1info>
 
@@ -79,5 +75,5 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
 make</userinput></screen>
 
@@ -88,4 +84,12 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+  
   </sect2>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 77632493fdcab5850b650f7908377ca136907bf4)
+++ introduction/welcome/changelog.xml	(revision b56f06c3fefb3e09f96ce09721e7cbe8ca39d96a)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>June 30th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated the GNOME Accessibility packages'
+          instructions to be compatible with the GNOME-2.14.2 update.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 29th, 2006</para>
       <itemizedlist>
