Index: gnome/core/control-center.xml
===================================================================
--- gnome/core/control-center.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/control-center.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -89,6 +89,6 @@
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; \
             --libexecdir=$(pkg-config \
                 --variable=prefix ORBit-2.0)/lib/control-center &amp;&amp;
@@ -106,18 +106,19 @@
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../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/control-center</parameter>: This switch puts libexec files in
+    ORBit-2.0)/lib/control-center</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/control-center</filename>
     instead of
     <filename class="directory">$GNOME_PREFIX/libexec</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>
-
-    <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><option>--enable-aboutme</option>: Enables building the
@@ -149,5 +150,5 @@
         modules and <application>Nautilus</application> library module
         extensions</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/gnome-window-settings-2.0,
         lib/{control-center, nautilus, window-manager-settings},
Index: gnome/core/eel.xml
===================================================================
--- gnome/core/eel.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/eel.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -88,4 +88,12 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -99,5 +107,5 @@
         <seg>None</seg>
         <seg>libeel-2.{so,a}</seg>
-        <seg>$GNOME_PREFIX/include/eel-2</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/include/eel-2</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gail.xml
===================================================================
--- gnome/core/gail.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gail.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -100,12 +100,14 @@
   </sect2>
 
-  <!-- <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>-enable-gtk-doc</option>: Use this parameter if you have
-    <application>GTK-Doc</application> installed and wish to build 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="../gnome-prefix.xml"/>
 
-  </sect2> -->
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
 
   <sect2 role="content">
@@ -121,7 +123,7 @@
         <seg>libgailutil.so and <application>GAIL</application>
         <application>GTK+</application> modules</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/gail-1.0,
-        lib/gtk-2.0/modules, and
+        lib/gtk-2.0/modules and
         share/gtk-doc/html/gail-libgail-util</seg>
       </seglistitem>
Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gconf.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -98,18 +98,28 @@
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter
+    causes the <application>GConf-2</application> configuration database to be
+    built in <filename class="directory">&gnome-etc-dir;</filename> instead of
+    <filename class="directory">$GNOME_PREFIX/etc</filename>. This installation
+    controls all future installations of <application>GConf-2</application>
+    schemas. If you change the location (which includes eliminating this
+    parameter), it <emphasis role='strong'>must</emphasis> be consistent for
+    every subsequent package installation that updates the
+    <application>GConf-2</application> configuration database.</para>
+
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/GConf</parameter>: This switch puts libexec files in
+    ORBit-2.0)/lib/GConf</parameter>: This parameter causes the libexec files
+    to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/GConf</filename> instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch
-    puts <application>GConf-2</application> configuration files
-    in <filename class="directory">&gnome-etc-dir;</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/etc</filename>.  This
-    installation controls all future installations of schemas. If you
-    change the location (which includes eliminating this parameter), it
-    <emphasis>must</emphasis> be consistent for every subsequent
-    package installation that updates the <application>GConf-2</application>
-    configuration database.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-mandir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -127,7 +137,7 @@
         <seg>libgconf-2.{so,a}</seg>
         <seg>&gnome-etc-dir;/gconf and the following subdirectories of
-        $GNOME_PREFIX/:
+        <envar>$GNOME_PREFIX</envar>/:
         include/gconf,
-        lib/GConf, and
+        lib/GConf and
         share/{GConf, gtk-doc/html/gconf, sgml/gconf}</seg>
       </seglistitem>
Index: gnome/core/gnome-applets.xml
===================================================================
--- gnome/core/gnome-applets.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-applets.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -70,9 +70,6 @@
     <xref linkend="system-tools-backends"/>,
     <xref linkend="docbook-utils"/>,
-    <ulink
-    url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink>,
-    and <ulink
-    url="http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.2.2.tar.gz">
-    libnotify-0.2.2</ulink></para>
+    <ulink url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink>, and
+    <ulink url="http://www.galago-project.org/news/index.php">libnotify</ulink></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -88,6 +85,6 @@
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; \
             --libexecdir=$(pkg-config \
                 --variable=prefix ORBit-2.0)/lib/gnome-applets \
@@ -108,21 +105,26 @@
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../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/gnome-applets</parameter>: This switch puts libexec files
+    ORBit-2.0)/lib/gnome-applets</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
     in <filename class="directory">$GNOME_PREFIX/lib/gnome-applets</filename>
     instead of
     <filename class="directory">$GNOME_PREFIX/libexec</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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-mandir.xml"/>
 
-    <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><command>make -C man install-man</command>: This installs the man-pages
-    that are not installed during <command>make install</command>.</para>
+    <para><command>make -C man install-man</command>: This command installs
+    the man-pages that are not installed during
+    <command>make install</command>.</para>
 
   </sect2>
@@ -139,10 +141,9 @@
         <seg>cpufreq-selector and gswitchit-plugins-capplet</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas}apps/{too
-        many to list} and the following subdirectories of $GNOME_PREFIX/:
-        include/libgswitchit,
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
+        include/libg{switchit,weather},
         lib/gnome-applets,
         share/{gnome-applets, {gnome/help,omf}/{too many to list},
-        pixmaps/{accessx-status-applet, cpufreq-applet, stickynotes}, and
+        pixmaps/{accessx-status-applet, cpufreq-applet, stickynotes},
         xmodmap}</seg>
       </seglistitem>
Index: gnome/core/gnome-backgrounds.xml
===================================================================
--- gnome/core/gnome-backgrounds.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-backgrounds.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -31,6 +31,8 @@
 
     <para>The <application>gnome-backgrounds</application> package contains
-    a set of backgrounds used in the <application>GNOME</application>
-    desktop.</para>
+    a collection of graphics files which can be used as backgrounds in the
+    GNOME desktop environment. Additionally, the package creates the proper
+    framework and directory structure so that you can add your own files to
+    the collection.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -89,4 +91,12 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -100,5 +110,5 @@
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/{gnome-background-properties,
+        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome-background-properties,
         pixmaps/backgrounds}</seg>
       </seglistitem>
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-desktop.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -95,7 +95,12 @@
     <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="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
 
     <para><option>--with-gnome-distributor="Some Name"</option>: Use this
@@ -106,4 +111,10 @@
     parameter if <application>KDE</application> is installed in any prefix
     other than <filename class='directory'>/usr</filename>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-mandir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -120,5 +131,5 @@
         <seg>gnome-about</seg>
         <seg>libgnome-desktop-2.{so,a}</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/gnome-desktop-2.0,
         share/{gnome-about,
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-doc-utils.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -69,8 +69,10 @@
     <xref linkend="scrollkeeper"/></para>
 
-    <para>The packages are listed as recommended because if they are not
-    installed (and the proper switches are passed to the
-    <command>configure</command> command), functionality will be missing that
-    is expected later in other GNOME packages.</para>
+    <para>The packages are listed as recommended even though
+    <application>GNOME Doc Utils</application> will build fine without them.
+    If you don't install the recommended packages (and you pass the appropriate
+    flags to the <command>configure</command> command so that it will build
+    without them), functionality will be missing that is expected later in
+    other GNOME packages.</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -104,4 +106,15 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-mandir.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -116,5 +129,6 @@
         <seg>gnome-doc-prepare and xml2po</seg>
         <seg>None</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/share/:
+        <seg>The following subdirectories of
+        <envar>$GNOME_PREFIX</envar>/share/:
         gnome-doc-utils,
         gnome/help/gnome-doc-{make,xslt},
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-keyring.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -94,6 +94,10 @@
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-keyring</parameter>: This switch puts libexec files in
+    ORBit-2.0)/lib/gnome-keyring</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/gnome-keyring</filename>
     instead of
@@ -106,12 +110,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>gnome-keyring-daemon</seg>
         <seg>libgnome-keyring.so</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/gnome-keyring-1,
         lib/gnome-keyring and
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-menus.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -95,15 +95,14 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If your <application>GNOME</application>-2 installation prefix is
-    anything other than <filename class='directory'>/usr</filename> and you
-    have <application>Python</application> installed, create some symbolic
-    links as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>ln -v -s $(pkg-config --variable=prefix \
-             ORBit-2.0)/lib/python2.4/site-packages/GMenuSimpleEditor \
-         /usr/lib/python2.4/site-packages &amp;&amp;
-ln -v -s $(pkg-config --variable=prefix \
-             ORBit-2.0)/lib/python2.4/site-packages/gmenu.* \
-         /usr/lib/python2.4/site-packages</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
 
   </sect2>
@@ -115,11 +114,34 @@
       <title>Configuration Information</title>
 
-      <para>So that <application>GNOME</application> can find the desktop
-      configuration files, ensure you set the <envar>XDG_CONFIG_DIRS</envar>
-      environment variable in the system profile, or in individual user's
-      profiles as shown below (you may add additional directories, separated
-      with colons, if desired):</para>
+      <sect4>
+        <title>XDG_CONFIG_DIRS Variable</title>
+
+        <para>So that <application>GNOME</application> can find the desktop
+        configuration files, ensure you set the <envar>XDG_CONFIG_DIRS</envar>
+        environment variable in the system profile, or in individual user's
+        profiles as shown below (you may add additional directories, separated
+        with colons, if desired):</para>
 
 <screen><literal>export XDG_CONFIG_DIRS=/usr/share:&gnome-etc-dir;/xdg</literal></screen>
+
+      </sect4>
+
+      <sect4>
+        <title>PYTHONPATH Variable</title>
+
+        <para>If your GNOME-2 installation prefix is anything other than
+        <filename class='directory'>/usr</filename> and you have
+        <application>Python</application> installed, you need to update the
+        <envar>PYTHONPATH</envar> environment variable so that the
+        <filename>gmenu</filename> module can be located by
+        <application>Python</application>. Set the variable in the system
+        profile, or in individual user's profiles as shown below:</para>
+
+<screen><literal>export PYTHONPATH=$PYTHONPATH:$(pkg-config --variable=prefix \
+       ORBit-2.0)/lib/python2.4/site-packages:$(pkg-config \
+       --variable=prefix \
+       ORBit-2.0)/lib/python2.4/site-packages/GMenuSimpleEditor</literal></screen>
+
+      </sect4>
 
     </sect3>
@@ -131,5 +153,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
@@ -139,5 +161,5 @@
         <seg>libgnome-menu.{so,a}</seg>
         <seg>&gnome-etc-dir;/xdg and the following subdirectories of
-        $GNOME_PREFIX/:
+        <envar>$GNOME_PREFIX</envar>/:
         include/gnome-menus,
         lib/python2.4/site-packages/GMenuSimpleEditor,
Index: gnome/core/gnome-mime-data.xml
===================================================================
--- gnome/core/gnome-mime-data.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-mime-data.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -95,12 +95,12 @@
     <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="../gnome-prefix.xml"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
 
-    <para><parameter>--mandir=...</parameter>: This switch is unneeded and may
-    be removed as the man page is installed manually. It is only in the
-    instructions in case the man page is ever installed during
-    <command>make install</command>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-mandir.xml"/>
 
   </sect2>
@@ -117,5 +117,6 @@
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/{application-registry, share/mime-info}</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/{application-registry,
+        share/mime-info}</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-panel.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -81,6 +81,6 @@
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; \
             --libexecdir=$(pkg-config \
                 --variable=prefix ORBit-2.0)/lib/gnome-panel \
@@ -100,13 +100,25 @@
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../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/gnome-panel</parameter>: This switch puts libexec files in
+    ORBit-2.0)/lib/gnome-panel</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/gnome-panel</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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-mandir.xml"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -117,5 +129,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -123,5 +135,5 @@
         <seg>gnome-desktop-item-edit, gnome-panel and panel-test-applets</seg>
         <seg>libpanel-applet-2.{so,a}</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/panel-2.0,
         lib/gnome-panel,
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-session.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -93,7 +93,12 @@
     <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="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-mandir.xml"/>
 
   </sect2>
@@ -105,5 +110,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
@@ -111,5 +116,5 @@
         gnome-session-save, and gnome-wm</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/pixmaps/splash</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/pixmaps/splash</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-terminal.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -75,6 +75,6 @@
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
 
@@ -90,12 +90,12 @@
     <title>Command Explanations</title>
 
-    <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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
 
-    <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="../gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
 
   </sect2>
@@ -112,5 +112,5 @@
         <seg>gnome-terminal</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/{,gnome/help/,omf/}gnome-terminal</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/{,gnome/help/,omf/}gnome-terminal</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-user-docs.xml
===================================================================
--- gnome/core/gnome-user-docs.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-user-docs.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -91,8 +91,9 @@
     <title>Command Explanations</title>
 
-    <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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
 
   </sect2>
@@ -109,5 +110,6 @@
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/{gnome/help/{gnome-access-guide,system-admin-guide,user-guide},
+        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/{gnome-access-guide,
+        system-admin-guide, user-guide},
         omf/{gnome-user-docs,user-guide}}</seg>
       </seglistitem>
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gnome-vfs.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -82,9 +82,9 @@
 
     <para>If you run <command>./configure --help</command> for the complete
-    list of dependency requirements and available switches, you may notice a
+    list of dependency requirements and available parameters, you may notice a
     message about the <xref linkend="gnome-mount"/> package. This package is
     not required at build-time, and is only a run-time dependency. If
     <application>gnome-mount</application> is available at run-time,
-    <application>GNOME-VFS</application> will use it. If not available,
+    <application>GNOME-VFS</application> will use it. If it is not available,
     <application>GNOME-VFS</application> will fall back to using other mounting
     mechanisms.</para>
@@ -118,19 +118,16 @@
     <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="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
 
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-vfs-2.0</parameter>: This switch puts libexec files in
+    ORBit-2.0)/lib/gnome-vfs-2.0</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/gnome-vfs-2.0</filename>
     instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <!-- Apparently fixed
-    <para><command>rmdir $(pkg-config -variable=prefix ORBit-2.0)/doc</command>:
-    Use this command if <envar>$GNOME_PREFIX</envar> is anything other than
-    <filename class='directory'>/usr</filename> as the directory is unneeded and
-    unpopulated.</para> -->
 
     <para><option>--with-hal-eject=PROGRAM</option>: This parameter does not
@@ -138,11 +135,9 @@
     url="http://ca.geocities.com/jefftranter@rogers.com/eject.html">Eject</ulink>
     or <xref linkend="gnome-mount"/> installed, as the <command>eject</command>
-    program is used if gnome-mount is not installed.</para>
+    program is used if <application>gnome-mount</application> is not
+    installed.</para>
 
-    <!-- Commenting this out for now as the documentation is already built
-         and installed by default
-    <para><option>-enable-gtk-doc</option>: Use this option if you have
-    <application>GTK-Doc</application> installed and wish to build the API
-    documentation.</para> -->
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -162,5 +157,6 @@
         <seg>The following subdirectories of &gnome-etc-dir;/:
         gconf/{schemas, gconf.xml.defaults/{desktop, schemas, system},
-        gnome-vfs-2.0} and the following subdirectories of $GNOME_PREFIX/:
+        gnome-vfs-2.0} and the following subdirectories of
+        <envar>$GNOME_PREFIX</envar>/:
         include/gnome-vfs-{,module-}2.0,
         lib/gnome-vfs{,-2.0},
Index: gnome/core/gtk-engines.xml
===================================================================
--- gnome/core/gtk-engines.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/gtk-engines.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -95,5 +95,5 @@
         <seg>None</seg>
         <seg><application>GTK-2</application> engines libraries</seg>
-        <seg>/usr/lib/gtk-2.0/engines and /usr/share/themes/{theme name}</seg>
+        <seg>/usr/lib/gtk-2.0/engines and /usr/share/themes/{theme names}</seg>
         <seg>Clearlooks, Crux, Industrial, LighthouseBlue, Metal, Mist,
         Redmond and ThinIce</seg>
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/libbonobo.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -98,20 +98,21 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--prefix=$(pkg-config --variable=prefix
-    ORBit-2.0)</parameter>: Setting the prefix with this command instead of
-    with <envar>GNOME_PREFIX</envar> will ensure that the prefix is
-    consistent with the installation environment.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
 
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/bonobo</parameter>: This switch puts libexec files in
+    ORBit-2.0)/lib/bonobo</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/bonobo</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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-mandir.xml"/>
 
-    <para><option>--enable-gtk-doc</option>: This switch rebuilds the
-    documentation during the <command>make</command> command.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -133,5 +134,5 @@
         servers, and libmoniker_std_2.{so,a} bonobo library</seg>
         <seg>&gnome-etc-dir;/bonobo-activation and the following subdirectories
-        of $GNOME_PREFIX/:
+        of <envar>$GNOME_PREFIX</envar>/:
         include/{bonobo-activation-2.0,libbonobo-2.0},
         lib/{bonobo{,-2.0},libbonobo}, and
Index: gnome/core/libbonoboui.xml
===================================================================
--- gnome/core/libbonoboui.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/libbonoboui.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -85,7 +85,17 @@
 install -v -m755 -d $(pkg-config \
         --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version; &amp;&amp;
-install -v -m644 doc/*.{dtd,txt,xml,html} \
-        $(pkg-config \
-            --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version;</userinput></screen>
+install -v -m644 doc/*.{dtd,txt,xml,html} $(pkg-config \
+        --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -102,6 +112,6 @@
         <seg>bonobo-browser and test-moniker</seg>
         <seg>libbonoboui-2.{so,a} and libbonobo.{so,a} Glade library</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
-        include/libbonoboui-2.0 and
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
+        include/libbonoboui-2.0,
         share/{doc/libbonoboui-&libbonoboui-version;,
         gnome-2.0, gtk-doc/html/libbonoboui}</seg>
Index: gnome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/libgnome.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -94,10 +94,12 @@
     <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="../gnome-prefix.xml"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
 
     <para><parameter>--localstatedir=/var/lib</parameter>: This
-    switch sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to
+    parameter sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to
     <filename class='directory'>/var/lib</filename> instead
     of <filename class='directory'>$GNOME_PREFIX/var</filename>
@@ -105,4 +107,10 @@
     installation and properly record high scores in
     <filename class='directory'>/var/lib/games</filename>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-mandir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -121,5 +129,5 @@
         library</seg>
         <seg>&gnome-etc-dir;/sound,
-        and the following subdirectories of $GNOME_PREFIX/:
+        and the following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/libgnome-2.0, share/gtk-doc/html/libgnome</seg>
       </seglistitem>
Index: gnome/core/libgnomecanvas.xml
===================================================================
--- gnome/core/libgnomecanvas.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/libgnomecanvas.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -91,4 +91,15 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -103,7 +114,7 @@
         <seg>libgnomecanvas-2.{so,a} and the libcanvas.{so,a} Glade
         library</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/libgnomecanvas-2.0,
-        lib/libglade, and
+        lib/libglade and
         share/gtk-doc/html/libgnomecanvas</seg>
       </seglistitem>
Index: gnome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/libgnomeui.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -102,6 +102,10 @@
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/libgnomeui</parameter>: This switch puts libexec files in
+    ORBit-2.0)/lib/libgnomeui</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/libgnomeui</filename> instead
     of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
@@ -110,4 +114,7 @@
     parameter if you have <application>KDE</application> installed in any prefix
     other than <filename class='directory'>/usr</filename>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -138,5 +145,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
@@ -146,7 +153,7 @@
         <seg>libgnomeui-2.{so,a}, the libgnome.{so,a} Glade library, and
         the libgnome-vfs.{so,a} <application>GTK+</application> library</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/libgnomeui-2.0,
-        lib/{gtk-2.0/2.4.0/filesystems, libgnomeui}, and
+        lib/{gtk-2.0/2.4.0/filesystems, libgnomeui} and
         share/gtk-doc/html/libgnomeui</seg>
       </seglistitem>
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/libgtop.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -105,4 +105,7 @@
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
     <para><parameter>--infodir=$(pkg-config --variable=prefix
     ORBit-2.0)/share/info</parameter>:
@@ -136,5 +139,6 @@
       to your system-wide or personal profile:</para>
 
-<screen><literal>export INFOPATH=/usr/share/info:$GNOME_PREFIX/share/info</literal></screen>
+<screen><literal>export INFOPATH=/usr/share/info:$(pkg-config \
+       --variable=prefix ORBit-2.0)/share/info</literal></screen>
 
     </sect3>
@@ -153,5 +157,5 @@
         <seg>file_by_inode2 and mkinodedb2</seg>
         <seg>libgtop-2.0.{so,a}</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/libgtop-2.0 and
         lib/libgtop/examples</seg>
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/nautilus.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -104,7 +104,9 @@
     <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="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
 
   </sect2>
@@ -115,12 +117,12 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>nautilus, nautilus-connect-server, and
+        <seg>nautilus, nautilus-connect-server and
         nautilus-file-management-properties</seg>
         <seg>libnautilus-extension.so</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/nautilus,
         share/{doc/nautilus-&nautilus-version;, {,pixmaps}nautilus}</seg>
Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/orbit2.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -95,14 +95,12 @@
     installation for <application>GNOME-2</application> from which all future
     package installations will receive their prefix parameter. Be sure that
-    <envar>GNOME_PREFIX</envar> is set for this install or globally to your
+    <envar>$GNOME_PREFIX</envar> is set for this install or globally to your
     install directory as described in the introduction of this Chapter.</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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
 
-    <para><option>--enable-gtk-doc</option>: Use this parameter if you have
-    <application>GTK-Doc</application> installed and you wish to build the
-    documentation.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -121,7 +119,7 @@
         <seg>libname-server-2.a, libORBit-2.{so,a}, libORBit-imodule-2.{so,a},
         libORBitCosNaming-2.{so,a}, and Everything_module.{so,a}</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/orbit-2.0,
-        lib/orbit-2.0, and
+        lib/orbit-2.0 and
         share/{gtk-doc/html/ORBit2, idl/orbit-2.0}</seg>
       </seglistitem>
Index: gnome/core/vte.xml
===================================================================
--- gnome/core/vte.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/vte.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -122,6 +122,7 @@
     additional parameters to the <command>configure</command> script.</para>
 
-    <para><parameter>--libexecdir=/usr/lib/vte</parameter>: This switch puts
-    libexec files in <filename class="directory">/usr/lib/vte</filename>
+    <para><parameter>--libexecdir=/usr/lib/vte</parameter>: This parameter
+    causes the libexec files to be installed in the preferred location of
+    <filename class="directory">/usr/lib/vte</filename>
     instead of <filename class="directory">/usr/libexec</filename>.</para>
 
@@ -131,10 +132,6 @@
     <application>VTE</application> library.</para>
 
-    <!-- Disabling as the docs are not built by default in this release and
-         the tarball contains current docs
-    <para><parameter>-disable-gtk-doc</parameter>: This switch prevents the
-    building of documentation. Remove it if you have
-    <application>GTK-Doc</application> installed and wish to rebuild the
-    documentation.</para> -->
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -144,5 +141,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ gnome/core/yelp.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -95,6 +95,6 @@
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
 
@@ -110,8 +110,12 @@
     <title>Command Explanations</title>
 
-    <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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
 
   </sect2>
@@ -123,10 +127,10 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>gnome-help and yelp</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/yelp</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/yelp</seg>
       </seglistitem>
     </segmentedlist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7539d8f75dfae276ad858443fa652eefd15d0dca)
+++ introduction/welcome/changelog.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
@@ -46,4 +46,11 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Minor fixes and clean-up to the core GNOME-2
+          package instructions including standardizing the text in the
+          'Command Explanations' section by using xinclude files and changing
+          the creation of symbolic links to using PYTHONPATH so Python can
+          find modules installed in non-standard locations.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added some new xinclude files to replace the
           repetitive similar text in many package insructions.</para>
